forked from pool/u-boot
Dirk Mueller
f39b767ea5
Fix boo#1216036. Tested on RPi4. Boot from USB and uSD fine. For details see: https://lore.kernel.org/u-boot/20231023070216.394709-1-sjg@chromium.org/#t * Patches added: 0018-Revert-bootstd-Scan-all-bootdevs-in.patch 0019-bootstd-Expand-boot-ordering-test-t.patch 0020-bootstd-Correct-logic-for-single-uc.patch 0021-bootstd-Scan-all-bootdevs-in-a-boot.patch OBS-URL: https://build.opensuse.org/request/show/1120007 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=201
36 lines
1.7 KiB
Diff
36 lines
1.7 KiB
Diff
From defcec8a26ffc9fe6f03bec58af89e0ad9219062 Mon Sep 17 00:00:00 2001
|
|
From: Guillaume GARDET <guillaume.gardet@free.fr>
|
|
Date: Wed, 13 Apr 2016 13:44:29 +0200
|
|
Subject: [PATCH] XXX openSUSE XXX: Prepend partition 3 (and 4 for chromebook
|
|
snow) to the list of boot partition to load DTB before EFI. It used to be 2
|
|
and 3 up to python-kiwi 9.18.34, since swap was the last partition at that
|
|
time. Keep #2 for compatibility purpose. Fix boo#1163723 Also add new folders
|
|
to find DTB
|
|
|
|
---
|
|
include/config_distro_bootcmd.h | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
|
|
index 2a136b96a6d..f2d2c761616 100644
|
|
--- a/include/config_distro_bootcmd.h
|
|
+++ b/include/config_distro_bootcmd.h
|
|
@@ -166,7 +166,7 @@
|
|
"load ${devtype} ${devnum}:${distro_bootpart} " \
|
|
"${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 \
|
|
@@ -540,7 +540,7 @@
|
|
"scan_dev_for_boot_part=" \
|
|
"part list ${devtype} ${devnum} -bootable devplist; " \
|
|
"env exists devplist || setenv devplist 1; " \
|
|
- "for distro_bootpart in ${devplist}; do " \
|
|
+ "for distro_bootpart in 3 4 2 ${devplist}; do " \
|
|
"if fstype ${devtype} " \
|
|
"${devnum}:${distro_bootpart} " \
|
|
"bootfstype; then " \
|