summaryrefslogtreecommitdiff
path: root/include/configs/nitrogen6x.h
diff options
context:
space:
mode:
authorJoe Hershberger <joe.hershberger@ni.com>2015-06-22 16:15:29 -0500
committerTom Rini <trini@konsulko.com>2015-06-25 22:17:55 -0400
commitc9bb942e2f91d9f8e5f25ed1961eba2d64f65b8d (patch)
tree727c74825b6b09abddfb19b1ab7232e1d02d068c /include/configs/nitrogen6x.h
parent3c85c8b9f91334b001837123ffaba0a17cde51eb (diff)
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 'include/configs/nitrogen6x.h')
-rw-r--r--include/configs/nitrogen6x.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index beaa11932c..67a3c97f8b 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -36,7 +36,6 @@
#define CONFIG_CMD_SF
#ifdef CONFIG_CMD_SF
-#define CONFIG_SPI_FLASH
#define CONFIG_SPI_FLASH_SST
#define CONFIG_MXC_SPI
#define CONFIG_SF_DEFAULT_BUS 0