diff mbox

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

Message ID 1346143859-26733-1-git-send-email-sr@denx.de
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Stefan Roese Aug. 28, 2012, 8:50 a.m. UTC 
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>
---
 common/spl/spl.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Tom Rini Aug. 29, 2012, 5:38 p.m. UTC | #1 
On Tue, Aug 28, 2012 at 10:50:59AM +0200, Stefan Roese wrote:

> 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>

Picked up for my v6, thanks!
diff mbox

Patch

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 7b5656a..26526f3 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
@@ -103,7 +106,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";