diff options
| author | Joe Hershberger <joe.hershberger@ni.com> | 2015-06-22 16:15:29 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-06-25 22:17:55 -0400 |
| commit | c9bb942e2f91d9f8e5f25ed1961eba2d64f65b8d (patch) | |
| tree | 727c74825b6b09abddfb19b1ab7232e1d02d068c /configs/zynq_zybo_defconfig | |
| parent | 3c85c8b9f91334b001837123ffaba0a17cde51eb (diff) | |
| download | u-boot-imx-c9bb942e2f91d9f8e5f25ed1961eba2d64f65b8d.zip u-boot-imx-c9bb942e2f91d9f8e5f25ed1961eba2d64f65b8d.tar.gz u-boot-imx-c9bb942e2f91d9f8e5f25ed1961eba2d64f65b8d.tar.bz2 | |
Move default y configs out of arch/board Kconfig
Some archs/boards specify their own default by pre-defining the config
which causes the Kconfig system to mix up the order of the configs in
the defconfigs... This will cause merge pain if allowed to proliferate.
Remove the configs that behave this way from the archs.
A few configs still remain, but that is because they only exist as
defaults and do not have a proper Kconfig entry. Those appear to be:
SPIFLASH
DISPLAY_BOARDINFO
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
[trini: rastaban, am43xx_evm_usbhost_boot, am43xx_evm_ethboot updates,
drop DM_USB from MSI_Primo81 as USB_MUSB_SUNXI isn't converted yet to DM]
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'configs/zynq_zybo_defconfig')
| -rw-r--r-- | configs/zynq_zybo_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig index 1849c74..fcfd543 100644 --- a/configs/zynq_zybo_defconfig +++ b/configs/zynq_zybo_defconfig @@ -1,7 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_ZYNQ=y CONFIG_TARGET_ZYNQ_ZYBO=y -CONFIG_SPL_DISABLE_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="zynq-zybo" # CONFIG_SYS_MALLOC_F is not set CONFIG_SPL=y @@ -10,3 +9,4 @@ CONFIG_FIT_VERBOSE=y CONFIG_FIT_SIGNATURE=y CONFIG_CMD_NET=y CONFIG_OF_CONTROL=y +CONFIG_SPL_DISABLE_OF_CONTROL=y |