Accepting request 947249 from hardware👢staging

OBS-URL: https://build.opensuse.org/request/show/947249
OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=158

0001-XXX-openSUSE-XXX-Prepend-partition-.patch

@@ -1,4 +1,4 @@
-From d2526d797aed3a59eadb64ffc81e371e9edb0c54 Mon Sep 17 00:00:00 2001
+From 7ad49a07ec2d3681b7badaf54a858dd8fd21fe4d 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 750e9e04e8..71bbf4bc21 100644
+index 3f724aa10f..06f7d504e5 100644
 --- a/include/config_distro_bootcmd.h
 +++ b/include/config_distro_bootcmd.h
 @@ -151,7 +151,7 @@
@@ -24,7 +24,7 @@ index 750e9e04e8..71bbf4bc21 100644
  	"scan_dev_for_efi="                                               \
  		"setenv efi_fdtfile ${fdtfile}; "                         \
  		BOOTENV_EFI_SET_FDTFILE_FALLBACK                          \
-@@ -478,7 +478,7 @@
+@@ -479,7 +479,7 @@
  	"scan_dev_for_boot_part="                                         \
  		"part list ${devtype} ${devnum} -bootable devplist; "     \
  		"env exists devplist || setenv devplist 1; "              \

0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch

@@ -1,4 +1,4 @@
-From a25b6fca9b8a33ee63073f3911581bd786726a72 Mon Sep 17 00:00:00 2001
+From c06d9f8faff40e57aa38f2093e9391a563477023 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 7cdf7f1589..c06f0f8e67 100644
+index fdb8b479ea..c253045a8c 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)

0003-rpi-Use-firmware-provided-device-tr.patch

@@ -1,4 +1,4 @@
-From 0156cd76f4468bb145508b9f90fa6afe0e279edb Mon Sep 17 00:00:00 2001
+From c612f847df31e9715cbbdb99a9e812b8f55e06a5 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,10 +28,10 @@ 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 d17e102052..e5cd7d4913 100644
+index 6d76d12910..ebc2be002f 100644
 --- a/configs/rpi_0_w_defconfig
 +++ b/configs/rpi_0_w_defconfig
-@@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y
+@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y
  CONFIG_CMD_MMC=y
  CONFIG_CMD_USB=y
  CONFIG_CMD_FS_UUID=y
@@ -41,10 +41,10 @@ index d17e102052..e5cd7d4913 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 8b8affb777..8bda6e6aa9 100644
+index 1931607132..164562cd57 100644
 --- a/configs/rpi_2_defconfig
 +++ b/configs/rpi_2_defconfig
-@@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y
+@@ -19,7 +19,7 @@ CONFIG_CMD_GPIO=y
  CONFIG_CMD_MMC=y
  CONFIG_CMD_USB=y
  CONFIG_CMD_FS_UUID=y
@@ -54,10 +54,10 @@ index 8b8affb777..8bda6e6aa9 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 b867b7fa7b..370495c9e4 100644
+index 060fd36da5..78448bbbfe 100644
 --- a/configs/rpi_3_32b_defconfig
 +++ b/configs/rpi_3_32b_defconfig
-@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y
+@@ -20,7 +20,7 @@ CONFIG_CMD_GPIO=y
  CONFIG_CMD_MMC=y
  CONFIG_CMD_USB=y
  CONFIG_CMD_FS_UUID=y
@@ -67,10 +67,10 @@ index b867b7fa7b..370495c9e4 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 3cebd657da..bb0a7ebcd5 100644
+index 8016fe1d55..b49dd9af98 100644
 --- a/configs/rpi_3_defconfig
 +++ b/configs/rpi_3_defconfig
-@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y
+@@ -19,7 +19,7 @@ CONFIG_CMD_GPIO=y
  CONFIG_CMD_MMC=y
  CONFIG_CMD_USB=y
  CONFIG_CMD_FS_UUID=y
@@ -80,10 +80,10 @@ index 3cebd657da..bb0a7ebcd5 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 af2189b8fe..f6517eb52a 100644
+index 8acf04d0e4..5d5e700224 100644
 --- a/configs/rpi_defconfig
 +++ b/configs/rpi_defconfig
-@@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y
+@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y
  CONFIG_CMD_MMC=y
  CONFIG_CMD_USB=y
  CONFIG_CMD_FS_UUID=y

0004-Temp-workaround-for-Chromebook-snow.patch

