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/arm | |
| 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/arm')
| -rw-r--r-- | arch/arm/lib/armlinux.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/lib/armlinux.c b/arch/arm/lib/armlinux.c index 7c2cbf95ea..b50d535811 100644 --- a/arch/arm/lib/armlinux.c +++ b/arch/arm/lib/armlinux.c @@ -212,7 +212,7 @@ int do_bootm_linux(struct image_data *data) void (*theKernel)(int zero, int arch, void *params); image_header_t *os_header = &data->os->header; - 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; } @@ -227,14 +227,14 @@ int do_bootm_linux(struct image_data *data) return -1; } - theKernel = (void *)image_get_ep(os_header); + theKernel = (void *)ntohl(os_header->ih_ep); debug("## Transferring control to Linux (at address 0x%p) ...\n", theKernel); setup_tags(); - if (relocate_image(data->os, (void *)image_get_load(os_header))) + if (relocate_image(data->os, (void *)ntohl(os_header->ih_load))) return -1; /* we assume that the kernel is in place */ |