Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 0b4b82ad1461cc37434e7e0c1de00a61193a95db

Authored by Michal Simek
1 parent 4aba5fb857
Exists in smarc_8mq_lf_v2020.04 and in 11 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

arm: zynq: Remove checkboard and enable DISPLAY_CPUINFO 

Now that showing silicon version is part of the CPU
info display, let's remove checkboard().

Note that the generic show_board_info() will still
show the DT 'model' property. For instance:

U-Boot 2018.05-rc2-00025-g611b3ee0159b (Apr 19 2018 - 11:23:12 +0200)

CPU:   Zynq 7z045
Silicon: v1.0
Model: Zynq ZC706 Development Board
I2C:   ready

Based on patches from Ariel D'Alessandro <ariel@vanguardiasur.com.ar>,
and Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>

mini configuration doesn't need to show this information.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

Showing 19 changed files with 19 additions and 34 deletions Side-by-side Diff

arch/arm/mach-zynq/cpu.c
Diff comments   View file @ 0b4b82a
... ... @@ -123,4 +123,23 @@
123 123 return 0;
124 124 }
125 125 #endif
  126 +
  127 +#ifdef CONFIG_DISPLAY_CPUINFO
  128 +int print_cpuinfo(void)
  129 +{
  130 + u32 version;
  131 + int cpu_id = cpu_desc_id();
  132 +
  133 + if (cpu_id < 0)
  134 + return 0;
  135 +
  136 + version = zynq_get_silicon_version() << 1;
  137 + if (version > (PCW_SILICON_VERSION_3 << 1))
  138 + version += 1;
  139 +
  140 + printf("CPU: Zynq %s\n", zynq_fpga_descs[cpu_id].devicename);
  141 + printf("Silicon: v%d.%d\n", version >> 1, version & 1);
  142 + return 0;
  143 +}
  144 +#endif
