diff options
author | Adam Ford <aford173@gmail.com> | 2019-08-03 15:56:10 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-08-12 20:33:42 +0300 |
commit | 51cd1e2373274dc3167dabba628dcfc25828d36d (patch) | |
tree | e215d56fa5cf717e98fe0b2c0d17f5a44f44eb23 /board | |
parent | 79bb64678c7a3476093df097d9543ca505d2d4e4 (diff) | |
download | u-boot-51cd1e2373274dc3167dabba628dcfc25828d36d.tar.xz |
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')
-rw-r--r-- | board/davinci/da8xxevm/da850evm.c | 3 |
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 |