arm64: zynqmp: Call psu_init() only when ZYNQMP_PSU_INIT_ENABLED

Remove SPL_BUILD dependency from zynqmp.c and move it to header file.
Use only one symbol for including psu_init.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
master
Michal Simek 7 years ago
parent 9753c4f886
commit 88f05a926d
  1. 2
      board/xilinx/zynqmp/zynqmp.c
  2. 4
      include/configs/xilinx_zynqmp.h

@ -242,7 +242,7 @@ int board_early_init_f(void)
zynqmp_pmufw_version();
#endif
#if defined(CONFIG_SPL_BUILD) || defined(CONFIG_ZYNQMP_PSU_INIT_ENABLED)
#if defined(CONFIG_ZYNQMP_PSU_INIT_ENABLED)
ret = psu_init();
#endif

@ -80,6 +80,10 @@
# define CONFIG_MTD_DEVICE
#endif
#if defined(CONFIG_SPL_BUILD)
#define CONFIG_ZYNQMP_PSU_INIT_ENABLED
#endif
/* Miscellaneous configurable options */
#define CONFIG_SYS_LOAD_ADDR 0x8000000

Loading…
Cancel
Save