u-boot/0001-XXX-openSUSE-XXX-Load-dtb-from-part.patch
Guillaume GARDET 31045129c4 Accepting request 607419 from hardware👢staging
- Conditionalize pine64plus ATF support on uboot_atf_pine64
- u-boot-board.spec.in: Update license
- Add poplar
- Update to 2018.05
- Update to 2018.05-rc3
- Include u-boot.spec in autogeneration logic
- Add support for .bif generation in mkimage
- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
* Patches added:
  0006-tools-zynqmpimage-Add-partition-rea.patch
  0007-tools-zynqmpimage-Move-defines-to-h.patch
  0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
  0009-tools-zynqmpimage-Add-bif-support.patch
  0010-tools-zynqmpbif-Add-support-for-loa.patch
- Add generic ZynqMP support
- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
* Patches added:
  0005-zynqmp-Add-generic-target.patch
- Update to 2018.05-rc2
- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
* Patches dropped:
  0004-rpi3-Enable-lan78xx-driver.patch
  0005-rpi-Add-identifier-for-the-new-RPi3.patch
  0006-efi_loader-Fix-network-DP-with-DM_E.patch
  0007-mkimage-do-not-fail-if-there-is-no-.patch
  0008-rpi-Allow-to-boot-without-serial.patch
  0009-mmc-use-core-clock-frequency-in-bcm.patch
  0010-Temp-workaround-for-Chromebook-snow.patch
* Patches added:
  0004-Temp-workaround-for-Chromebook-snow.patch
- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
* Patches added:
  0010-Temp-workaround-for-Chromebook-snow.patch
  
- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
* Patches dropped:
  0009-rpi-Allow-to-boot-without-serial.patch
  0010-mmc-use-core-clock-frequency-in-bcm.patch
* Patches added:
  0008-rpi-Allow-to-boot-without-serial.patch
  0009-mmc-use-core-clock-frequency-in-bcm.patch
    
- Update to 2018.05-rc1
- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05
* Patches dropped:
  0003-Revert-rockchip-mkimage-remove-plac.patch
  0004-rpi-Use-firmware-provided-device-tr.patch
  0005-rpi3-Enable-lan78xx-driver.patch
  0006-net-Only-access-network-devices-aft.patch
  0007-rpi-Add-identifier-for-the-new-RPi3.patch
  0008-efi_loader-Fix-network-DP-with-DM_E.patch
* Patches added:
  0003-rpi-Use-firmware-provided-device-tr.patch
  0004-rpi3-Enable-lan78xx-driver.patch
  0005-rpi-Add-identifier-for-the-new-RPi3.patch
  0006-efi_loader-Fix-network-DP-with-DM_E.patch
  0007-mkimage-do-not-fail-if-there-is-no-.patch

OBS-URL: https://build.opensuse.org/request/show/607419
OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=16
2018-05-15 09:14:56 +00:00

42 lines
1.8 KiB
Diff

From db706bed3365f1c03e47cc7f46a0a23462f9ac17 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 8d5feb3ac7..8ec95574ca 100644
--- a/include/config_distro_bootcmd.h
+++ b/include/config_distro_bootcmd.h
@@ -134,16 +134,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;" \