Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arm64: zynqmp: Handle CONFIG_BOARD_LATE_INIT via Kconfig

Browse Source 
Disable BOARD_LATE_INIT via Kconfig.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
lime2-spi
Michal Simek 6 years ago
parent 284b27cf81
commit 8eb55e1965
11 changed files with 10 additions and 5 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      arch/arm/Kconfig
  2. 2
      common/Kconfig
  3. 1
      configs/xilinx_zynqmp_mini_emmc0_defconfig
  4. 1
      configs/xilinx_zynqmp_mini_emmc1_defconfig
  5. 1
      configs/xilinx_zynqmp_mini_nand_defconfig
  6. 1
      configs/xilinx_zynqmp_mini_qspi_defconfig
  7. 1
      configs/zynq_cse_nand_defconfig
  8. 1
      configs/zynq_cse_nor_defconfig
  9. 1
      configs/zynq_cse_qspi_defconfig
  10. 1
      include/configs/xilinx_zynqmp_mini.h
  11. 1
      include/configs/zynq_cse.h

4
arch/arm/Kconfig
Unescape View File

@ -861,7 +861,6 @@ config ARCH_VF610
config ARCH_ZYNQ config ARCH_ZYNQ
bool "Xilinx Zynq based platform" bool "Xilinx Zynq based platform"
select BOARD_EARLY_INIT_F if WDT select BOARD_EARLY_INIT_F if WDT
select BOARD_LATE_INIT
select CLK select CLK
select CLK_ZYNQ select CLK_ZYNQ
select CPU_V7A select CPU_V7A
@ -881,6 +880,7 @@ config ARCH_ZYNQ
select SPL_SEPARATE_BSS if SPL select SPL_SEPARATE_BSS if SPL
select SUPPORT_SPL select SUPPORT_SPL
imply ARCH_EARLY_INIT_R imply ARCH_EARLY_INIT_R
imply BOARD_LATE_INIT
imply CMD_CLK imply CMD_CLK
imply CMD_DM imply CMD_DM
imply CMD_SPL imply CMD_SPL
@ -898,7 +898,6 @@ config ARCH_ZYNQMP_R5
config ARCH_ZYNQMP config ARCH_ZYNQMP
bool "Xilinx ZynqMP based platform" bool "Xilinx ZynqMP based platform"
select ARM64 select ARM64
select BOARD_LATE_INIT
select CLK select CLK
select DM select DM
select DM_SERIAL select DM_SERIAL
@ -907,6 +906,7 @@ config ARCH_ZYNQMP
select SPL_BOARD_INIT if SPL select SPL_BOARD_INIT if SPL
select SPL_CLK if SPL select SPL_CLK if SPL
select SUPPORT_SPL select SUPPORT_SPL
imply BOARD_LATE_INIT
imply CMD_DM imply CMD_DM
imply FAT_WRITE imply FAT_WRITE

2
common/Kconfig
Unescape View File

@ -557,7 +557,7 @@ config VERSION_VARIABLE
next reset. next reset.
config BOARD_LATE_INIT config BOARD_LATE_INIT
bool bool "Execute Board late init"
help help
Sometimes board require some initialization code that might Sometimes board require some initialization code that might
require once the actual init done, example saving board specific env, require once the actual init done, example saving board specific env,

1
configs/xilinx_zynqmp_mini_emmc0_defconfig
Unescape View File

@ -9,6 +9,7 @@ CONFIG_NR_DRAM_BANKS=1
CONFIG_FIT=y CONFIG_FIT=y
CONFIG_BOOTDELAY=-1 CONFIG_BOOTDELAY=-1
CONFIG_SUPPORT_RAW_INITRD=y CONFIG_SUPPORT_RAW_INITRD=y
# CONFIG_BOARD_LATE_INIT is not set
# CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_CPUINFO is not set
CONFIG_BOARD_EARLY_INIT_R=y CONFIG_BOARD_EARLY_INIT_R=y
# CONFIG_CMDLINE_EDITING is not set # CONFIG_CMDLINE_EDITING is not set

1
configs/xilinx_zynqmp_mini_emmc1_defconfig
Unescape View File

@ -9,6 +9,7 @@ CONFIG_NR_DRAM_BANKS=1
CONFIG_FIT=y CONFIG_FIT=y
CONFIG_BOOTDELAY=-1 CONFIG_BOOTDELAY=-1
CONFIG_SUPPORT_RAW_INITRD=y CONFIG_SUPPORT_RAW_INITRD=y
# CONFIG_BOARD_LATE_INIT is not set
# CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_CPUINFO is not set
CONFIG_BOARD_EARLY_INIT_R=y CONFIG_BOARD_EARLY_INIT_R=y
# CONFIG_CMDLINE_EDITING is not set # CONFIG_CMDLINE_EDITING is not set

1
configs/xilinx_zynqmp_mini_nand_defconfig
Unescape View File

@ -9,6 +9,7 @@ CONFIG_NR_DRAM_BANKS=1
CONFIG_FIT=y CONFIG_FIT=y
CONFIG_BOOTDELAY=-1 CONFIG_BOOTDELAY=-1
CONFIG_SUPPORT_RAW_INITRD=y CONFIG_SUPPORT_RAW_INITRD=y
# CONFIG_BOARD_LATE_INIT is not set
# CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_CPUINFO is not set
CONFIG_BOARD_EARLY_INIT_R=y CONFIG_BOARD_EARLY_INIT_R=y
# CONFIG_CMDLINE_EDITING is not set # CONFIG_CMDLINE_EDITING is not set

1
configs/xilinx_zynqmp_mini_qspi_defconfig
Unescape View File

@ -9,6 +9,7 @@ CONFIG_ZYNQMP_NO_DDR=y
CONFIG_NR_DRAM_BANKS=1 CONFIG_NR_DRAM_BANKS=1
# CONFIG_IMAGE_FORMAT_LEGACY is not set # CONFIG_IMAGE_FORMAT_LEGACY is not set
CONFIG_BOOTDELAY=-1 CONFIG_BOOTDELAY=-1
# CONFIG_BOARD_LATE_INIT is not set
# CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_CMDLINE_EDITING is not set # CONFIG_CMDLINE_EDITING is not set
# CONFIG_AUTO_COMPLETE is not set # CONFIG_AUTO_COMPLETE is not set

1
configs/zynq_cse_nand_defconfig
Unescape View File

@ -6,6 +6,7 @@ CONFIG_ENV_SIZE=0x190
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_STACK_R_ADDR=0x200000 CONFIG_SPL_STACK_R_ADDR=0x200000
CONFIG_SYS_MALLOC_LEN=0x1000 CONFIG_SYS_MALLOC_LEN=0x1000
# CONFIG_BOARD_LATE_INIT is not set
# CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_CPUINFO is not set
CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R=y
CONFIG_SYS_PROMPT="Zynq> " CONFIG_SYS_PROMPT="Zynq> "

1
configs/zynq_cse_nor_defconfig
Unescape View File

@ -7,6 +7,7 @@ CONFIG_SPL=y
CONFIG_SPL_STACK_R_ADDR=0x200000 CONFIG_SPL_STACK_R_ADDR=0x200000
CONFIG_SYS_MALLOC_LEN=0x1000 CONFIG_SYS_MALLOC_LEN=0x1000
CONFIG_BOOTDELAY=-1 CONFIG_BOOTDELAY=-1
# CONFIG_BOARD_LATE_INIT is not set
# CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_CPUINFO is not set
CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R=y
CONFIG_SYS_PROMPT="Zynq> " CONFIG_SYS_PROMPT="Zynq> "

1
configs/zynq_cse_qspi_defconfig
Unescape View File

@ -15,6 +15,7 @@ CONFIG_DISTRO_DEFAULTS=y
# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
CONFIG_BOOTDELAY=-1 CONFIG_BOOTDELAY=-1
# CONFIG_USE_BOOTCOMMAND is not set # CONFIG_USE_BOOTCOMMAND is not set
# CONFIG_BOARD_LATE_INIT is not set
# CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_ARCH_EARLY_INIT_R is not set # CONFIG_ARCH_EARLY_INIT_R is not set
CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R=y

1
include/configs/xilinx_zynqmp_mini.h
Unescape View File

@ -24,7 +24,6 @@
#undef CONFIG_BOOTM_NETBSD #undef CONFIG_BOOTM_NETBSD
#undef CONFIG_BOOTM_VXWORKS #undef CONFIG_BOOTM_VXWORKS
#undef CONFIG_BOOTM_LINUX #undef CONFIG_BOOTM_LINUX
#undef CONFIG_BOARD_LATE_INIT
/* BOOTP options */ /* BOOTP options */
#undef CONFIG_BOOTP_BOOTFILESIZE #undef CONFIG_BOOTP_BOOTFILESIZE

1
include/configs/zynq_cse.h
Unescape View File

@ -17,7 +17,6 @@
/* Undef unneeded configs */ /* Undef unneeded configs */
#undef CONFIG_EXTRA_ENV_SETTINGS #undef CONFIG_EXTRA_ENV_SETTINGS
#undef CONFIG_BOARD_LATE_INIT
#undef CONFIG_ZLIB #undef CONFIG_ZLIB
#undef CONFIG_GZIP #undef CONFIG_GZIP

Write Preview
Loading…
Cancel
Save