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/Merrii_A80_Optimus_defconfig | |
| parent | 3c85c8b9f91334b001837123ffaba0a17cde51eb (diff) | |
| download | talos-obmc-uboot-c9bb942e2f91d9f8e5f25ed1961eba2d64f65b8d.tar.gz talos-obmc-uboot-c9bb942e2f91d9f8e5f25ed1961eba2d64f65b8d.zip | |
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/Merrii_A80_Optimus_defconfig')
| -rw-r--r-- | configs/Merrii_A80_Optimus_defconfig | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/configs/Merrii_A80_Optimus_defconfig b/configs/Merrii_A80_Optimus_defconfig index 6bd5273939..4a0dce78b8 100644 --- a/configs/Merrii_A80_Optimus_defconfig +++ b/configs/Merrii_A80_Optimus_defconfig @@ -1,11 +1,18 @@ -CONFIG_DEFAULT_DEVICE_TREE="sun9i-a80-optimus" -CONFIG_VIDEO=n -CONFIG_USB_KEYBOARD=n -CONFIG_MMC0_CD_PIN="PH18" CONFIG_ARM=y CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN9I=y -# these are unused atm but we must set them to something CONFIG_DRAM_CLK=360 CONFIG_DRAM_ZQ=123 CONFIG_SYS_CLK_FREQ=1008000000 +CONFIG_MMC0_CD_PIN="PH18" +# CONFIG_VIDEO is not set +# CONFIG_USB_KEYBOARD is not set +CONFIG_DEFAULT_DEVICE_TREE="sun9i-a80-optimus" +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_CMD_SETEXPR=y +CONFIG_CMD_NET=y +CONFIG_DM_ETH=y +CONFIG_NETDEVICES=y +CONFIG_DM_SERIAL=y +CONFIG_USB=y +CONFIG_DM_USB=y |
