Eric Lee / smarc-uboot

Download as
Browse Code »

Commit 4943dc2f1977cf89297b87f93f96ad4d7f09d24d

Authored by Cédric Schieli
Committed by Tom Rini
1 parent 9b6ef528d0
Exists in smarc_8mq_lf_v2020.04 and in 22 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

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>

Showing 2 changed files with 6 additions and 0 deletions Side-by-side Diff

... ... @@ -132,6 +132,9 @@
132 132  
133 133 images.os.os = IH_OS_LINUX;
134 134 ret = do_bootm_states(cmdtp, flag, argc, argv,
  135 +#ifdef CONFIG_SYS_BOOT_RAMDISK_HIGH
  136 + BOOTM_STATE_RAMDISK |
  137 +#endif
135 138 BOOTM_STATE_OS_PREP | BOOTM_STATE_OS_FAKE_GO |
136 139 BOOTM_STATE_OS_GO,
137 140 &images, 1);
... ... @@ -76,6 +76,9 @@
76 76  
77 77 images.os.os = IH_OS_LINUX;
78 78 ret = do_bootm_states(cmdtp, flag, argc, argv,
  79 +#ifdef CONFIG_SYS_BOOT_RAMDISK_HIGH
  80 + BOOTM_STATE_RAMDISK |
  81 +#endif
79 82 BOOTM_STATE_OS_PREP | BOOTM_STATE_OS_FAKE_GO |
80 83 BOOTM_STATE_OS_GO,
81 84 &images, 1);