diff options
| author | Alexander Graf <agraf@suse.de> | 2016-03-04 01:10:11 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-03-15 21:30:13 -0400 |
| commit | da3e620d68ba06d7cb501f4756db7a3caf90e215 (patch) | |
| tree | d1a1ce1df2384fa016052b2f8bca4831a5b53c11 | |
| parent | e4a7394ad2ea7511811370a53deeaa168bb273fc (diff) | |
| download | u-boot-da3e620d68ba06d7cb501f4756db7a3caf90e215.zip u-boot-da3e620d68ba06d7cb501f4756db7a3caf90e215.tar.gz u-boot-da3e620d68ba06d7cb501f4756db7a3caf90e215.tar.bz2 | |
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>
| -rw-r--r-- | include/config_distro_bootcmd.h | 4 | ||||
| -rw-r--r-- | include/configs/hikey.h | 2 | ||||
| -rw-r--r-- | include/configs/vexpress_aemv8a.h | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h index 5792d29..ad9045e 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h @@ -107,7 +107,7 @@ \ "load_efi_dtb=" \ "load ${devtype} ${devnum}:${distro_bootpart} " \ - "${fdt_addr_r} ${prefix}${fdt_name}; " \ + "${fdt_addr_r} ${prefix}${fdtfile}; " \ "fdt addr ${fdt_addr_r}\0" \ \ "efi_dtb_prefixes=/ /dtb/ /dtb/current/\0" \ @@ -115,7 +115,7 @@ "for prefix in ${efi_dtb_prefixes}; do " \ "if test -e ${devtype} " \ "${devnum}:${distro_bootpart} " \ - "${prefix}${fdt_name}; then " \ + "${prefix}${fdtfile}; then " \ "run load_efi_dtb; " \ "fi;" \ "done;" \ diff --git a/include/configs/hikey.h b/include/configs/hikey.h index 2c89bd9..0851626 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -118,7 +118,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "kernel_name=Image\0" \ "kernel_addr_r=0x00080000\0" \ - "fdt_name=hi6220-hikey.dtb\0" \ + "fdtfile=hi6220-hikey.dtb\0" \ "fdt_addr_r=0x02000000\0" \ "fdt_high=0xffffffffffffffff\0" \ "initrd_high=0xffffffffffffffff\0" \ diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 4a9b97d..31b1a24 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -188,7 +188,7 @@ "kernel_addr=0x80080000\0" \ "initrd_name=ramdisk.img\0" \ "initrd_addr=0x84000000\0" \ - "fdt_name=board.dtb\0" \ + "fdtfile=board.dtb\0" \ "fdt_alt_name=juno\0" \ "fdt_addr=0x83000000\0" \ "fdt_high=0xffffffffffffffff\0" \ @@ -210,10 +210,10 @@ "${kernel_name}; "\ " afs load ${kernel_alt_name} ${kernel_addr};"\ "fi ; "\ - "afs load ${fdt_name} ${fdt_addr} ; " \ + "afs load ${fdtfile} ${fdt_addr} ; " \ "if test $? -eq 1; then "\ " echo Loading ${fdt_alt_name} instead of "\ - "${fdt_name}; "\ + "${fdtfile}; "\ " afs load ${fdt_alt_name} ${fdt_addr}; "\ "fi ; "\ "fdt addr ${fdt_addr}; fdt resize; " \ @@ -232,7 +232,7 @@ "kernel_addr=0x80080000\0" \ "initrd_name=ramdisk.img\0" \ "initrd_addr=0x88000000\0" \ - "fdt_name=devtree.dtb\0" \ + "fdtfile=devtree.dtb\0" \ "fdt_addr=0x83000000\0" \ "fdt_high=0xffffffffffffffff\0" \ "initrd_high=0xffffffffffffffff\0" @@ -242,7 +242,7 @@ "loglevel=9" #define CONFIG_BOOTCOMMAND "smhload ${kernel_name} ${kernel_addr}; " \ - "smhload ${fdt_name} ${fdt_addr}; " \ + "smhload ${fdtfile} ${fdt_addr}; " \ "smhload ${initrd_name} ${initrd_addr} "\ "initrd_end; " \ "fdt addr ${fdt_addr}; fdt resize; " \ |