Accepting request 795564 from hardware:boot:staging
- Drop downstream zynqmp generic patches since zynqmp virt config
superseed it:
Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2020.04
* Patches dropped:
0005-zynqmp-Add-generic-target.patch
0006-tools-zynqmpbif-Add-support-for-loa.patch
0007-boo-1123170-Remove-ubifs-support-fr.patch
0008-zynqmp-generic-fix-compilation.patch
0009-boo-1144161-Remove-nand-mtd-spi-dfu.patch
0010-Kconfig-add-btrfs-to-distro-boot.patch
0011-configs-Re-sync-with-CONFIG_DISTRO_.patch
0012-configs-am335x_evm-disable-BTRFS.patch
0013-net-bcmgenet-Don-t-set-ID_MODE_DIS-.patch
0014-uboot-fs-btrfs-Use-LZO_LEN-to-repla.patch
0015-uboot-fs-btrfs-Fix-LZO-false-decomp.patch
* Patches added:
0005-tools-zynqmpbif-Add-support-for-loa.patch
0006-boo-1123170-Remove-ubifs-support-fr.patch
0007-boo-1144161-Remove-nand-mtd-spi-dfu.patch
0008-Kconfig-add-btrfs-to-distro-boot.patch
0009-configs-Re-sync-with-CONFIG_DISTRO_.patch
0010-configs-am335x_evm-disable-BTRFS.patch
0011-net-bcmgenet-Don-t-set-ID_MODE_DIS-.patch
0012-uboot-fs-btrfs-Use-LZO_LEN-to-repla.patch
0013-uboot-fs-btrfs-Fix-LZO-false-decomp.patch
- Follow upstream commits f7c6ee7f and be1b6c32 to unify
zynq/zynqmp configs:
* Update zynq configs to use generic config + device tree for
u-boot-avnetultra96rev1 and u-boot-xilinxzynqmpzcu102rev10
* Use upstream u-boot-xilinxzynqmpvirt instead of downstream
u-boot-xilinxzynqmpgeneric
- Switch to http URLs, ftp is obsolete
- Update to v2020.04:
* Platfrom fixes: Amlogic, Atmel, fsl, iMX, Marvell, Mediatek,
rockchip, RPi, samsung, socfpga, sunxi, Tegra, TI
* EFI fixes
* I2C fixes
* GPIO fixes
* MMC fixes
* SPI fixes
* USB fixes
* Filesystem fixes
Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2020.04
* Patches dropped:
0010-ARM-tegra-Add-NVIDIA-Jetson-Nano-De.patch
0011-net-Add-support-for-Broadcom-GENETv.patch
0012-rpi4-Update-memory-map-to-accommoda.patch
0013-rpi4-Enable-GENET-Ethernet-controll.patch
0014-Kconfig-add-btrfs-to-distro-boot.patch
0015-configs-Re-sync-with-CONFIG_DISTRO_.patch
0016-configs-am335x_evm-disable-BTRFS.patch
0017-net-phy-Fix-overlong-PHY-timeout.patch
0018-net-bcmgenet-Don-t-set-ID_MODE_DIS-.patch
0019-uboot-fs-btrfs-Use-LZO_LEN-to-repla.patch
0020-uboot-fs-btrfs-Fix-LZO-false-decomp.patch
* Patches added:
0010-Kconfig-add-btrfs-to-distro-boot.patch
0011-configs-Re-sync-with-CONFIG_DISTRO_.patch
0012-configs-am335x_evm-disable-BTRFS.patch
0013-net-bcmgenet-Don-t-set-ID_MODE_DIS-.patch
0014-uboot-fs-btrfs-Use-LZO_LEN-to-repla.patch
0015-uboot-fs-btrfs-Fix-LZO-false-decomp.patch
OBS-URL: https://build.opensuse.org/request/show/795564
OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=96
2020-04-20 11:32:05 +02:00
|
|
|
From 5637f1acf10c604ef8f25d43eb4d4fa1d6d4b4e4 Mon Sep 17 00:00:00 2001
|
2018-07-18 15:39:52 +02:00
|
|
|
From: Guillaume GARDET <guillaume.gardet@free.fr>
|
|
|
|
Date: Wed, 13 Apr 2016 13:44:29 +0200
|
2020-02-17 17:59:47 +01:00
|
|
|
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
|
2018-07-18 15:39:52 +02:00
|
|
|
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
|
2020-02-17 17:59:47 +01:00
|
|
|
index fc0935fa21..f9cda052e1 100644
|
2018-07-18 15:39:52 +02:00
|
|
|
--- a/include/config_distro_bootcmd.h
|
|
|
|
+++ b/include/config_distro_bootcmd.h
|
|
|
|
@@ -141,7 +141,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 \
|
2020-01-28 10:38:57 +01:00
|
|
|
@@ -466,7 +466,7 @@
|
2018-07-18 15:39:52 +02:00
|
|
|
"scan_dev_for_boot_part=" \
|
|
|
|
"part list ${devtype} ${devnum} -bootable devplist; " \
|
|
|
|
"env exists devplist || setenv devplist 1; " \
|
|
|
|
- "for distro_bootpart in ${devplist}; do " \
|
2020-02-17 17:59:47 +01:00
|
|
|
+ "for distro_bootpart in 3 4 2 ${devplist}; do " \
|
2018-07-18 15:39:52 +02:00
|
|
|
"if fstype ${devtype} " \
|
|
|
|
"${devnum}:${distro_bootpart} " \
|
|
|
|
"bootfstype; then " \
|