Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit cd5d95653c34723f99c2c712e7a9455687d36e9f

Authored by Masahiro Yamada
1 parent a304143925
Exists in v2017.01-smarct4x and in 30 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-rel_imx_4.1.15_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, smarc_8mq_lf_v2020.04, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

ARM: uniphier: factor out common part of boot commands 

The environment "bootm_low" is updated before the "bootz" command.
This is common for all the boot modes (NOR, NAND, TFTP, etc.), so
can be factored out.

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

Showing 1 changed file with 10 additions and 11 deletions Side-by-side Diff

include/configs/uniphier.h
Diff comments   View file @ cd5d956
... ... @@ -201,22 +201,21 @@
201 201 "ramdisk_addr_r=0x84a00000\0" \
202 202 "ramdisk_size=0x00600000\0" \
203 203 "ramdisk_file=rootfs.cpio.uboot\0" \
204   - "norboot=setexpr bootm_low $kernel_addr_r '&' fe000000 &&" \
205   - "setexpr kernel_addr $nor_base + $kernel_addr &&" \
  204 + "boot_common=setexpr bootm_low $kernel_addr_r '&' fe000000 &&" \
  205 + "bootz $kernel_addr_r $ramdisk_addr_r $fdt_addr_r\0" \
  206 + "norboot=setexpr kernel_addr $nor_base + $kernel_addr &&" \
206 207 "cp.b $kernel_addr $kernel_addr_r $kernel_size &&" \
207   - "setexpr ramdisk_addr $nor_base + $ramdisk_addr &&" \
208   - "setexpr fdt_addr $nor_base + $fdt_addr &&" \
209   - "bootz $kernel_addr_r $ramdisk_addr $fdt_addr\0" \
210   - "nandboot=setexpr bootm_low $kernel_addr_r '&' fe000000 &&" \
211   - "nand read $kernel_addr_r $kernel_addr $kernel_size &&" \
  208 + "setexpr ramdisk_addr_r $nor_base + $ramdisk_addr &&" \
  209 + "setexpr fdt_addr_r $nor_base + $fdt_addr &&" \
  210 + "run boot_common\0" \
  211 + "nandboot=nand read $kernel_addr_r $kernel_addr $kernel_size &&" \
212 212 "nand read $ramdisk_addr_r $ramdisk_addr $ramdisk_size &&" \
213 213 "nand read $fdt_addr_r $fdt_addr $fdt_size &&" \
214   - "bootz $kernel_addr_r $ramdisk_addr_r $fdt_addr_r\0" \
215   - "tftpboot=setexpr bootm_low $kernel_addr_r '&' fe000000 &&" \
216   - "tftpboot $kernel_addr_r $bootfile &&" \
  214 + "run boot_common\0" \
  215 + "tftpboot=tftpboot $kernel_addr_r $bootfile &&" \
217 216 "tftpboot $ramdisk_addr_r $ramdisk_file &&" \
218 217 "tftpboot $fdt_addr_r $fdt_file &&" \
219   - "bootz $kernel_addr_r $ramdisk_addr_r $fdt_addr_r\0""
  218 + "run boot_common\0""
220 219 #endif
221 220  
222 221 #define CONFIG_EXTRA_ENV_SETTINGS \