diff options
author | Michal Simek <michal.simek@xilinx.com> | 2018-01-15 14:52:59 +0300 |
---|---|---|
committer | Michal Simek <michal.simek@xilinx.com> | 2018-01-30 16:29:12 +0300 |
commit | 88f05a926d52a4b05eac2e325bb600fa83f8eee1 (patch) | |
tree | 122858bc7d208883ce3224b8beebea3c470091fb | |
parent | 9753c4f886e22c9166ef0d918ef7a6f1c88de7e8 (diff) | |
download | u-boot-88f05a926d52a4b05eac2e325bb600fa83f8eee1.tar.xz |
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>
-rw-r--r-- | board/xilinx/zynqmp/zynqmp.c | 2 | ||||
-rw-r--r-- | include/configs/xilinx_zynqmp.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index db557e8806..6c8254b982 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -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 diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index d883897c6c..dddfe274fb 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -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 |