Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 47a785a9dd9725e0a1981ca0ebd50b37f35f07c6

Authored by Simon Glass
1 parent b65d5209b3
Exists in v2017.01-smarct4x and in 34 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

dts: Disable device tree for SPL on all boards 

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>

Showing 22 changed files with 33 additions and 0 deletions Side-by-side Diff

... ... @@ -668,6 +668,7 @@
668 668 select SUPPORT_SPL
669 669 select SPL
670 670 select OF_CONTROL
  671 + select SPL_DISABLE_OF_CONTROL
671 672 select CPU_V7
672 673 select DM
673 674 select DM_SPI_FLASH
... ... @@ -794,6 +795,7 @@
794 795 select DM
795 796 select DM_SERIAL
796 797 select DM_I2C
  798 + select SPL_DISABLE_OF_CONTROL
797 799 help
798 800 Support for UniPhier SoC family developed by Socionext Inc.
799 801 (formerly, System LSI Business Division of Panasonic Corporation)
arch/arm/cpu/armv7/exynos/Kconfig
Diff comments   View file @ 47a785a
... ... @@ -8,6 +8,7 @@
8 8 select SUPPORT_SPL
9 9 bool "Exynos4210 SMDKV310 board"
10 10 select OF_CONTROL
  11 + select SPL_DISABLE_OF_CONTROL
11 12  
12 13 config TARGET_TRATS
13 14 bool "Exynos4210 Trats board"
... ... @@ -28,6 +29,7 @@
28 29 config TARGET_ODROID_XU3
29 30 bool "Exynos5422 Odroid board"
30 31 select OF_CONTROL
  32 + select SPL_DISABLE_OF_CONTROL
31 33  
32 34 config TARGET_ARNDALE
33 35 bool "Exynos5250 Arndale board"
34 36  
35 37  
36 38  
37 39  
38 40  
... ... @@ -35,31 +37,37 @@
35 37 select CPU_V7_HAS_VIRT
36 38 select SUPPORT_SPL
37 39 select OF_CONTROL
  40 + select SPL_DISABLE_OF_CONTROL
38 41  
39 42 config TARGET_SMDK5250
40 43 bool "SMDK5250 board"
41 44 select SUPPORT_SPL
42 45 select OF_CONTROL
  46 + select SPL_DISABLE_OF_CONTROL
43 47  
44 48 config TARGET_SNOW
45 49 bool "Snow board"
46 50 select SUPPORT_SPL
47 51 select OF_CONTROL
  52 + select SPL_DISABLE_OF_CONTROL
48 53  
49 54 config TARGET_SMDK5420
50 55 bool "SMDK5420 board"
51 56 select SUPPORT_SPL
52 57 select OF_CONTROL
  58 + select SPL_DISABLE_OF_CONTROL
53 59  
54 60 config TARGET_PEACH_PI
55 61 bool "Peach Pi board"
56 62 select SUPPORT_SPL
57 63 select OF_CONTROL
  64 + select SPL_DISABLE_OF_CONTROL
58 65  
59 66 config TARGET_PEACH_PIT
60 67 bool "Peach Pit board"
61 68 select SUPPORT_SPL
62 69 select OF_CONTROL
  70 + select SPL_DISABLE_OF_CONTROL
63 71  
64 72 endchoice
65 73  
arch/arm/cpu/armv7/s5pc1xx/Kconfig
Diff comments   View file @ 47a785a
... ... @@ -7,10 +7,12 @@
7 7 config TARGET_S5P_GONI
8 8 bool "S5P Goni board"
9 9 select OF_CONTROL
  10 + select SPL_DISABLE_OF_CONTROL
10 11  
11 12 config TARGET_SMDKC100
12 13 bool "Support smdkc100 board"
13 14 select OF_CONTROL
  15 + select SPL_DISABLE_OF_CONTROL
14 16  
15 17 endchoice
16 18  
arch/arm/mach-tegra/Kconfig
Diff comments   View file @ 47a785a
... ... @@ -30,6 +30,9 @@
30 30 config SPL_DM
31 31 default y
32 32  
  33 +config SPL_DISABLE_OF_CONTROL
  34 + default y
  35 +
