summaryrefslogtreecommitdiff
path: root/board/davinci
diff options
context:
space:
mode:
authorAdam Ford <aford173@gmail.com>2019-08-03 07:56:10 -0500
committerTom Rini <trini@konsulko.com>2019-08-12 13:33:42 -0400
commit51cd1e2373274dc3167dabba628dcfc25828d36d (patch)
treee215d56fa5cf717e98fe0b2c0d17f5a44f44eb23 /board/davinci
parent79bb64678c7a3476093df097d9543ca505d2d4e4 (diff)
ARM: da850-evm: Enable SPI Flash and NAND Flash when booting NOR
Historically there have been various boot options, SPI flash, NAND or NOR. The NOR flash is mutually exclusive with MMC, but it isn't mutually exclusive with NAND or SPI Flash, so this patch enables both NAND flash and SPI Flash when booting from NOR. Signed-off-by: Adam Ford <aford173@gmail.com>
Diffstat (limited to 'board/davinci')
-rw-r--r--board/davinci/da8xxevm/da850evm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c
index 2d5710076d..c9c34a0c29 100644
--- a/board/davinci/da8xxevm/da850evm.c
+++ b/board/davinci/da8xxevm/da850evm.c
@@ -234,7 +234,8 @@ const struct pinmux_resource pinmuxes[] = {
PINMUX_ITEM(emifa_pins_cs3),
PINMUX_ITEM(emifa_pins_cs4),
PINMUX_ITEM(emifa_pins_nand),
-#elif defined(CONFIG_USE_NOR)
+#endif
+#ifdef CONFIG_USE_NOR
PINMUX_ITEM(emifa_pins_cs2),
PINMUX_ITEM(emifa_pins_nor),
#endif