[PATCH] include: configs: soc64: Use CONFIG_SPL_ATF to differentiate bootfile

Jit Loon Lim jit.loon.lim at intel.com
Mon Nov 21 16:22:03 CET 2022


From: Siew Chin Lim <elly.siew.chin.lim at intel.com>

Legacy boot flow (SPL->U-Boot Proper->OS) boot to OS via Kernel Image and
dtb files using booti command.

ATF boot flow (SPL->ATF->U-Boot Proper->OS) boot to OS via kernel.itb file
using bootm command.

Change to use CONFIG_SPL_ATF to differentiate the bootfile of default
environment variable. We shouldn't use CONFIG_FIT because it is enabled
by default for U-Boot Proper.

Signed-off-by: Siew Chin Lim <elly.siew.chin.lim at intel.com>
Signed-off-by: Jit Loon Lim <jit.loon.lim at intel.com>
---
 include/configs/socfpga_soc64_common.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h
index 12da770077..7edffc3975 100644
--- a/include/configs/socfpga_soc64_common.h
+++ b/include/configs/socfpga_soc64_common.h
@@ -50,6 +50,13 @@
 /*
  * Environment variable
  */
+
+#if IS_ENABLED(CONFIG_SPL_ATF)
+#define CONFIG_BOOTFILE "kernel.itb"
+#else
+#define CONFIG_BOOTFILE "Image"
+#endif
+
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"qspibootimageaddr=0x020E0000\0" \
 	"qspifdtaddr=0x020D0000\0" \
-- 
2.26.2



More information about the U-Boot mailing list