summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2006-03-13 11:16:36 +0100
committerStefan Roese <sr@denx.de>2006-03-13 11:16:36 +0100
commit15940c9af39deed77f72c7c8ad458b7ffc9c8683 (patch)
treed0bc12d3c0e2891785d65a7e2805be77147bb7f9
parentf3fecfe6d7cf07a2c5879d64fc1d849a94a0b67d (diff)
downloadu-boot-imx-15940c9af39deed77f72c7c8ad458b7ffc9c8683.zip
u-boot-imx-15940c9af39deed77f72c7c8ad458b7ffc9c8683.tar.gz
u-boot-imx-15940c9af39deed77f72c7c8ad458b7ffc9c8683.tar.bz2
Change max size of uncompressed uImage's to 8MByte and add
CFG_BOOTM_LEN to adjust this setting. As mentioned by Robin Getz on 2005-05-24 the size of uncompressed uImages was restricted to 4MBytes. This default size is now increased to 8Mbytes and can be overrided by setting CFG_BOOTM_LEN in the board config file. Patch by Stefan Roese, 13 Mar 2006
-rw-r--r--CHANGELOG10
-rw-r--r--README8
-rw-r--r--common/cmd_bootm.c8
3 files changed, 23 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 09f1dfa..492fb04 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,16 @@
Changes since U-Boot 1.1.4:
======================================================================
+* Change max size of uncompressed uImage's to 8MByte and add
+ CFG_BOOTM_LEN to adjust this setting.
+
+ As mentioned by Robin Getz on 2005-05-24 the size of uncompressed
+ uImages was restricted to 4MBytes. This default size is now
+ increased to 8Mbytes and can be overrided by setting CFG_BOOTM_LEN
+ in the board config file.
+
+ Patch by Stefan Roese, 13 Mar 2006
+
* Fix problem with updated PCI code in cpu/ppc4xx/405gp_pci.c
Patch by Stefan Roese, 13 Mar 2006
diff --git a/README b/README
index c805437..b6cb981 100644
--- a/README
+++ b/README
@@ -421,7 +421,7 @@ The following options need to be configured:
Space should be pre-allocated in the dts for the bd_t.
CONFIG_OF_HAS_UBOOT_ENV
-
+
The resulting flat device tree will have a copy of u-boot's
environment variables
@@ -1734,6 +1734,12 @@ Configuration Settings:
- CFG_MALLOC_LEN:
Size of DRAM reserved for malloc() use.
+- CFG_BOOTM_LEN:
+ Normally compressed uImages are limited to an
+ uncompressed size of 8 MBytes. If this is not enough,
+ you can define CFG_BOOTM_LEN in your board config file
+ to adjust this setting to your needs.
+
- CFG_BOOTMAPSZ:
Maximum size of memory mapped by the startup code of
the Linux kernel; all data that must be processed by
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index a20e584..aeb7842 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -1,5 +1,5 @@
/*
- * (C) Copyright 2000-2002
+ * (C) Copyright 2000-2006
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*
* See file CREDITS for list of people who contributed to this
@@ -140,6 +140,10 @@ static boot_os_Fcn do_bootm_lynxkdi;
extern void lynxkdi_boot( image_header_t * );
#endif
+#ifndef CFG_BOOTM_LEN
+#define CFG_BOOTM_LEN 0x800000 /* use 8MByte as default max gunzip size */
+#endif
+
image_header_t header;
ulong load_addr = CFG_LOAD_ADDR; /* Default Load Address */
@@ -150,7 +154,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
ulong addr;
ulong data, len, checksum;
ulong *len_ptr;
- uint unc_len = 0x400000;
+ uint unc_len = CFG_BOOTM_LEN;
int i, verify;
char *name, *s;
int (*appl)(int, char *[]);