[U-Boot] [PATCH] spl: spl_nor: surround Linux-load code with #ifdef CONFIG_SPL_OS_BOOT

[Masahiro Yamada]

If CONFIG_SPL_NOR_SUPPORT is defined, spl_nor_load_image() requires
spl_start_uboot(), CONFIG_SYS_OS_BASE, CONFIG_SYS_SPL_ARGS_ADDR,
CONFIG_SYS_FDT_BASE to be defined even if users just want to run
U-Boot, not Linux.  This is inconvenient.

Signed-off-by: Masahiro Yamada <yamada.m at jp.panasonic.com>
---

 common/spl/spl_nor.c | 74 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 41 insertions(+), 33 deletions(-)

diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c
index b444a3e..6f91176 100644
--- a/common/spl/spl_nor.c
+++ b/common/spl/spl_nor.c
@@ -7,6 +7,45 @@
 #include <common.h>
 #include <spl.h>
 
+#if defined(CONFIG_SPL_OS_BOOT)
+int load_linux(void)
+{
+	if (spl_start_uboot())
+		return -1;
+
+	spl_parse_image_header(
+		       (const struct image_header *)CONFIG_SYS_OS_BASE);
+
+	memcpy((void *)spl_image.load_addr,
+	       (void *)(CONFIG_SYS_OS_BASE + sizeof(struct image_header)),
+	       spl_image.size);
+
+	/*
+	 * Copy DT blob (fdt) to SDRAM. Passing pointer to flash
+	 * doesn't work (16 KiB should be enough for DT)
+	 */
+	memcpy((void *)CONFIG_SYS_SPL_ARGS_ADDR, (void *)(CONFIG_SYS_FDT_BASE),
+	       16 << 10);
+
+	return 0;
+}
+#else
+int load_linux(void)
+{
+	return -1;
+}
+#endif
+
+void load_uboot(void)
+{
+	spl_parse_image_header(
+			(const struct image_header *)CONFIG_SYS_UBOOT_BASE);
+
+	memcpy((void *)spl_image.load_addr,
+	       (void *)(CONFIG_SYS_UBOOT_BASE + sizeof(struct image_header)),
+	       spl_image.size);
+}
+
 void spl_nor_load_image(void)
 {
 	/*
@@ -15,37 +54,6 @@ void spl_nor_load_image(void)
 	 */
 	spl_image.flags |= SPL_COPY_PAYLOAD_ONLY;
 
-	if (spl_start_uboot()) {
-		/*
-		 * Load real U-Boot from its location in NOR flash to its
-		 * defined location in SDRAM
-		 */
-		spl_parse_image_header(
-			(const struct image_header *)CONFIG_SYS_UBOOT_BASE);
-
-		memcpy((void *)spl_image.load_addr,
-		       (void *)(CONFIG_SYS_UBOOT_BASE +
-				sizeof(struct image_header)),
-		       spl_image.size);
-	} else {
-		/*
-		 * Load Linux from its location in NOR flash to its defined
-		 * location in SDRAM
-		 */
-		spl_parse_image_header(
-			(const struct image_header *)CONFIG_SYS_OS_BASE);
-
-		memcpy((void *)spl_image.load_addr,
-		       (void *)(CONFIG_SYS_OS_BASE +
-				sizeof(struct image_header)),
-		       spl_image.size);
-
-		/*
-		 * Copy DT blob (fdt) to SDRAM. Passing pointer to flash
-		 * doesn't work (16 KiB should be enough for DT)
-		 */
-		memcpy((void *)CONFIG_SYS_SPL_ARGS_ADDR,
-		       (void *)(CONFIG_SYS_FDT_BASE),
-		       (16 << 10));
-	}
+	if (load_linux() < 0)
+		load_uboot();
 }
-- 
1.9.1