diff options
| author | Adam Ford <aford173@gmail.com> | 2019-08-13 14:04:02 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-20 11:46:38 -0400 |
| commit | a24b051a14227c5e38b00cf07b076ec8f45b97e1 (patch) | |
| tree | b1e7884715ea3c1ad285ad6c46612123191d1176 /board/davinci | |
| parent | 8f6babf82c0b6ad9aa93de238df7c0bf978c4695 (diff) | |
| download | u-boot-a24b051a14227c5e38b00cf07b076ec8f45b97e1.tar.gz u-boot-a24b051a14227c5e38b00cf07b076ec8f45b97e1.tar.bz2 u-boot-a24b051a14227c5e38b00cf07b076ec8f45b97e1.zip | |
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.
Diffstat (limited to 'board/davinci')
| -rw-r--r-- | board/davinci/da8xxevm/da850evm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c index b2b2fa272a..d9019de6e0 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 |