diff options
| author | Cédric Schieli <cschieli@gmail.com> | 2017-01-23 16:51:45 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-01-24 10:35:55 -0500 |
| commit | 4943dc2f1977cf89297b87f93f96ad4d7f09d24d (patch) | |
| tree | 5b7dd85d13c861006d5649354f456bb5d64a5782 /cmd | |
| parent | 9b6ef528d0dd83ce4b09adb559e5336b107d5654 (diff) | |
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>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/booti.c | 3 | ||||
| -rw-r--r-- | cmd/bootz.c | 3 |
2 files changed, 6 insertions, 0 deletions
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); |