Whoops. Thank you for catching that.
Reviewed-by: Rick Altherr raltherr@google.com
On Mon, Jan 23, 2017 at 7:51 AM, Cédric Schieli cschieli@gmail.com wrote:
In commit c2e7e72, the ramdisk relocation code was moved from image_setup_linux to do_bootm, leaving the bootz and booti cases broken.
This patch fixes both by adding the BOOTM_STATE_RAMDISK state in their call to do_bootm_states if CONFIG_SYS_BOOT_RAMDISK_HIGH is set.
Signed-off-by: Cédric Schieli cschieli@gmail.com
cmd/booti.c | 3 +++ cmd/bootz.c | 3 +++ 2 files changed, 6 insertions(+)
diff --git a/cmd/booti.c b/cmd/booti.c index 6c1c998..2d879f3 100644 --- a/cmd/booti.c +++ b/cmd/booti.c @@ -132,6 +132,9 @@ int do_booti(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
images.os.os = IH_OS_LINUX; ret = do_bootm_states(cmdtp, flag, argc, argv,+#ifdef CONFIG_SYS_BOOT_RAMDISK_HIGH
BOOTM_STATE_RAMDISK |+#endif BOOTM_STATE_OS_PREP | BOOTM_STATE_OS_FAKE_GO | BOOTM_STATE_OS_GO, &images, 1); diff --git a/cmd/bootz.c b/cmd/bootz.c index 9648fe9..ceff01b 100644 --- a/cmd/bootz.c +++ b/cmd/bootz.c @@ -76,6 +76,9 @@ int do_bootz(cmd_tbl_t *cmdtp, int flag, int argc, char
const argv[])
images.os.os = IH_OS_LINUX; ret = do_bootm_states(cmdtp, flag, argc, argv,+#ifdef CONFIG_SYS_BOOT_RAMDISK_HIGH
BOOTM_STATE_RAMDISK |+#endif BOOTM_STATE_OS_PREP | BOOTM_STATE_OS_FAKE_GO | BOOTM_STATE_OS_GO, &images, 1); -- 2.10.2
U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot