Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package u-boot for openSUSE:Factory checked 
in at 2021-04-08 21:03:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/u-boot (Old)
 and      /work/SRC/openSUSE:Factory/.u-boot.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "u-boot"

Thu Apr  8 21:03:16 2021 rev:146 rq:883295 version:2021.04

Changes:
--------
--- /work/SRC/openSUSE:Factory/u-boot/u-boot.changes    2021-03-21 
23:19:25.748719852 +0100
+++ /work/SRC/openSUSE:Factory/.u-boot.new.2401/u-boot.changes  2021-04-08 
21:03:27.369984277 +0200
@@ -1,0 +2,55 @@
+Tue Apr  6 11:25:03 UTC 2021 - Matwey Kornilov <matwey.korni...@gmail.com>
+
+- Add u-boot-zturnv5 flavour instead of u-boot-zturn.
+  I've failed to find anybody who has v4 zturn board.
+
+-------------------------------------------------------------------
+Tue Apr  6 08:00:08 UTC 2021 - Guillaume GARDET <guillaume.gar...@opensuse.org>
+
+- mx53loco now uses u-boot-dtb.imx instead of u-boot.imx
+
+-------------------------------------------------------------------
+Tue Apr  6 07:22:01 UTC 2021 - Guillaume GARDET <guillaume.gar...@opensuse.org>
+
+- Update to 2021.04
+- Patch queue updated from https://github.com/openSUSE/u-boot.git 
tumbleweed-2021.04
+* Patches dropped:
+  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-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch
+  0012-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch
+  0013-sunxi-Enable-SPI-support-on-Orange-.patch
+  0014-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch
+  0015-rpi-Add-identifier-for-the-new-RPi4.patch
+  0016-rpi-Add-identifier-for-the-new-CM4.patch
+  0017-pci-pcie-brcmstb-Fix-inbound-window.patch
+  0018-dm-Introduce-xxx_get_dma_range.patch
+  0019-dm-test-Add-test-case-for-dev_get_d.patch
+  0020-dm-Introduce-DMA-constraints-into-t.patch
+  0021-dm-test-Add-test-case-for-dev-dma_o.patch
+  0022-dm-Introduce-dev_phys_to_bus-dev_bu.patch
+  0023-dm-test-Add-test-case-for-dev_phys_.patch
+  0024-xhci-translate-virtual-addresses-in.patch
+  0025-mmc-Introduce-mmc_phys_to_bus-mmc_b.patch
+  0026-configs-rpi4-Enable-DM_DMA-across-a.patch
+  0027-video-arm-rpi-Add-brcm-bcm2711-hdmi.patch
+  0028-usb-xhci-pci-Add-DM_FLAG_OS_PREPARE.patch
+  0029-pci-brcmstb-Cleanup-controller-stat.patch
+  0030-fs-btrfs-Select-SHA256-in-Kconfig.patch
+  0031-efi_loader-Avoid-emitting-efi_var_b.patch
+  0032-configs-BPI-R2-Disable-EFI-Grub-wor.patch
+  0033-configs-RPi2-Disable-EFI-Grub-worka.patch
+  0034-smbios-Fix-table-whit-no-string-is-.patch
+* Patches added:
+  0006-Kconfig-add-btrfs-to-distro-boot.patch
+  0007-configs-Re-sync-with-CONFIG_DISTRO_.patch
+  0008-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch
+  0009-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch
+  0010-sunxi-Enable-SPI-support-on-Orange-.patch
+  0011-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch
+  0012-smbios-Fix-table-when-no-string-is-.patch
+
+-------------------------------------------------------------------

