7f03d9189a
* Full changelog available at:
https://source.denx.de/u-boot/u-boot/-/compare/v2024.10...v2025.01
Patch queue updated from https://github.com/openSUSE/u-boot.git tumbleweed-2025.01
* Patches dropped:
0016-cmd-boot-add-brom-cmd-to-reboot-to-.patch
0017-riscv-dts-jh7110-Update-qspi-node-w.patch
0018-Revert-riscv-dts-jh7110-Update-qspi.patch
0019-scripts-dtc-pylibfdt-libfdt.i_shipp.patch
OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=227
78 lines
2.5 KiB
Diff
78 lines
2.5 KiB
Diff
From 32e24d2a705a85ba91e51823102799182a8c7166 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 7960b2ef42..ac74bdbcfb 100644
|
|
--- a/configs/sandbox64_defconfig
|
|
+++ b/configs/sandbox64_defconfig
|
|
@@ -94,7 +94,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 718e4a8283..ba0c7da4d4 100644
|
|
--- a/configs/sandbox_defconfig
|
|
+++ b/configs/sandbox_defconfig
|
|
@@ -133,7 +133,6 @@ CONFIG_CMD_AES=y
|
|
CONFIG_CMD_TPM=y
|
|
CONFIG_CMD_TPM_TEST=y
|
|
CONFIG_CMD_SCMI=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 7b3b022d20..00625d9295 100644
|
|
--- a/configs/socfpga_arria10_defconfig
|
|
+++ b/configs/socfpga_arria10_defconfig
|
|
@@ -67,3 +67,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 5ba7d76f9e..8f4341e319 100644
|
|
--- a/configs/turris_mox_defconfig
|
|
+++ b/configs/turris_mox_defconfig
|
|
@@ -48,7 +48,6 @@ CONFIG_CMD_CACHE=y
|
|
CONFIG_CMD_TIME=y
|
|
CONFIG_CMD_AES=y
|
|
CONFIG_CMD_HASH=y
|
|
-CONFIG_CMD_BTRFS=y
|
|
CONFIG_CMD_EXT4_WRITE=y
|
|
CONFIG_MAC_PARTITION=y
|
|
CONFIG_OF_LIST="armada-3720-turris-mox armada-3720-ripe-atlas"
|
|
diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig
|
|
index bdcc740714..e4b244eb45 100644
|
|
--- a/configs/turris_omnia_defconfig
|
|
+++ b/configs/turris_omnia_defconfig
|
|
@@ -79,7 +79,6 @@ CONFIG_CMD_TIME=y
|
|
CONFIG_CMD_RNG=y
|
|
CONFIG_CMD_AES=y
|
|
CONFIG_CMD_HASH=y
|
|
-CONFIG_CMD_BTRFS=y
|
|
CONFIG_CMD_FS_UUID=y
|
|
CONFIG_ENV_OVERWRITE=y
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|