92 lines
3.4 KiB
Diff
92 lines
3.4 KiB
Diff
|
commit f01eab5acb39a4adf7577a83ef81cf4a0736633a
|
||
|
|
Author: Alexander Graf <agraf@suse.de>
|
||
|
|
Date: Sun Feb 28 11:58:15 2016 +0100
|
||
|
|
|
||
|
|
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>
|
||
|
|
|
||
|
|
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
|
||
|
|
index c19f1b0..e7d7002 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 2d9ace9..f3ae0dd 100644
|
||
|
|
--- a/include/configs/hikey.h
|
||
|
|
+++ b/include/configs/hikey.h
|
||
|
|
@@ -121,7 +121,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 2949170..3e588c0 100644
|
||
|
|
--- a/include/configs/vexpress_aemv8a.h
|
||
|
|
+++ b/include/configs/vexpress_aemv8a.h
|
||
|
|
@@ -191,7 +191,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" \
|
||
|
|
@@ -213,10 +213,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; " \
|
||
|
|
@@ -235,7 +235,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"
|
||
|
|
@@ -245,7 +245,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; " \
|