diff options
| author | wdenk <wdenk> | 2002-11-21 23:11:29 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2002-11-21 23:11:29 +0000 |
| commit | ea909b7604306a400ee3abf57e2fa7b2dde5dde1 (patch) | |
| tree | f23f5653250d0440fe81b098037814a401fc9cc9 /lib_i386/i386_linux.c | |
| parent | b2184c314de0af9788ce505b413030d2114cfa4a (diff) | |
| download | u-boot-imx-ea909b7604306a400ee3abf57e2fa7b2dde5dde1.zip u-boot-imx-ea909b7604306a400ee3abf57e2fa7b2dde5dde1.tar.gz u-boot-imx-ea909b7604306a400ee3abf57e2fa7b2dde5dde1.tar.bz2 | |
* Added support for both PCMCIA slots (at the same time!) on MPC8xx
* Patch by Rod Boyce, 21 Nov 2002:
fix PCMCIA on MBX8xx board
* Patch by Pierre Aubert , 21 Nov 2002
Add CFG_CPM_POST_WORD_ADDR to make the offset of the
bootmode word in DPRAM configurable
Diffstat (limited to 'lib_i386/i386_linux.c')
| -rw-r--r-- | lib_i386/i386_linux.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib_i386/i386_linux.c b/lib_i386/i386_linux.c index c37a0d8..5a596ff 100644 --- a/lib_i386/i386_linux.c +++ b/lib_i386/i386_linux.c @@ -47,7 +47,7 @@ image_header_t *fake_header(image_header_t *hdr, void *ptr, int size) void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], ulong addr, ulong *len_ptr, int verify) { - ulong base_ptr; + void *base_ptr; ulong len = 0, checksum; ulong initrd_start, initrd_end; @@ -150,7 +150,7 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], initrd_end = 0; } - base_ptr = load_zimage(addr + sizeof(image_header_t), ntohl(hdr->ih_size), + base_ptr = load_zimage((void*)addr + sizeof(image_header_t), ntohl(hdr->ih_size), initrd_start, initrd_end-initrd_start, 0); if (NULL == base_ptr) { |