We plan to enable device tree in SPL by default. Before doing this,
explicitly disable it for all boards.
Signed-off-by: Simon Glass s...@chromium.org
---
Changes in v2: None
arch/arm/Kconfig | 2 ++
arch/arm/cpu/armv7/exynos/Kconfig| 8
arch/arm/cpu/armv7/s5pc1xx/Kconfig | 2 ++
arch/arm/mach-tegra/Kconfig | 3 +++
configs/am335x_boneblack_vboot_defconfig | 1 +
configs/arches_defconfig | 1 +
configs/canyonlands_defconfig| 1 +
configs/galileo_defconfig| 1 +
configs/microblaze-generic_defconfig | 1 +
configs/odroid_defconfig | 1 +
configs/origen_defconfig | 1 +
configs/s5pc210_universal_defconfig | 1 +
configs/socfpga_socrates_defconfig | 1 +
configs/trats2_defconfig | 1 +
configs/trats_defconfig | 1 +
configs/zynq_microzed_defconfig | 1 +
configs/zynq_zc70x_defconfig | 1 +
configs/zynq_zc770_xm010_defconfig | 1 +
configs/zynq_zc770_xm012_defconfig | 1 +
configs/zynq_zc770_xm013_defconfig | 1 +
configs/zynq_zed_defconfig | 1 +
configs/zynq_zybo_defconfig | 1 +
22 files changed, 33 insertions(+)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index cee3126..c85c728 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -666,6 +666,7 @@ config TEGRA
select SUPPORT_SPL
select SPL
select OF_CONTROL
+ select SPL_DISABLE_OF_CONTROL
select CPU_V7
select DM
select DM_SPI_FLASH
@@ -792,6 +793,7 @@ config ARCH_UNIPHIER
select DM
select DM_SERIAL
select DM_I2C
+ select SPL_DISABLE_OF_CONTROL
config TARGET_STM32F429_DISCOVERY
bool Support STM32F429 Discovery
diff --git a/arch/arm/cpu/armv7/exynos/Kconfig
b/arch/arm/cpu/armv7/exynos/Kconfig
index f6084ac..f0a6330 100644
--- a/arch/arm/cpu/armv7/exynos/Kconfig
+++ b/arch/arm/cpu/armv7/exynos/Kconfig
@@ -7,6 +7,7 @@ config TARGET_SMDKV310
select SUPPORT_SPL
bool Exynos4210 SMDKV310 board
select OF_CONTROL
+ select SPL_DISABLE_OF_CONTROL
config TARGET_TRATS
bool Exynos4210 Trats board
@@ -27,6 +28,7 @@ config TARGET_ODROID
config TARGET_ODROID_XU3
bool Exynos5422 Odroid board
select OF_CONTROL
+ select SPL_DISABLE_OF_CONTROL
config TARGET_ARNDALE
bool Exynos5250 Arndale board
@@ -34,31 +36,37 @@ config TARGET_ARNDALE
select CPU_V7_HAS_VIRT
select SUPPORT_SPL
select OF_CONTROL
+ select SPL_DISABLE_OF_CONTROL
config TARGET_SMDK5250
bool SMDK5250 board
select SUPPORT_SPL
select OF_CONTROL
+ select SPL_DISABLE_OF_CONTROL
config TARGET_SNOW
bool Snow board
select SUPPORT_SPL
select OF_CONTROL
+ select SPL_DISABLE_OF_CONTROL
config TARGET_SMDK5420
bool SMDK5420 board
select SUPPORT_SPL
select OF_CONTROL
+ select SPL_DISABLE_OF_CONTROL
config TARGET_PEACH_PI
bool Peach Pi board
select SUPPORT_SPL
select OF_CONTROL
+ select SPL_DISABLE_OF_CONTROL
config TARGET_PEACH_PIT
bool Peach Pit board
select SUPPORT_SPL
select OF_CONTROL
+ select SPL_DISABLE_OF_CONTROL
endchoice
diff --git a/arch/arm/cpu/armv7/s5pc1xx/Kconfig
b/arch/arm/cpu/armv7/s5pc1xx/Kconfig
index bc73813..65cc9eb 100644
--- a/arch/arm/cpu/armv7/s5pc1xx/Kconfig
+++ b/arch/arm/cpu/armv7/s5pc1xx/Kconfig
@@ -6,10 +6,12 @@ choice
config TARGET_S5P_GONI
bool S5P Goni board
select OF_CONTROL
+ select SPL_DISABLE_OF_CONTROL
config TARGET_SMDKC100
bool Support smdkc100 board
select OF_CONTROL
+ select SPL_DISABLE_OF_CONTROL
endchoice
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 8bab594..36e7389 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -26,6 +26,9 @@ config USE_PRIVATE_LIBGCC
config SPL_DM
default y
+config SPL_DISABLE_OF_CONTROL
+ default y
+
source arch/arm/mach-tegra/tegra20/Kconfig
source arch/arm/mach-tegra/tegra30/Kconfig
source arch/arm/mach-tegra/tegra114/Kconfig
diff --git a/configs/am335x_boneblack_vboot_defconfig
b/configs/am335x_boneblack_vboot_defconfig
index e4ffe5f..df36a32 100644
--- a/configs/am335x_boneblack_vboot_defconfig
+++ b/configs/am335x_boneblack_vboot_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_EXTRA_OPTIONS=EMMC_BOOT,ENABLE_VBOOT
CONFIG_ARM=y
CONFIG_TARGET_AM335X_EVM=y
CONFIG_OF_CONTROL=y
+CONFIG_SPL_DISABLE_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE=am335x-boneblack
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
diff --git a/configs/arches_defconfig b/configs/arches_defconfig
index 30c6932..2af8446 100644
--- a/configs/arches_defconfig
+++ b/configs/arches_defconfig
@@ -4,4 +4,5 @@ CONFIG_TARGET_CANYONLANDS=y
CONFIG_ARCHES=y
