pool/u-boot
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 923181 from hardware👢staging

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/923181
OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=153
This commit is contained in:
Guillaume GARDET 2021-10-05 08:40:19 +00:00 committed by Git OBS Bridge
parent 7140a173ad
commit bbcbfca128
21 changed files with 48 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
0001-XXX-openSUSE-XXX-Prepend-partition-.patch
View File

@ -1,4 +1,4 @@
From d547eaaabdd35fff44fb9c26c2bce6399c539dbc Mon Sep 17 00:00:00 2001
From d2526d797aed3a59eadb64ffc81e371e9edb0c54 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,7 +12,7 @@ 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 750e9e04e8f..71bbf4bc21d 100644
index 750e9e04e8..71bbf4bc21 100644
--- a/include/config_distro_bootcmd.h
+++ b/include/config_distro_bootcmd.h
@@ -151,7 +151,7 @@

4
0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch
View File

@ -1,4 +1,4 @@
From b65fd55b8a88f691c41617f553665d8844bf24cb Mon Sep 17 00:00:00 2001
From a25b6fca9b8a33ee63073f3911581bd786726a72 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,7 +9,7 @@ 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 7cdf7f15898..c06f0f8e678 100644
index 7cdf7f1589..c06f0f8e67 100644
--- a/arch/arm/mach-omap2/boot-common.c
+++ b/arch/arm/mach-omap2/boot-common.c
@@ -134,8 +134,6 @@ void save_omap_boot_params(void)

12
0003-rpi-Use-firmware-provided-device-tr.patch
View File

@ -1,4 +1,4 @@
From b47a0c9da4a6f4460f1c81607c92ab6d68762370 Mon Sep 17 00:00:00 2001
From 0156cd76f4468bb145508b9f90fa6afe0e279edb 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 d17e1020525..e5cd7d49139 100644
index d17e102052..e5cd7d4913 100644
--- a/configs/rpi_0_w_defconfig
+++ b/configs/rpi_0_w_defconfig
@@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y
@ -41,7 +41,7 @@ index d17e1020525..e5cd7d49139 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 8b8affb7774..8bda6e6aa91 100644
index 8b8affb777..8bda6e6aa9 100644
--- a/configs/rpi_2_defconfig
+++ b/configs/rpi_2_defconfig
@@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y
@ -54,7 +54,7 @@ index 8b8affb7774..8bda6e6aa91 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 b867b7fa7bf..370495c9e43 100644
index b867b7fa7b..370495c9e4 100644
--- a/configs/rpi_3_32b_defconfig
+++ b/configs/rpi_3_32b_defconfig
@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y
@ -67,7 +67,7 @@ index b867b7fa7bf..370495c9e43 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 3cebd657da7..bb0a7ebcd5d 100644
index 3cebd657da..bb0a7ebcd5 100644
--- a/configs/rpi_3_defconfig
+++ b/configs/rpi_3_defconfig
@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y
@ -80,7 +80,7 @@ index 3cebd657da7..bb0a7ebcd5d 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 af2189b8fe2..f6517eb52a6 100644
index af2189b8fe..f6517eb52a 100644
--- a/configs/rpi_defconfig
+++ b/configs/rpi_defconfig
@@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y

4
0004-Temp-workaround-for-Chromebook-snow.patch
View File

