From a24b051a14227c5e38b00cf07b076ec8f45b97e1 Mon Sep 17 00:00:00 2001 From: Adam Ford Date: Tue, 13 Aug 2019 14:04:02 -0500 Subject: Revert "ARM: da850-evm: Enable SPI Flash and NAND Flash when booting NOR" Sorry for the noise, but there appears to be a regression with older hardware. Since it broke the direct_nor boot option, it should be reverted until a better solution is available. This reverts commit 51cd1e2373274dc3167dabba628dcfc25828d36d. --- board/davinci/da8xxevm/da850evm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'board/davinci/da8xxevm/da850evm.c') diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c index b2b2fa2..d9019de 100644 --- a/board/davinci/da8xxevm/da850evm.c +++ b/board/davinci/da8xxevm/da850evm.c @@ -234,8 +234,7 @@ const struct pinmux_resource pinmuxes[] = { PINMUX_ITEM(emifa_pins_cs3), PINMUX_ITEM(emifa_pins_cs4), PINMUX_ITEM(emifa_pins_nand), -#endif -#ifdef CONFIG_USE_NOR +#elif defined(CONFIG_USE_NOR) PINMUX_ITEM(emifa_pins_cs2), PINMUX_ITEM(emifa_pins_nor), #endif -- cgit v1.1