Old:
----
  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-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch
  0012-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch
  0013-sunxi-Enable-SPI-support-on-Orange-.patch
  0014-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch
  0015-rpi-Add-identifier-for-the-new-RPi4.patch
  0016-rpi-Add-identifier-for-the-new-CM4.patch
  0017-pci-pcie-brcmstb-Fix-inbound-window.patch
  0018-dm-Introduce-xxx_get_dma_range.patch
  0019-dm-test-Add-test-case-for-dev_get_d.patch
  0020-dm-Introduce-DMA-constraints-into-t.patch
  0021-dm-test-Add-test-case-for-dev-dma_o.patch
  0022-dm-Introduce-dev_phys_to_bus-dev_bu.patch
  0023-dm-test-Add-test-case-for-dev_phys_.patch
  0024-xhci-translate-virtual-addresses-in.patch
  0025-mmc-Introduce-mmc_phys_to_bus-mmc_b.patch
  0026-configs-rpi4-Enable-DM_DMA-across-a.patch
  0027-video-arm-rpi-Add-brcm-bcm2711-hdmi.patch
  0028-usb-xhci-pci-Add-DM_FLAG_OS_PREPARE.patch
  0029-pci-brcmstb-Cleanup-controller-stat.patch
  0030-fs-btrfs-Select-SHA256-in-Kconfig.patch
  0031-efi_loader-Avoid-emitting-efi_var_b.patch
  0032-configs-BPI-R2-Disable-EFI-Grub-wor.patch
  0033-configs-RPi2-Disable-EFI-Grub-worka.patch
  0034-smbios-Fix-table-whit-no-string-is-.patch
  u-boot-2021.01.tar.bz2
  u-boot-2021.01.tar.bz2.sig

New:
----
  0006-Kconfig-add-btrfs-to-distro-boot.patch
  0007-configs-Re-sync-with-CONFIG_DISTRO_.patch
  0008-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch
  0009-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch
  0010-sunxi-Enable-SPI-support-on-Orange-.patch
  0011-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch
  0012-smbios-Fix-table-when-no-string-is-.patch
  u-boot-2021.04.tar.bz2
  u-boot-2021.04.tar.bz2.sig

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ u-boot.spec ++++++
--- /var/tmp/diff_new_pack.RcVbhq/_old  2021-04-08 21:03:28.745985763 +0200
+++ /var/tmp/diff_new_pack.RcVbhq/_new  2021-04-08 21:03:28.753985772 +0200
@@ -118,11 +118,7 @@
 %define is_armv7 1
 %define binext .img
 %endif
-%if "%target" == "mx53loco"
-%define is_armv7 1
-%define binext .imx
-%endif
-%if "%target" == "mx6qsabrelite"
+%if "%target" == "mx53loco" || "%target" == "mx6qsabrelite"
 %define is_armv7 1
 %define binext -dtb.imx
 %endif
@@ -161,7 +157,7 @@
 %define is_armv7 1
 %define binext .img
 %endif
-%if "%target" == "zynqzturn" || "%target" == "xilinxzynqvirt"
+%if "%target" == "zynqzturnv5" || "%target" == "xilinxzynqvirt"
 %define is_zynq 1
 %define is_armv7 1
 %define binext .img
@@ -176,7 +172,7 @@
 %define is_ppc 1
 %endif
 # archive_version differs from version for RC version only
-%define archive_version 2021.01
+%define archive_version 2021.04
 %if "%{target}" == ""
 ExclusiveArch:  do_not_build
 %else
@@ -212,7 +208,7 @@
 %else
 %bcond_with uboot_atf
 %endif
-Version:        2021.01
+Version:        2021.04
 Release:        0
 Summary:        The U-Boot firmware for the %target platform
 License:        GPL-2.0-only
@@ -229,35 +225,13 @@
 Patch0003:      0003-rpi-Use-firmware-provided-device-tr.patch
 Patch0004:      0004-Temp-workaround-for-Chromebook-snow.patch
 Patch0005:      0005-tools-zynqmpbif-Add-support-for-loa.patch
