2022-01-19 12:06:46 +01:00
|
|
|
From d7ff1c814fed2a14096054ac8d20cb0cb88b5f59 Mon Sep 17 00:00:00 2001
|
2020-01-29 11:08:54 +01:00
|
|
|
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
|
2022-01-19 12:06:46 +01:00
|
|
|
index d849989cf6..d58bd2e30b 100644
|
2020-01-29 11:08:54 +01:00
|
|
|
--- a/configs/sandbox64_defconfig
|
|
|
|
+++ b/configs/sandbox64_defconfig
|
2022-01-19 12:06:46 +01:00
|
|
|
@@ -79,7 +79,6 @@ CONFIG_CMD_REGULATOR=y
|
2020-01-29 11:08:54 +01:00
|
|
|
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
|
2022-01-19 12:06:46 +01:00
|
|
|
index c390afe9de..c08fc476c1 100644
|
2020-01-29 11:08:54 +01:00
|
|
|
--- a/configs/sandbox_defconfig
|
|
|
|
+++ b/configs/sandbox_defconfig
|
2022-01-19 12:06:46 +01:00
|
|
|
@@ -102,7 +102,6 @@ CONFIG_CMD_REGULATOR=y
|
2020-01-29 11:08:54 +01:00
|
|
|
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
|
2022-01-19 12:06:46 +01:00
|
|
|
index d6b7444750..74b6d65915 100644
|
2020-01-29 11:08:54 +01:00
|
|
|
--- a/configs/socfpga_arria10_defconfig
|
|
|
|
+++ b/configs/socfpga_arria10_defconfig
|
2022-01-19 12:06:46 +01:00
|
|
|
@@ -54,3 +54,5 @@ CONFIG_DESIGNWARE_APB_TIMER=y
|
2021-10-04 12:32:24 +02:00
|
|
|
CONFIG_USB=y
|
2020-10-19 11:00:01 +02:00
|
|
|
CONFIG_USB_DWC2=y
|
2020-01-29 11:08:54 +01:00
|
|
|
# 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
|
2022-01-19 12:06:46 +01:00
|
|
|
index 3cae32f69b..555919147b 100644
|
2020-01-29 11:08:54 +01:00
|
|
|
--- a/configs/turris_mox_defconfig
|
|
|
|
+++ b/configs/turris_mox_defconfig
|
2022-01-19 12:06:46 +01:00
|
|
|
@@ -47,7 +47,6 @@ CONFIG_CMD_TIME=y
|
2020-01-29 11:08:54 +01:00
|
|
|
CONFIG_CMD_MVEBU_BUBT=y
|
2021-07-27 12:35:46 +02:00
|
|
|
CONFIG_CMD_AES=y
|
|
|
|
CONFIG_CMD_HASH=y
|
2020-01-29 11:08:54 +01:00
|
|
|
-CONFIG_CMD_BTRFS=y
|
|
|
|
CONFIG_CMD_EXT4_WRITE=y
|
|
|
|
CONFIG_MAC_PARTITION=y
|
2020-10-19 11:00:01 +02:00
|
|
|
CONFIG_ENV_OVERWRITE=y
|
2020-01-29 11:08:54 +01:00
|
|
|
diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig
|
2022-01-19 12:06:46 +01:00
|
|
|
index e6f901ea77..fbded23612 100644
|
2020-01-29 11:08:54 +01:00
|
|
|
--- a/configs/turris_omnia_defconfig
|
|
|
|
+++ b/configs/turris_omnia_defconfig
|
2022-01-19 12:06:46 +01:00
|
|
|
@@ -55,7 +55,6 @@ CONFIG_CMD_CACHE=y
|
2020-01-29 11:08:54 +01:00
|
|
|
CONFIG_CMD_TIME=y
|
|
|
|
CONFIG_CMD_AES=y
|
|
|
|
CONFIG_CMD_HASH=y
|
|
|
|
-CONFIG_CMD_BTRFS=y
|
2021-07-27 12:35:46 +02:00
|
|
|
CONFIG_CMD_FS_UUID=y
|
2020-01-29 11:08:54 +01:00
|
|
|
# CONFIG_SPL_PARTITION_UUIDS is not set
|
2020-10-19 11:00:01 +02:00
|
|
|
CONFIG_ENV_OVERWRITE=y
|