SHA256
1
0
forked from pool/u-boot

Accepting request 849300 from hardware👢staging

OBS-URL: https://build.opensuse.org/request/show/849300
OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=111
This commit is contained in:
Guillaume GARDET 2020-11-18 14:00:21 +00:00 committed by Git OBS Bridge
parent ba29a19b0d
commit fb69251c5c
3 changed files with 30 additions and 0 deletions

View File

@ -0,0 +1,22 @@
From a8517eab022f355186354858721b54a4747b3a8a 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
fix compilation - bsc#1178884
---
configs/xilinx_zynqmp_virt_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig
index a0984c8045..ab1889ab13 100644
--- a/configs/xilinx_zynqmp_virt_defconfig
+++ b/configs/xilinx_zynqmp_virt_defconfig
@@ -52,6 +52,7 @@ CONFIG_CMD_TFTPPUT=y
CONFIG_CMD_TIME=y
CONFIG_CMD_TIMER=y
CONFIG_CMD_EXT4_WRITE=y
+# CONFIG_CMD_BTRFS is not set
CONFIG_CMD_MTDPARTS=y
CONFIG_CMD_MTDPARTS_SPREAD=y
CONFIG_CMD_MTDPARTS_SHOW_NET_SIZES=y

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Nov 18 13:50:35 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>
Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2020.10
* Patches added:
0014-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch - bsc#1178884
-------------------------------------------------------------------
Wed Oct 14 09:48:25 UTC 2020 - Andreas Schwab <schwab@suse.de>

View File

@ -226,6 +226,7 @@ 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
# Patches: end
BuildRequires: bc
BuildRequires: bison