summaryrefslogtreecommitdiff
path: root/board/esd/hh405
diff options
context:
space:
mode:
authorWolfgang Denk <wd@nyx.denx.de>2006-03-06 11:25:22 +0100
committerWolfgang Denk <wd@nyx.denx.de>2006-03-06 11:25:22 +0100
commit4e3ccd26925e5ada78dd89779838f052dffe3e67 (patch)
tree2df070a78b8f9e69b03b0e0b8bfd01d0d639865e /board/esd/hh405
parentf1ee982506d8e58262ff0e5d1fb208e703640e34 (diff)
parentaddb2e1650fdf872334478393f482dfdce965a61 (diff)
Merge the new NAND code (testing-NAND brach); see doc/README.nand
Rewrite of NAND code based on what is in 2.6.12 Linux kernel Patch by Ladislav Michl, 29 Jun 2005 [Merge with /home/tur/nand/u-boot]
Diffstat (limited to 'board/esd/hh405')
-rw-r--r--board/esd/hh405/config.mk4
-rw-r--r--board/esd/hh405/hh405.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/board/esd/hh405/config.mk b/board/esd/hh405/config.mk
index 7129ad568b..ca1f57572b 100644
--- a/board/esd/hh405/config.mk
+++ b/board/esd/hh405/config.mk
@@ -29,3 +29,7 @@
TEXT_BASE = 0xFFF80000
#TEXT_BASE = 0xFFFC0000
#TEXT_BASE = 0x00FC0000
+
+# Compile the legacy NAND code (CFG_NAND_LEGACY must be defined)
+BOARDLIBS = drivers/nand_legacy/libnand_legacy.a
+
diff --git a/board/esd/hh405/hh405.c b/board/esd/hh405/hh405.c
index 958af8f755..99fd556c69 100644
--- a/board/esd/hh405/hh405.c
+++ b/board/esd/hh405/hh405.c
@@ -697,7 +697,7 @@ void ide_set_reset(int on)
#if (CONFIG_COMMANDS & CFG_CMD_NAND)
-#include <linux/mtd/nand.h>
+#include <linux/mtd/nand_legacy.h>
extern struct nand_chip nand_dev_desc[CFG_MAX_NAND_DEVICE];
void nand_init(void)