Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dts: Disable device tree for SPL on all boards

Browse Source 
We plan to enable device tree in SPL by default. Before doing this,
explicitly disable it for all boards.

Signed-off-by: Simon Glass <sjg@chromium.org>
master
Simon Glass 10 years ago
parent b65d5209b3
commit 47a785a9dd
22 changed files with 33 additions and 0 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      arch/arm/Kconfig
  2. 8
      arch/arm/cpu/armv7/exynos/Kconfig
  3. 2
      arch/arm/cpu/armv7/s5pc1xx/Kconfig
  4. 3
      arch/arm/mach-tegra/Kconfig
  5. 1
      configs/am335x_boneblack_vboot_defconfig
  6. 1
      configs/arches_defconfig
  7. 1
      configs/canyonlands_defconfig
  8. 1
      configs/galileo_defconfig
  9. 1
      configs/microblaze-generic_defconfig
  10. 1
      configs/odroid_defconfig
  11. 1
      configs/origen_defconfig
  12. 1
      configs/s5pc210_universal_defconfig
  13. 1
      configs/socfpga_socrates_defconfig
  14. 1
      configs/trats2_defconfig
  15. 1
      configs/trats_defconfig
  16. 1
      configs/zynq_microzed_defconfig
  17. 1
      configs/zynq_zc70x_defconfig
  18. 1
      configs/zynq_zc770_xm010_defconfig
  19. 1
      configs/zynq_zc770_xm012_defconfig
  20. 1
      configs/zynq_zc770_xm013_defconfig
  21. 1
      configs/zynq_zed_defconfig
  22. 1
      configs/zynq_zybo_defconfig

2
arch/arm/Kconfig
Unescape View File

@ -668,6 +668,7 @@ config TEGRA
select SUPPORT_SPL select SUPPORT_SPL
select SPL select SPL
select OF_CONTROL select OF_CONTROL
select SPL_DISABLE_OF_CONTROL
select CPU_V7 select CPU_V7
select DM select DM
select DM_SPI_FLASH select DM_SPI_FLASH
@ -794,6 +795,7 @@ config ARCH_UNIPHIER
select DM select DM
select DM_SERIAL select DM_SERIAL
select DM_I2C select DM_I2C
select SPL_DISABLE_OF_CONTROL
help help
Support for UniPhier SoC family developed by Socionext Inc. Support for UniPhier SoC family developed by Socionext Inc.
(formerly, System LSI Business Division of Panasonic Corporation) (formerly, System LSI Business Division of Panasonic Corporation)

8
arch/arm/cpu/armv7/exynos/Kconfig
Unescape View File

