diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2010-09-23 21:32:19 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-09-24 08:46:22 +0200 |
| commit | 0ceafe14be072696eff3e549d8c7b7de8a3e416d (patch) | |
| tree | c0ea8344342f23ab546e26a78753452075294619 /arch/ppc/lib | |
| parent | aba80a2d2d0f1b25185246925577ce2108247dde (diff) | |
| download | barebox-0ceafe14be072696eff3e549d8c7b7de8a3e416d.tar.gz barebox-0ceafe14be072696eff3e549d8c7b7de8a3e416d.tar.xz | |
Replace direct header access with the API routines
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/ppc/lib')
| -rw-r--r-- | arch/ppc/lib/ppclinux.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ppc/lib/ppclinux.c b/arch/ppc/lib/ppclinux.c index 35a9d31a8e..5ee908d132 100644 --- a/arch/ppc/lib/ppclinux.c +++ b/arch/ppc/lib/ppclinux.c @@ -45,7 +45,7 @@ static int do_bootm_linux(struct image_data *idata) printf("entering %s: os_header: %p initrd_header: %p oftree: %s\n", __FUNCTION__, os_header, initrd_header, idata->oftree); - if (os_header->ih_type == IH_TYPE_MULTI) { + if (image_check_type(os_header, IH_TYPE_MULTI)) { unsigned long *data = (unsigned long *)(idata->os->data); unsigned long len1 = 0, len2 = 0; @@ -199,9 +199,9 @@ static int do_bootm_linux(struct image_data *idata) #endif /* CONFIG_MPC5xxx */ } - kernel = (void (*)(bd_t *, ulong, ulong, ulong, ulong))ntohl(os_header->ih_ep); /* FIXME */ + kernel = (void (*)(bd_t *, ulong, ulong, ulong, ulong))image_get_ep(os_header); /* FIXME */ - if (relocate_image(idata->os, (void *)ntohl(os_header->ih_load))) + if (relocate_image(idata->os, (void *)image_get_load(os_header))) return -1; #if defined(CFG_INIT_RAM_LOCK) && !defined(CONFIG_E500) |