summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2011-10-08 16:29:52 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2011-10-09 11:35:42 +0200
commita0746e71c29ecb83377b1f1d47c3a5648211fffc (patch)
tree2d09e92996a031d96813f63590578a6a5fde2dc5 /arch/arm
parent83cf63d763006ddfc6f3b43acc9ae52ea218ec0c (diff)
downloadbarebox-a0746e71c29ecb83377b1f1d47c3a5648211fffc.tar.gz
barebox-a0746e71c29ecb83377b1f1d47c3a5648211fffc.tar.xz
arm/bootm: enable multi uimage support
tested on imx53 loco board with a Multi uImage file generate like this mkimage -A arm -O linux -T multi -C none -a 0x70008000 -e 0x70008000 -n Linux-2.6.35.3-00745-gce4c61a-dirty -d zImage:rootfs.cpio.lzma uImage.Multi and boot via bootm bootm -r @1 -L 0x72000000 /dev/ram0.kernel Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/lib/bootm.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index 7156eeab81..87bf3b323e 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -24,11 +24,6 @@ static 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_get_type(os_header) == IH_TYPE_MULTI) {
- printf("Multifile images not handled at the moment\n");
- return -1;
- }
-
theKernel = (void *)image_get_ep(os_header);
debug("## Transferring control to Linux (at address 0x%p) ...\n",