From: Cédric Schieli Date: Mon, 23 Jan 2017 15:51:45 +0000 (+0100) Subject: bootz/booti: relocate ramdisk if CONFIG_SYS_BOOT_RAMDISK_HIGH set X-Git-Tag: v2017.03-rc1~57 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4943dc2f1977cf89297b87f93f96ad4d7f09d24d;p=u-boot 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 Reviewed-by: Rick Altherr Tested-by: Masahiro Yamada --- diff --git a/cmd/booti.c b/cmd/booti.c index 6c1c998a56..2d879f39f5 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 9648fe9948..ceff01bc04 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);