board/xilinx/zynq/board.c
Diff comments   View file @ 0b4b82a
... ... @@ -13,7 +13,6 @@
13 13 #include <zynqpl.h>
14 14 #include <asm/arch/hardware.h>
15 15 #include <asm/arch/sys_proto.h>
16   -#include <asm/arch/ps7_init_gpl.h>
17 16  
18 17 DECLARE_GLOBAL_DATA_PTR;
19 18  
... ... @@ -72,22 +71,6 @@
72 71  
73 72 return 0;
74 73 }
75   -
76   -#ifdef CONFIG_DISPLAY_BOARDINFO
77   -int checkboard(void)
78   -{
79   - u32 version = zynq_get_silicon_version();
80   -
81   - version <<= 1;
82   - if (version > (PCW_SILICON_VERSION_3 << 1))
83   - version += 1;
84   -
85   - puts("Board: Xilinx Zynq\n");
86   - printf("Silicon: v%d.%d\n", version >> 1, version & 1);
87   -
88   - return 0;
89   -}
90   -#endif
91 74  
92 75 int zynq_board_read_rom_ethaddr(unsigned char *ethaddr)
93 76 {
configs/syzygy_hub_defconfig
Diff comments   View file @ 0b4b82a
... ... @@ -13,7 +13,6 @@
13 13 CONFIG_FIT_VERBOSE=y
14 14 CONFIG_IMAGE_FORMAT_LEGACY=y
15 15 CONFIG_BOOTCOMMAND="run $modeboot || run distro_bootcmd"
16   -# CONFIG_DISPLAY_CPUINFO is not set
17 16 CONFIG_SPL_STACK_R=y
18 17 CONFIG_SPL_OS_BOOT=y
19 18 CONFIG_SYS_PROMPT="Zynq> "
configs/topic_miami_defconfig
Diff comments   View file @ 0b4b82a
... ... @@ -11,7 +11,6 @@
11 11 CONFIG_DISTRO_DEFAULTS=y
12 12 CONFIG_BOOTDELAY=0
13 13 CONFIG_BOOTCOMMAND="run $modeboot || run distro_bootcmd"
14   -# CONFIG_DISPLAY_CPUINFO is not set
15 14 CONFIG_SPL_STACK_R=y
16 15 CONFIG_SPL_SPI_LOAD=y
17 16 CONFIG_SYS_PROMPT="zynq-uboot> "
configs/topic_miamilite_defconfig
Diff comments   View file @ 0b4b82a
... ... @@ -11,7 +11,6 @@
11 11 CONFIG_DISTRO_DEFAULTS=y
12 12 CONFIG_BOOTDELAY=0
13 13 CONFIG_BOOTCOMMAND="run $modeboot || run distro_bootcmd"
14   -# CONFIG_DISPLAY_CPUINFO is not set
15 14 CONFIG_SPL_STACK_R=y
16 15 CONFIG_SPL_SPI_LOAD=y
17 16 CONFIG_SYS_PROMPT="zynq-uboot> "
configs/topic_miamiplus_defconfig
Diff comments   View file @ 0b4b82a
... ... @@ -11,7 +11,6 @@
11 11 CONFIG_DISTRO_DEFAULTS=y
12 12 CONFIG_BOOTDELAY=0
13 13 CONFIG_BOOTCOMMAND="run $modeboot || run distro_bootcmd"
14   -# CONFIG_DISPLAY_CPUINFO is not set
15 14 CONFIG_SPL_STACK_R=y
16 15 CONFIG_SPL_SPI_LOAD=y
17 16 CONFIG_SYS_PROMPT="zynq-uboot> "
configs/zynq_cc108_defconfig
Diff comments   View file @ 0b4b82a
... ... @@ -11,7 +11,6 @@
11 11 CONFIG_FIT_VERBOSE=y
12 12 CONFIG_IMAGE_FORMAT_LEGACY=y
13 13 CONFIG_BOOTCOMMAND="run $modeboot || run distro_bootcmd"
14   -# CONFIG_DISPLAY_CPUINFO is not set
15 14 CONFIG_SPL_STACK_R=y
16 15 CONFIG_SPL_SPI_LOAD=y
17 16 CONFIG_SYS_PROMPT="Zynq> "
configs/zynq_microzed_defconfig
Diff comments   View file @ 0b4b82a
... ... @@ -10,7 +10,6 @@
10 10 CONFIG_FIT_VERBOSE=y
11 11 CONFIG_IMAGE_FORMAT_LEGACY=y
12 12 CONFIG_BOOTCOMMAND="run $modeboot || run distro_bootcmd"
13   -# CONFIG_DISPLAY_CPUINFO is not set
14 13 CONFIG_SPL_STACK_R=y
15 14 CONFIG_SPL_OS_BOOT=y
16 15 CONFIG_SPL_SPI_LOAD=y
configs/zynq_picozed_defconfig
Diff comments   View file @ 0b4b82a
... ... @@ -6,7 +6,6 @@
6 6 CONFIG_DEFAULT_DEVICE_TREE="zynq-picozed"
7 7 CONFIG_DISTRO_DEFAULTS=y
8 8 CONFIG_BOOTCOMMAND="run $modeboot || run distro_bootcmd"
9   -# CONFIG_DISPLAY_CPUINFO is not set
10 9 CONFIG_SPL_STACK_R=y
11 10 CONFIG_SPL_OS_BOOT=y
12 11 CONFIG_SYS_PROMPT="Zynq> "
configs/zynq_z_turn_defconfig
Diff comments   View file @ 0b4b82a
... ... @@ -11,7 +11,6 @@
11 11 CONFIG_FIT_VERBOSE=y
12 12 CONFIG_IMAGE_FORMAT_LEGACY=y
13 13 CONFIG_BOOTCOMMAND="run $modeboot || run distro_bootcmd"
14   -# CONFIG_DISPLAY_CPUINFO is not set
15 14 CONFIG_SPL_STACK_R=y
16 15 CONFIG_SPL_OS_BOOT=y
17 16 CONFIG_SPL_SPI_LOAD=y
configs/zynq_zc702_defconfig
Diff comments   View file @ 0b4b82a
... ... @@ -13,7 +13,6 @@
13 13 CONFIG_FIT_VERBOSE=y
14 14 CONFIG_IMAGE_FORMAT_LEGACY=y
15 15 CONFIG_BOOTCOMMAND="run $modeboot || run distro_bootcmd"
16   -# CONFIG_DISPLAY_CPUINFO is not set
17 16 CONFIG_SPL_STACK_R=y
18 17 CONFIG_SPL_OS_BOOT=y
19 18 CONFIG_SPL_SPI_LOAD=y
configs/zynq_zc706_defconfig
Diff comments   View file @ 0b4b82a
... ... @@ -13,7 +13,6 @@
13 13 CONFIG_FIT_VERBOSE=y
14 14 CONFIG_IMAGE_FORMAT_LEGACY=y
15 15 CONFIG_BOOTCOMMAND="run $modeboot || run distro_bootcmd"
16   -# CONFIG_DISPLAY_CPUINFO is not set
17 16 CONFIG_SPL_STACK_R=y
18 17 CONFIG_SPL_OS_BOOT=y
19 18 CONFIG_SPL_SPI_LOAD=y
configs/zynq_zc770_xm010_defconfig
Diff comments   View file @ 0b4b82a
... ... @@ -12,7 +12,6 @@
12 12 CONFIG_FIT_VERBOSE=y
13 13 CONFIG_IMAGE_FORMAT_LEGACY=y
14 14 CONFIG_BOOTCOMMAND="run $modeboot || run distro_bootcmd"
15   -# CONFIG_DISPLAY_CPUINFO is not set
16 15 CONFIG_SPL_STACK_R=y
17 16 CONFIG_SPL_OS_BOOT=y
18 17 CONFIG_SPL_SPI_LOAD=y
configs/zynq_zc770_xm011_defconfig
Diff comments   View file @ 0b4b82a
... ... @@ -13,7 +13,6 @@
13 13 CONFIG_FIT_VERBOSE=y
14 14 CONFIG_IMAGE_FORMAT_LEGACY=y
15 15 CONFIG_BOOTCOMMAND="run $modeboot || run distro_bootcmd"
16   -# CONFIG_DISPLAY_CPUINFO is not set
17 16 CONFIG_SPL_STACK_R=y
18 17 CONFIG_SPL_OS_BOOT=y
19 18 CONFIG_SYS_PROMPT="Zynq> "
configs/zynq_zc770_xm011_x16_defconfig
Diff comments   View file @ 0b4b82a
... ... @@ -13,7 +13,6 @@
13 13 CONFIG_FIT_VERBOSE=y
14 14 CONFIG_IMAGE_FORMAT_LEGACY=y
15 15 CONFIG_BOOTCOMMAND="run $modeboot || run distro_bootcmd"
16   -# CONFIG_DISPLAY_CPUINFO is not set
17 16 CONFIG_SPL_STACK_R=y
18 17 CONFIG_SPL_OS_BOOT=y
19 18 CONFIG_SYS_PROMPT="Zynq> "
configs/zynq_zc770_xm012_defconfig
Diff comments   View file @ 0b4b82a
... ... @@ -12,7 +12,6 @@
12 12 CONFIG_FIT_VERBOSE=y
13 13 CONFIG_IMAGE_FORMAT_LEGACY=y
14 14 CONFIG_BOOTCOMMAND="run $modeboot || run distro_bootcmd"
15   -# CONFIG_DISPLAY_CPUINFO is not set
16 15 CONFIG_SPL_STACK_R=y
17 16 CONFIG_SPL_OS_BOOT=y
18 17 CONFIG_SYS_PROMPT="Zynq> "
configs/zynq_zc770_xm013_defconfig
Diff comments   View file @ 0b4b82a
... ... @@ -12,7 +12,6 @@
12 12 CONFIG_FIT_VERBOSE=y
13 13 CONFIG_IMAGE_FORMAT_LEGACY=y
14 14 CONFIG_BOOTCOMMAND="run $modeboot || run distro_bootcmd"
15   -# CONFIG_DISPLAY_CPUINFO is not set
16 15 CONFIG_SPL_STACK_R=y
17 16 CONFIG_SPL_OS_BOOT=y
18 17 CONFIG_SPL_SPI_LOAD=y
configs/zynq_zed_defconfig
Diff comments   View file @ 0b4b82a
... ... @@ -11,7 +11,6 @@
11 11 CONFIG_FIT_VERBOSE=y
12 12 CONFIG_IMAGE_FORMAT_LEGACY=y
13 13 CONFIG_BOOTCOMMAND="run $modeboot || run distro_bootcmd"
14   -# CONFIG_DISPLAY_CPUINFO is not set
15 14 CONFIG_SPL_STACK_R=y
16 15 CONFIG_SPL_OS_BOOT=y
17 16 CONFIG_SPL_SPI_LOAD=y
configs/zynq_zybo_defconfig
Diff comments   View file @ 0b4b82a
... ... @@ -12,7 +12,6 @@
12 12 CONFIG_FIT_VERBOSE=y
13 13 CONFIG_IMAGE_FORMAT_LEGACY=y
14 14 CONFIG_BOOTCOMMAND="run $modeboot || run distro_bootcmd"
15   -# CONFIG_DISPLAY_CPUINFO is not set
16 15 CONFIG_SPL_STACK_R=y
17 16 CONFIG_SPL_OS_BOOT=y
18 17 CONFIG_SPL_SPI_LOAD=y