Skip to contentSkip to conversation

Kconfig: add btrfs to distro boot

PATCH Superseded matthias.bgg at kernel.org 3 participants 4 messages Jan 15, 2020

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 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 v2:
- disable default btrfs support riscv

 Kconfig | 1 +
 1 file changed, 1 insertion(+)
Kconfig +1 -0
index 99cc56f3c2..f0abf91e99 100644
@@ -79,6 +79,7 @@ config DISTRO_DEFAULTS
 	select CMDLINE_EDITING
 	select CMD_BOOTI if ARM64
 	select CMD_BOOTZ if ARM && !ARM64
+	select CMD_BTRFS if !RISCV
 	select CMD_DHCP if CMD_NET
 	select CMD_ENV_EXISTS
 	select CMD_EXT2
Signature · 1 line
2.24.0
#1 lore raw

PATCH v2 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 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
#2 lore raw

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

In reply to matthias.bgg at kernel.org
Quoted 22 lines · On Wed, Jan 15, 2020 at 9:55 AM <[email protected]> wrote:

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 v2:
- disable default btrfs support riscv

 Kconfig | 1 +
 1 file changed, 1 insertion(+)
Kconfig +0 -0
index 99cc56f3c2..f0abf91e99 100644

Kconfig config DISTRO_DEFAULTS · line 82

Quoted 4 lines
Kconfig +1 -0
@@ -79,6 +79,7 @@ config DISTRO_DEFAULTS
        select CMDLINE_EDITING
        select CMD_BOOTI if ARM64
        select CMD_BOOTZ if ARM && !ARM64
+       select CMD_BTRFS if !RISCV

Any chance this could be done with 'imply' instead of 'select' to give people the ability to turn it off if they want?

Kconfig config DISTRO_DEFAULTS

Quoted 4 lines
Kconfig +0 -1
        select CMD_DHCP if CMD_NET
        select CMD_ENV_EXISTS
        select CMD_EXT2
--

adam

Quoted 2 lines

2.24.0

#3 lore raw

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

Quoted 18 lines · Adam Ford
Quoted 17 lines · On Wed, Jan 15, 2020 at 9:55 AM <[email protected]> wrote:

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 v2:
- disable default btrfs support riscv

 Kconfig | 1 +
 1 file changed, 1 insertion(+)
Quoted 13 lines

Kconfig config DISTRO_DEFAULTS · line 82

Quoted 9 lines
Kconfig +1 -0
index 99cc56f3c2..f0abf91e99 100644
@@ -79,6 +79,7 @@ config DISTRO_DEFAULTS
        select CMDLINE_EDITING
        select CMD_BOOTI if ARM64
        select CMD_BOOTZ if ARM && !ARM64
+       select CMD_BTRFS if !RISCV

Any chance this could be done with 'imply' instead of 'select' to give people the ability to turn it off if they want?

Sounds reasonable. I'll change that in v3.

Thanks for the feedback!

Matthias