7140a173ad
Fix Grub loading slowdown when connecting USB keyboard (bsc#1171222). Enable BTRFS for Risc-V. Patch queue updated from https://github.com/openSUSE/u-boot.git tumbleweed-2021.10 * Patches added: 0013-riscv-enable-CMD_BTRFS.patch 0014-Disable-timer-check-in-file-loading.patch OBS-URL: https://build.opensuse.org/request/show/922977 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=152
78 lines
2.5 KiB
Diff
78 lines
2.5 KiB
Diff
From 7834a28a8e0dcffb3fecddaaa85a7759582e55d4 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 f7098b49698..09bf1f8eb39 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 ea08a9e5bd1..ec19587e82e 100644
|
|
--- a/configs/sandbox_defconfig
|
|
+++ b/configs/sandbox_defconfig
|
|
@@ -99,7 +99,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/socfpga_arria10_defconfig b/configs/socfpga_arria10_defconfig
|
|
index ef9bbb9c3ac..c4ddbcc6128 100644
|
|
--- a/configs/socfpga_arria10_defconfig
|
|
+++ b/configs/socfpga_arria10_defconfig
|
|
@@ -53,3 +53,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 9a9102430e6..dca076bf4b1 100644
|
|
--- a/configs/turris_mox_defconfig
|
|
+++ b/configs/turris_mox_defconfig
|
|
@@ -44,7 +44,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 a724a1baa16..1695a99f308 100644
|
|
--- a/configs/turris_omnia_defconfig
|
|
+++ b/configs/turris_omnia_defconfig
|
|
@@ -54,7 +54,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
|