Hello community, here is the log from the commit of package u-boot for openSUSE:Factory checked in at 2020-04-21 13:07:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/u-boot (Old) and /work/SRC/openSUSE:Factory/.u-boot.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "u-boot" Tue Apr 21 13:07:51 2020 rev:129 rq:795731 version:2020.04 Changes: -------- --- /work/SRC/openSUSE:Factory/u-boot/u-boot.changes 2020-04-09 23:18:49.046361133 +0200 +++ /work/SRC/openSUSE:Factory/.u-boot.new.2738/u-boot.changes 2020-04-21 13:08:44.924582700 +0200 @@ -1,0 +2,78 @@ +Fri Apr 17 12:05:54 UTC 2020 - Guillaume GARDET <[email protected]> + +- 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 + +------------------------------------------------------------------- +Wed Apr 15 10:02:37 UTC 2020 - Guillaume GARDET <[email protected]> + +- 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 + +------------------------------------------------------------------- +Wed Apr 15 09:36:17 UTC 2020 - Andreas Schwab <[email protected]> + +- Switch to http URLs, ftp is obsolete + +------------------------------------------------------------------- +Tue Apr 14 10:29:42 UTC 2020 - Guillaume GARDET <[email protected]> + +- 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 + +------------------------------------------------------------------- Old: ---- 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-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 u-boot-2020.01.tar.bz2 u-boot-2020.01.tar.bz2.sig New: ---- 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 u-boot-2020.04.tar.bz2 u-boot-2020.04.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ u-boot.spec ++++++ --- /var/tmp/diff_new_pack.HLDSD7/_old 2020-04-21 13:08:46.812586466 +0200 +++ /var/tmp/diff_new_pack.HLDSD7/_new 2020-04-21 13:08:46.816586474 +0200 @@ -35,6 +35,7 @@ %define is_armv8 0 %define is_ppc 0 %define is_riscv64 0 +%define is_zynqmp 0 %define tools_only 0 %if "%target" == "rpi" || "%target" == "rpi2" || "%target" == "rpi3" || "%target" == "rpi4" || "%target" == "rpiarm64" %define is_rpi 1 @@ -135,7 +136,8 @@ %if "%target" == "geekbox" || "%target" == "hikey" || "%target" == "khadas-vim" || "%target" == "khadas-vim2" || "%target" == "libretech-ac" || "%target" == "libretech-cc" || "%target" == "ls1012afrdmqspi" || "%target" == "mvebudb-88f3720" || "%target" == "mvebudbarmada8k" || "%target" == "mvebuespressobin-88f3720" || "%target" == "mvebumcbin-88f8040" || "%target" == "odroid-c2" || "%target" == "odroid-n2" || "%target" == "p2371-2180" || "%target" == "p2771-0000-500" || "%target" == "p3450-0000" || "%target" == "poplar" %define is_armv8 1 %endif -%if "%target" == "avnetultra96rev1" || "%target" == "xilinxzynqmpgeneric" || "%target" == "xilinxzynqmpzcu102rev10" +%if "%target" == "avnetultra96rev1" || "%target" == "xilinxzynqmpvirt" || "%target" == "xilinxzynqmpzcu102rev10" +%define is_zynqmp 1 %define is_armv8 1 %define binext .elf %endif @@ -157,7 +159,7 @@ %define is_ppc 1 %endif # archive_version differs from version for RC version only -%define archive_version 2020.01 +%define archive_version 2020.04 %if "%{target}" == "" ExclusiveArch: do_not_build %else @@ -189,14 +191,14 @@ %endif %bcond_with uboot_atf %bcond_with uboot_atf_pine64 -Version: 2020.01 +Version: 2020.04 Release: 0 Summary: The U-Boot firmware for the %target platform License: GPL-2.0-only Group: System/Boot URL: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2 -Source1: ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2.sig +Source: http://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2 +Source1: http://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2.sig Source2: arndale-bl1.img Source300: u-boot-rpmlintrc Source900: update_git.sh @@ -205,22 +207,15 @@ Patch0002: 0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch Patch0003: 0003-rpi-Use-firmware-provided-device-tr.patch Patch0004: 0004-Temp-workaround-for-Chromebook-snow.patch -Patch0005: 0005-zynqmp-Add-generic-target.patch -Patch0006: 0006-tools-zynqmpbif-Add-support-for-loa.patch -Patch0007: 0007-boo-1123170-Remove-ubifs-support-fr.patch -Patch0008: 0008-zynqmp-generic-fix-compilation.patch -Patch0009: 0009-boo-1144161-Remove-nand-mtd-spi-dfu.patch -Patch0010: 0010-ARM-tegra-Add-NVIDIA-Jetson-Nano-De.patch -Patch0011: 0011-net-Add-support-for-Broadcom-GENETv.patch -Patch0012: 0012-rpi4-Update-memory-map-to-accommoda.patch -Patch0013: 0013-rpi4-Enable-GENET-Ethernet-controll.patch -Patch0014: 0014-Kconfig-add-btrfs-to-distro-boot.patch -Patch0015: 0015-configs-Re-sync-with-CONFIG_DISTRO_.patch -Patch0016: 0016-configs-am335x_evm-disable-BTRFS.patch -Patch0017: 0017-net-phy-Fix-overlong-PHY-timeout.patch -Patch0018: 0018-net-bcmgenet-Don-t-set-ID_MODE_DIS-.patch -Patch0019: 0019-uboot-fs-btrfs-Use-LZO_LEN-to-repla.patch -Patch0020: 0020-uboot-fs-btrfs-Fix-LZO-false-decomp.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-net-bcmgenet-Don-t-set-ID_MODE_DIS-.patch +Patch0012: 0012-uboot-fs-btrfs-Use-LZO_LEN-to-repla.patch +Patch0013: 0013-uboot-fs-btrfs-Fix-LZO-false-decomp.patch # Patches: end BuildRequires: bc BuildRequires: bison @@ -320,6 +315,10 @@ Obsoletes: u-boot-rpi4 < %{version} Provides: u-boot-rpi4 = %{version} %endif +%if "%{name}" == "u-boot-xilinxzynqmpvirt" +Obsoletes: u-boot-xilinxzynqmpgeneric < %{version} +Provides: u-boot-xilinxzynqmpgeneric = %{version} +%endif %description Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors. @@ -375,7 +374,17 @@ %endif %endif +%if !%{is_zynqmp} confname=$(ls configs | perl -ne '$l=lc; $l=~ s,_,,g; $l eq "%{target}defconfig\n" && print;') +%else +confname="xilinx_zynqmp_virt_defconfig" +%if "%target" == "avnetultra96rev1" +export DEVICE_TREE=avnet-ultra96-rev1 +%endif +%if "%target" == "xilinxzynqmpzcu102rev10" +export DEVICE_TREE=zynqmp-zcu102-rev1.0 +%endif +%endif make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="%{optflags}" $confname echo "Attempting to enable fdt apply command (.dtbo) support." ++++++ 0001-XXX-openSUSE-XXX-Prepend-partition-.patch ++++++ --- /var/tmp/diff_new_pack.HLDSD7/_old 2020-04-21 13:08:46.836586513 +0200 +++ /var/tmp/diff_new_pack.HLDSD7/_new 2020-04-21 13:08:46.836586513 +0200 @@ -1,4 +1,4 @@ -From 14aae2bd722de8aa56e75c3ed2b07211fb9f8bce Mon Sep 17 00:00:00 2001 +From 5637f1acf10c604ef8f25d43eb4d4fa1d6d4b4e4 Mon Sep 17 00:00:00 2001 From: Guillaume GARDET <[email protected]> Date: Wed, 13 Apr 2016 13:44:29 +0200 Subject: [PATCH] XXX openSUSE XXX: Prepend partition 3 (and 4 for chromebook ++++++ 0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch ++++++ --- /var/tmp/diff_new_pack.HLDSD7/_old 2020-04-21 13:08:46.848586537 +0200 +++ /var/tmp/diff_new_pack.HLDSD7/_new 2020-04-21 13:08:46.848586537 +0200 @@ -1,4 +1,4 @@ -From 770252742a9d4ec8aa7e53c41e552d26f1253eb4 Mon Sep 17 00:00:00 2001 +From 4a9ece206c304a7dd8d05797102f333a7ccb5777 Mon Sep 17 00:00:00 2001 From: Alexander Graf <[email protected]> Date: Mon, 2 May 2016 23:25:07 +0200 Subject: [PATCH] Revert "Revert "omap3: Use raw SPL by default for mmc1"" ++++++ 0003-rpi-Use-firmware-provided-device-tr.patch ++++++ --- /var/tmp/diff_new_pack.HLDSD7/_old 2020-04-21 13:08:46.860586562 +0200 +++ /var/tmp/diff_new_pack.HLDSD7/_new 2020-04-21 13:08:46.864586569 +0200 @@ -1,4 +1,4 @@ -From 9f8b17cd1c23f8bb4e5702d16da2951e8cd79ab1 Mon Sep 17 00:00:00 2001 +From 224598332df1ec7783e5abdecb72482c7715f81e Mon Sep 17 00:00:00 2001 From: Alexander Graf <[email protected]> Date: Wed, 21 Feb 2018 17:41:13 +0100 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 75c6c9c447..6e7fe71bbf 100644 +index cecc16cbfc..17a10f1ccc 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_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig -index 4e8204ef88..b5b7a08698 100644 +index 762a72a574..96236ab82f 100644 --- a/configs/rpi_2_defconfig +++ b/configs/rpi_2_defconfig @@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y @@ -54,7 +54,7 @@ CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig -index d50953287c..4b9f61b2b2 100644 +index 5ca31648f9..2f7c233e93 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_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig -index c0c0955131..ce7813fb1f 100644 +index 51d5a717d5..a7e134fc48 100644 --- a/configs/rpi_3_defconfig +++ b/configs/rpi_3_defconfig @@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y @@ -80,7 +80,7 @@ CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig -index 2f4c7da6dc..063ec9f196 100644 +index dbbc818e14..1b88bb9255 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.HLDSD7/_old 2020-04-21 13:08:46.872586585 +0200 +++ /var/tmp/diff_new_pack.HLDSD7/_new 2020-04-21 13:08:46.872586585 +0200 @@ -1,4 +1,4 @@ -From 4e8c64e9062a728cc79d1c8c37ffe4f896ead1df Mon Sep 17 00:00:00 2001 +From 91c18e17e22e76454d0ed7f75a1a1ec6c6637084 Mon Sep 17 00:00:00 2001 From: Guillaume GARDET <[email protected]> Date: Mon, 9 Apr 2018 10:28:26 +0200 Subject: [PATCH] Temp workaround for Chromebook snow to avoid the 'unable to ++++++ 0006-tools-zynqmpbif-Add-support-for-loa.patch -> 0005-tools-zynqmpbif-Add-support-for-loa.patch ++++++ --- /work/SRC/openSUSE:Factory/u-boot/0006-tools-zynqmpbif-Add-support-for-loa.patch 2020-02-18 10:43:40.193344143 +0100 +++ /work/SRC/openSUSE:Factory/.u-boot.new.2738/0005-tools-zynqmpbif-Add-support-for-loa.patch 2020-04-21 13:08:31.440555807 +0200 @@ -1,4 +1,4 @@ -From 405c8b6a704c4cf477c7d6e8f4999dea7d63208a Mon Sep 17 00:00:00 2001 +From f4562a3ff7fa2116a443cf040ed9ed878a7a2d11 Mon Sep 17 00:00:00 2001 From: Alexander Graf <[email protected]> Date: Thu, 26 Apr 2018 13:30:32 +0200 Subject: [PATCH] tools: zynqmpbif: Add support for load=after ++++++ 0007-boo-1123170-Remove-ubifs-support-fr.patch -> 0006-boo-1123170-Remove-ubifs-support-fr.patch ++++++ --- /work/SRC/openSUSE:Factory/u-boot/0007-boo-1123170-Remove-ubifs-support-fr.patch 2020-02-18 10:43:40.241344242 +0100 +++ /work/SRC/openSUSE:Factory/.u-boot.new.2738/0006-boo-1123170-Remove-ubifs-support-fr.patch 2020-04-21 13:08:32.212557347 +0200 @@ -1,4 +1,4 @@ -From 789d64316535a62f065fe386fb9efb1bb30fada1 Mon Sep 17 00:00:00 2001 +From be3112208a9246eb6f0bd15947154db0bef65d26 Mon Sep 17 00:00:00 2001 From: Guillaume GARDET <[email protected]> Date: Tue, 29 Jan 2019 11:38:12 +0100 Subject: [PATCH] boo#1123170: Remove ubifs support from omap3_beagle to keep a ++++++ 0009-boo-1144161-Remove-nand-mtd-spi-dfu.patch -> 0007-boo-1144161-Remove-nand-mtd-spi-dfu.patch ++++++ --- /work/SRC/openSUSE:Factory/u-boot/0009-boo-1144161-Remove-nand-mtd-spi-dfu.patch 2020-02-18 10:43:40.293344347 +0100 +++ /work/SRC/openSUSE:Factory/.u-boot.new.2738/0007-boo-1144161-Remove-nand-mtd-spi-dfu.patch 2020-04-21 13:08:34.552562013 +0200 @@ -1,4 +1,4 @@ -From 92f993cab1b84e49b3d0788fde619fab83a526af Mon Sep 17 00:00:00 2001 +From 349eb7b2fb80724040951accfa440fe61b71bff8 Mon Sep 17 00:00:00 2001 From: Guillaume Gardet <[email protected]> Date: Mon, 16 Dec 2019 17:51:17 +0100 Subject: [PATCH] boo#1144161: Remove nand/mtd/spi/dfu/fastboot support from ++++++ 0014-Kconfig-add-btrfs-to-distro-boot.patch -> 0008-Kconfig-add-btrfs-to-distro-boot.patch ++++++ --- /work/SRC/openSUSE:Factory/u-boot/0014-Kconfig-add-btrfs-to-distro-boot.patch 2020-02-18 10:43:40.505344780 +0100 +++ /work/SRC/openSUSE:Factory/.u-boot.new.2738/0008-Kconfig-add-btrfs-to-distro-boot.patch 2020-04-21 13:08:35.944564790 +0200 @@ -1,4 +1,4 @@ -From 911ea9f66f6b6117a07f8ae4790a767224665d55 Mon Sep 17 00:00:00 2001 +From b54dd0d97ff8affb76cd83b26b1f2b56cb87f43a Mon Sep 17 00:00:00 2001 From: Matthias Brugger <[email protected]> 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 92fc4fc135..b61ebf22f6 100644 +index f698e0a94f..8d104486c1 100644 --- a/Kconfig +++ b/Kconfig @@ -93,6 +93,7 @@ config DISTRO_DEFAULTS ++++++ 0015-configs-Re-sync-with-CONFIG_DISTRO_.patch -> 0009-configs-Re-sync-with-CONFIG_DISTRO_.patch ++++++ --- /work/SRC/openSUSE:Factory/u-boot/0015-configs-Re-sync-with-CONFIG_DISTRO_.patch 2020-02-18 10:43:40.557344886 +0100 +++ /work/SRC/openSUSE:Factory/.u-boot.new.2738/0009-configs-Re-sync-with-CONFIG_DISTRO_.patch 2020-04-21 13:08:38.112569114 +0200 @@ -1,4 +1,4 @@ -From 3ce290961a8c6c6f5a127c1a7c8f8ca5206390e8 Mon Sep 17 00:00:00 2001 +From c2dd94a9854d148a77cee50f3f9b4757db3a060f Mon Sep 17 00:00:00 2001 From: Matthias Brugger <[email protected]> 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 cc536ff0ba..1d625a9a84 100644 +index 71a4d7fccb..f07e017b0e 100644 --- a/configs/sandbox64_defconfig +++ b/configs/sandbox64_defconfig @@ -63,7 +63,6 @@ CONFIG_CMD_REGULATOR=y @@ -30,10 +30,10 @@ CONFIG_CMD_CRAMFS=y CONFIG_CMD_EXT4_WRITE=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig -index 64245f7cdc..95b4d06171 100644 +index f96891ecae..694880f71f 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig -@@ -71,7 +71,6 @@ CONFIG_CMD_REGULATOR=y +@@ -72,7 +72,6 @@ CONFIG_CMD_REGULATOR=y CONFIG_CMD_AES=y CONFIG_CMD_TPM=y CONFIG_CMD_TPM_TEST=y @@ -42,7 +42,7 @@ CONFIG_CMD_CRAMFS=y CONFIG_CMD_EXT4_WRITE=y diff --git a/configs/socfpga_arria10_defconfig b/configs/socfpga_arria10_defconfig -index b4826548eb..fa7a5681ec 100644 +index ca34457ddd..5a4204eaf6 100644 --- a/configs/socfpga_arria10_defconfig +++ b/configs/socfpga_arria10_defconfig @@ -50,3 +50,5 @@ CONFIG_TIMER=y @@ -52,10 +52,10 @@ +# 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 b88cc4b842..89a1c73957 100644 +index 2e637044c1..a6140ce92f 100644 --- a/configs/turris_mox_defconfig +++ b/configs/turris_mox_defconfig -@@ -32,7 +32,6 @@ CONFIG_CMD_TFTPPUT=y +@@ -33,7 +33,6 @@ CONFIG_CMD_TFTPPUT=y CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_MVEBU_BUBT=y @@ -64,10 +64,10 @@ CONFIG_MAC_PARTITION=y CONFIG_OF_BOARD_FIXUP=y diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig -index b6cb9a5f9d..160f1de656 100644 +index f3ed9917d5..0c48800873 100644 --- a/configs/turris_omnia_defconfig +++ b/configs/turris_omnia_defconfig -@@ -49,7 +49,6 @@ CONFIG_CMD_CACHE=y +@@ -50,7 +50,6 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_AES=y CONFIG_CMD_HASH=y ++++++ 0016-configs-am335x_evm-disable-BTRFS.patch -> 0010-configs-am335x_evm-disable-BTRFS.patch ++++++ --- /work/SRC/openSUSE:Factory/u-boot/0016-configs-am335x_evm-disable-BTRFS.patch 2020-02-18 10:43:40.589344952 +0100 +++ /work/SRC/openSUSE:Factory/.u-boot.new.2738/0010-configs-am335x_evm-disable-BTRFS.patch 2020-04-21 13:08:39.088571060 +0200 @@ -1,4 +1,4 @@ -From baf5b711ffca44ea86f92c89d6e9be55441d1b1d Mon Sep 17 00:00:00 2001 +From 0403d42def8d2ea3251f131a05ff9f76de2b602a Mon Sep 17 00:00:00 2001 From: Matthias Brugger <[email protected]> Date: Wed, 29 Jan 2020 10:26:43 +0100 Subject: [PATCH] configs: am335x_evm: disable BTRFS ++++++ 0018-net-bcmgenet-Don-t-set-ID_MODE_DIS-.patch -> 0011-net-bcmgenet-Don-t-set-ID_MODE_DIS-.patch ++++++ --- /work/SRC/openSUSE:Factory/u-boot/0018-net-bcmgenet-Don-t-set-ID_MODE_DIS-.patch 2020-02-21 16:43:31.070172092 +0100 +++ /work/SRC/openSUSE:Factory/.u-boot.new.2738/0011-net-bcmgenet-Don-t-set-ID_MODE_DIS-.patch 2020-04-21 13:08:39.524571930 +0200 @@ -1,4 +1,4 @@ -From 1a8daf7eef525b8c0c54f6b6274d0bb64f2787cc Mon Sep 17 00:00:00 2001 +From bf743c28432ba1eea23e0b05c582762b4b6fe1b7 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne <[email protected]> Date: Thu, 20 Feb 2020 17:36:31 +0100 Subject: [PATCH] net: bcmgenet: Don't set ID_MODE_DIS when not using RGMII ++++++ 0019-uboot-fs-btrfs-Use-LZO_LEN-to-repla.patch -> 0012-uboot-fs-btrfs-Use-LZO_LEN-to-repla.patch ++++++ --- /work/SRC/openSUSE:Factory/u-boot/0019-uboot-fs-btrfs-Use-LZO_LEN-to-repla.patch 2020-03-20 23:59:56.593042676 +0100 +++ /work/SRC/openSUSE:Factory/.u-boot.new.2738/0012-uboot-fs-btrfs-Use-LZO_LEN-to-repla.patch 2020-04-21 13:08:39.796572472 +0200 @@ -1,4 +1,4 @@ -From 528169a95fac4edbc0935796d919876b1c64b204 Mon Sep 17 00:00:00 2001 +From 35fec3c2ae56857f07d5f68a48da84d010a62429 Mon Sep 17 00:00:00 2001 From: Qu Wenruo <[email protected]> Date: Thu, 19 Mar 2020 20:30:05 +0800 Subject: [PATCH] uboot: fs/btrfs: Use LZO_LEN to replace immediate number ++++++ 0020-uboot-fs-btrfs-Fix-LZO-false-decomp.patch -> 0013-uboot-fs-btrfs-Fix-LZO-false-decomp.patch ++++++ --- /work/SRC/openSUSE:Factory/u-boot/0020-uboot-fs-btrfs-Fix-LZO-false-decomp.patch 2020-03-20 23:59:56.609042686 +0100 +++ /work/SRC/openSUSE:Factory/.u-boot.new.2738/0013-uboot-fs-btrfs-Fix-LZO-false-decomp.patch 2020-04-21 13:08:40.140573159 +0200 @@ -1,4 +1,4 @@ -From a6aa59c7e4daef9ba202eb260daf23c4c5de63c1 Mon Sep 17 00:00:00 2001 +From 82ad3674e71029334b519ff8c2bc077df82c2243 Mon Sep 17 00:00:00 2001 From: Qu Wenruo <[email protected]> Date: Thu, 19 Mar 2020 20:30:06 +0800 Subject: [PATCH] uboot: fs/btrfs: Fix LZO false decompression error caused by ++++++ _multibuild ++++++ --- /var/tmp/diff_new_pack.HLDSD7/_old 2020-04-21 13:08:47.012586864 +0200 +++ /var/tmp/diff_new_pack.HLDSD7/_new 2020-04-21 13:08:47.016586872 +0200 @@ -82,7 +82,7 @@ <flavor>turrisomnia</flavor> <flavor>udoo</flavor> <flavor>udooneo</flavor> - <flavor>xilinxzynqmpgeneric</flavor> + <flavor>xilinxzynqmpvirt</flavor> <flavor>xilinxzynqmpzcu102rev10</flavor> <flavor>zynqzturn</flavor> </multibuild> ++++++ u-boot-2020.01.tar.bz2 -> u-boot-2020.04.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/u-boot/u-boot-2020.01.tar.bz2 /work/SRC/openSUSE:Factory/.u-boot.new.2738/u-boot-2020.04.tar.bz2 differ: char 11, line 1 ++++++ update_git.sh ++++++ --- /var/tmp/diff_new_pack.HLDSD7/_old 2020-04-21 13:08:47.076586992 +0200 +++ /var/tmp/diff_new_pack.HLDSD7/_new 2020-04-21 13:08:47.076586992 +0200 @@ -13,8 +13,8 @@ GIT_TREE=git://github.com/openSUSE/u-boot.git GIT_LOCAL_TREE=~/git/u-boot-opensuse -GIT_BRANCH=tumbleweed-2020.01 -GIT_UPSTREAM_TAG=v2020.01 +GIT_BRANCH=tumbleweed-2020.04 +GIT_UPSTREAM_TAG=v2020.04 GIT_DIR=/dev/shm/u-boot-factory-git-dir CMP_DIR=/dev/shm/u-boot-factory-cmp-dir
