u-boot/0009-configs-Re-sync-with-CONFIG_DISTRO_.patch

78 lines
2.6 KiB
Diff
Raw Normal View History

Accepting request 795564 from hardware:boot:staging - 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 - 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 - Switch to http URLs, ftp is obsolete - 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 OBS-URL: https://build.opensuse.org/request/show/795564 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=96
2020-04-20 11:32:05 +02:00
From c2dd94a9854d148a77cee50f3f9b4757db3a060f 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
CONFIG_DISTRO_DEFAULTS now enables CMD_BTRFS by default,
we can delete the config option in the corresponding default
configs. Other boards won't build with btrfs enabled so disable
the support by default.
Signed-off-by: Matthias Brugger <mbrugger@suse.com>
---
configs/sandbox64_defconfig | 1 -
configs/sandbox_defconfig | 1 -
configs/socfpga_arria10_defconfig | 2 ++
configs/turris_mox_defconfig | 1 -
configs/turris_omnia_defconfig | 1 -
5 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig
Accepting request 795564 from hardware:boot:staging - 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 - 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 - Switch to http URLs, ftp is obsolete - 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 OBS-URL: https://build.opensuse.org/request/show/795564 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=96
2020-04-20 11:32:05 +02:00
index 71a4d7fccb..f07e017b0e 100644
--- a/configs/sandbox64_defconfig
+++ b/configs/sandbox64_defconfig
@@ -63,7 +63,6 @@ CONFIG_CMD_REGULATOR=y
CONFIG_CMD_AES=y
CONFIG_CMD_TPM=y
CONFIG_CMD_TPM_TEST=y
-CONFIG_CMD_BTRFS=y
CONFIG_CMD_CBFS=y
CONFIG_CMD_CRAMFS=y
CONFIG_CMD_EXT4_WRITE=y
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
Accepting request 795564 from hardware:boot:staging - 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 - 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 - Switch to http URLs, ftp is obsolete - 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 OBS-URL: https://build.opensuse.org/request/show/795564 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=96
2020-04-20 11:32:05 +02:00
index f96891ecae..694880f71f 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
Accepting request 795564 from hardware:boot:staging - 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 - 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 - Switch to http URLs, ftp is obsolete - 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 OBS-URL: https://build.opensuse.org/request/show/795564 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=96
2020-04-20 11:32:05 +02:00
@@ -72,7 +72,6 @@ CONFIG_CMD_REGULATOR=y
CONFIG_CMD_AES=y
CONFIG_CMD_TPM=y
CONFIG_CMD_TPM_TEST=y
-CONFIG_CMD_BTRFS=y
CONFIG_CMD_CBFS=y
CONFIG_CMD_CRAMFS=y
CONFIG_CMD_EXT4_WRITE=y
diff --git a/configs/socfpga_arria10_defconfig b/configs/socfpga_arria10_defconfig
Accepting request 795564 from hardware:boot:staging - 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 - 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 - Switch to http URLs, ftp is obsolete - 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 OBS-URL: https://build.opensuse.org/request/show/795564 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=96
2020-04-20 11:32:05 +02:00
index ca34457ddd..5a4204eaf6 100644
--- a/configs/socfpga_arria10_defconfig
+++ b/configs/socfpga_arria10_defconfig
@@ -50,3 +50,5 @@ CONFIG_TIMER=y
CONFIG_SPL_TIMER=y
CONFIG_DESIGNWARE_APB_TIMER=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
Accepting request 795564 from hardware:boot:staging - 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 - 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 - Switch to http URLs, ftp is obsolete - 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 OBS-URL: https://build.opensuse.org/request/show/795564 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=96
2020-04-20 11:32:05 +02:00
index 2e637044c1..a6140ce92f 100644
--- a/configs/turris_mox_defconfig
+++ b/configs/turris_mox_defconfig
Accepting request 795564 from hardware:boot:staging - 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 - 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 - Switch to http URLs, ftp is obsolete - 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 OBS-URL: https://build.opensuse.org/request/show/795564 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=96
2020-04-20 11:32:05 +02:00
@@ -33,7 +33,6 @@ CONFIG_CMD_TFTPPUT=y
CONFIG_CMD_CACHE=y
CONFIG_CMD_TIME=y
CONFIG_CMD_MVEBU_BUBT=y
-CONFIG_CMD_BTRFS=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_MAC_PARTITION=y
CONFIG_OF_BOARD_FIXUP=y
diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig
Accepting request 795564 from hardware:boot:staging - 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 - 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 - Switch to http URLs, ftp is obsolete - 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 OBS-URL: https://build.opensuse.org/request/show/795564 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=96
2020-04-20 11:32:05 +02:00
index f3ed9917d5..0c48800873 100644
--- a/configs/turris_omnia_defconfig
+++ b/configs/turris_omnia_defconfig
Accepting request 795564 from hardware:boot:staging - 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 - 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 - Switch to http URLs, ftp is obsolete - 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 OBS-URL: https://build.opensuse.org/request/show/795564 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=96
2020-04-20 11:32:05 +02:00
@@ -50,7 +50,6 @@ CONFIG_CMD_CACHE=y
CONFIG_CMD_TIME=y
CONFIG_CMD_AES=y
CONFIG_CMD_HASH=y
-CONFIG_CMD_BTRFS=y
# CONFIG_SPL_PARTITION_UUIDS is not set
CONFIG_DEFAULT_DEVICE_TREE="armada-385-turris-omnia"
CONFIG_ENV_IS_IN_SPI_FLASH=y