diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-10-07 14:11:38 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-10-07 14:11:38 +0200 |
| commit | f7403928a9ee57ac717e38610dcbb04bb7798734 (patch) | |
| tree | 3b7d58ff844b1ea9edbf0147035c62fe4887be5f /arch/m68k | |
| parent | 884f4d47c697b825a7e69fe51d3b409be58da5d0 (diff) | |
| download | barebox-f7403928a9ee57ac717e38610dcbb04bb7798734.tar.gz barebox-f7403928a9ee57ac717e38610dcbb04bb7798734.tar.xz | |
Revert "Replace direct header access with the API routines"
This reverts commit 0ceafe14be072696eff3e549d8c7b7de8a3e416d.
Conflicts:
include/image.h
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/lib/m68k-linuxboot.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/m68k/lib/m68k-linuxboot.c b/arch/m68k/lib/m68k-linuxboot.c index e5e90a8722..417a8e0cd7 100644 --- a/arch/m68k/lib/m68k-linuxboot.c +++ b/arch/m68k/lib/m68k-linuxboot.c @@ -109,20 +109,20 @@ static int do_bootm_linux(struct image_data *data) const char *commandline = getenv ("bootargs"); uint32_t loadaddr,loadsize; - if (image_check_type(os_header, IH_TYPE_MULTI)) { + if (os_header->ih_type == IH_TYPE_MULTI) { printf("Multifile images not handled at the moment\n"); return -1; } printf("commandline: %s\n", commandline); - theKernel = (void (*)(int,int,uint))image_get_ep(os_header); + theKernel = (void (*)(int,int,uint))ntohl((os_header->ih_ep)); debug ("## Transferring control to Linux (at address %08lx) ...\n", (ulong) theKernel); - loadaddr = (uint32_t)image_get_load(os_header); - loadsize = (uint32_t)image_get_size(os_header); + loadaddr = (uint32_t)ntohl(os_header->ih_load); + loadsize = (uint32_t)ntohl(os_header->ih_size); setup_boot_record( (char*)(loadaddr+loadsize),(char*)commandline); if (relocate_image(data->os, (void *)loadaddr)) |