@ -8,6 +8,7 @@ config TARGET_SMDKV310
select SUPPORT_SPL select SUPPORT_SPL
bool "Exynos4210 SMDKV310 board" bool "Exynos4210 SMDKV310 board"
select OF_CONTROL select OF_CONTROL
select SPL_DISABLE_OF_CONTROL
config TARGET_TRATS config TARGET_TRATS
bool "Exynos4210 Trats board" bool "Exynos4210 Trats board"
@ -28,6 +29,7 @@ config TARGET_ODROID
config TARGET_ODROID_XU3 config TARGET_ODROID_XU3
bool "Exynos5422 Odroid board" bool "Exynos5422 Odroid board"
select OF_CONTROL select OF_CONTROL
select SPL_DISABLE_OF_CONTROL
config TARGET_ARNDALE config TARGET_ARNDALE
bool "Exynos5250 Arndale board" bool "Exynos5250 Arndale board"
@ -35,31 +37,37 @@ config TARGET_ARNDALE
select CPU_V7_HAS_VIRT select CPU_V7_HAS_VIRT
select SUPPORT_SPL select SUPPORT_SPL
select OF_CONTROL select OF_CONTROL
select SPL_DISABLE_OF_CONTROL
config TARGET_SMDK5250 config TARGET_SMDK5250
bool "SMDK5250 board" bool "SMDK5250 board"
select SUPPORT_SPL select SUPPORT_SPL
select OF_CONTROL select OF_CONTROL
select SPL_DISABLE_OF_CONTROL
config TARGET_SNOW config TARGET_SNOW
bool "Snow board" bool "Snow board"
select SUPPORT_SPL select SUPPORT_SPL
select OF_CONTROL select OF_CONTROL
select SPL_DISABLE_OF_CONTROL
config TARGET_SMDK5420 config TARGET_SMDK5420
bool "SMDK5420 board" bool "SMDK5420 board"
select SUPPORT_SPL select SUPPORT_SPL
select OF_CONTROL select OF_CONTROL
select SPL_DISABLE_OF_CONTROL
config TARGET_PEACH_PI config TARGET_PEACH_PI
bool "Peach Pi board" bool "Peach Pi board"
select SUPPORT_SPL select SUPPORT_SPL
select OF_CONTROL select OF_CONTROL
select SPL_DISABLE_OF_CONTROL
config TARGET_PEACH_PIT config TARGET_PEACH_PIT
bool "Peach Pit board" bool "Peach Pit board"
select SUPPORT_SPL select SUPPORT_SPL
select OF_CONTROL select OF_CONTROL
select SPL_DISABLE_OF_CONTROL
endchoice endchoice

2
arch/arm/cpu/armv7/s5pc1xx/Kconfig
Unescape View File

@ -7,10 +7,12 @@ choice
config TARGET_S5P_GONI config TARGET_S5P_GONI
bool "S5P Goni board" bool "S5P Goni board"
select OF_CONTROL select OF_CONTROL
select SPL_DISABLE_OF_CONTROL
config TARGET_SMDKC100 config TARGET_SMDKC100
bool "Support smdkc100 board" bool "Support smdkc100 board"
select OF_CONTROL select OF_CONTROL
select SPL_DISABLE_OF_CONTROL
endchoice endchoice

3
arch/arm/mach-tegra/Kconfig
Unescape View File

@ -30,6 +30,9 @@ config DM_USB
config SPL_DM config SPL_DM
default y default y
config SPL_DISABLE_OF_CONTROL
default y
source "arch/arm/mach-tegra/tegra20/Kconfig" source "arch/arm/mach-tegra/tegra20/Kconfig"
source "arch/arm/mach-tegra/tegra30/Kconfig" source "arch/arm/mach-tegra/tegra30/Kconfig"
source "arch/arm/mach-tegra/tegra114/Kconfig" source "arch/arm/mach-tegra/tegra114/Kconfig"

1
configs/am335x_boneblack_vboot_defconfig
Unescape View File

@ -1,5 +1,6 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_TARGET_AM335X_EVM=y CONFIG_TARGET_AM335X_EVM=y
CONFIG_SPL_DISABLE_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="am335x-boneblack" CONFIG_DEFAULT_DEVICE_TREE="am335x-boneblack"
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R=y

1
configs/arches_defconfig
Unescape View File

@ -6,3 +6,4 @@ CONFIG_DEFAULT_DEVICE_TREE="arches"
CONFIG_CMD_SETEXPR=y CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y CONFIG_CMD_NET=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_SPL_DISABLE_OF_CONTROL=y

1
configs/canyonlands_defconfig
Unescape View File

@ -6,4 +6,5 @@ CONFIG_DEFAULT_DEVICE_TREE="canyonlands"
CONFIG_CMD_SETEXPR=y CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y CONFIG_CMD_NET=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_SPL_DISABLE_OF_CONTROL=y
CONFIG_OF_EMBED=y CONFIG_OF_EMBED=y

1
configs/galileo_defconfig
Unescape View File