@@ -1,4 +1,4 @@
-From d37b7bd4ee7d5b77987e97198c8ebe28244c86e1 Mon Sep 17 00:00:00 2001
+From 762a2818a8c6ba8aaa6ce2116bff56a3fced5530 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

0005-tools-zynqmpbif-Add-support-for-loa.patch

@@ -1,4 +1,4 @@
-From fb581695b39e1877cc182717c124d519fb815bc9 Mon Sep 17 00:00:00 2001
+From f5bcc3684d051d2160eb37d241ab29ef5b222987 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

0006-Kconfig-add-btrfs-to-distro-boot.patch

@@ -1,4 +1,4 @@
-From b9839e3f75e51f8a01766e7613d01c4a70e86e51 Mon Sep 17 00:00:00 2001
+From 391a0de4201a19529fb83daec080952c0340c6b6 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,10 +13,10 @@ Signed-off-by: Matthias Brugger <mbrugger@suse.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/Kconfig b/Kconfig
-index a6c42b902f..01186e2098 100644
+index c46f4fce86..a247b1a30a 100644
 --- a/Kconfig
 +++ b/Kconfig
-@@ -182,6 +182,7 @@ config DISTRO_DEFAULTS
+@@ -178,6 +178,7 @@ config DISTRO_DEFAULTS
  	select HUSH_PARSER
  	select SUPPORT_RAW_INITRD
  	select SYS_LONGHELP

0007-configs-Re-sync-with-CONFIG_DISTRO_.patch

@@ -1,4 +1,4 @@
-From 66bcb6bf6a3b3bffde8281927712154ee7be7aa8 Mon Sep 17 00:00:00 2001
+From d7ff1c814fed2a14096054ac8d20cb0cb88b5f59 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 f7098b4969..09bf1f8eb3 100644
+index d849989cf6..d58bd2e30b 100644
 --- a/configs/sandbox64_defconfig
 +++ b/configs/sandbox64_defconfig
-@@ -77,7 +77,6 @@ CONFIG_CMD_REGULATOR=y
+@@ -79,7 +79,6 @@ CONFIG_CMD_REGULATOR=y
  CONFIG_CMD_AES=y
  CONFIG_CMD_TPM=y
  CONFIG_CMD_TPM_TEST=y
@@ -30,10 +30,10 @@ index f7098b4969..09bf1f8eb3 100644
  CONFIG_CMD_CRAMFS=y
  CONFIG_CMD_EXT4_WRITE=y
 diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
-index ea08a9e5bd..ec19587e82 100644
+index c390afe9de..c08fc476c1 100644
 --- a/configs/sandbox_defconfig
 +++ b/configs/sandbox_defconfig
-@@ -99,7 +99,6 @@ CONFIG_CMD_REGULATOR=y
+@@ -102,7 +102,6 @@ CONFIG_CMD_REGULATOR=y
  CONFIG_CMD_AES=y
  CONFIG_CMD_TPM=y
  CONFIG_CMD_TPM_TEST=y
@@ -42,20 +42,20 @@ index ea08a9e5bd..ec19587e82 100644
  CONFIG_CMD_CRAMFS=y
  CONFIG_CMD_EXT4_WRITE=y
 diff --git a/configs/socfpga_arria10_defconfig b/configs/socfpga_arria10_defconfig
-index ef9bbb9c3a..c4ddbcc612 100644
+index d6b7444750..74b6d65915 100644
 --- a/configs/socfpga_arria10_defconfig
 +++ b/configs/socfpga_arria10_defconfig
-@@ -53,3 +53,5 @@ CONFIG_DESIGNWARE_APB_TIMER=y
+@@ -54,3 +54,5 @@ CONFIG_DESIGNWARE_APB_TIMER=y
  CONFIG_USB=y
  CONFIG_USB_DWC2=y
  # CONFIG_SPL_WDT is not set
 +# 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 9a9102430e..dca076bf4b 100644
+index 3cae32f69b..555919147b 100644
 --- a/configs/turris_mox_defconfig
 +++ b/configs/turris_mox_defconfig
-@@ -44,7 +44,6 @@ CONFIG_CMD_TIME=y
+@@ -47,7 +47,6 @@ CONFIG_CMD_TIME=y
  CONFIG_CMD_MVEBU_BUBT=y
  CONFIG_CMD_AES=y
  CONFIG_CMD_HASH=y
