redonkable
/
remarkable-uboot
1
0
Fork 0
Code Releases Activity

of: flip CONFIG_SPL_DISABLE_OF_CONTROL into CONFIG_SPL_OF_CONTROL 

As we discussed a couple of times, negative CONFIG options make our
life difficult; CONFIG_SYS_NO_FLASH, CONFIG_SYS_DCACHE_OFF, ...
and here is another one.

Now, there are three boards enabling OF_CONTROL on SPL:
 - socfpga_arria5_defconfig
 - socfpga_cyclone5_defconfig
 - socfpga_socrates_defconfig

This commit adds CONFIG_SPL_OF_CONTROL for them and deletes
CONFIG_SPL_DISABLE_OF_CONTROL from the other boards to invert
the logic.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
utp
Masahiro Yamada 2015-08-12 07:31:54 +09:00 committed by Tom Rini
parent cc7aebe819
commit dffb86e468
23 changed files with 17 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/Kconfig
View File

@ -658,7 +658,6 @@ config ARCH_SUNXI
select DM_USB select DM_USB
select OF_CONTROL select OF_CONTROL
select OF_SEPARATE select OF_SEPARATE
select SPL_DISABLE_OF_CONTROL
select USB select USB
select USB_STORAGE select USB_STORAGE
select USB_KEYBOARD select USB_KEYBOARD
@ -684,7 +683,6 @@ config ARCH_ZYNQ
select CPU_V7 select CPU_V7
select SUPPORT_SPL select SUPPORT_SPL
select OF_CONTROL select OF_CONTROL
select SPL_DISABLE_OF_CONTROL
select DM select DM
select DM_SPI select DM_SPI
select DM_SPI_FLASH select DM_SPI_FLASH
@ -821,7 +819,6 @@ 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)

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

@ -7,12 +7,10 @@ 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

8
arch/arm/mach-exynos/Kconfig
View File

@ -8,7 +8,6 @@ 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"
@ -29,7 +28,6 @@ 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"
@ -37,19 +35,16 @@ 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_SPRING config TARGET_SPRING
bool "Spring board" bool "Spring board"
@ -61,19 +56,16 @@ 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

1
arch/arm/mach-tegra/Kconfig
View File

@ -5,7 +5,6 @@ config TEGRA_ARMV7_COMMON
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

2
common/spl/spl.c
View File

