Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit c0df1fafd764aa41e1b5762af377c7dea296e600

Authored by Masahiro Yamada
1 parent 99b8517037
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

ARM: uniphier: set initrd_high environment to skip initrd relocation 

The boot_ramdisk_high() checks the environment "initrd_high" and,
if it is set to (ulong)-1, skip the initrd relocation.  This is
useful for faster booting when we know the initrd is already located
within the reach of the kernel.

Change "norboot" to copy images in order to make it work without
depending on the automatic relocation.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

Showing 1 changed file with 7 additions and 2 deletions Side-by-side Diff

include/configs/uniphier.h
Diff comments   View file @ c0df1fa
... ... @@ -202,8 +202,12 @@
202 202 "norboot=setexpr kernel_addr_nor $nor_base + $kernel_addr && " \
203 203 "setexpr kernel_size_div4 $kernel_size / 4 && " \
204 204 "cp $kernel_addr_nor $kernel_addr_load $kernel_size_div4 && " \
205   - "setexpr ramdisk_addr_r $nor_base + $ramdisk_addr &&" \
206   - "setexpr fdt_addr_r $nor_base + $fdt_addr &&" \
  205 + "setexpr ramdisk_addr_nor $nor_base + $ramdisk_addr && " \
  206 + "setexpr ramdisk_size_div4 $ramdisk_size / 4 && " \
  207 + "cp $ramdisk_addr_nor $ramdisk_addr_r $ramdisk_size_div4 && " \
  208 + "setexpr fdt_addr_nor $nor_base + $fdt_addr && " \
  209 + "setexpr fdt_size_div4 $fdt_size / 4 && " \
  210 + "cp $fdt_addr_nor $fdt_addr_r $fdt_size_div4 && " \
207 211 "run boot_common\0" \
208 212 "nandboot=nand read $kernel_addr_load $kernel_addr $kernel_size && " \
209 213 "nand read $ramdisk_addr_r $ramdisk_addr $ramdisk_size &&" \
... ... @@ -222,6 +226,7 @@
222 226 #define CONFIG_EXTRA_ENV_SETTINGS \
223 227 "netdev=eth0\0" \
224 228 "verify=n\0" \
  229 + "initrd_high=0xffffffffffffffff\0" \
225 230 "nor_base=0x42000000\0" \
226 231 "sramupdate=setexpr tmp_addr $nor_base + 0x50000 &&" \
227 232 "tftpboot $tmp_addr u-boot-spl.bin &&" \