dabac30ba5
OBS-URL: https://build.opensuse.org/request/show/774960 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=84
78 lines
2.6 KiB
Diff
78 lines
2.6 KiB
Diff
From 3ce290961a8c6c6f5a127c1a7c8f8ca5206390e8 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
|
|
index cc536ff0ba..1d625a9a84 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
|
|
index 64245f7cdc..95b4d06171 100644
|
|
--- a/configs/sandbox_defconfig
|
|
+++ b/configs/sandbox_defconfig
|
|
@@ -71,7 +71,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
|
|
index b4826548eb..fa7a5681ec 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
|
|
index b88cc4b842..89a1c73957 100644
|
|
--- a/configs/turris_mox_defconfig
|
|
+++ b/configs/turris_mox_defconfig
|
|
@@ -32,7 +32,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
|
|
index b6cb9a5f9d..160f1de656 100644
|
|
--- a/configs/turris_omnia_defconfig
|
|
+++ b/configs/turris_omnia_defconfig
|
|
@@ -49,7 +49,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
|