@ -158,7 +158,7 @@ int spl_init(void)
gd->malloc_ptr = 0; gd->malloc_ptr = 0;
#endif #endif
if (IS_ENABLED(CONFIG_OF_CONTROL) && if (IS_ENABLED(CONFIG_OF_CONTROL) &&
!IS_ENABLED(CONFIG_SPL_DISABLE_OF_CONTROL)) { IS_ENABLED(CONFIG_SPL_OF_CONTROL)) {
ret = fdtdec_setup(); ret = fdtdec_setup();
if (ret) { if (ret) {
debug("fdtdec_setup() returned error %d\n", ret); debug("fdtdec_setup() returned error %d\n", ret);

1
configs/am335x_boneblack_vboot_defconfig
View File

@ -12,5 +12,4 @@ CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT,ENABLE_VBOOT"
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_SPL_DISABLE_OF_CONTROL=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y

1
configs/arches_defconfig
View File

@ -4,4 +4,3 @@ CONFIG_TARGET_CANYONLANDS=y
CONFIG_ARCHES=y CONFIG_ARCHES=y
CONFIG_DEFAULT_DEVICE_TREE="arches" CONFIG_DEFAULT_DEVICE_TREE="arches"
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_SPL_DISABLE_OF_CONTROL=y

1
configs/canyonlands_defconfig
View File

@ -4,5 +4,4 @@ CONFIG_TARGET_CANYONLANDS=y
CONFIG_CANYONLANDS=y CONFIG_CANYONLANDS=y
CONFIG_DEFAULT_DEVICE_TREE="canyonlands" CONFIG_DEFAULT_DEVICE_TREE="canyonlands"
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
View File

@ -11,7 +11,6 @@ CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y CONFIG_BOOTSTAGE_REPORT=y
CONFIG_CMD_BOOTSTAGE=y CONFIG_CMD_BOOTSTAGE=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_SPL_DISABLE_OF_CONTROL=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_ETH_DESIGNWARE=y CONFIG_ETH_DESIGNWARE=y

1
configs/microblaze-generic_defconfig
View File

@ -4,6 +4,5 @@ CONFIG_DEFAULT_DEVICE_TREE="microblaze-generic"
CONFIG_SPL=y CONFIG_SPL=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_SPL_DISABLE_OF_CONTROL=y
CONFIG_OF_EMBED=y CONFIG_OF_EMBED=y
CONFIG_SYS_PROMPT="U-Boot-mONStR> " CONFIG_SYS_PROMPT="U-Boot-mONStR> "

1
configs/odroid_defconfig
View File

@ -11,7 +11,6 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos4412-odroid"
CONFIG_CMD_PMIC=y CONFIG_CMD_PMIC=y
CONFIG_CMD_REGULATOR=y CONFIG_CMD_REGULATOR=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_SPL_DISABLE_OF_CONTROL=y
CONFIG_DM_I2C=y CONFIG_DM_I2C=y
CONFIG_DM_I2C_COMPAT=y CONFIG_DM_I2C_COMPAT=y
CONFIG_DM_PMIC=y CONFIG_DM_PMIC=y

1
configs/origen_defconfig
View File

@ -10,7 +10,6 @@ CONFIG_SPL=y
# CONFIG_CMD_NFS is not set # CONFIG_CMD_NFS is not set
# CONFIG_CMD_MISC is not set # CONFIG_CMD_MISC is not set
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_SPL_DISABLE_OF_CONTROL=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_DM_USB=y CONFIG_DM_USB=y
CONFIG_SYS_PROMPT="ORIGEN # " CONFIG_SYS_PROMPT="ORIGEN # "

1
configs/s5pc210_universal_defconfig
View File

@ -9,7 +9,6 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos4210-universal_c210"
# CONFIG_CMD_NFS is not set # CONFIG_CMD_NFS is not set
# CONFIG_CMD_MISC is not set # CONFIG_CMD_MISC is not set
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_SPL_DISABLE_OF_CONTROL=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_DM_USB=y CONFIG_DM_USB=y
CONFIG_SYS_PROMPT="Universal # " CONFIG_SYS_PROMPT="Universal # "

1
configs/socfpga_arria5_defconfig
View File

@ -6,6 +6,7 @@ CONFIG_SPL=y
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_SPL_DM=y CONFIG_SPL_DM=y
CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y

1
configs/socfpga_cyclone5_defconfig
View File

@ -6,6 +6,7 @@ CONFIG_SPL=y
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y

1
configs/socfpga_socrates_defconfig
View File

@ -6,6 +6,7 @@ CONFIG_SPL=y
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y

1
configs/trats2_defconfig
View File

@ -10,7 +10,6 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos4412-trats2"
# CONFIG_CMD_NFS is not set # CONFIG_CMD_NFS is not set
# CONFIG_CMD_MISC is not set # CONFIG_CMD_MISC is not set
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_SPL_DISABLE_OF_CONTROL=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_DM_USB=y CONFIG_DM_USB=y
CONFIG_SYS_PROMPT="Trats2 # " CONFIG_SYS_PROMPT="Trats2 # "

1
configs/trats_defconfig
View File

@ -9,7 +9,6 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos4210-trats"
# CONFIG_CMD_NFS is not set # CONFIG_CMD_NFS is not set
# CONFIG_CMD_MISC is not set # CONFIG_CMD_MISC is not set
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_SPL_DISABLE_OF_CONTROL=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_DM_USB=y CONFIG_DM_USB=y
CONFIG_SYS_PROMPT="Trats # " CONFIG_SYS_PROMPT="Trats # "

6
dts/Kconfig
View File

@ -14,9 +14,9 @@ config OF_CONTROL
This feature provides for run-time configuration of U-Boot This feature provides for run-time configuration of U-Boot
via a flattened device tree. via a flattened device tree.
config SPL_DISABLE_OF_CONTROL config SPL_OF_CONTROL
bool "Disable run-time configuration via Device Tree in SPL" bool "Enable run-time configuration via Device Tree in SPL"
depends on OF_CONTROL depends on SPL && OF_CONTROL
help help
Some boards use device tree in U-Boot but only have 4KB of SRAM Some boards use device tree in U-Boot but only have 4KB of SRAM
which is not enough to support device tree. Enable this option to which is not enough to support device tree. Enable this option to

2
include/config_uncmd_spl.h
View File

@ -20,7 +20,7 @@
#undef CONFIG_CMD_SNTP #undef CONFIG_CMD_SNTP
#undef CONFIG_CMD_TFTPPUT #undef CONFIG_CMD_TFTPPUT
#undef CONFIG_CMD_TFTPSRV #undef CONFIG_CMD_TFTPSRV
#ifdef CONFIG_SPL_DISABLE_OF_CONTROL #ifndef CONFIG_SPL_OF_CONTROL
#undef CONFIG_OF_CONTROL #undef CONFIG_OF_CONTROL
#endif #endif

2
include/fdtdec.h
View File

@ -46,7 +46,7 @@ struct fdt_memory {
#endif #endif
#ifdef CONFIG_OF_CONTROL #ifdef CONFIG_OF_CONTROL
# if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_DISABLE_OF_CONTROL) # if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_OF_CONTROL)
# define OF_CONTROL 0 # define OF_CONTROL 0
# else # else
# define OF_CONTROL 1 # define OF_CONTROL 1

8
lib/Makefile
View File

@ -49,7 +49,13 @@ obj-$(CONFIG_BITREVERSE) += bitrev.o
obj-y += list_sort.o obj-y += list_sort.o
endif endif
ifndef CONFIG_SPL_DISABLE_OF_CONTROL ifndef CONFIG_SPL_BUILD
obj-$(CONFIG_OF_LIBFDT) += libfdt/
obj-$(CONFIG_OF_CONTROL) += fdtdec_common.o
obj-$(CONFIG_OF_CONTROL) += fdtdec.o
endif
ifdef CONFIG_SPL_OF_CONTROL
obj-$(CONFIG_OF_LIBFDT) += libfdt/ obj-$(CONFIG_OF_LIBFDT) += libfdt/
obj-$(CONFIG_OF_CONTROL) += fdtdec_common.o obj-$(CONFIG_OF_CONTROL) += fdtdec_common.o
obj-$(CONFIG_OF_CONTROL) += fdtdec.o obj-$(CONFIG_OF_CONTROL) += fdtdec.o

2
scripts/Makefile.uncmd_spl
View File

@ -3,7 +3,7 @@
# TODO: Invent a better way # TODO: Invent a better way
ifdef CONFIG_SPL_BUILD ifdef CONFIG_SPL_BUILD
ifdef CONFIG_SPL_DISABLE_OF_CONTROL ifndef CONFIG_SPL_OF_CONTROL
CONFIG_OF_CONTROL= CONFIG_OF_CONTROL=
endif endif