summaryrefslogtreecommitdiff
path: root/common/spl
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2012-08-28 10:50:59 +0200
committerTom Rini <trini@ti.com>2012-09-27 11:20:27 -0700
commit3c6f8a0d19c0c8e2cee3dae933dbc5a75e29906d (patch)
tree6b4e36cb8864f9c46d2e98f20256c3c371687850 /common/spl
parenta4cc1c487757fe71ee13adead888c8010191c961 (diff)
downloadu-boot-imx-3c6f8a0d19c0c8e2cee3dae933dbc5a75e29906d.zip
u-boot-imx-3c6f8a0d19c0c8e2cee3dae933dbc5a75e29906d.tar.gz
u-boot-imx-3c6f8a0d19c0c8e2cee3dae933dbc5a75e29906d.tar.bz2
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>
Diffstat (limited to 'common/spl')
-rw-r--r--common/spl/spl.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c
index 40de454..14f7bdb 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";