Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 90a6e929881caf4a74015c8e8f2279ee0a7b3804

Authored by Masahiro Yamada
1 parent 9ef2835f26
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: fix NOR boot command 

Commit 89835b3557fe ("ARM: uniphier: allow to run zImage rather than
uImage") changed the kernel boot commands.  Unlike "bootm", "bootz"
does not relocate the kernel image.  When the boot device is a NOR
flash, the zImage should be copied from the NOR onto the DRAM before
it is passed to the "bootz" command.

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

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

include/configs/uniphier.h
Diff comments   View file @ 90a6e92
... ... @@ -203,9 +203,10 @@
203 203 "ramdisk_file=rootfs.cpio.uboot\0" \
204 204 "norboot=setexpr bootm_low $kernel_addr_r '&' fe000000 &&" \
205 205 "setexpr kernel_addr $nor_base + $kernel_addr &&" \
  206 + "cp.b $kernel_addr $kernel_addr_r $kernel_size &&" \
206 207 "setexpr ramdisk_addr $nor_base + $ramdisk_addr &&" \
207 208 "setexpr fdt_addr $nor_base + $fdt_addr &&" \
208   - "bootz $kernel_addr $ramdisk_addr $fdt_addr $ramdisk_addr $fdt_addr\0" \" \
  209 + "bootz $kernel_addr_r $ramdisk_addr $fdt_addr $ramdisk_addr $fdt_addr\0" \" \
209 210 "nandboot=setexpr bootm_low $kernel_addr_r '&' fe000000 &&" \
210 211 "nand read $kernel_addr_r $kernel_addr $kernel_size &&" \
211 212 "nand read $ramdisk_addr_r $ramdisk_addr $ramdisk_size &&" \
... ... @@ -221,7 +222,7 @@
221 222 #define CONFIG_EXTRA_ENV_SETTINGS \
222 223 "netdev=eth0\0" \
223 224 "verify=n\0" \
224   - "norbase=0x42000000base=0x42000000\0" \" \
  225 + "nor_base=0x42000000base=0x42000000\0" \" \
225 226 "nandupdate=nand erase 0 0x00100000 &&" \
226 227 "tftpboot u-boot-spl-dtb.bin &&" \
227 228 "nand write $loadaddr 0 0x00010000 &&" \