@ -5,5 +5,6 @@ CONFIG_DEFAULT_DEVICE_TREE="galileo"
CONFIG_TARGET_GALILEO=y CONFIG_TARGET_GALILEO=y
CONFIG_CMD_NET=y CONFIG_CMD_NET=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_SPL_DISABLE_OF_CONTROL=y
CONFIG_ETH_DESIGNWARE=y CONFIG_ETH_DESIGNWARE=y
CONFIG_GENERATE_PIRQ_TABLE=y CONFIG_GENERATE_PIRQ_TABLE=y

1
configs/microblaze-generic_defconfig
Unescape View File

@ -4,4 +4,5 @@ CONFIG_DEFAULT_DEVICE_TREE="microblaze-generic"
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_CMD_NET=y CONFIG_CMD_NET=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_SPL_DISABLE_OF_CONTROL=y
CONFIG_OF_EMBED=y CONFIG_OF_EMBED=y

1
configs/odroid_defconfig
Unescape View File

@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_ARCH_EXYNOS=y CONFIG_ARCH_EXYNOS=y
CONFIG_TARGET_ODROID=y CONFIG_TARGET_ODROID=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_DISABLE_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="exynos4412-odroid" CONFIG_DEFAULT_DEVICE_TREE="exynos4412-odroid"
CONFIG_CMD_SETEXPR=y CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y CONFIG_CMD_NET=y

1
configs/origen_defconfig
Unescape View File

@ -1,6 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_EXYNOS=y CONFIG_ARCH_EXYNOS=y
CONFIG_TARGET_ORIGEN=y CONFIG_TARGET_ORIGEN=y
CONFIG_SPL_DISABLE_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="exynos4210-origen" CONFIG_DEFAULT_DEVICE_TREE="exynos4210-origen"
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_CMD_SETEXPR=y CONFIG_CMD_SETEXPR=y

1
configs/s5pc210_universal_defconfig
Unescape View File

@ -1,6 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_EXYNOS=y CONFIG_ARCH_EXYNOS=y
CONFIG_TARGET_S5PC210_UNIVERSAL=y CONFIG_TARGET_S5PC210_UNIVERSAL=y
CONFIG_SPL_DISABLE_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="exynos4210-universal_c210" CONFIG_DEFAULT_DEVICE_TREE="exynos4210-universal_c210"
CONFIG_CMD_SETEXPR=y CONFIG_CMD_SETEXPR=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y

1
configs/socfpga_socrates_defconfig
Unescape View File

@ -1,6 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_SOCFPGA=y CONFIG_ARCH_SOCFPGA=y
CONFIG_TARGET_SOCFPGA_CYCLONE5=y CONFIG_TARGET_SOCFPGA_CYCLONE5=y
CONFIG_SPL_DISABLE_OF_CONTROL=y
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates" CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates"
CONFIG_SPL=y CONFIG_SPL=y

1
configs/trats2_defconfig
Unescape View File

@ -1,6 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_EXYNOS=y CONFIG_ARCH_EXYNOS=y
CONFIG_TARGET_TRATS2=y CONFIG_TARGET_TRATS2=y
CONFIG_SPL_DISABLE_OF_CONTROL=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_DEFAULT_DEVICE_TREE="exynos4412-trats2" CONFIG_DEFAULT_DEVICE_TREE="exynos4412-trats2"
CONFIG_CMD_SETEXPR=y CONFIG_CMD_SETEXPR=y

1
configs/trats_defconfig
Unescape View File

@ -1,6 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_EXYNOS=y CONFIG_ARCH_EXYNOS=y
CONFIG_TARGET_TRATS=y CONFIG_TARGET_TRATS=y
CONFIG_SPL_DISABLE_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="exynos4210-trats" CONFIG_DEFAULT_DEVICE_TREE="exynos4210-trats"
CONFIG_CMD_SETEXPR=y CONFIG_CMD_SETEXPR=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y

1
configs/zynq_microzed_defconfig
Unescape View File

