forked from pool/u-boot
cad836ad68
Sorry for the supersede, this fixes a small issue with beaglebone where grub2 would overwrite the initrd while patching the device tree because it's missing boundary checks. - EFI: Map fdt as reserved * efi-map-fdt-as-reserved.patch - Fix OMAP3 boards to load u-boot from raw sector offset * omap3-Use-raw-SPL-by-default-for-mmc1.patch - Allow grub2 to find its config * efi_loader-Pass-proper-device-path-in-on-boot.patch - Fix Raspberry Pi 1 build * efi_loader-Provide-icache-flush-stub.patch - Move omap3 to distro bootcmd (to enable efi boot on beagle-xm) * omap3-Move-to-distro-bootcmd.patch - Add EFI patch to support FDT fixups (patches in RAM size) * efi_loader-Call-fdt-preparation-functions.patch - Patch the default u-boot env to search for dtb in /boot at part 2 * efi-default-env.patch - Use $fdtfile rather than $fdt_name everywhere: * efi2.patch - Add EFI support about to move upstream: * efi.patch - EFI: Map fdt as reserved * efi-map-fdt-as-reserved.patch - Fix OMAP3 boards to load u-boot from raw sector offset * omap3-Use-raw-SPL-by-default-for-mmc1.patch (forwarded request 365802 from algraf) OBS-URL: https://build.opensuse.org/request/show/366093 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/u-boot?expand=0&rev=68
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; " \
|