random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 04:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

arm64: zynqmp: Fix dependencies around ZYNQMP_PSU_INIT_ENABLED

Browse Source 
ZYNQMP_PSU_INIT_ENABLED is called only when BOARD_EARLY_INIT_F is defined
that's why cover this dependency in Kconfig.
 board_early_init_f() is only part related to
CONFIG_ZYNQMP_PSU_INIT_ENABLED which is disabled now that's why disable
BOARD_EARLY_INIT_F and also build board_early_init_f() only when
CONFIG_BOARD_EARLY_INIT_F is enabled.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Link: https://lore.kernel.org/r/d89253ec1590cd513dcd4bfbedebae618bd6d605.1645104518.git.michal.simek@xilinx.com
This commit is contained in:
Michal Simek 2022-02-17 14:28:40 +01:00
parent 27703ba06d
commit 83d2941fe9
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-zynqmp/Kconfig
View File

@ -140,6 +140,7 @@ config DEFINE_TCM_OCM_MMAP
config ZYNQMP_PSU_INIT_ENABLED config ZYNQMP_PSU_INIT_ENABLED
bool "Include psu_init" bool "Include psu_init"
select BOARD_EARLY_INIT_F
help help
Include psu_init to full u-boot. SPL include psu_init by default. Include psu_init to full u-boot. SPL include psu_init by default.

2
board/xilinx/zynqmp/zynqmp.c
View File

@ -313,6 +313,7 @@ static char *zynqmp_get_silicon_idcode_name(void)
} }
#endif #endif
#if defined(CONFIG_BOARD_EARLY_INIT_F)
int board_early_init_f(void) int board_early_init_f(void)
{ {
#if defined(CONFIG_ZYNQMP_PSU_INIT_ENABLED) #if defined(CONFIG_ZYNQMP_PSU_INIT_ENABLED)
@ -345,6 +346,7 @@ int board_early_init_f(void)
return 0; return 0;
} }
#endif
static int multi_boot(void) static int multi_boot(void)
{ {

1
configs/xilinx_zynqmp_virt_defconfig
View File

@ -28,7 +28,6 @@ CONFIG_SPL_LOAD_FIT_ADDRESS=0x10000000
# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
CONFIG_USE_PREBOOT=y CONFIG_USE_PREBOOT=y
CONFIG_PREBOOT="run scsi_init;usb start" CONFIG_PREBOOT="run scsi_init;usb start"
CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_BOARD_EARLY_INIT_R=y CONFIG_BOARD_EARLY_INIT_R=y
CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R=y
CONFIG_SPL_FPGA=y CONFIG_SPL_FPGA=y