bootz/booti: relocate ramdisk if CONFIG_SYS_BOOT_RAMDISK_HIGH set
PATCH 1/1 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.
---
cmd/booti.c | 3 +++ cmd/bootz.c | 3 +++ 2 files changed, 6 insertions(+)
cmd/booti.c +3 -0
@@ -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 | +#endifBOOTM_STATE_OS_PREP |BOOTM_STATE_OS_FAKE_GO |BOOTM_STATE_OS_GO , &images,1 );
cmd/bootz.c +3 -0
@@ -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 | +#endifBOOTM_STATE_OS_PREP |BOOTM_STATE_OS_FAKE_GO |BOOTM_STATE_OS_GO , &images,1 );
Signature · 1 line
2.10.2
PATCH 1/1 bootz/booti: relocate ramdisk if CONFIG_SYS_BOOT_RAMDISK_HIGH set
Whoops. Thank you for catching that.
Quoted 53 lines · C?dric Schieli
In commit c2e7e72, the ramdisk relocation code was moved from
image_setup_linuxtodo_bootm, leaving the bootz and booti cases broken.This patch fixes both by adding the
BOOTM_STATE_RAMDISKstate in their call todo_bootm_statesifCONFIG_SYS_BOOT_RAMDISK_HIGHis set.Signed-off-by C?dric Schieli <[email protected]>---
cmd/booti.c | 3 +++ cmd/bootz.c | 3 +++ 2 files changed, 6 insertions(+)cmd/booti.c +3
-0@@ -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);cmd/bootz.c +3
-0@@ -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 at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
PATCH 1/1 bootz/booti: relocate ramdisk if CONFIG_SYS_BOOT_RAMDISK_HIGH set
In reply to Cédric Schieli2017-01-24 0:51 GMT+09:00 C?dric Schieli <[email protected]>:
Quoted 7 lines
In commit c2e7e72, the ramdisk relocation code was moved from
image_setup_linuxtodo_bootm, leaving the bootz and booti cases broken.This patch fixes both by adding the
BOOTM_STATE_RAMDISKstate in their call todo_bootm_statesifCONFIG_SYS_BOOT_RAMDISK_HIGHis set.Signed-off-by C?dric Schieli <[email protected]>
Thanks!
Signature · 2 lines
Best Regards Masahiro Yamada
Quoted 9 lines · C?dric Schieli
In commit c2e7e72, the ramdisk relocation code was moved from
image_setup_linuxtodo_bootm, leaving the bootz and booti cases broken.This patch fixes both by adding the
BOOTM_STATE_RAMDISKstate in their call todo_bootm_statesifCONFIG_SYS_BOOT_RAMDISK_HIGHis set.Signed-off-by C?dric Schieli <[email protected]>Reviewed-by Rick Altherr <[email protected]>Tested-by Masahiro Yamada <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170124/e6ea2ca1/attachment.sig>