diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2010-10-08 00:04:15 +0800 |
|---|---|---|
| committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2010-10-08 00:04:28 +0800 |
| commit | a3c1e5d888d0ee317ffc7635694684bb71213c9c (patch) | |
| tree | 24226d1678b57d7a58947fe8899b41facf630878 /arch/ppc/lib | |
| parent | 2fbdb02b11ded2619a0ad023910f8160ead5c48a (diff) | |
| download | barebox-a3c1e5d888d0ee317ffc7635694684bb71213c9c.tar.gz barebox-a3c1e5d888d0ee317ffc7635694684bb71213c9c.tar.xz | |
Replace direct header access with the API routines
Copied from U-Boot
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
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) |