f99a5ed47d
Add support for Jetson Nano. (jsc#SLE-9387) Enable btrfs by default. (jsc#SLE-10302) Add network support for RPi4 (jsc#SLE-7276) * Patches added: 0010-ARM-tegra-Add-NVIDIA-Jetson-Nano-De.patch 0011-Kconfig-add-btrfs-to-distro-boot.patch 0012-configs-Re-sync-with-CONFIG_DISTRO_.patch 0013-net-Add-support-for-Broadcom-GENETv.patch 0014-rpi4-Update-memory-map-to-accommoda.patch 0015-rpi4-Enable-GENET-Ethernet-controll.patch OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=77
89 lines
2.9 KiB
Diff
89 lines
2.9 KiB
Diff
From f48a27f33d462c594a297eb315be92b43277630d Mon Sep 17 00:00:00 2001
|
|
From: Matthias Brugger <mbrugger@suse.com>
|
|
Date: Fri, 17 Jan 2020 20:59:03 +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/am335x_evm_defconfig | 2 ++
|
|
configs/sandbox64_defconfig | 1 -
|
|
configs/sandbox_defconfig | 1 -
|
|
configs/socfpga_arria10_defconfig | 2 ++
|
|
configs/turris_mox_defconfig | 1 -
|
|
configs/turris_omnia_defconfig | 1 -
|
|
6 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
|
|
index ccb11c9b2a..1894678eea 100644
|
|
--- a/configs/am335x_evm_defconfig
|
|
+++ b/configs/am335x_evm_defconfig
|
|
@@ -61,3 +61,5 @@ CONFIG_DYNAMIC_CRC_TABLE=y
|
|
CONFIG_RSA=y
|
|
CONFIG_LZO=y
|
|
# CONFIG_OF_LIBFDT_OVERLAY is not set
|
|
+# CONFIG_CMD_BTRFS is not set
|
|
+# CONFIG_FS_BTRFS is not set
|
|
diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig
|
|
index cc536ff0ba..1d625a9a84 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 64245f7cdc..95b4d06171 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/socfpga_arria10_defconfig b/configs/socfpga_arria10_defconfig
|
|
index b4826548eb..fa7a5681ec 100644
|
|
--- a/configs/socfpga_arria10_defconfig
|
|
+++ b/configs/socfpga_arria10_defconfig
|
|
@@ -50,3 +50,5 @@ CONFIG_TIMER=y
|
|
CONFIG_SPL_TIMER=y
|
|
CONFIG_DESIGNWARE_APB_TIMER=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 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
|