@ -1,4 +1,4 @@
From 940492c0a974f5e165bedcb96a925bb859d3889c Mon Sep 17 00:00:00 2001
From d37b7bd4ee7d5b77987e97198c8ebe28244c86e1 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
@ -9,7 +9,7 @@ Subject: [PATCH] Temp workaround for Chromebook snow to avoid the 'unable to
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c
index a949dad5740..cc8539edae1 100644
index a949dad574..cc8539edae 100644
--- a/drivers/mmc/dw_mmc.c
+++ b/drivers/mmc/dw_mmc.c
@@ -608,7 +608,8 @@ void dwmci_setup_cfg(struct mmc_config *cfg, struct dwmci_host *host,

4
0005-tools-zynqmpbif-Add-support-for-loa.patch
View File

@ -1,4 +1,4 @@
From bf3fe233ee3c55796d9733232eb14d439260519f Mon Sep 17 00:00:00 2001
From fb581695b39e1877cc182717c124d519fb815bc9 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
@ -34,7 +34,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
1 file changed, 15 insertions(+)
diff --git a/tools/zynqmpbif.c b/tools/zynqmpbif.c
index 82ce0ac1a52..b4302fa67ee 100644
index 82ce0ac1a5..b4302fa67e 100644
--- a/tools/zynqmpbif.c
+++ b/tools/zynqmpbif.c
@@ -42,6 +42,7 @@ enum bif_flag {

4
0006-Kconfig-add-btrfs-to-distro-boot.patch
View File

@ -1,4 +1,4 @@
From 7fa6ccd62ca3bbf68fc0f2f5ccb1acbc69ba162d Mon Sep 17 00:00:00 2001
From b9839e3f75e51f8a01766e7613d01c4a70e86e51 Mon Sep 17 00:00:00 2001
From: Matthias Brugger <mbrugger@suse.com>
Date: Fri, 17 Jan 2020 20:59:02 +0100
Subject: [PATCH] Kconfig: add btrfs to distro boot
@ -13,7 +13,7 @@ Signed-off-by: Matthias Brugger <mbrugger@suse.com>
1 file changed, 1 insertion(+)
diff --git a/Kconfig b/Kconfig
index a6c42b902f7..01186e20986 100644
index a6c42b902f..01186e2098 100644
--- a/Kconfig
+++ b/Kconfig
@@ -182,6 +182,7 @@ config DISTRO_DEFAULTS

12
0007-configs-Re-sync-with-CONFIG_DISTRO_.patch
View File

@ -1,4 +1,4 @@
From 7834a28a8e0dcffb3fecddaaa85a7759582e55d4 Mon Sep 17 00:00:00 2001
From 66bcb6bf6a3b3bffde8281927712154ee7be7aa8 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,7 +18,7 @@ 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 f7098b49698..09bf1f8eb39 100644
index f7098b4969..09bf1f8eb3 100644
--- a/configs/sandbox64_defconfig
+++ b/configs/sandbox64_defconfig
@@ -77,7 +77,6 @@ CONFIG_CMD_REGULATOR=y
@ -30,7 +30,7 @@ index f7098b49698..09bf1f8eb39 100644
CONFIG_CMD_CRAMFS=y
CONFIG_CMD_EXT4_WRITE=y
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index ea08a9e5bd1..ec19587e82e 100644
index ea08a9e5bd..ec19587e82 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -99,7 +99,6 @@ CONFIG_CMD_REGULATOR=y
@ -42,7 +42,7 @@ index ea08a9e5bd1..ec19587e82e 100644
CONFIG_CMD_CRAMFS=y
CONFIG_CMD_EXT4_WRITE=y
diff --git a/configs/socfpga_arria10_defconfig b/configs/socfpga_arria10_defconfig
index ef9bbb9c3ac..c4ddbcc6128 100644
index ef9bbb9c3a..c4ddbcc612 100644
--- a/configs/socfpga_arria10_defconfig
+++ b/configs/socfpga_arria10_defconfig
@@ -53,3 +53,5 @@ CONFIG_DESIGNWARE_APB_TIMER=y
@ -52,7 +52,7 @@ index ef9bbb9c3ac..c4ddbcc6128 100644
+# CONFIG_CMD_BTRFS is not set
+# CONFIG_FS_BTRFS is not set
diff --git a/configs/turris_mox_defconfig b/configs/turris_mox_defconfig
index 9a9102430e6..dca076bf4b1 100644
index 9a9102430e..dca076bf4b 100644
--- a/configs/turris_mox_defconfig
+++ b/configs/turris_mox_defconfig
@@ -44,7 +44,6 @@ CONFIG_CMD_TIME=y
@ -64,7 +64,7 @@ index 9a9102430e6..dca076bf4b1 100644
CONFIG_MAC_PARTITION=y
CONFIG_ENV_OVERWRITE=y
diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig
index a724a1baa16..1695a99f308 100644
index a724a1baa1..1695a99f30 100644
--- a/configs/turris_omnia_defconfig
+++ b/configs/turris_omnia_defconfig
@@ -54,7 +54,6 @@ CONFIG_CMD_CACHE=y

6
0008-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch
View File

@ -1,4 +1,4 @@
From 51f848d472723da6c97fd7ad86425ffe28876c8c Mon Sep 17 00:00:00 2001
From cf306dba0ea094571f16ebad7bcd254b3692f95a 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
@ -15,7 +15,7 @@ Signed-off-by: Matthias Brugger <mbrugger@suse.com>
create mode 100644 arch/arm/dts/sunxi-spi-u-boot.dtsi
diff --git a/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts
index f19ed981da9..3f0d0281ba5 100644
index f19ed981da..3f0d0281ba 100644
--- a/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts
+++ b/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts
@@ -46,6 +46,7 @@
@ -28,7 +28,7 @@ index f19ed981da9..3f0d0281ba5 100644
#include <dt-bindings/input/input.h>
diff --git a/arch/arm/dts/sunxi-spi-u-boot.dtsi b/arch/arm/dts/sunxi-spi-u-boot.dtsi
new file mode 100644
index 00000000000..df89d02ff2f
index 0000000000..df89d02ff2
--- /dev/null
+++ b/arch/arm/dts/sunxi-spi-u-boot.dtsi
@@ -0,0 +1,8 @@

4
0009-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch
View File

@ -1,4 +1,4 @@
From 33cf14f4d4a1af33b13b32698213e95201f5e6ba Mon Sep 17 00:00:00 2001
From 33c1292e19391d45b0abe3d4709eed90821867a3 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.
@ -13,7 +13,7 @@ Signed-off-by: Matthias Brugger <mbrugger@suse.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts
index 3f0d0281ba5..b08e84c6161 100644
index 3f0d0281ba..b08e84c616 100644
--- a/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts
+++ b/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts
@@ -164,8 +164,8 @@

4
0010-sunxi-Enable-SPI-support-on-Orange-.patch
View File

@ -1,4 +1,4 @@
From 3c75d26e8169a80eb8832b1b04eb1b8327c3bd90 Mon Sep 17 00:00:00 2001
From eb8774e67be4498078722f9ba333d120f88994f9 Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.de>
Date: Mon, 28 Sep 2020 23:02:02 +0200
Subject: [PATCH] sunxi: Enable SPI support on Orange Pi Zero
@ -12,7 +12,7 @@ Signed-off-by: Matthias Brugger <mbrugger@suse.com>
1 file changed, 8 insertions(+)
diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig
index 332cd4739ea..1317a48ae6e 100644
index 332cd4739e..1317a48ae6 100644
--- a/configs/orangepi_zero_defconfig
+++ b/configs/orangepi_zero_defconfig
@@ -8,6 +8,14 @@ CONFIG_DRAM_CLK=624

4
0011-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch
View File

@ -1,4 +1,4 @@
From 042e8f8b9eb5846b66167ebed94a5a38e986f21a Mon Sep 17 00:00:00 2001
From 2bae907961222cddaa84f428d174a89f77e8aa09 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,7 +9,7 @@ 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 2c8dc3427cf..7b26c1445b9 100644
index 2c8dc3427c..7b26c1445b 100644
--- a/configs/xilinx_zynqmp_virt_defconfig
+++ b/configs/xilinx_zynqmp_virt_defconfig
@@ -73,6 +73,7 @@ CONFIG_CMD_TIMER=y

4
0012-smbios-Fix-table-when-no-string-is-.patch
View File

@ -1,4 +1,4 @@
From 24bc073e2808f10fa43412d5734476bdbeb7145a Mon Sep 17 00:00:00 2001
From 4e4375819ad4e941fa154b2f7a7b4792fbbe0402 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
@ -19,7 +19,7 @@ Series-cc: u-boot@lists.denx.de
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/smbios.c b/lib/smbios.c
index d7f4999e8b2..2cdfef7a2c9 100644
index d7f4999e8b..2cdfef7a2c 100644
--- a/lib/smbios.c
+++ b/lib/smbios.c
@@ -172,7 +172,7 @@ static int smbios_add_prop(struct smbios_ctx *ctx, const char *prop)

4
0013-riscv-enable-CMD_BTRFS.patch
View File

@ -1,4 +1,4 @@
From 032563d01b116c2b31e7b9f34054d6772351d347 Mon Sep 17 00:00:00 2001
From ed00c40485b16b217c67adb8326b7e6d4e4f8a27 Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@suse.de>
Date: Fri, 24 Sep 2021 18:25:51 +0200
Subject: [PATCH] riscv: enable CMD_BTRFS
@ -9,7 +9,7 @@ Signed-off-by: Matthias Brugger <mbrugger@suse.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Kconfig b/Kconfig
index 01186e20986..2d17084d55f 100644
index 01186e2098..2d17084d55 100644
--- a/Kconfig
+++ b/Kconfig
@@ -182,7 +182,7 @@ config DISTRO_DEFAULTS

4
0014-Disable-timer-check-in-file-loading.patch
View File

@ -1,4 +1,4 @@
From 2f6e5f98b7ce3ddcfaaefac693041e3fd3d058e8 Mon Sep 17 00:00:00 2001
From 52c5c682035d9b61f69f0e25fb4db48272644bdb 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 988907ecb91..ea75687508c 100644
index 988907ecb9..ea75687508 100644
--- a/lib/efi_loader/efi_disk.c
+++ b/lib/efi_loader/efi_disk.c
@@ -15,6 +15,7 @@

3
u-boot-2021.10-rc5.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d4c65de9b71873bffdff82488296fe2d12bf0bf1dcc85eb7b77297a8d87dce0d
size 17376303

BIN
u-boot-2021.10-rc5.tar.bz2.sig
View File

Binary file not shown.

3
u-boot-2021.10.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cde723e19262e646f2670d25e5ec4b1b368490de950d4e26275a988c36df0bd4
size 17358295

BIN
u-boot-2021.10.tar.bz2.sig Normal file
View File

Binary file not shown.

5
u-boot.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Oct 5 08:09:14 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Update to 2021.10
-------------------------------------------------------------------
Thu Sep 30 02:30:51 UTC 2021 - Matthias Brugger <mbrugger@suse.com>

4
u-boot.spec
View File

@ -172,7 +172,7 @@
%define is_ppc 1
%endif
# archive_version differs from version for RC version only
%define archive_version 2021.10-rc5
%define archive_version 2021.10
%if "%{target}" == ""
ExclusiveArch: do_not_build
%else
@ -208,7 +208,7 @@ ExclusiveArch: do_not_build
%else
%bcond_with uboot_atf
%endif
Version: 2021.10~rc5
Version: 2021.10
Release: 0
Summary: The U-Boot firmware for the %target platform
License: GPL-2.0-only

2
update_git.sh
View File

@ -14,7 +14,7 @@ set -e
GIT_TREE=https://github.com/openSUSE/u-boot.git
GIT_LOCAL_TREE=~/src/opensuse/u-boot-opensuse
GIT_BRANCH=tumbleweed-2021.10
GIT_UPSTREAM_TAG=v2021.10-rc5
GIT_UPSTREAM_TAG=v2021.10
GIT_DIR=`mktemp -d -p /dev/shm`
CMP_DIR=`mktemp -d -p /dev/shm`