bootz/booti: relocate ramdisk if CONFIG_SYS_BOOT_RAMDISK_HIGH set

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>
Reviewed-by: Rick Altherr <raltherr@google.com>
Tested-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/cmd/booti.c b/cmd/booti.c
index 6c1c998a568c48a69db292e8e53370d280c12ee7..2d879f39f5a6983e940656b28ba0acc1839919d2 100644 (file)
--- 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 9648fe9948d5a16327c4153a12bf8b90542a4501..ceff01bc04164d1b903bd24433b34d56ae3e2e6c 100644 (file)
--- 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);