Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 8eb55e19650b7b27ba76cd93a7c2bffba9552d77

Authored by Michal Simek
1 parent 284b27cf81
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

arm64: zynqmp: Handle CONFIG_BOARD_LATE_INIT via Kconfig 

Disable BOARD_LATE_INIT via Kconfig.

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

Showing 11 changed files with 10 additions and 5 deletions Side-by-side Diff

... ... @@ -861,7 +861,6 @@
861 861 config ARCH_ZYNQ
862 862 bool "Xilinx Zynq based platform"
863 863 select BOARD_EARLY_INIT_F if WDT
864   - select BOARD_LATE_INIT
865 864 select CLK
866 865 select CLK_ZYNQ
867 866 select CPU_V7A
... ... @@ -881,6 +880,7 @@
881 880 select SPL_SEPARATE_BSS if SPL
882 881 select SUPPORT_SPL
883 882 imply ARCH_EARLY_INIT_R
  883 + imply BOARD_LATE_INIT
884 884 imply CMD_CLK
885 885 imply CMD_DM
886 886 imply CMD_SPL
... ... @@ -898,7 +898,6 @@
898 898 config ARCH_ZYNQMP
899 899 bool "Xilinx ZynqMP based platform"
900 900 select ARM64
901   - select BOARD_LATE_INIT
902 901 select CLK
903 902 select DM
904 903 select DM_SERIAL
... ... @@ -907,6 +906,7 @@
907 906 select SPL_BOARD_INIT if SPL
908 907 select SPL_CLK if SPL
909 908 select SUPPORT_SPL
  909 + imply BOARD_LATE_INIT
910 910 imply CMD_DM
911 911 imply FAT_WRITE
912 912  
... ... @@ -557,7 +557,7 @@
557 557 next reset.
558 558  
559 559 config BOARD_LATE_INIT
560   - bool
  560 + bool "Execute Board late init"
561 561 help
562 562 Sometimes board require some initialization code that might
563 563 require once the actual init done, example saving board specific env,
configs/xilinx_zynqmp_mini_emmc0_defconfig
Diff comments   View file @ 8eb55e1
... ... @@ -9,6 +9,7 @@
9 9 CONFIG_FIT=y
10 10 CONFIG_BOOTDELAY=-1
11 11 CONFIG_SUPPORT_RAW_INITRD=y
  12 +# CONFIG_BOARD_LATE_INIT is not set
12 13 # CONFIG_DISPLAY_CPUINFO is not set
13 14 CONFIG_BOARD_EARLY_INIT_R=y
14 15 # CONFIG_CMDLINE_EDITING is not set
configs/xilinx_zynqmp_mini_emmc1_defconfig
Diff comments   View file @ 8eb55e1
... ... @@ -9,6 +9,7 @@
9 9 CONFIG_FIT=y
10 10 CONFIG_BOOTDELAY=-1
11 11 CONFIG_SUPPORT_RAW_INITRD=y
  12 +# CONFIG_BOARD_LATE_INIT is not set
12 13 # CONFIG_DISPLAY_CPUINFO is not set
13 14 CONFIG_BOARD_EARLY_INIT_R=y
14 15 # CONFIG_CMDLINE_EDITING is not set
configs/xilinx_zynqmp_mini_nand_defconfig
Diff comments   View file @ 8eb55e1
... ... @@ -9,6 +9,7 @@
9 9 CONFIG_FIT=y
10 10 CONFIG_BOOTDELAY=-1
11 11 CONFIG_SUPPORT_RAW_INITRD=y
  12 +# CONFIG_BOARD_LATE_INIT is not set
12 13 # CONFIG_DISPLAY_CPUINFO is not set
13 14 CONFIG_BOARD_EARLY_INIT_R=y
14 15 # CONFIG_CMDLINE_EDITING is not set
configs/xilinx_zynqmp_mini_qspi_defconfig
Diff comments   View file @ 8eb55e1
... ... @@ -9,6 +9,7 @@
9 9 CONFIG_NR_DRAM_BANKS=1
10 10 # CONFIG_IMAGE_FORMAT_LEGACY is not set
11 11 CONFIG_BOOTDELAY=-1
  12 +# CONFIG_BOARD_LATE_INIT is not set
12 13 # CONFIG_DISPLAY_CPUINFO is not set
13 14 # CONFIG_CMDLINE_EDITING is not set
14 15 # CONFIG_AUTO_COMPLETE is not set
configs/zynq_cse_nand_defconfig
Diff comments   View file @ 8eb55e1
... ... @@ -6,6 +6,7 @@
6 6 CONFIG_SPL=y
7 7 CONFIG_SPL_STACK_R_ADDR=0x200000
8 8 CONFIG_SYS_MALLOC_LEN=0x1000
  9 +# CONFIG_BOARD_LATE_INIT is not set
9 10 # CONFIG_DISPLAY_CPUINFO is not set
10 11 CONFIG_SPL_STACK_R=y
11 12 CONFIG_SYS_PROMPT="Zynq> "
configs/zynq_cse_nor_defconfig
Diff comments   View file @ 8eb55e1
... ... @@ -7,6 +7,7 @@
7 7 CONFIG_SPL_STACK_R_ADDR=0x200000
8 8 CONFIG_SYS_MALLOC_LEN=0x1000
9 9 CONFIG_BOOTDELAY=-1
  10 +# CONFIG_BOARD_LATE_INIT is not set
10 11 # CONFIG_DISPLAY_CPUINFO is not set
11 12 CONFIG_SPL_STACK_R=y
12 13 CONFIG_SYS_PROMPT="Zynq> "
configs/zynq_cse_qspi_defconfig
Diff comments   View file @ 8eb55e1
... ... @@ -15,6 +15,7 @@
15 15 # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
16 16 CONFIG_BOOTDELAY=-1
17 17 # CONFIG_USE_BOOTCOMMAND is not set
  18 +# CONFIG_BOARD_LATE_INIT is not set
18 19 # CONFIG_DISPLAY_CPUINFO is not set
19 20 # CONFIG_ARCH_EARLY_INIT_R is not set
20 21 CONFIG_SPL_STACK_R=y
include/configs/xilinx_zynqmp_mini.h
Diff comments   View file @ 8eb55e1
... ... @@ -24,7 +24,6 @@
24 24 #undef CONFIG_BOOTM_NETBSD
25 25 #undef CONFIG_BOOTM_VXWORKS
26 26 #undef CONFIG_BOOTM_LINUX
27   -#undef CONFIG_BOARD_LATE_INIT
28 27  
29 28 /* BOOTP options */
30 29 #undef CONFIG_BOOTP_BOOTFILESIZE
include/configs/zynq_cse.h
Diff comments   View file @ 8eb55e1
... ... @@ -17,7 +17,6 @@
17 17  
18 18 /* Undef unneeded configs */
19 19 #undef CONFIG_EXTRA_ENV_SETTINGS
20   -#undef CONFIG_BOARD_LATE_INIT
21 20 #undef CONFIG_ZLIB
22 21 #undef CONFIG_GZIP
23 22