e32bbea07e
- Update to 2022.07 - Update to 2022.07-rc6 - Drop obsolete 0015-mx6qsabrelite-Enable-DM_ETH-to-re-e.patch - Add rbrom command to enter mask rom on Rockchip devices + 0015-cmd-boot-add-brom-cmd-to-reboot-to-.patch - Add rbrom command to enter mask rom on Allwinner devices + 0016-cmd-boot-add-brom-cmd-to-reboot-to-.patch - ATF is required to boot rk3399. Do not build without it (boo#1201120). OBS-URL: https://build.opensuse.org/request/show/988566 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=168
78 lines
2.5 KiB
Diff
78 lines
2.5 KiB
Diff
From 05708a723c33b9b7fee5747222bc95eb73d8f928 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 d7f22b39ae..2aff3f5850 100644
|
|
--- a/configs/sandbox64_defconfig
|
|
+++ b/configs/sandbox64_defconfig
|
|
@@ -77,7 +77,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 c509a924e6..e941b68c71 100644
|
|
--- a/configs/sandbox_defconfig
|
|
+++ b/configs/sandbox_defconfig
|
|
@@ -104,7 +104,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_EROFS=y
|
|
diff --git a/configs/socfpga_arria10_defconfig b/configs/socfpga_arria10_defconfig
|
|
index 1be9a2df08..d7fa785534 100644
|
|
--- a/configs/socfpga_arria10_defconfig
|
|
+++ b/configs/socfpga_arria10_defconfig
|
|
@@ -57,3 +57,5 @@ CONFIG_DESIGNWARE_APB_TIMER=y
|
|
CONFIG_USB=y
|
|
CONFIG_USB_DWC2=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 c1bd1de4a9..fdad1dccdf 100644
|
|
--- a/configs/turris_mox_defconfig
|
|
+++ b/configs/turris_mox_defconfig
|
|
@@ -48,7 +48,6 @@ CONFIG_CMD_TIME=y
|
|
CONFIG_CMD_MVEBU_BUBT=y
|
|
CONFIG_CMD_AES=y
|
|
CONFIG_CMD_HASH=y
|
|
-CONFIG_CMD_BTRFS=y
|
|
CONFIG_CMD_EXT4_WRITE=y
|
|
CONFIG_MAC_PARTITION=y
|
|
CONFIG_ENV_OVERWRITE=y
|
|
diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig
|
|
index da94ca74ac..b8dd666394 100644
|
|
--- a/configs/turris_omnia_defconfig
|
|
+++ b/configs/turris_omnia_defconfig
|
|
@@ -59,7 +59,6 @@ CONFIG_CMD_CACHE=y
|
|
CONFIG_CMD_TIME=y
|
|
CONFIG_CMD_AES=y
|
|
CONFIG_CMD_HASH=y
|
|
-CONFIG_CMD_BTRFS=y
|
|
CONFIG_CMD_FS_UUID=y
|
|
# CONFIG_SPL_PARTITION_UUIDS is not set
|
|
CONFIG_ENV_OVERWRITE=y
|