From 7b191ea9e47433148a5e29fc1ea4f3ec47bfcc22 Mon Sep 17 00:00:00 2001 From: Ryan Harkin Date: Thu, 2 Mar 2017 17:57:13 +0000 Subject: vexpress64: rename fdtfile to fdt_name Rename the fdtfile environment variable for consistency with the naming of the kernel and initrd variables. Signed-off-by: Ryan Harkin --- include/configs/vexpress_aemv8a.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index ab0b978ca4..abaef7e8fd 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -169,7 +169,7 @@ "kernel_addr=0x80080000\0" \ "initrd_name=ramdisk.img\0" \ "initrd_addr=0x84000000\0" \ - "fdtfile=board.dtb\0" \ + "fdt_name=board.dtb\0" \ "fdt_alt_name=juno\0" \ "fdt_addr=0x82000000\0" \ "fdt_high=0xffffffffffffffff\0" \ @@ -192,10 +192,10 @@ "${kernel_name}; "\ " afs load ${kernel_alt_name} ${kernel_addr};"\ "fi ; "\ - "afs load ${fdtfile} ${fdt_addr} ; " \ + "afs load ${fdt_name} ${fdt_addr} ; " \ "if test $? -eq 1; then "\ " echo Loading ${fdt_alt_name} instead of "\ - "${fdtfile}; "\ + "${fdt_name}; "\ " afs load ${fdt_alt_name} ${fdt_addr}; "\ "fi ; "\ "fdt addr ${fdt_addr}; fdt resize; " \ @@ -214,7 +214,7 @@ "kernel_addr=0x80080000\0" \ "initrd_name=ramdisk.img\0" \ "initrd_addr=0x88000000\0" \ - "fdtfile=devtree.dtb\0" \ + "fdt_name=devtree.dtb\0" \ "fdt_addr=0x82000000\0" \ "fdt_high=0xffffffffffffffff\0" \ "initrd_high=0xffffffffffffffff\0" @@ -225,7 +225,7 @@ "loglevel=9" #define CONFIG_BOOTCOMMAND "smhload ${kernel_name} ${kernel_addr}; " \ - "smhload ${fdtfile} ${fdt_addr}; " \ + "smhload ${fdt_name} ${fdt_addr}; " \ "smhload ${initrd_name} ${initrd_addr} "\ "initrd_end; " \ "fdt addr ${fdt_addr}; fdt resize; " \ -- cgit v1.2.3