[U-Boot] [PATCH v2 1/3] arm64: zynqmp: Call psu_init() only when ZYNQMP_PSU_INIT_ENABLED

Michal Simek michal.simek at xilinx.com
Tue Jan 16 15:05:16 UTC 2018


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 at xilinx.com>
---

Changes in v2:
- New patch in this series

 board/xilinx/zynqmp/zynqmp.c    | 2 +-
 include/configs/xilinx_zynqmp.h | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c
index db557e880674..6c8254b9824b 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 0cb6ba8de08e..3f4738afe20f 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
 
-- 
1.9.1



More information about the U-Boot mailing list