sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

[new uImage] Don't pass kdb to ramdisk_high since we may not have one 

We don't actually need the kdb param as we are just using it to get
bd->bi_memsize which we can get from gd->bd->bi_memsize.  Also, if we
boot via OF we might not actually fill out a kdb.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Marian Balakowicz <m8@semihalf.com>
This commit is contained in:
Kumar Gala 2008-02-27 21:51:43 -06:00 committed by Marian Balakowicz
parent 4efbe9dbb1
commit a6612bdfe7
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/image.c
View File

@ -694,7 +694,6 @@ void get_ramdisk (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
* ramdisk_high - relocate init ramdisk
* @rd_data: ramdisk data start address
* @rd_len: ramdisk data length
* @kbd: kernel board info copy (within BOOTMAPSZ boundary)
* @sp_limit: stack pointer limit (including BOOTMAPSZ)
* @sp: current stack pointer
* @initrd_start: pointer to a ulong variable, will hold final init ramdisk
@ -712,7 +711,7 @@ void get_ramdisk (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
* - returns new allc_current, next free address below BOOTMAPSZ
*/
ulong ramdisk_high (ulong alloc_current, ulong rd_data, ulong rd_len,
bd_t *kbd, ulong sp_limit, ulong sp,
ulong sp_limit, ulong sp,
ulong *initrd_start, ulong *initrd_end)
{
char *s;
@ -734,9 +733,9 @@ ulong ramdisk_high (ulong alloc_current, ulong rd_data, ulong rd_len,
#ifdef CONFIG_LOGBUFFER
/* Prevent initrd from overwriting logbuffer */
if (initrd_high < (kbd->bi_memsize - LOGBUFF_LEN - LOGBUFF_OVERHEAD))
initrd_high = kbd->bi_memsize - LOGBUFF_LEN - LOGBUFF_OVERHEAD;
debug ("## Logbuffer at 0x%08lx ", kbd->bi_memsize - LOGBUFF_LEN);
if (initrd_high < (gd->bd->bi_memsize - LOGBUFF_LEN - LOGBUFF_OVERHEAD))
initrd_high = gd->bd->bi_memsize - LOGBUFF_LEN - LOGBUFF_OVERHEAD;
debug ("## Logbuffer at 0x%08lx ", gd->bd->bi_memsize - LOGBUFF_LEN);
#endif
debug ("## initrd_high = 0x%08lx, copy_to_ram = %d\n",
initrd_high, initrd_copy_to_ram);

2
include/image.h
View File

@ -388,7 +388,7 @@ void get_ramdisk (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
#if defined(CONFIG_PPC) || defined(CONFIG_M68K)
ulong ramdisk_high (ulong alloc_current, ulong rd_data, ulong rd_len,
bd_t *kbd, ulong sp_limit, ulong sp,
ulong sp_limit, ulong sp,
ulong *initrd_start, ulong *initrd_end);
ulong get_boot_sp_limit (ulong sp);

3
lib_m68k/bootm.c
View File

@ -100,8 +100,7 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag,
rd_len = rd_data_end - rd_data_start;
alloc_current = ramdisk_high (alloc_current, rd_data_start, rd_len,
kbd, sp_limit, get_sp (),
&initrd_start, &initrd_end);
sp_limit, get_sp (), &initrd_start, &initrd_end);
debug("## Transferring control to Linux (at address %08lx) ...\n",
(ulong) kernel);

3
lib_ppc/bootm.c
View File

@ -120,8 +120,7 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
rd_len = rd_data_end - rd_data_start;
alloc_current = ramdisk_high (alloc_current, rd_data_start, rd_len,
kbd, sp_limit, get_sp (),
&initrd_start, &initrd_end);
sp_limit, get_sp (), &initrd_start, &initrd_end);
#if defined(CONFIG_OF_LIBFDT)
/* find flattened device tree */