summaryrefslogtreecommitdiff
path: root/include/configs/MPC8536DS.h
diff options
context:
space:
mode:
authorJoe Hershberger <joe.hershberger@ni.com>2015-06-22 21:15:29 (GMT)
committerTom Rini <trini@konsulko.com>2015-06-26 02:17:55 (GMT)
commitc9bb942e2f91d9f8e5f25ed1961eba2d64f65b8d (patch)
tree727c74825b6b09abddfb19b1ab7232e1d02d068c /include/configs/MPC8536DS.h
parent3c85c8b9f91334b001837123ffaba0a17cde51eb (diff)
downloadu-boot-c9bb942e2f91d9f8e5f25ed1961eba2d64f65b8d.tar.xz
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/MPC8536DS.h')
-rw-r--r--include/configs/MPC8536DS.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index f57afff..30d8cdc 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -50,7 +50,6 @@
#define CONFIG_MPC8536DS 1
#define CONFIG_FSL_ELBC 1 /* Has Enhanced localbus controller */
-#define CONFIG_SPI_FLASH 1 /* Has SPI Flash */
#define CONFIG_PCI 1 /* Enable PCI/PCIE */
#define CONFIG_PCI1 1 /* Enable PCI controller 1 */
#define CONFIG_PCIE1 1 /* PCIE controler 1 (slot 1) */