-Patch0006:      0006-boo-1123170-Remove-ubifs-support-fr.patch
-Patch0007:      0007-boo-1144161-Remove-nand-mtd-spi-dfu.patch
-Patch0008:      0008-Kconfig-add-btrfs-to-distro-boot.patch
-Patch0009:      0009-configs-Re-sync-with-CONFIG_DISTRO_.patch
-Patch0010:      0010-configs-am335x_evm-disable-BTRFS.patch
-Patch0011:      0011-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch
-Patch0012:      0012-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch
-Patch0013:      0013-sunxi-Enable-SPI-support-on-Orange-.patch
-Patch0014:      0014-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch
-Patch0015:      0015-rpi-Add-identifier-for-the-new-RPi4.patch
-Patch0016:      0016-rpi-Add-identifier-for-the-new-CM4.patch
-Patch0017:      0017-pci-pcie-brcmstb-Fix-inbound-window.patch
-Patch0018:      0018-dm-Introduce-xxx_get_dma_range.patch
-Patch0019:      0019-dm-test-Add-test-case-for-dev_get_d.patch
-Patch0020:      0020-dm-Introduce-DMA-constraints-into-t.patch
-Patch0021:      0021-dm-test-Add-test-case-for-dev-dma_o.patch
-Patch0022:      0022-dm-Introduce-dev_phys_to_bus-dev_bu.patch
-Patch0023:      0023-dm-test-Add-test-case-for-dev_phys_.patch
-Patch0024:      0024-xhci-translate-virtual-addresses-in.patch
-Patch0025:      0025-mmc-Introduce-mmc_phys_to_bus-mmc_b.patch
-Patch0026:      0026-configs-rpi4-Enable-DM_DMA-across-a.patch
-Patch0027:      0027-video-arm-rpi-Add-brcm-bcm2711-hdmi.patch
-Patch0028:      0028-usb-xhci-pci-Add-DM_FLAG_OS_PREPARE.patch
-Patch0029:      0029-pci-brcmstb-Cleanup-controller-stat.patch
-Patch0030:      0030-fs-btrfs-Select-SHA256-in-Kconfig.patch
-Patch0031:      0031-efi_loader-Avoid-emitting-efi_var_b.patch
-Patch0032:      0032-configs-BPI-R2-Disable-EFI-Grub-wor.patch
-Patch0033:      0033-configs-RPi2-Disable-EFI-Grub-worka.patch
-Patch0034:      0034-smbios-Fix-table-whit-no-string-is-.patch
+Patch0006:      0006-Kconfig-add-btrfs-to-distro-boot.patch
+Patch0007:      0007-configs-Re-sync-with-CONFIG_DISTRO_.patch
+Patch0008:      0008-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch
+Patch0009:      0009-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch
+Patch0010:      0010-sunxi-Enable-SPI-support-on-Orange-.patch
+Patch0011:      0011-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch
+Patch0012:      0012-smbios-Fix-table-when-no-string-is-.patch
 # Patches: end
 BuildRequires:  bc
 BuildRequires:  bison
@@ -452,8 +426,8 @@
 %if "%target" == "xilinxzynqmpzcu102rev10"
 export DEVICE_TREE=zynqmp-zcu102-rev1.0
 %endif
-%if "%target" == "zynqzturn"
-export DEVICE_TREE=zynq-zturn
+%if "%target" == "zynqzturnv5"
+export DEVICE_TREE=zynq-zturn-v5
 %endif
 
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="%{optflags}" $confname
@@ -572,7 +546,7 @@
 %if %socfpga_spl == 1
 install -D -m 0644 u-boot-with-spl.sfp 
