summaryrefslogtreecommitdiffstats
path: root/common/spl
diff options
context:
space:
mode:
authorStefano Babic <sbabic@denx.de>2012-08-23 12:46:16 +0200
committerTom Rini <trini@ti.com>2012-09-27 09:49:59 -0700
commitae83d882f5fdf7aa7c5aec09cfafb593153c25d6 (patch)
treeeab094ae367b2c4364c2b2a72e6a739fbf9180f5 /common/spl
parent6507f133f3201ed5fb22e4a3d73c33b47497539d (diff)
downloadtalos-obmc-uboot-ae83d882f5fdf7aa7c5aec09cfafb593153c25d6.tar.gz
talos-obmc-uboot-ae83d882f5fdf7aa7c5aec09cfafb593153c25d6.zip
SPL: do not use fix value for u-boot size
If an u-boot image is not found, SPL thinks to load a bare u-boot.bin image with a maximum size of 200KB. Use CONFIG_SYS_MONITOR_LEN instead. Signed-off-by: Stefan Roese <stefan.roese@gmail.com> Signed-off-by: Stefano Babic <sbabic@denx.de> Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'common/spl')
-rw-r--r--common/spl/spl.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c
index 3f41014023..70c374a490 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -35,6 +35,10 @@
DECLARE_GLOBAL_DATA_PTR;
+#ifndef CONFIG_SYS_MONITOR_LEN
+#define CONFIG_SYS_MONITOR_LEN (200 * 1024)
+#endif
+
u32 *boot_params_ptr = NULL;
struct spl_image_info spl_image;
@@ -86,7 +90,7 @@ void spl_parse_image_header(const struct image_header *header)
debug("mkimage signature not found - ih_magic = %x\n",
header->ih_magic);
/* Let's assume U-Boot will not be more than 200 KB */
- spl_image.size = 200 * 1024;
+ spl_image.size = CONFIG_SYS_MONITOR_LEN;
spl_image.entry_point = CONFIG_SYS_TEXT_BASE;
spl_image.load_addr = CONFIG_SYS_TEXT_BASE;
spl_image.os = IH_OS_U_BOOT;
OpenPOWER on IntegriCloud