u-boot/0001-XXX-openSUSE-XXX-Load-dtb-from-partition-2.patch

From 94393e83682d6dfd5b8572e869f03d27ef751fae Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Wed, 13 Apr 2016 13:44:29 +0200
Subject: [PATCH 01/17] 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 ad9045e..50a8371 100644
--- a/include/config_distro_bootcmd.h
+++ b/include/config_distro_bootcmd.h
@@ -106,15 +106,15 @@
 		"bootefi ${kernel_addr_r}\0"                              \
 	\
 	"load_efi_dtb="                                                   \
-		"load ${devtype} ${devnum}:${distro_bootpart} "           \
+		"load ${devtype} ${devnum}:2 "                            \
 			"${fdt_addr_r} ${prefix}${fdtfile}; "             \
 		"fdt addr ${fdt_addr_r}\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="                                               \
 		"for prefix in ${efi_dtb_prefixes}; do "                  \
 			"if test -e ${devtype} "                          \
-					"${devnum}:${distro_bootpart} "   \
+					"${devnum}:2 "                    \
 					"${prefix}${fdtfile}; then "      \
 				"run load_efi_dtb; "                      \
 			"fi;"                                             \
-- 
1.8.5.6