Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit da3e620d68ba06d7cb501f4756db7a3caf90e215

Authored by Alexander Graf
Committed by Tom Rini
1 parent e4a7394ad2
Exists in v2017.01-smarct4x and in 29 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, 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

arm64: Replace fdt_name env variables with fdtfile 

The commonly defined environment variable to determine the device tree
file name is called fdtfile rather than fdt_name. Replace all occurences
of fdt_name with fdtfile.

Signed-off-by: Alexander Graf <agraf@suse.de>

Showing 3 changed files with 8 additions and 8 deletions Side-by-side Diff

include/config_distro_bootcmd.h
Diff comments   View file @ da3e620
... ... @@ -107,7 +107,7 @@
107 107 \
108 108 "load_efi_dtb=" \
109 109 "load ${devtype} ${devnum}:${distro_bootpart} " \
110   - "${fdt_addr_r} ${prefix}${fdt_name}; " \
  110 + "${fdt_addr_r} ${prefix}${fdtfile}; " \
111 111 "fdt addr ${fdt_addr_r}\0" \
112 112 \
113 113 "efi_dtb_prefixes=/ /dtb/ /dtb/current/\0" \
... ... @@ -115,7 +115,7 @@
115 115 "for prefix in ${efi_dtb_prefixes}; do " \
116 116 "if test -e ${devtype} " \
117 117 "${devnum}:${distro_bootpart} " \
118   - "${prefix}${fdt_name}; then " \
  118 + "${prefix}${fdtfile}; then " \
119 119 "run load_efi_dtb; " \
120 120 "fi;" \
121 121 "done;" \
include/configs/hikey.h
Diff comments   View file @ da3e620
... ... @@ -118,7 +118,7 @@
118 118 #define CONFIG_EXTRA_ENV_SETTINGS \
119 119 "kernel_name=Image\0" \
120 120 "kernel_addr_r=0x00080000\0" \
121   - "fdt_name=hi6220-hikey.dtbe=hi6220-hikey.dtb\0" \" \
  121 + "fdtfile=hi6220-hikey.dtbe=hi6220-hikey.dtb\0" \" \
122 122 "fdt_addr_r=0x02000000\0" \
123 123 "fdt_high=0xffffffffffffffff\0" \
124 124 "initrd_high=0xffffffffffffffff\0" \
include/configs/vexpress_aemv8a.h
Diff comments   View file @ da3e620
... ... @@ -188,7 +188,7 @@
188 188 "kernel_addr=0x80080000\0" \
189 189 "initrd_name=ramdisk.img\0" \
190 190 "initrd_addr=0x84000000\0" \
191   - "fdt_name=board.dtbe=board.dtb\0" \" \
  191 + "fdtfile=board.dtbe=board.dtb\0" \" \
192 192 "fdt_alt_name=juno\0" \
193 193 "fdt_addr=0x83000000\0" \
194 194 "fdt_high=0xffffffffffffffff\0" \
195 195  
... ... @@ -210,10 +210,10 @@
210 210 "${kernel_name}; "\
211 211 " afs load ${kernel_alt_name} ${kernel_addr};"\
212 212 "fi ; "\
213   - "afs load ${fdt_name} ${fdt_addr} ; " \
  213 + "afs load ${fdtfile} ${fdt_addr} ; " \
214 214 "if test $? -eq 1; then "\
215 215 " echo Loading ${fdt_alt_name} instead of "\
216   - "${fdt_name}; "\
  216 + "${fdtfile}; "\
217 217 " afs load ${fdt_alt_name} ${fdt_addr}; "\
218 218 "fi ; "\
219 219 "fdt addr ${fdt_addr}; fdt resize; " \
... ... @@ -232,7 +232,7 @@
232 232 "kernel_addr=0x80080000\0" \
233 233 "initrd_name=ramdisk.img\0" \
234 234 "initrd_addr=0x88000000\0" \
235   - "fdt_name=devtree.dtb\0" \
  235 + "fdtfile=devtree.dtb\0" \
236 236 "fdt_addr=0x83000000\0" \
237 237 "fdt_high=0xffffffffffffffff\0" \
238 238 "initrd_high=0xffffffffffffffff\0"
... ... @@ -242,7 +242,7 @@
242 242 "loglevel=9"
243 243  
244 244 #define CONFIG_BOOTCOMMAND "smhload ${kernel_name} ${kernel_addr}; " \
245   - "smhload ${fdt_name} ${fdt_addr}; " \
  245 + "smhload ${fdtfile} ${fdt_addr}; " \
246 246 "smhload ${initrd_name} ${initrd_addr} "\
247 247 "initrd_end; " \
248 248 "fdt addr ${fdt_addr}; fdt resize; " \