[PATCH v2 1/2] Kconfig: add btrfs to distro boot
From: Matthias Brugger mbrugger@suse.com
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.
Signed-off-by: Matthias Brugger mbrugger@suse.com
---
Changes in v2: - disable default btrfs support riscv
Kconfig | 1 + 1 file changed, 1 insertion(+)
diff --git a/Kconfig b/Kconfig index 99cc56f3c2..f0abf91e99 100644 --- a/Kconfig +++ b/Kconfig @@ -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
From: Matthias Brugger mbrugger@suse.com
CONFIG_DISTRO_DEFAULTS now enables CMD_BTRFS by default, we can delete the config option in the corresponding default configs.
Signed-off-by: Matthias Brugger mbrugger@suse.com
---
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(-)
diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig index 64d1d3102f..0826c06aa9 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 d8d8645425..f2d5572f99 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/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
On Wed, Jan 15, 2020 at 9:55 AM matthias.bgg@kernel.org wrote:
From: Matthias Brugger mbrugger@suse.com
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.
Signed-off-by: Matthias Brugger mbrugger@suse.com
Changes in v2:
- disable default btrfs support riscv
Kconfig | 1 + 1 file changed, 1 insertion(+)
diff --git a/Kconfig b/Kconfig index 99cc56f3c2..f0abf91e99 100644 --- a/Kconfig +++ b/Kconfig @@ -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?
select CMD_DHCP if CMD_NET select CMD_ENV_EXISTS select CMD_EXT2--
adam
2.24.0
On 15/01/2020 17:07, Adam Ford wrote:
On Wed, Jan 15, 2020 at 9:55 AM matthias.bgg@kernel.org wrote:
From: Matthias Brugger mbrugger@suse.com
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.
Signed-off-by: Matthias Brugger mbrugger@suse.com
Changes in v2:
- disable default btrfs support riscv
Kconfig | 1 + 1 file changed, 1 insertion(+)
diff --git a/Kconfig b/Kconfig index 99cc56f3c2..f0abf91e99 100644 --- a/Kconfig +++ b/Kconfig @@ -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 !RISCVAny 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
participants (3)
-
Adam Ford -
Matthias Brugger -
matthias.bgg＠kernel.org