From: Simon Glass <sjg@chromium.org>
Date: Sat, 7 Feb 2015 17:47:29 +0000 (-0700)
Subject: arm: spl: Provide for a board-specific loader
X-Git-Tag: v2015.04-rc2~3^2~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c01c71bc16d2836c3ff81af54529dab0686bca00;p=oweals%2Fu-boot.git

arm: spl: Provide for a board-specific loader

Some boards have a special way of loading U-Boot that does not fit with
the existing SPL code. For example sunxi uses an 'FEL' mode where U-Boot
is loaded over USB. Add a CONFIG option and boot mode for this.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Siarhei Siamashka <siarhei.siamashka@gmail.com>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---

diff --git a/arch/arm/include/asm/spl.h b/arch/arm/include/asm/spl.h
index 8acd7cd1bd..17b6f544da 100644
--- a/arch/arm/include/asm/spl.h
+++ b/arch/arm/include/asm/spl.h
@@ -26,10 +26,14 @@ enum {
 	BOOT_DEVICE_SPI,
 	BOOT_DEVICE_SATA,
 	BOOT_DEVICE_I2C,
+	BOOT_DEVICE_BOARD,
 	BOOT_DEVICE_NONE
 };
 #endif
 
+/* Board-specific load method */
+void spl_board_load_image(void);
+
 /* Linker symbols. */
 extern char __bss_start[], __bss_end[];
 
diff --git a/common/spl/spl.c b/common/spl/spl.c
index daaeb507c4..ded0f30478 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -228,6 +228,11 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
 	case BOOT_DEVICE_SATA:
 		spl_sata_load_image();
 		break;
+#endif
+#ifdef CONFIG_SPL_BOARD_LOAD_IMAGE
+	case BOOT_DEVICE_BOARD:
+		spl_board_load_image();
+		break;
 #endif
 	default:
 #if defined(CONFIG_SPL_SERIAL_SUPPORT) && defined(CONFIG_SPL_LIBCOMMON_SUPPORT)