summaryrefslogtreecommitdiff
path: root/cpu
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 /cpu
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 'cpu')
-rwxr-xr-xcpu/arm926ejs/da8xx/nand.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpu/arm926ejs/da8xx/nand.c b/cpu/arm926ejs/da8xx/nand.c
index 4e2d0c29e75..e1e56c435ec 100755
--- a/cpu/arm926ejs/da8xx/nand.c
+++ b/cpu/arm926ejs/da8xx/nand.c
@@ -44,7 +44,7 @@
#include <common.h>
#include <asm/io.h>
-#ifdef CONFIG_SYS_USE_NAND
+#ifdef CONFIG_CMD_NAND
#if !defined(CONFIG_NAND_LEGACY)
#include <nand.h>
@@ -1029,4 +1029,4 @@ int board_nand_init(struct nand_chip *nand)
#else
#error "U-Boot legacy NAND support not available for DaVinci chips"
#endif
-#endif /* CONFIG_SYS_USE_NAND */
+#endif /* CONFIG_CMD_NAND */