From: Stefan Roese <sr@denx.de>
Date: Tue, 28 Aug 2012 08:50:59 +0000 (+0200)
Subject: SPL: Enable use of custom defined U-Boot entry point
X-Git-Tag: v2012.10-rc2~16
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3c6f8a0d19c0c8e2cee3dae933dbc5a75e29906d;p=oweals%2Fu-boot.git

SPL: Enable use of custom defined U-Boot entry point

By setting CONFIG_SYS_UBOOT_START boards can now use a different entry
point for their U-Boot image. So the U-Boot entry point is not fixed
to CONFIG_SYS_TEXT_BASE any more.

Signed-off-by: Stefan Roese <sr@denx.de>
Signed-off-by: Tom Rini <trini@ti.com>
---

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 40de45491e..14f7bdb49e 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -35,6 +35,9 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+#ifndef CONFIG_SYS_UBOOT_START
+#define CONFIG_SYS_UBOOT_START	CONFIG_SYS_TEXT_BASE
+#endif
 #ifndef CONFIG_SYS_MONITOR_LEN
 #define CONFIG_SYS_MONITOR_LEN	(200 * 1024)
 #endif
@@ -104,7 +107,7 @@ void spl_parse_image_header(const struct image_header *header)
 			header->ih_magic);
 		/* Let's assume U-Boot will not be more than 200 KB */
 		spl_image.size = CONFIG_SYS_MONITOR_LEN;
-		spl_image.entry_point = CONFIG_SYS_TEXT_BASE;
+		spl_image.entry_point = CONFIG_SYS_UBOOT_START;
 		spl_image.load_addr = CONFIG_SYS_TEXT_BASE;
 		spl_image.os = IH_OS_U_BOOT;
 		spl_image.name = "U-Boot";