commit 1a1ab5a3f4bdf599e6b7cf7e736d90014e3b6e2f
author Michal Simek <michal.simek@xilinx.com> Mon Jan 15 12:52:59 2018 +0100
committer Michal Simek <michal.simek@xilinx.com> Tue Jan 30 14:29:12 2018 +0100
tree 122858bc7d208883ce3224b8beebea3c470091fb
parent 20966ecb7cc9298e5a16dde9369cbf1f70ccf402

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>

board/xilinx/zynqmp/zynqmp.c

diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c
index db557e8..6c8254b 100644
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -242,7 +242,7 @@
 	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
 

include/configs/xilinx_zynqmp.h

diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index d883897..dddfe27 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