Skip to contentSkip to conversation

Kconfig: add btrfs to distro boot

PATCH Superseded matthias.bgg at kernel.org 1 participant 2 messages Jan 16, 2020

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/2 Kconfig: add btrfs to distro boot

From: Matthias Brugger <[email protected]>

Some distributions use btrfs as the default file system. Enable btrfs support by default when using distro boot for all architectures but riscv, as it breaks compilation due to size problems.

---

Changes in v3:
- use imply instead of select

Changes in v2:
- disable default btrfs support riscv

 Kconfig | 1 +
 1 file changed, 1 insertion(+)
Kconfig +1 -0
index 99cc56f3c2..9c942c673d 100644
@@ -93,6 +93,7 @@ config DISTRO_DEFAULTS
 	select HUSH_PARSER
 	select SUPPORT_RAW_INITRD
 	select SYS_LONGHELP
+	imply CMD_BTRFS if !RISCV
 	imply CMD_MII if NET
 	imply USB_STORAGE
 	imply USE_BOOTCOMMAND
Signature · 1 line
2.24.0
#1 lore raw

PATCH v3 2/2 configs: Re-sync with CONFIG_DISTRO_DEFAULTS

From: Matthias Brugger <[email protected]>

CONFIG_DISTRO_DEFAULTS now enables CMD_BTRFS by default, we can delete the config option in the corresponding default configs.

---

Changes in v3: None
Changes in v2: None

 configs/sandbox64_defconfig    | 1 -
 configs/sandbox_defconfig      | 1 -
 configs/turris_mox_defconfig   | 1 -
 configs/turris_omnia_defconfig | 1 -
 4 files changed, 4 deletions(-)
configs/sandbox64_defconfig +0 -1
index 64d1d3102f..0826c06aa9 100644
@@ -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
configs/sandbox_defconfig +0 -1
index d8d8645425..f2d5572f99 100644
@@ -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
configs/turris_mox_defconfig +0 -1
index b88cc4b842..89a1c73957 100644
@@ -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
configs/turris_omnia_defconfig +0 -1
index b6cb9a5f9d..160f1de656 100644
@@ -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
Signature · 1 line
2.24.0