summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2007-04-20 15:50:04 +0200
committerWolfgang Denk <wd@denx.de>2007-04-20 15:50:04 +0200
commit85f87fa4125fc1480283b8286c5e4cdea4c2b262 (patch)
tree0980fccd1e8229cff0a0d92595ac0a5dc3da1096
parent0a4307c7afc8111cacf907c4bb37d700c877780f (diff)
parent6923565db12af34fd5e02d354ee65a8c78ac460f (diff)
downloadu-boot-imx-85f87fa4125fc1480283b8286c5e4cdea4c2b262.zip
u-boot-imx-85f87fa4125fc1480283b8286c5e4cdea4c2b262.tar.gz
u-boot-imx-85f87fa4125fc1480283b8286c5e4cdea4c2b262.tar.bz2
Merge with /home/dzu/src/git/u-boot
-rw-r--r--board/nc650/config.mk3
-rw-r--r--include/configs/NC650.h12
2 files changed, 2 insertions, 13 deletions
diff --git a/board/nc650/config.mk b/board/nc650/config.mk
index 52c8ffe..9d9b892 100644
--- a/board/nc650/config.mk
+++ b/board/nc650/config.mk
@@ -1,5 +1,5 @@
#
-# (C) Copyright 2006 Detlev Zundel, dzu@denx.de
+# (C) Copyright 2006, 2007 Detlev Zundel, dzu@denx.de
# (C) Copyright 2004
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
#
@@ -27,4 +27,3 @@
#
TEXT_BASE = 0x40700000
-BOARDLIBS = $(obj)drivers/nand/libnand.a
diff --git a/include/configs/NC650.h b/include/configs/NC650.h
index 8da29c4..a12c8da 100644
--- a/include/configs/NC650.h
+++ b/include/configs/NC650.h
@@ -1,5 +1,5 @@
/*
- * (C) Copyright 2006 Detlev Zundel, dzu@denx.de
+ * (C) Copyright 2006, 2007 Detlev Zundel, dzu@denx.de
* (C) Copyright 2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*
@@ -237,18 +237,8 @@
/*
* NAND flash support
*/
-#define CFG_NAND_LEGACY
-
#define CFG_MAX_NAND_DEVICE 1
-#define NAND_ChipID_UNKNOWN 0x00
-#define SECTORSIZE 512
-#define NAND_MAX_FLOORS 1
#define NAND_MAX_CHIPS 1
-#define ADDR_PAGE 2
-#define ADDR_COLUMN_PAGE 3
-#define ADDR_COLUMN 1
-#define NAND_NO_RB
-
/*-----------------------------------------------------------------------
* SYPCR - System Protection Control 11-9