33 36 source "arch/arm/mach-tegra/tegra20/Kconfig"
34 37 source "arch/arm/mach-tegra/tegra30/Kconfig"
35 38 source "arch/arm/mach-tegra/tegra114/Kconfig"
configs/am335x_boneblack_vboot_defconfig
Diff comments   View file @ 47a785a
1 1 CONFIG_ARM=y
2 2 CONFIG_TARGET_AM335X_EVM=y
  3 +CONFIG_SPL_DISABLE_OF_CONTROL=y
3 4 CONFIG_DEFAULT_DEVICE_TREE="am335x-boneblack"
4 5 CONFIG_SPL=y
5 6 CONFIG_SPL_STACK_R=y
configs/arches_defconfig
Diff comments   View file @ 47a785a
... ... @@ -6,4 +6,5 @@
6 6 CONFIG_CMD_SETEXPR=y
7 7 CONFIG_CMD_NET=y
8 8 CONFIG_OF_CONTROL=y
  9 +CONFIG_SPL_DISABLE_OF_CONTROL=y
configs/canyonlands_defconfig
Diff comments   View file @ 47a785a
... ... @@ -6,5 +6,6 @@
6 6 CONFIG_CMD_SETEXPR=y
7 7 CONFIG_CMD_NET=y
8 8 CONFIG_OF_CONTROL=y
  9 +CONFIG_SPL_DISABLE_OF_CONTROL=y
9 10 CONFIG_OF_EMBED=y
configs/galileo_defconfig
Diff comments   View file @ 47a785a
... ... @@ -5,6 +5,7 @@
5 5 CONFIG_TARGET_GALILEO=y
6 6 CONFIG_CMD_NET=y
7 7 CONFIG_OF_CONTROL=y
  8 +CONFIG_SPL_DISABLE_OF_CONTROL=y
8 9 CONFIG_ETH_DESIGNWARE=y
9 10 CONFIG_GENERATE_PIRQ_TABLE=y
configs/microblaze-generic_defconfig
Diff comments   View file @ 47a785a
... ... @@ -4,5 +4,6 @@
4 4 CONFIG_SPL=y
5 5 CONFIG_CMD_NET=y
6 6 CONFIG_OF_CONTROL=y
  7 +CONFIG_SPL_DISABLE_OF_CONTROL=y
7 8 CONFIG_OF_EMBED=y
configs/odroid_defconfig
Diff comments   View file @ 47a785a
... ... @@ -2,6 +2,7 @@
2 2 CONFIG_ARCH_EXYNOS=y
3 3 CONFIG_TARGET_ODROID=y
4 4 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
  5 +CONFIG_SPL_DISABLE_OF_CONTROL=y
5 6 CONFIG_DEFAULT_DEVICE_TREE="exynos4412-odroid"
6 7 CONFIG_CMD_SETEXPR=y
7 8 CONFIG_CMD_NET=y
configs/origen_defconfig
Diff comments   View file @ 47a785a
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_EXYNOS=y
3 3 CONFIG_TARGET_ORIGEN=y
  4 +CONFIG_SPL_DISABLE_OF_CONTROL=y
4 5 CONFIG_DEFAULT_DEVICE_TREE="exynos4210-origen"
5 6 CONFIG_SPL=y
6 7 CONFIG_CMD_SETEXPR=y
configs/s5pc210_universal_defconfig
Diff comments   View file @ 47a785a
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_EXYNOS=y
3 3 CONFIG_TARGET_S5PC210_UNIVERSAL=y
  4 +CONFIG_SPL_DISABLE_OF_CONTROL=y
4 5 CONFIG_DEFAULT_DEVICE_TREE="exynos4210-universal_c210"
5 6 CONFIG_CMD_SETEXPR=y
6 7 CONFIG_OF_CONTROL=y
configs/socfpga_socrates_defconfig
Diff comments   View file @ 47a785a
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_SOCFPGA=y
3 3 CONFIG_TARGET_SOCFPGA_CYCLONE5=y
  4 +CONFIG_SPL_DISABLE_OF_CONTROL=y
