From a7e044eece1d28a53f343503890e361322de96e3 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Wed, 13 Apr 2016 13:44:29 +0200
Subject: [PATCH] XXX openSUSE XXX: Load dtb from partition 2
Upstream U-Boot loads the device tree from the EFI partition. This is
mostly because upstream we don't know which partition really holds the
boot data.
For openSUSE however we do know, so let's just patch the boot script to
load device trees from partition 2.
Signed-off-by: Alexander Graf <agraf@suse.de>
---
include/config_distro_bootcmd.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
index e0d0034ed3..120e22e995 100644
--- a/include/config_distro_bootcmd.h
+++ b/include/config_distro_bootcmd.h
@@ -126,16 +126,16 @@
"fi\0" \
\
"load_efi_dtb=" \
- "load ${devtype} ${devnum}:${distro_bootpart} " \
+ "load ${devtype} ${devnum}:2 " \
"${fdt_addr_r} ${prefix}${efi_fdtfile}\0" \
\
- "efi_dtb_prefixes=/ /dtb/ /dtb/current/\0" \
+ "efi_dtb_prefixes=/ /dtb/ /dtb/current/ /boot/ /boot/dtb/ /boot/dtb/current/\0" \
"scan_dev_for_efi=" \
"setenv efi_fdtfile ${fdtfile}; " \
BOOTENV_EFI_SET_FDTFILE_FALLBACK \
"for prefix in ${efi_dtb_prefixes}; do " \
"if test -e ${devtype} " \
- "${devnum}:${distro_bootpart} " \
+ "${devnum}:2 " \
"${prefix}${efi_fdtfile}; then " \
"run load_efi_dtb; " \
"fi;" \