forked from pool/u-boot
4a8c51668e
- Added support for DE0-Nanos-SoC board - Updated to v2016.11 - Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2016.11 to fix build of Raspberry Pi 1, 2 and 3 - Updated to v2016.11-rc3 - Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2016.11 * Patches dropped: 0004-efi_loader-Allow-boards-to-implemen.patch 0005-ARM-bcm283x-Implement-EFI-RTS-reset.patch 0006-efi_loader-gop-Expose-fb-when-32bpp.patch 0007-bcm2835-video-Map-frame-buffer-as-3.patch 0008-bcm2835-Reserve-the-spin-table-in-e.patch 0009-x86-Move-table-csum-into-separate-h.patch 0010-x86-Move-smbios-generation-into-arc.patch 0011-efi_loader-Expose-efi_install_confi.patch 0012-smbios-Allow-compilation-on-64bit-s.patch 0013-smbios-Expose-in-efi_loader-as-tabl.patch 0014-efi_loader-Fix-efi_install_configur.patch 0015-smbios-Provide-serial-number.patch 0016-efi_loader-Update-description-of-in.patch 0017-efi_loader-Fix-memory-map-size-chec.patch 0018-efi_loader-Fix-crash-on-32-bit-syst.patch 0019-efi_loader-Move-efi_allocate_pool-i.patch 0020-efi_loader-Track-size-of-pool-alloc.patch 0021-efi_loader-Readd-freed-pages-to-mem.patch 0022-efi_loader-Keep-memory-mapping-sort.patch 0023-efi_loader-Do-not-leak-memory-when-.patch OBS-URL: https://build.opensuse.org/request/show/448523 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/u-boot?expand=0&rev=83
42 lines
1.8 KiB
Diff
42 lines
1.8 KiB
Diff
From cc62469ed0d694373f4da3e51a316cf36d332bba 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 9ecaf38..42e39e7 100644
|
|
--- a/include/config_distro_bootcmd.h
|
|
+++ b/include/config_distro_bootcmd.h
|
|
@@ -125,16 +125,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;" \
|