4 5 CONFIG_NETDEVICES=y
5 6 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates"
6 7 CONFIG_SPL=y
configs/trats2_defconfig
Diff comments   View file @ 47a785a
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_EXYNOS=y
3 3 CONFIG_TARGET_TRATS2=y
  4 +CONFIG_SPL_DISABLE_OF_CONTROL=y
4 5 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
5 6 CONFIG_DEFAULT_DEVICE_TREE="exynos4412-trats2"
6 7 CONFIG_CMD_SETEXPR=y
configs/trats_defconfig
Diff comments   View file @ 47a785a
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_EXYNOS=y
3 3 CONFIG_TARGET_TRATS=y
  4 +CONFIG_SPL_DISABLE_OF_CONTROL=y
4 5 CONFIG_DEFAULT_DEVICE_TREE="exynos4210-trats"
5 6 CONFIG_CMD_SETEXPR=y
6 7 CONFIG_OF_CONTROL=y
configs/zynq_microzed_defconfig
Diff comments   View file @ 47a785a
... ... @@ -4,6 +4,7 @@
4 4 CONFIG_DEFAULT_DEVICE_TREE="zynq-microzed"
5 5 # CONFIG_SYS_MALLOC_F is not set
6 6 CONFIG_SPL=y
  7 +CONFIG_SPL_DISABLE_OF_CONTROL=y
7 8 CONFIG_FIT=y
8 9 CONFIG_FIT_VERBOSE=y
9 10 CONFIG_FIT_SIGNATURE=y
configs/zynq_zc70x_defconfig
Diff comments   View file @ 47a785a
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_ZYNQ=y
3 3 CONFIG_TARGET_ZYNQ_ZC70X=y
  4 +CONFIG_SPL_DISABLE_OF_CONTROL=y
4 5 CONFIG_DEFAULT_DEVICE_TREE="zynq-zc702"
5 6 # CONFIG_SYS_MALLOC_F is not set
6 7 CONFIG_SPL=y
configs/zynq_zc770_xm010_defconfig
Diff comments   View file @ 47a785a
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_ZYNQ=y
3 3 CONFIG_TARGET_ZYNQ_ZC770=y
  4 +CONFIG_SPL_DISABLE_OF_CONTROL=y
4 5 CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm010"
5 6 # CONFIG_SYS_MALLOC_F is not set
6 7 CONFIG_SPL=y
configs/zynq_zc770_xm012_defconfig
Diff comments   View file @ 47a785a
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_ZYNQ=y
3 3 CONFIG_TARGET_ZYNQ_ZC770=y
  4 +CONFIG_SPL_DISABLE_OF_CONTROL=y
4 5 CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm012"
5 6 # CONFIG_SYS_MALLOC_F is not set
6 7 CONFIG_SPL=y
configs/zynq_zc770_xm013_defconfig
Diff comments   View file @ 47a785a
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_ZYNQ=y
3 3 CONFIG_TARGET_ZYNQ_ZC770=y
  4 +CONFIG_SPL_DISABLE_OF_CONTROL=y
4 5 CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm013"
5 6 # CONFIG_SYS_MALLOC_F is not set
6 7 CONFIG_SPL=y
configs/zynq_zed_defconfig
Diff comments   View file @ 47a785a
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_ZYNQ=y
3 3 CONFIG_TARGET_ZYNQ_ZED=y
  4 +CONFIG_SPL_DISABLE_OF_CONTROL=y
4 5 CONFIG_DEFAULT_DEVICE_TREE="zynq-zed"
5 6 # CONFIG_SYS_MALLOC_F is not set
6 7 CONFIG_SPL=y
configs/zynq_zybo_defconfig
Diff comments   View file @ 47a785a
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_ZYNQ=y
3 3 CONFIG_TARGET_ZYNQ_ZYBO=y
  4 +CONFIG_SPL_DISABLE_OF_CONTROL=y
4 5 CONFIG_DEFAULT_DEVICE_TREE="zynq-zybo"
5 6 # CONFIG_SYS_MALLOC_F is not set
6 7 CONFIG_SPL=y