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

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
Stefan Roese
1 parent f3fecfe6d7
Showing 3 changed files with 23 additions and 3 deletions Side-by-side Diff
CHANGELOG
README
common/cmd_bootm.c
@@ -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
  
@@ -421,7 +421,7 @@
 		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
  
@@ -1733,6 +1733,12 @@
  
 - 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
 /*
- * (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 @@
 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 @@
 	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 *[]);
...	...	@@ -2,6 +2,16 @@
2	2	Changes since U-Boot 1.1.4:
3	3	======================================================================
4	4
	5	+* Change max size of uncompressed uImage's to 8MByte and add
	6	+ CFG_BOOTM_LEN to adjust this setting.
	7	+
	8	+ As mentioned by Robin Getz on 2005-05-24 the size of uncompressed
	9	+ uImages was restricted to 4MBytes. This default size is now
	10	+ increased to 8Mbytes and can be overrided by setting CFG_BOOTM_LEN
	11	+ in the board config file.
	12	+
	13	+ Patch by Stefan Roese, 13 Mar 2006
	14	+
5	15	* Fix problem with updated PCI code in cpu/ppc4xx/405gp_pci.c
6	16	Patch by Stefan Roese, 13 Mar 2006
7	17
...	...	@@ -421,7 +421,7 @@
421	421	Space should be pre-allocated in the dts for the bd_t.
422	422
423	423	CONFIG_OF_HAS_UBOOT_ENV
424		-
	424	+
425	425	The resulting flat device tree will have a copy of u-boot's
426	426	environment variables
427	427
...	...	@@ -1733,6 +1733,12 @@
1733	1733
1734	1734	- CFG_MALLOC_LEN:
1735	1735	Size of DRAM reserved for malloc() use.
	1736	+
	1737	+- CFG_BOOTM_LEN:
	1738	+ Normally compressed uImages are limited to an
	1739	+ uncompressed size of 8 MBytes. If this is not enough,
	1740	+ you can define CFG_BOOTM_LEN in your board config file
	1741	+ to adjust this setting to your needs.
1736	1742
1737	1743	- CFG_BOOTMAPSZ:
1738	1744	Maximum size of memory mapped by the startup code of
1	1	/*
2		- * (C) Copyright 2000-2002
	2	+ * (C) Copyright 2000-2006
3	3	* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
4	4	*
5	5	* See file CREDITS for list of people who contributed to this
...	...	@@ -140,6 +140,10 @@
140	140	extern void lynxkdi_boot( image_header_t * );
141	141	#endif
142	142
	143	+#ifndef CFG_BOOTM_LEN
	144	+#define CFG_BOOTM_LEN 0x800000 /* use 8MByte as default max gunzip size */
	145	+#endif
	146	+
143	147	image_header_t header;
144	148
145	149	ulong load_addr = CFG_LOAD_ADDR; /* Default Load Address */
...	...	@@ -150,7 +154,7 @@
150	154	ulong addr;
151	155	ulong data, len, checksum;
152	156	ulong *len_ptr;
153		- uint unc_len = 0x400000;
	157	+ uint unc_len = CFG_BOOTM_LEN;
154	158	int i, verify;
155	159	char name, s;
156	160	int (appl)(int, char []);