@ -4,6 +4,7 @@ CONFIG_TARGET_ZYNQ_MICROZED=y
CONFIG_DEFAULT_DEVICE_TREE="zynq-microzed" CONFIG_DEFAULT_DEVICE_TREE="zynq-microzed"
# CONFIG_SYS_MALLOC_F is not set # CONFIG_SYS_MALLOC_F is not set
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_DISABLE_OF_CONTROL=y
CONFIG_FIT=y CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
CONFIG_FIT_SIGNATURE=y CONFIG_FIT_SIGNATURE=y

1
configs/zynq_zc70x_defconfig
Unescape View File

@ -1,6 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_ZYNQ=y CONFIG_ARCH_ZYNQ=y
CONFIG_TARGET_ZYNQ_ZC70X=y CONFIG_TARGET_ZYNQ_ZC70X=y
CONFIG_SPL_DISABLE_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc702" CONFIG_DEFAULT_DEVICE_TREE="zynq-zc702"
# CONFIG_SYS_MALLOC_F is not set # CONFIG_SYS_MALLOC_F is not set
CONFIG_SPL=y CONFIG_SPL=y

1
configs/zynq_zc770_xm010_defconfig
Unescape View File

@ -1,6 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_ZYNQ=y CONFIG_ARCH_ZYNQ=y
CONFIG_TARGET_ZYNQ_ZC770=y CONFIG_TARGET_ZYNQ_ZC770=y
CONFIG_SPL_DISABLE_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm010" CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm010"
# CONFIG_SYS_MALLOC_F is not set # CONFIG_SYS_MALLOC_F is not set
CONFIG_SPL=y CONFIG_SPL=y

1
configs/zynq_zc770_xm012_defconfig
Unescape View File

@ -1,6 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_ZYNQ=y CONFIG_ARCH_ZYNQ=y
CONFIG_TARGET_ZYNQ_ZC770=y CONFIG_TARGET_ZYNQ_ZC770=y
CONFIG_SPL_DISABLE_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm012" CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm012"
# CONFIG_SYS_MALLOC_F is not set # CONFIG_SYS_MALLOC_F is not set
CONFIG_SPL=y CONFIG_SPL=y

1
configs/zynq_zc770_xm013_defconfig
Unescape View File

@ -1,6 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_ZYNQ=y CONFIG_ARCH_ZYNQ=y
CONFIG_TARGET_ZYNQ_ZC770=y CONFIG_TARGET_ZYNQ_ZC770=y
CONFIG_SPL_DISABLE_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm013" CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm013"
# CONFIG_SYS_MALLOC_F is not set # CONFIG_SYS_MALLOC_F is not set
CONFIG_SPL=y CONFIG_SPL=y

1
configs/zynq_zed_defconfig
Unescape View File

@ -1,6 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_ZYNQ=y CONFIG_ARCH_ZYNQ=y
CONFIG_TARGET_ZYNQ_ZED=y CONFIG_TARGET_ZYNQ_ZED=y
CONFIG_SPL_DISABLE_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="zynq-zed" CONFIG_DEFAULT_DEVICE_TREE="zynq-zed"
# CONFIG_SYS_MALLOC_F is not set # CONFIG_SYS_MALLOC_F is not set
CONFIG_SPL=y CONFIG_SPL=y

1
configs/zynq_zybo_defconfig
Unescape View File

@ -1,6 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_ZYNQ=y CONFIG_ARCH_ZYNQ=y
CONFIG_TARGET_ZYNQ_ZYBO=y CONFIG_TARGET_ZYNQ_ZYBO=y
CONFIG_SPL_DISABLE_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="zynq-zybo" CONFIG_DEFAULT_DEVICE_TREE="zynq-zybo"
# CONFIG_SYS_MALLOC_F is not set # CONFIG_SYS_MALLOC_F is not set
CONFIG_SPL=y CONFIG_SPL=y

Write Preview
Loading…
Cancel
Save