summaryrefslogtreecommitdiff
path: root/board/da8xx/da8xx-evm/da850.c
diff options
context:
space:
mode:
authorJustin Waters <justin.waters@timesys.com>2009-10-16 16:28:49 -0400
committerJustin Waters <justin.waters@timesys.com>2009-10-16 16:28:49 -0400
commitd3edb1fd150d6d656d18ebacc3b57e5aabd8c7a3 (patch)
treeac5055793bae278864ce7ddad667793e1d10091b /board/da8xx/da8xx-evm/da850.c
parenteea473d268548ffb8524bd41d0acce2acc2b2ec7 (diff)
Fix configuration so that multiple flash chips can be enabled2009.01-omapl138-200910162028
The original port only allowed you to enable the chip that contains the environment. This enables everything possible. It also adds configuration options to build for different environment locations by specifying the flash type during the configure step.
Diffstat (limited to 'board/da8xx/da8xx-evm/da850.c')
-rw-r--r--board/da8xx/da8xx-evm/da850.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/board/da8xx/da8xx-evm/da850.c b/board/da8xx/da8xx-evm/da850.c
index ccc464d124..94520d4f22 100644
--- a/board/da8xx/da8xx-evm/da850.c
+++ b/board/da8xx/da8xx-evm/da850.c
@@ -165,7 +165,7 @@ int board_init(void)
#endif
/* Async EMIF */
-#if defined(CONFIG_SYS_USE_NOR)
+#if defined(CONFIG_CMD_FLASH)
REG(PINMUX6) = 0x11111111;
REG(PINMUX7) = 0x11111111;
REG(PINMUX8) = 0x11111111;
@@ -175,7 +175,7 @@ int board_init(void)
REG(PINMUX12) = 0x11111111;
REG(PINMUX5) &= 0x00FFFFFF;
REG(PINMUX5) |= 0x11000000;
-#elif defined(CONFIG_SYS_USE_NAND)
+#else
REG(PINMUX7) &= 0xFF00F00F;
REG(PINMUX7) |= 0x00110110;
REG(PINMUX9) = 0x11111111;