Message ID | CAOCHtYjzRRirJ+FF5SYB_s_48_avyYxSJb=D3A94nm7eeLqxqg@mail.gmail.com |
---|---|
State | Not Applicable |
Delegated to: | Tom Rini |
Headers | show |
> diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c > index 7b3e459..5749057 100644 > --- a/common/cmd_bootm.c > +++ b/common/cmd_bootm.c > @@ -1758,6 +1758,10 @@ static int bootz_start(cmd_tbl_t *cmdtp, int > flag, int argc, > int ret; > void *zi_start, *zi_end; > > + memset(images, 0, sizeof(bootm_headers_t)); > + boot_start_lmb(images); > + images->os.os = IH_OS_LINUX; > + > ret = do_bootm_states(cmdtp, flag, argc, argv, BOOTM_STATE_START, > images, 1); > > > > So I'm going to quickly re-test the wand, which is a device tree: > 'bootz zImage - ftd" boot... Nope close half way there.. Still broken on Wand (device tree) Board file boot fine.. bootz zImage bootz zImage initrd.img The device tree cases, lock up.. bootz zImage - device.dtb bootz zImage initrd.img device.dtb Environment size: 2316/8188 bytes => load mmc ${mmcdev}:${mmcpart} ${loadaddr} zImage 4109672 bytes read in 310 ms (12.6 MiB/s) => load mmc ${mmcdev}:${mmcpart} ${fdt_addr} /dtbs/${fdt_file} 22150 bytes read in 259 ms (83 KiB/s) => run mmcargs => bootz ${loadaddr} - ${fdt_addr} Starting kernel ... Regards,
Hi Robert, On Thu, Jul 4, 2013 at 12:06 AM, Robert Nelson <robertcnelson@gmail.com>wrote: > > diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c > > index 7b3e459..5749057 100644 > > --- a/common/cmd_bootm.c > > +++ b/common/cmd_bootm.c > > @@ -1758,6 +1758,10 @@ static int bootz_start(cmd_tbl_t *cmdtp, int > > flag, int argc, > > int ret; > > void *zi_start, *zi_end; > > > > + memset(images, 0, sizeof(bootm_headers_t)); > > + boot_start_lmb(images); > > + images->os.os = IH_OS_LINUX; > > + > > ret = do_bootm_states(cmdtp, flag, argc, argv, BOOTM_STATE_START, > > images, 1); > > > > > > > > So I'm going to quickly re-test the wand, which is a device tree: > > 'bootz zImage - ftd" boot... > > Nope close half way there.. Still broken on Wand (device tree) > > Board file boot fine.. > > bootz zImage > bootz zImage initrd.img > > > The device tree cases, lock up.. > bootz zImage - device.dtb > bootz zImage initrd.img device.dtb > > Environment size: 2316/8188 bytes > => load mmc ${mmcdev}:${mmcpart} ${loadaddr} zImage > 4109672 bytes read in 310 ms (12.6 MiB/s) > => load mmc ${mmcdev}:${mmcpart} ${fdt_addr} /dtbs/${fdt_file} > 22150 bytes read in 259 ms (83 KiB/s) > => run mmcargs > => bootz ${loadaddr} - ${fdt_addr} > > Starting kernel ... > I hope to be able to test this on an ARM platform tomorrow (unfortunately I am travelling and don't have the right setup). In the meantime I have done some testing with sandbox and will send out some v2 patches which correct two more errors. I finally realised that when I tested this I was probably using zboot instead of bootz. Despite the obvious difference it somehow escaped me. Regards, Simon
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 7b3e459..5749057 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -1758,6 +1758,10 @@ static int bootz_start(cmd_tbl_t *cmdtp, int flag, int argc, int ret; void *zi_start, *zi_end; + memset(images, 0, sizeof(bootm_headers_t)); + boot_start_lmb(images); + images->os.os = IH_OS_LINUX; + ret = do_bootm_states(cmdtp, flag, argc, argv, BOOTM_STATE_START, images, 1);