@@ -64,10 +64,10 @@ index 9a9102430e..dca076bf4b 100644
  CONFIG_MAC_PARTITION=y
  CONFIG_ENV_OVERWRITE=y
 diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig
-index a724a1baa1..1695a99f30 100644
+index e6f901ea77..fbded23612 100644
 --- a/configs/turris_omnia_defconfig
 +++ b/configs/turris_omnia_defconfig
-@@ -54,7 +54,6 @@ CONFIG_CMD_CACHE=y
+@@ -55,7 +55,6 @@ CONFIG_CMD_CACHE=y
  CONFIG_CMD_TIME=y
  CONFIG_CMD_AES=y
  CONFIG_CMD_HASH=y

0008-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch

@@ -1,4 +1,4 @@
-From cf306dba0ea094571f16ebad7bcd254b3692f95a Mon Sep 17 00:00:00 2001
+From bb39f3ceaacb3257d1c63f090ded1d562fe2fa1f 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

0009-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch

@@ -1,4 +1,4 @@
-From 33c1292e19391d45b0abe3d4709eed90821867a3 Mon Sep 17 00:00:00 2001
+From 1a64496006aae69791b4bed6ce1074d752f1f381 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.

0010-sunxi-Enable-SPI-support-on-Orange-.patch

@@ -1,4 +1,4 @@
-From eb8774e67be4498078722f9ba333d120f88994f9 Mon Sep 17 00:00:00 2001
+From e96a8669cb1fd50542e30550709ea474e81a4f77 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

0011-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch

@@ -1,4 +1,4 @@
-From 2bae907961222cddaa84f428d174a89f77e8aa09 Mon Sep 17 00:00:00 2001
+From d0f0a636867c102306a253a9869503a0887e34ad 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 2c8dc3427c..7b26c1445b 100644
+index 687b41bfb1..bfdc2cea17 100644
 --- a/configs/xilinx_zynqmp_virt_defconfig
 +++ b/configs/xilinx_zynqmp_virt_defconfig
-@@ -73,6 +73,7 @@ CONFIG_CMD_TIMER=y
+@@ -75,6 +75,7 @@ CONFIG_CMD_TIMER=y
  CONFIG_CMD_REGULATOR=y
  CONFIG_CMD_TPM=y
  CONFIG_CMD_EXT4_WRITE=y

0012-smbios-Fix-table-when-no-string-is-.patch

@@ -1,4 +1,4 @@
-From 4e4375819ad4e941fa154b2f7a7b4792fbbe0402 Mon Sep 17 00:00:00 2001
+From 1f077671ecab642a19c3cad2f96364b12bfdb649 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

0013-riscv-enable-CMD_BTRFS.patch

@@ -1,4 +1,4 @@
-From ed00c40485b16b217c67adb8326b7e6d4e4f8a27 Mon Sep 17 00:00:00 2001
+From 7e6e8b7651edc75ab338e8a8eae64f4f2ab51ac2 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,10 +9,10 @@ Signed-off-by: Matthias Brugger <mbrugger@suse.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Kconfig b/Kconfig
-index 01186e2098..2d17084d55 100644
+index a247b1a30a..fead97a460 100644
 --- a/Kconfig
 +++ b/Kconfig
-@@ -182,7 +182,7 @@ config DISTRO_DEFAULTS
+@@ -178,7 +178,7 @@ config DISTRO_DEFAULTS
  	select HUSH_PARSER
  	select SUPPORT_RAW_INITRD
  	select SYS_LONGHELP

0014-Disable-timer-check-in-file-loading.patch

@@ -1,4 +1,4 @@
-From 52c5c682035d9b61f69f0e25fb4db48272644bdb Mon Sep 17 00:00:00 2001
+From 333627a8c6ac6c75ed02c08fa6ff82d8e633a823 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 988907ecb9..ea75687508 100644
+index 45127d1768..02ae7e7916 100644
 --- a/lib/efi_loader/efi_disk.c
 +++ b/lib/efi_loader/efi_disk.c
 @@ -15,6 +15,7 @@

0015-Enable-EFI-and-ISO-partitions-suppo.patch

@@ -1,4 +1,4 @@
-From a519f498352b5a1a1009310c033dc2b74128d832 Mon Sep 17 00:00:00 2001
+From f870f98a54a3a8490d5c533122a5acfa7260091e 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
@@ -10,10 +10,10 @@ Subject: [PATCH] Enable EFI and ISO partitions support on socfpga_de0_nano_soc
  1 file changed, 2 deletions(-)
 
 diff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig
-index 4539d08dea..1c940ec6de 100644
+index 826b14ebdd..7950a88503 100644
 --- a/configs/socfpga_de0_nano_soc_defconfig
 +++ b/configs/socfpga_de0_nano_soc_defconfig
-@@ -33,8 +33,6 @@ CONFIG_CMD_EXT4_WRITE=y
+@@ -34,8 +34,6 @@ CONFIG_CMD_EXT4_WRITE=y
  CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0"
  CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705000.spi.0:1m(u-boot),256k(env1),256k(env2),14848k(boot),16m(rootfs),-@1536k(UBI)"
  CONFIG_CMD_UBI=y

0016-Revert-video-backlight-fix-pwm-s-du.patch

@@ -1,74 +0,0 @@
-From 30b758689c60de57a3e55276a78a37974f43047a Mon Sep 17 00:00:00 2001
-From: Guillaume Gardet <guillaume.gardet@arm.com>
-Date: Thu, 21 Oct 2021 15:20:10 +0200
-Subject: [PATCH] Revert "video: backlight: fix pwm's duty cycle calculation"
-
-This reverts commit 76c2ff3e5fd8068b433acbb0e76d33fa5116dade.
-
-This fixes backlight on Chromebook snow - boo#1187573
----
- drivers/video/pwm_backlight.c |  2 +-
- test/dm/panel.c               | 12 ++++++------
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/drivers/video/pwm_backlight.c b/drivers/video/pwm_backlight.c
-index d7c096923b..2f3a68ba87 100644
---- a/drivers/video/pwm_backlight.c
-+++ b/drivers/video/pwm_backlight.c
-@@ -64,7 +64,7 @@ static int set_pwm(struct pwm_backlight_priv *priv)
- 
- 	if (priv->period_ns) {
- 		duty_cycle = priv->period_ns * (priv->cur_level - priv->min_level) /
--			(priv->max_level - priv->min_level);
-+			(priv->max_level - priv->min_level + 1);
- 		ret = pwm_set_config(priv->pwm, priv->channel, priv->period_ns,
- 				     duty_cycle);
- 	} else {
-diff --git a/test/dm/panel.c b/test/dm/panel.c
-index 4d435a0d25..9229c7f4ea 100644
---- a/test/dm/panel.c
-+++ b/test/dm/panel.c
-@@ -40,7 +40,7 @@ static int dm_test_panel(struct unit_test_state *uts)
- 	ut_assertok(sandbox_pwm_get_config(pwm, 0, &period_ns, &duty_ns,
- 					   &enable, &polarity));
- 	ut_asserteq(1000, period_ns);
--	ut_asserteq(170 * 1000 / 255, duty_ns);
-+	ut_asserteq(170 * 1000 / 256, duty_ns);
- 	ut_asserteq(true, enable);
- 	ut_asserteq(false, polarity);
- 	ut_asserteq(1, sandbox_gpio_get_value(gpio, 1));
-@@ -49,29 +49,29 @@ static int dm_test_panel(struct unit_test_state *uts)
- 	ut_assertok(panel_set_backlight(dev, 40));
- 	ut_assertok(sandbox_pwm_get_config(pwm, 0, &period_ns, &duty_ns,
- 					   &enable, &polarity));
--	ut_asserteq(64 * 1000 / 255, duty_ns);
-+	ut_asserteq(64 * 1000 / 256, duty_ns);
- 
- 	ut_assertok(panel_set_backlight(dev, BACKLIGHT_MAX));
- 	ut_assertok(sandbox_pwm_get_config(pwm, 0, &period_ns, &duty_ns,
- 					   &enable, &polarity));
--	ut_asserteq(255 * 1000 / 255, duty_ns);
-+	ut_asserteq(255 * 1000 / 256, duty_ns);
- 
- 	ut_assertok(panel_set_backlight(dev, BACKLIGHT_MIN));
- 	ut_assertok(sandbox_pwm_get_config(pwm, 0, &period_ns, &duty_ns,
- 					   &enable, &polarity));
--	ut_asserteq(0 * 1000 / 255, duty_ns);
-+	ut_asserteq(0 * 1000 / 256, duty_ns);
- 	ut_asserteq(1, sandbox_gpio_get_value(gpio, 1));
- 
- 	ut_assertok(panel_set_backlight(dev, BACKLIGHT_DEFAULT));
- 	ut_assertok(sandbox_pwm_get_config(pwm, 0, &period_ns, &duty_ns,
- 					   &enable, &polarity));
- 	ut_asserteq(true, enable);
--	ut_asserteq(170 * 1000 / 255, duty_ns);
-+	ut_asserteq(170 * 1000 / 256, duty_ns);
- 
- 	ut_assertok(panel_set_backlight(dev, BACKLIGHT_OFF));
- 	ut_assertok(sandbox_pwm_get_config(pwm, 0, &period_ns, &duty_ns,
- 					   &enable, &polarity));
--	ut_asserteq(0 * 1000 / 255, duty_ns);
-+	ut_asserteq(0 * 1000 / 256, duty_ns);
- 	ut_asserteq(0, sandbox_gpio_get_value(gpio, 1));
- 	ut_asserteq(false, regulator_get_enable(reg));
- 

0017-rpi-Add-identifier-for-the-new-RPi-.patch

@@ -1,30 +0,0 @@
-From e1882910eac0e40ec286ab2946207dd4c8136e98 Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Sun, 21 Nov 2021 17:03:46 +0000
-Subject: [PATCH] rpi: Add identifier for the new RPi Zero 2 W
-
-The Raspberry Pi Foundation released the new Zero 2 W which we
-want to detect, so we can detect the correct device tree file name.
-
-Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
-Signed-off-by: Matthias Brugger <mbrugger@suse.com>
----
- board/raspberrypi/rpi/rpi.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
-index 372b26b6f2..c8662f6e75 100644
---- a/board/raspberrypi/rpi/rpi.c
-+++ b/board/raspberrypi/rpi/rpi.c
-@@ -157,6 +157,11 @@ static const struct rpi_model rpi_models_new_scheme[] = {
- 		DTB_DIR "bcm2711-rpi-4-b.dtb",
- 		true,
- 	},
-+	[0x12] = {
-+		"Zero 2 W",
-+		DTB_DIR "bcm2837-rpi-zero-2.dtb",
-+		false,
-+	},
- 	[0x13] = {
- 		"400",
- 		DTB_DIR "bcm2711-rpi-400.dtb",

u-boot-2021.10.tar.bz2

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

u-boot-2022.01.tar.bz2

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

u-boot.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Jan 18 14:54:31 UTC 2022 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Update to 2022.01
+
+-------------------------------------------------------------------
+Thu Dec 23 11:08:18 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Update to 2022.01-rc4
+- Patch queue updated from https://github.com/openSUSE/u-boot.git tumbleweed-2022.01
+* Patches dropped (upstreamed):
+  0016-Revert-video-backlight-fix-pwm-s-du.patch
+  0017-rpi-Add-identifier-for-the-new-RPi-.patch
+
 -------------------------------------------------------------------
 Tue Nov 30 15:53:17 UTC 2021 - Matthias Brugger <mbrugger@suse.com>
 

u-boot.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package u-boot
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 # Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon
 # Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
@@ -172,7 +172,7 @@
 %define is_ppc 1
 %endif
 # archive_version differs from version for RC version only
-%define archive_version 2021.10
+%define archive_version 2022.01
 %if "%{target}" == ""
 ExclusiveArch:  do_not_build
 %else
@@ -208,7 +208,7 @@ ExclusiveArch:  do_not_build
 %else
 %bcond_with uboot_atf
 %endif
-Version:        2021.10
+Version:        2022.01
 Release:        0
 Summary:        The U-Boot firmware for the %target platform
 License:        GPL-2.0-only
@@ -235,8 +235,6 @@ Patch0012:      0012-smbios-Fix-table-when-no-string-is-.patch
 Patch0013:      0013-riscv-enable-CMD_BTRFS.patch
 Patch0014:      0014-Disable-timer-check-in-file-loading.patch
 Patch0015:      0015-Enable-EFI-and-ISO-partitions-suppo.patch
-Patch0016:      0016-Revert-video-backlight-fix-pwm-s-du.patch
-Patch0017:      0017-rpi-Add-identifier-for-the-new-RPi-.patch
 # Patches: end
 BuildRequires:  bc
 BuildRequires:  bison

update_git.sh

@@ -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-2021.10
+GIT_BRANCH=tumbleweed-2022.01
-GIT_UPSTREAM_TAG=v2021.10
+GIT_UPSTREAM_TAG=v2022.01
 GIT_DIR=`mktemp -d -p /dev/shm`
 CMP_DIR=`mktemp -d -p /dev/shm`