%{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
 %endif
-%if "%{name}" == "u-boot-zynqzturn"
+%if "%{name}" == "u-boot-zynqzturnv5"
 install -D -m 0644 spl/boot.bin %{buildroot}%{uboot_dir}/boot.bin
 %endif
 %if "%{name}" == "u-boot-rpi3"

++++++ 0001-XXX-openSUSE-XXX-Prepend-partition-.patch ++++++
--- /var/tmp/diff_new_pack.RcVbhq/_old  2021-04-08 21:03:28.773985793 +0200
+++ /var/tmp/diff_new_pack.RcVbhq/_new  2021-04-08 21:03:28.773985793 +0200
@@ -1,4 +1,4 @@
-From da36e129a526f1a7921c7971013d3f5918c504a3 Mon Sep 17 00:00:00 2001
+From 64c8c72d668be879002700dfcf917b06832632a5 Mon Sep 17 00:00:00 2001
 From: Guillaume GARDET <guillaume.gar...@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 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
-index c9862260a3..39e3247d41 100644
+index 2627c2a6a5..7dccc083cf 100644
 --- a/include/config_distro_bootcmd.h
 +++ b/include/config_distro_bootcmd.h
-@@ -145,7 +145,7 @@
+@@ -151,7 +151,7 @@
                "load ${devtype} ${devnum}:${distro_bootpart} "           \
                        "${fdt_addr_r} ${prefix}${efi_fdtfile}\0"         \
        \
@@ -24,7 +24,7 @@
        "scan_dev_for_efi="                                               \
                "setenv efi_fdtfile ${fdtfile}; "                         \
                BOOTENV_EFI_SET_FDTFILE_FALLBACK                          \
-@@ -472,7 +472,7 @@
+@@ -478,7 +478,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 ++++++
--- /var/tmp/diff_new_pack.RcVbhq/_old  2021-04-08 21:03:28.781985802 +0200
+++ /var/tmp/diff_new_pack.RcVbhq/_new  2021-04-08 21:03:28.781985802 +0200
@@ -1,4 +1,4 @@
-From 34515ca90618bb0545ce360abb91b6037b1546e3 Mon Sep 17 00:00:00 2001
+From 31b4bbb7ddadd1ee9109bc6087d998746db7b1dd Mon Sep 17 00:00:00 2001
 From: Alexander Graf <ag...@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 @@
  1 file changed, 2 deletions(-)
 
 diff --git a/arch/arm/mach-omap2/boot-common.c 
b/arch/arm/mach-omap2/boot-common.c
-index cb9d7fdb15..50dec906df 100644
+index 1268a32503..e564fad0e9 100644
 --- a/arch/arm/mach-omap2/boot-common.c
 +++ b/arch/arm/mach-omap2/boot-common.c
-@@ -133,8 +133,6 @@ void save_omap_boot_params(void)
+@@ -134,8 +134,6 @@ void save_omap_boot_params(void)
            (boot_device <= MMC_BOOT_DEVICES_END)) {
                switch (boot_device) {
                case BOOT_DEVICE_MMC1:

++++++ 0003-rpi-Use-firmware-provided-device-tr.patch ++++++
--- /var/tmp/diff_new_pack.RcVbhq/_old  2021-04-08 21:03:28.793985814 +0200
+++ /var/tmp/diff_new_pack.RcVbhq/_new  2021-04-08 21:03:28.793985814 +0200
@@ -1,4 +1,4 @@
-From 2f2b5324682ebf078c78372e74ce759b3620e4bc Mon Sep 17 00:00:00 2001
+From faef6b729e84803c91ef6c61f6e167e4da40c98e Mon Sep 17 00:00:00 2001
 From: Guillaume Gardet <guillaume.gar...@arm.com>
 Date: Fri, 18 Sep 2020 15:27:37 +0200
 Subject: [PATCH] rpi: Use firmware provided device tree
@@ -28,7 +28,7 @@
  5 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig
-index 93d790aae6..cae50fa2ab 100644
+index 01565991f5..c0a9b6c788 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 @@
  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 33f27cf09f..e546c3e7be 100644
+index 1ad0626782..33e0ef6989 100644
 --- a/configs/rpi_2_defconfig
 +++ b/configs/rpi_2_defconfig
 @@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y
@@ -54,7 +54,7 @@
  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 cdc67cb3ac..2256ad1fc1 100644
+index a14d7eefbc..15c62adc69 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 @@
  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 7075d39d10..4a34d35898 100644
+index 4aedfb17cd..daeb6d1b64 100644
 --- a/configs/rpi_3_defconfig
 +++ b/configs/rpi_3_defconfig
 @@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y
@@ -80,7 +80,7 @@
  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 bba36ca7fc..98728fc8c0 100644
+index 78638105f7..06b390d907 100644
 --- a/configs/rpi_defconfig
 +++ b/configs/rpi_defconfig
 @@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y

++++++ 0004-Temp-workaround-for-Chromebook-snow.patch ++++++
--- /var/tmp/diff_new_pack.RcVbhq/_old  2021-04-08 21:03:28.805985828 +0200
+++ /var/tmp/diff_new_pack.RcVbhq/_new  2021-04-08 21:03:28.805985828 +0200
@@ -1,4 +1,4 @@
-From ec7b043f9c2b0cb4e7ff2a9ae808456b310375c9 Mon Sep 17 00:00:00 2001
+From 612aefa5be3ff8074a17862ca5121b86da401e02 Mon Sep 17 00:00:00 2001
 From: Guillaume GARDET <guillaume.gar...@free.fr>
 Date: Mon, 9 Apr 2018 10:28:26 +0200
 Subject: [PATCH] Temp workaround for Chromebook snow to avoid the 'unable to
@@ -9,10 +9,10 @@
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c
-index 7702f4be3f..ff2cd946fc 100644
+index 7c8a312fa7..2865e9f964 100644
 --- a/drivers/mmc/dw_mmc.c
 +++ b/drivers/mmc/dw_mmc.c
-@@ -603,7 +603,8 @@ void dwmci_setup_cfg(struct mmc_config *cfg, struct 
dwmci_host *host,
+@@ -608,7 +608,8 @@ void dwmci_setup_cfg(struct mmc_config *cfg, struct 
dwmci_host *host,
                cfg->host_caps |= MMC_MODE_4BIT;
                cfg->host_caps &= ~MMC_MODE_8BIT;
        }

++++++ 0005-tools-zynqmpbif-Add-support-for-loa.patch ++++++
--- /var/tmp/diff_new_pack.RcVbhq/_old  2021-04-08 21:03:28.813985836 +0200
+++ /var/tmp/diff_new_pack.RcVbhq/_new  2021-04-08 21:03:28.813985836 +0200
@@ -1,4 +1,4 @@
-From 45f65400eede913d46a21868122678753305a294 Mon Sep 17 00:00:00 2001
+From c31a2d2fe0e9386ba98bfe64fa3b07cc8f09cc34 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <ag...@suse.de>
 Date: Thu, 26 Apr 2018 13:30:32 +0200
 Subject: [PATCH] tools: zynqmpbif: Add support for load=after

++++++ 0008-Kconfig-add-btrfs-to-distro-boot.patch -> 
0006-Kconfig-add-btrfs-to-distro-boot.patch ++++++
--- 
/work/SRC/openSUSE:Factory/u-boot/0008-Kconfig-add-btrfs-to-distro-boot.patch   
    2021-02-23 20:20:21.223652988 +0100
+++ 
/work/SRC/openSUSE:Factory/.u-boot.new.2401/0006-Kconfig-add-btrfs-to-distro-boot.patch
     2021-04-08 21:03:26.793983654 +0200
@@ -1,4 +1,4 @@
-From 5b3fe80ea3daebde777533fc40bd071c860438b0 Mon Sep 17 00:00:00 2001
+From 042795c3d5a9048c5dc1b3ddeb63f17c22f8374b Mon Sep 17 00:00:00 2001
 From: Matthias Brugger <mbrug...@suse.com>
 Date: Fri, 17 Jan 2020 20:59:02 +0100
 Subject: [PATCH] Kconfig: add btrfs to distro boot
@@ -13,7 +13,7 @@
  1 file changed, 1 insertion(+)
 
 diff --git a/Kconfig b/Kconfig
-index 6dc20ed25b..35e8dc7bad 100644
+index 86f0a39bb0..fea92305a3 100644
 --- a/Kconfig
 +++ b/Kconfig
 @@ -143,6 +143,7 @@ config DISTRO_DEFAULTS

++++++ 0009-configs-Re-sync-with-CONFIG_DISTRO_.patch -> 
0007-configs-Re-sync-with-CONFIG_DISTRO_.patch ++++++
--- 
/work/SRC/openSUSE:Factory/u-boot/0009-configs-Re-sync-with-CONFIG_DISTRO_.patch
    2021-02-23 20:20:21.387653133 +0100
+++ 
/work/SRC/openSUSE:Factory/.u-boot.new.2401/0007-configs-Re-sync-with-CONFIG_DISTRO_.patch
  2021-04-08 21:03:26.833983698 +0200
@@ -1,4 +1,4 @@
-From 0901a320eb56b18739af922493ef17916daa1d80 Mon Sep 17 00:00:00 2001
+From 4b2b7d1548bc36391f63cbc73626852335b90f33 Mon Sep 17 00:00:00 2001
 From: Matthias Brugger <mbrug...@suse.com>
 Date: Wed, 29 Jan 2020 09:56:06 +0100
 Subject: [PATCH] configs: Re-sync with CONFIG_DISTRO_DEFAULTS
@@ -18,7 +18,7 @@
  5 files changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig
-index 5fbbfd7236..1afe9a4665 100644
+index cfda83474b..657c72b595 100644
 --- a/configs/sandbox64_defconfig
 +++ b/configs/sandbox64_defconfig
 @@ -77,7 +77,6 @@ CONFIG_CMD_REGULATOR=y
@@ -30,7 +30,7 @@
  CONFIG_CMD_CRAMFS=y
  CONFIG_CMD_EXT4_WRITE=y
 diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
-index f1ec701a9f..5bc9186d6e 100644
+index 5bc90d09a8..a1f91a5870 100644
 --- a/configs/sandbox_defconfig
 +++ b/configs/sandbox_defconfig
 @@ -90,7 +90,6 @@ CONFIG_CMD_REGULATOR=y
@@ -52,7 +52,7 @@
 +# 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 66dc2473d6..906d79a5c3 100644
+index f938fbb475..399941d4e1 100644
 --- a/configs/turris_mox_defconfig
 +++ b/configs/turris_mox_defconfig
 @@ -36,7 +36,6 @@ CONFIG_CMD_TFTPPUT=y

++++++ 0011-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch -> 
0008-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch ++++++
--- 
/work/SRC/openSUSE:Factory/u-boot/0011-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch
    2021-02-23 20:20:21.767653469 +0100
+++ 
/work/SRC/openSUSE:Factory/.u-boot.new.2401/0008-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch
  2021-04-08 21:03:26.853983719 +0200
@@ -1,4 +1,4 @@
-From 96d142c3738348da1ea98e39a8bbaf5c4a640692 Mon Sep 17 00:00:00 2001
+From 650c3bf0b238e402efbb462ee284a3413028a82d Mon Sep 17 00:00:00 2001
 From: Michal Suchanek <msucha...@suse.de>
 Date: Tue, 29 Sep 2020 10:13:33 +0200
 Subject: [PATCH] sunxi: dts: OrangePi Zero: Add SPI aliases to make bus usable

++++++ 0012-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch -> 
0009-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch ++++++
--- 
/work/SRC/openSUSE:Factory/u-boot/0012-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch
    2021-02-23 20:20:21.931653614 +0100
+++ 
/work/SRC/openSUSE:Factory/.u-boot.new.2401/0009-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch
  2021-04-08 21:03:26.869983736 +0200
@@ -1,4 +1,4 @@
-From b1098dbd2cc344dd9c2df14d7dfab0eb0a107959 Mon Sep 17 00:00:00 2001
+From 779e02d702960aaa13facd1add368caefc35702e Mon Sep 17 00:00:00 2001
 From: Michal Suchanek <msucha...@suse.de>
 Date: Mon, 28 Sep 2020 23:02:01 +0200
 Subject: [PATCH] sunxi: dts: OrangePi Zero: Enable SPI flash.

++++++ 0013-sunxi-Enable-SPI-support-on-Orange-.patch -> 
0010-sunxi-Enable-SPI-support-on-Orange-.patch ++++++
--- 
/work/SRC/openSUSE:Factory/u-boot/0013-sunxi-Enable-SPI-support-on-Orange-.patch
    2021-02-23 20:20:21.975653653 +0100
+++ 
/work/SRC/openSUSE:Factory/.u-boot.new.2401/0010-sunxi-Enable-SPI-support-on-Orange-.patch
  2021-04-08 21:03:26.901983771 +0200
@@ -1,4 +1,4 @@
-From 415d7b01833b5c4271a9f7c209b82a5e9198ff21 Mon Sep 17 00:00:00 2001
+From 71eae7038a475626427e1aeaa3ba8251ea3fbfa4 Mon Sep 17 00:00:00 2001
 From: Michal Suchanek <msucha...@suse.de>
 Date: Mon, 28 Sep 2020 23:02:02 +0200
 Subject: [PATCH] sunxi: Enable SPI support on Orange Pi Zero

++++++ 0014-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch -> 
0011-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch ++++++
--- 
/work/SRC/openSUSE:Factory/u-boot/0014-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch
    2021-02-23 20:20:22.119653780 +0100
+++ 
/work/SRC/openSUSE:Factory/.u-boot.new.2401/0011-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch
  2021-04-08 21:03:26.909983780 +0200
@@ -1,4 +1,4 @@
-From 42719d4568f2aec214e5d096fe0e096ba2000265 Mon Sep 17 00:00:00 2001
+From dd35ffaf8b307852f994b7adab00d0313acd973c Mon Sep 17 00:00:00 2001
 From: Guillaume Gardet <guillaume.gar...@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 @@
  1 file changed, 1 insertion(+)
 
 diff --git a/configs/xilinx_zynqmp_virt_defconfig 
b/configs/xilinx_zynqmp_virt_defconfig
-index e400cd4702..a490f04de3 100644
+index 0bf4b7d692..6e6d14b7f3 100644
 --- a/configs/xilinx_zynqmp_virt_defconfig
 +++ b/configs/xilinx_zynqmp_virt_defconfig
-@@ -59,6 +59,7 @@ CONFIG_CMD_TIME=y
+@@ -60,6 +60,7 @@ CONFIG_CMD_TIME=y
  CONFIG_CMD_TIMER=y
  CONFIG_CMD_TPM=y
  CONFIG_CMD_EXT4_WRITE=y

++++++ 0012-smbios-Fix-table-when-no-string-is-.patch ++++++
>From c6623753e7523061f0301ccce32785020a02832e Mon Sep 17 00:00:00 2001
From: Matthias Brugger <mbrug...@suse.com>
Date: Wed, 17 Mar 2021 12:20:32 +0100
Subject: [PATCH] smbios: Fix table when no string is present

When no string is present in a table, next_ptr points to the same
location as eos. When calculating the string table length, we would only
reserve one \0. By spec a SMBIOS table has to end with two \0\0 when no
strings a present.

Signed-off-by: Matthias Brugger <mbrug...@suse.com>

Series-to: s...@chromium.org
Series-cc: bmeng...@gmail.com
Series-cc: xypron.g...@gmx.de
Series-cc: u-b...@lists.denx.de
---
 lib/smbios.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/smbios.c b/lib/smbios.c
index 7d463c84a9..d21d37cdac 100644
--- a/lib/smbios.c
+++ b/lib/smbios.c
@@ -153,7 +153,7 @@ static int smbios_add_prop(struct smbios_ctx *ctx, const 
char *prop)
 static void smbios_set_eos(struct smbios_ctx *ctx, char *eos)
 {
        ctx->eos = eos;
-       ctx->next_ptr = eos;
+       ctx->next_ptr = eos + 1;
        ctx->last_str = NULL;
 }
 
++++++ _multibuild ++++++
--- /var/tmp/diff_new_pack.RcVbhq/_old  2021-04-08 21:03:28.905985936 +0200
+++ /var/tmp/diff_new_pack.RcVbhq/_new  2021-04-08 21:03:28.905985936 +0200
@@ -92,5 +92,5 @@
   <flavor>xilinxzynqvirt</flavor>
   <flavor>xilinxzynqmpvirt</flavor>
   <flavor>xilinxzynqmpzcu102rev10</flavor>
-  <flavor>zynqzturn</flavor>
+  <flavor>zynqzturnv5</flavor>
 </multibuild>


++++++ u-boot-2021.01.tar.bz2 -> u-boot-2021.04.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/u-boot/u-boot-2021.01.tar.bz2 
/work/SRC/openSUSE:Factory/.u-boot.new.2401/u-boot-2021.04.tar.bz2 differ: char 
11, line 1

++++++ update_git.sh ++++++
--- /var/tmp/diff_new_pack.RcVbhq/_old  2021-04-08 21:03:28.961985996 +0200
+++ /var/tmp/diff_new_pack.RcVbhq/_new  2021-04-08 21:03:28.961985996 +0200
@@ -13,8 +13,8 @@
 
 GIT_TREE=https://github.com/openSUSE/u-boot.git
 GIT_LOCAL_TREE=~/src/opensuse/u-boot
-GIT_BRANCH=tumbleweed-2021.01
-GIT_UPSTREAM_TAG=v2021.01
+GIT_BRANCH=tumbleweed-2021.04
+GIT_UPSTREAM_TAG=v2021.04
 GIT_DIR=`mktemp -d -p /dev/shm`
 CMP_DIR=`mktemp -d -p /dev/shm`
 

Reply via email to