From 51cd1e2373274dc3167dabba628dcfc25828d36d Mon Sep 17 00:00:00 2001 From: Adam Ford Date: Sat, 3 Aug 2019 07:56:10 -0500 Subject: 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 --- board/davinci/da8xxevm/da850evm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'board/davinci/da8xxevm') 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 -- cgit