LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: zboot update 

The header of recent Linux Kernels includes the size of the image, and
therefore is not needed to be passed to zboot. Still process the third
parameter (size of image) in the event that an older kernel is being loaded
This commit is contained in:
Graeme Russ 2010-10-07 20:03:19 +11:00
parent de25059404
commit abe98f49e1
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/i386/lib/zimage.c
View File

@ -248,7 +248,8 @@ void boot_zimage(void *setup_base)
int do_zboot (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
void *base_ptr;
void *bzImage_addr;
void *bzImage_addr = NULL;
char *s;
ulong bzImage_size = 0;
disable_interrupts();
@ -256,10 +257,17 @@ int do_zboot (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
/* Setup board for maximum PC/AT Compatibility */
setup_pcat_compatibility();
/* argv[1] holds the address of the bzImage */
bzImage_addr = (void *)simple_strtoul(argv[1], NULL, 16);
if (argc >= 2)
/* argv[1] holds the address of the bzImage */
s = argv[1];
else
s = getenv("fileaddr");
if (argc == 3)
if (s)
bzImage_addr = (void *)simple_strtoul(s, NULL, 16);
if (argc >= 3)
/* argv[2] holds the size of the bzImage */
bzImage_size = simple_strtoul(argv[2], NULL, 16);
/* Lets look for*/
@ -282,7 +290,7 @@ int do_zboot (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
}
U_BOOT_CMD(
zboot, 3, 0, do_zboot,
zboot, 2, 0, do_zboot,
"Boot bzImage",
""
);