SHA256
1
0
forked from pool/u-boot

Accepting request 1116640 from hardware👢staging

OBS-URL: https://build.opensuse.org/request/show/1116640
OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=197
This commit is contained in:
Matthias Brugger 2023-10-10 14:12:00 +00:00 committed by Git OBS Bridge
parent ecca7059cc
commit 1eb7b1de61
20 changed files with 72 additions and 43 deletions

View File

@ -1,4 +1,4 @@
From 22b887600bd65cdbe57614e62c18bc6646f23d78 Mon Sep 17 00:00:00 2001
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
@ -12,10 +12,10 @@ Subject: [PATCH] XXX openSUSE XXX: Prepend partition 3 (and 4 for chromebook
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
index 9d2a225e7e..399968fca8 100644
index 2a136b96a6..f2d2c76161 100644
--- a/include/config_distro_bootcmd.h
+++ b/include/config_distro_bootcmd.h
@@ -158,7 +158,7 @@
@@ -166,7 +166,7 @@
"load ${devtype} ${devnum}:${distro_bootpart} " \
"${fdt_addr_r} ${prefix}${efi_fdtfile}\0" \
\
@ -24,7 +24,7 @@ index 9d2a225e7e..399968fca8 100644
"scan_dev_for_efi=" \
"setenv efi_fdtfile ${fdtfile}; " \
BOOTENV_EFI_SET_FDTFILE_FALLBACK \
@@ -517,7 +517,7 @@
@@ -540,7 +540,7 @@
"scan_dev_for_boot_part=" \
"part list ${devtype} ${devnum} -bootable devplist; " \
"env exists devplist || setenv devplist 1; " \

View File

@ -1,4 +1,4 @@
From a2a171cf41394545b679580cb74564ee1a9305f1 Mon Sep 17 00:00:00 2001
From 231d5ffc43bcfcf08b4747416f70a19a2889dd37 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Mon, 2 May 2016 23:25:07 +0200
Subject: [PATCH] Revert "Revert "omap3: Use raw SPL by default for mmc1""
@ -9,10 +9,10 @@ This reverts commit 7fa75d0ac5502db813d109c1df7bd0da34688685.
1 file changed, 2 deletions(-)
diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c
index 9a342a1bf9..a7e62b80ee 100644
index a2dd5f6df0..d2c8e7f5ef 100644
--- a/arch/arm/mach-omap2/boot-common.c
+++ b/arch/arm/mach-omap2/boot-common.c
@@ -143,8 +143,6 @@ void save_omap_boot_params(void)
@@ -126,8 +126,6 @@ void save_omap_boot_params(void)
(boot_device <= MMC_BOOT_DEVICES_END)) {
switch (boot_device) {
case BOOT_DEVICE_MMC1:

View File

@ -1,4 +1,4 @@
From 7967ecdf06e39feacc79a5b7b6feadd840a284b7 Mon Sep 17 00:00:00 2001
From 4559c9605a9bdf4988d90f4f948fad70b93f5244 Mon Sep 17 00:00:00 2001
From: Guillaume Gardet <guillaume.gardet@arm.com>
Date: Fri, 18 Sep 2020 15:27:37 +0200
Subject: [PATCH] rpi: Use firmware provided device tree
@ -28,7 +28,7 @@ Signed-off-by: Guillaume Gardet <guillaume.gardet@free.fr>
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig
index 5da334a8bc..c423afdff0 100644
index ab6e6bcf29..a141bc4438 100644
--- a/configs/rpi_0_w_defconfig
+++ b/configs/rpi_0_w_defconfig
@@ -24,7 +24,7 @@ CONFIG_CMD_GPIO=y
@ -41,7 +41,7 @@ index 5da334a8bc..c423afdff0 100644
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
index 9908621607..50ddf25774 100644
index 0dea092f24..46bdbfb532 100644
--- a/configs/rpi_2_defconfig
+++ b/configs/rpi_2_defconfig
@@ -25,7 +25,7 @@ CONFIG_CMD_GPIO=y
@ -54,7 +54,7 @@ index 9908621607..50ddf25774 100644
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
index 80885aa948..d4d1d6db5c 100644
index 0ccc93d572..4c912b28f6 100644
--- a/configs/rpi_3_32b_defconfig
+++ b/configs/rpi_3_32b_defconfig
@@ -24,7 +24,7 @@ CONFIG_CMD_GPIO=y
@ -67,7 +67,7 @@ index 80885aa948..d4d1d6db5c 100644
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
index bb6fe12806..d27054a6f8 100644
index 84b61f862a..210ec94974 100644
--- a/configs/rpi_3_defconfig
+++ b/configs/rpi_3_defconfig
@@ -23,7 +23,7 @@ CONFIG_CMD_GPIO=y
@ -80,7 +80,7 @@ index bb6fe12806..d27054a6f8 100644
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
index 550b8dcb95..4c4a55c71e 100644
index d049d0fb5c..adf46bec3d 100644
--- a/configs/rpi_defconfig
+++ b/configs/rpi_defconfig
@@ -24,7 +24,7 @@ CONFIG_CMD_GPIO=y

View File

@ -1,4 +1,4 @@
From 684a84247e08b597401d3748c439d3d2b7b59c9a Mon Sep 17 00:00:00 2001
From 4dfea5f29e331a721d44f138225aad377ecb86bf Mon Sep 17 00:00:00 2001
From: Guillaume GARDET <guillaume.gardet@free.fr>
Date: Mon, 9 Apr 2018 10:28:26 +0200
Subject: [PATCH] Temp workaround for Chromebook snow to avoid the 'unable to

View File

@ -1,4 +1,4 @@
From b5b543d4307ce928b38c28d245cf575efbf24df1 Mon Sep 17 00:00:00 2001
From 4acde1714c68f941d76f86d2489157cf2d7f64a6 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Thu, 26 Apr 2018 13:30:32 +0200
Subject: [PATCH] tools: zynqmpbif: Add support for load=after

View File

@ -1,4 +1,4 @@
From e8c616bd70a9b1bc9a087c9832c9ee2c77e51806 Mon Sep 17 00:00:00 2001
From e854dbdbb82d0a422440ecb94ab0a545a7bc7a0b Mon Sep 17 00:00:00 2001
From: Guillaume Gardet <guillaume.gardet@arm.com>
Date: Wed, 5 Apr 2023 14:25:29 +0200
Subject: [PATCH] Kconfig: add btrfs to distro boot
@ -13,10 +13,10 @@ Signed-off-by: Matthias Brugger <mbrugger@suse.com>
1 file changed, 1 insertion(+)
diff --git a/boot/Kconfig b/boot/Kconfig
index a643a3d128..d180dd2a9c 100644
index 86c2787dc5..fc01c8932f 100644
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -875,6 +875,7 @@ config DISTRO_DEFAULTS
@@ -885,6 +885,7 @@ config DISTRO_DEFAULTS
select CMD_SYSBOOT
select HUSH_PARSER
select SYS_LONGHELP

View File

@ -1,4 +1,4 @@
From b13a81120f4df7bd98c48702769cd1ad8ce22670 Mon Sep 17 00:00:00 2001
From bfeb7f5da76408d16d8b8c10d033044181c0b0f5 Mon Sep 17 00:00:00 2001
From: Matthias Brugger <mbrugger@suse.com>
Date: Wed, 29 Jan 2020 09:56:06 +0100
Subject: [PATCH] configs: Re-sync with CONFIG_DISTRO_DEFAULTS
@ -18,10 +18,10 @@ Signed-off-by: Matthias Brugger <mbrugger@suse.com>
5 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig
index 98b3e0cda4..fd885377ff 100644
index 138a99b37f..82c85f4e77 100644
--- a/configs/sandbox64_defconfig
+++ b/configs/sandbox64_defconfig
@@ -87,7 +87,6 @@ CONFIG_CMD_REGULATOR=y
@@ -88,7 +88,6 @@ CONFIG_CMD_REGULATOR=y
CONFIG_CMD_AES=y
CONFIG_CMD_TPM=y
CONFIG_CMD_TPM_TEST=y
@ -30,10 +30,10 @@ index 98b3e0cda4..fd885377ff 100644
CONFIG_CMD_CRAMFS=y
CONFIG_CMD_EXT4_WRITE=y
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 1ec44d5b33..87b216ed0d 100644
index 62bc182ca1..841e0c07ff 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -121,7 +121,6 @@ CONFIG_CMD_REGULATOR=y
@@ -122,7 +122,6 @@ CONFIG_CMD_REGULATOR=y
CONFIG_CMD_AES=y
CONFIG_CMD_TPM=y
CONFIG_CMD_TPM_TEST=y

View File

@ -1,4 +1,4 @@
From bf3674f570ba2c43ddebf9b2fd94caa79e090684 Mon Sep 17 00:00:00 2001
From 7ac43cc15919c55b501d33922fdd4530177c252e Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.de>
Date: Tue, 29 Sep 2020 10:13:33 +0200
Subject: [PATCH] sunxi: dts: OrangePi Zero: Add SPI aliases to make bus usable

View File

@ -1,4 +1,4 @@
From 5c4092cf45efc08805fca8e5cd5c14eeeafede96 Mon Sep 17 00:00:00 2001
From 37c10688ad651b4c732f7a63c196256380e146a5 Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.de>
Date: Mon, 28 Sep 2020 23:02:01 +0200
Subject: [PATCH] sunxi: dts: OrangePi Zero: Enable SPI flash.

View File

@ -1,4 +1,4 @@
From 82a32ab693e8c62561e387e5d725c4e4a149d032 Mon Sep 17 00:00:00 2001
From a85b553e66f31c191bbfa9d9667ead5c7e8970f8 Mon Sep 17 00:00:00 2001
From: Guillaume Gardet <guillaume.gardet@arm.com>
Date: Wed, 18 Nov 2020 13:42:04 +0000
Subject: [PATCH] Disable CONFIG_CMD_BTRFS in xilinx_zynqmp_virt_defconfig to
@ -9,10 +9,10 @@ Subject: [PATCH] Disable CONFIG_CMD_BTRFS in xilinx_zynqmp_virt_defconfig to
1 file changed, 1 insertion(+)
diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig
index c4bbde2206..aab3b1f620 100644
index acab38fefe..59889a1c0b 100644
--- a/configs/xilinx_zynqmp_virt_defconfig
+++ b/configs/xilinx_zynqmp_virt_defconfig
@@ -97,6 +97,7 @@ CONFIG_CMD_REGULATOR=y
@@ -96,6 +96,7 @@ CONFIG_CMD_REGULATOR=y
CONFIG_CMD_SMC=y
CONFIG_CMD_TPM=y
CONFIG_CMD_EXT4_WRITE=y

View File

@ -1,4 +1,4 @@
From 75d060ab4d6abd34d1cd2b31ea85dd08b606b1ed Mon Sep 17 00:00:00 2001
From 26f8b6445177efe725b16a14b82a016f2379c341 Mon Sep 17 00:00:00 2001
From: Matthias Brugger <mbrugger@suse.com>
Date: Wed, 17 Mar 2021 12:20:32 +0100
Subject: [PATCH] smbios: Fix table when no string is present

View File

@ -1,4 +1,4 @@
From 928219e36637edcee2265207c7bd1b06a2c2afe7 Mon Sep 17 00:00:00 2001
From c61fcd21f50d440b7cc202d846217d61f1033a83 Mon Sep 17 00:00:00 2001
From: Guillaume Gardet <guillaume.gardet@arm.com>
Date: Wed, 5 Apr 2023 14:27:09 +0200
Subject: [PATCH] riscv: enable CMD_BTRFS
@ -9,10 +9,10 @@ Signed-off-by: Matthias Brugger <mbrugger@suse.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/boot/Kconfig b/boot/Kconfig
index d180dd2a9c..558fe71e98 100644
index fc01c8932f..f8c1e170e9 100644
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -875,7 +875,7 @@ config DISTRO_DEFAULTS
@@ -885,7 +885,7 @@ config DISTRO_DEFAULTS
select CMD_SYSBOOT
select HUSH_PARSER
select SYS_LONGHELP

View File

@ -1,4 +1,4 @@
From b5ba86719a8b5b516e04c675a8658c4407030202 Mon Sep 17 00:00:00 2001
From eb920203b4f5c1712524bf362991587ff24512d2 Mon Sep 17 00:00:00 2001
From: Michael Chang <mchang@suse.com>
Date: Tue, 25 May 2021 06:45:01 +0000
Subject: [PATCH] Disable timer check in file loading
@ -25,7 +25,7 @@ Signed-off-by: Matthias Brugger <mbrugger@suse.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c
index 28c8cdf710..132499aac6 100644
index f0d76113b0..314af7e202 100644
--- a/lib/efi_loader/efi_disk.c
+++ b/lib/efi_loader/efi_disk.c
@@ -19,6 +19,7 @@

View File

@ -1,4 +1,4 @@
From 70cd00173e776b2d688b0127c80914fe11178672 Mon Sep 17 00:00:00 2001
From b7a53f16111faecbf89b62dcec654b8606a272bc Mon Sep 17 00:00:00 2001
From: Guillaume Gardet <guillaume.gardet@arm.com>
Date: Thu, 21 Oct 2021 09:55:50 +0200
Subject: [PATCH] Enable EFI and ISO partitions support on socfpga_de0_nano_soc

View File

@ -1,4 +1,4 @@
From f372e8431381b35c1d0fe4ee44cab807f4da1235 Mon Sep 17 00:00:00 2001
From cc95069e85750a5a80d25a28b62068dbfe0f0965 Mon Sep 17 00:00:00 2001
From: Andy Yan <andy.yan@rock-chips.com>
Date: Tue, 6 Feb 2018 09:51:12 +0800
Subject: [PATCH] cmd: boot: add brom cmd to reboot to brom dnl mode

View File

@ -1,4 +1,4 @@
From e55bae4e1b8e54efd77ba5b055b45f5135752eb6 Mon Sep 17 00:00:00 2001
From 4c25eafaf0247cbe380594e6d4fa892ffd73ce09 Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.de>
Date: Sun, 3 Jul 2022 18:25:39 +0200
Subject: [PATCH] cmd: boot: add brom cmd to reboot to FEL mode
@ -36,10 +36,10 @@ index b08f202374..36e7697b1c 100644
+
#endif /* _SUNXI_CPU_H */
diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
index 6dcbb096f7..b6669cbaa0 100644
index e20c3a3ee9..43a4575049 100644
--- a/arch/arm/mach-sunxi/Kconfig
+++ b/arch/arm/mach-sunxi/Kconfig
@@ -1068,6 +1068,22 @@ source "board/sunxi/Kconfig"
@@ -1073,6 +1073,22 @@ source "board/sunxi/Kconfig"
endif
@ -63,7 +63,7 @@ index 6dcbb096f7..b6669cbaa0 100644
bool "Enable DIPs detection for CHIP board"
select SUPPORT_EXTENSION_SCAN
diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c
index 391a65a549..eebdebf41f 100644
index 78597ad932..71844952d8 100644
--- a/arch/arm/mach-sunxi/board.c
+++ b/arch/arm/mach-sunxi/board.c
@@ -300,7 +300,30 @@ uint32_t sunxi_get_boot_device(void)

View File

@ -0,0 +1,20 @@
From 23180509c73da88f6e4d2b28f519d65341ad07db Mon Sep 17 00:00:00 2001
From: Guillaume Gardet <guillaume.gardet@arm.com>
Date: Tue, 10 Oct 2023 11:42:35 +0200
Subject: [PATCH] rpi: fix boot on RPi4 after commit
c771e5b8c2a186fb072b6c6f571d4a3cc86efba9 boo#1216036
---
board/raspberrypi/rpi/rpi.env | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/board/raspberrypi/rpi/rpi.env b/board/raspberrypi/rpi/rpi.env
index 30228285ed..02210b97b5 100644
--- a/board/raspberrypi/rpi/rpi.env
+++ b/board/raspberrypi/rpi/rpi.env
@@ -74,4 +74,4 @@ pxefile_addr_r=0x02500000
fdt_addr_r=0x02600000
ramdisk_addr_r=0x02700000
-boot_targets=mmc usb pxe dhcp
+boot_targets=mmc0 mmc1 mmc2 usb pxe dhcp

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Oct 10 09:51:42 UTC 2023 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Fix update_git.sh
- Patch queue updated from https://github.com/openSUSE/u-boot.git tumbleweed-2023.10
* Patches added:
0017-rpi-fix-boot-on-RPi4-after-commit-c.patch - boo#1216036
-------------------------------------------------------------------
Wed Oct 4 15:57:05 UTC 2023 - Andreas Schwab <schwab@suse.de>

View File

@ -239,6 +239,7 @@ Patch0013: 0013-Disable-timer-check-in-file-loading.patch
Patch0014: 0014-Enable-EFI-and-ISO-partitions-suppo.patch
Patch0015: 0015-cmd-boot-add-brom-cmd-to-reboot-to-.patch
Patch0016: 0016-cmd-boot-add-brom-cmd-to-reboot-to-.patch
Patch0017: 0017-rpi-fix-boot-on-RPi4-after-commit-c.patch
# Patches: end
BuildRequires: bc
BuildRequires: bison

View File

@ -13,8 +13,8 @@ set -e
GIT_TREE=https://github.com/openSUSE/u-boot.git
GIT_LOCAL_TREE=~/src/opensuse/u-boot-opensuse
GIT_BRANCH=tumbleweed-2023.07
GIT_UPSTREAM_TAG=v2023.07
GIT_BRANCH=tumbleweed-2023.10
GIT_UPSTREAM_TAG=v2023.10
GIT_DIR=`mktemp -d -p /dev/shm`
CMP_DIR=`mktemp -d -p /dev/shm`
@ -139,6 +139,6 @@ for file in $patch_list; do
done
osc service localrun format_spec_file
osc service run format_spec_file
echo "Please update version in u-boot.spec, if needed"