diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-04-12 12:26:32 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-04-12 12:26:32 +0200 |
| commit | b28a31ca0290627c531b9df0d48ec0239078d2d4 (patch) | |
| tree | 780f563c9083e773f08b4ca3423b8af0c6994aba /board/delta | |
| parent | 3a5e21881a194f4d4e053be8410d82a2458e8544 (diff) | |
| parent | 6db39708117d6391a72f3fc3ea7860231b630270 (diff) | |
Merge with /home/m8/git/u-boot
Diffstat (limited to 'board/delta')
| -rw-r--r-- | board/delta/config.mk | 7 | ||||
| -rw-r--r-- | board/delta/nand.c | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/board/delta/config.mk b/board/delta/config.mk index c72e956524e..3fe406ca027 100644 --- a/board/delta/config.mk +++ b/board/delta/config.mk @@ -1,8 +1 @@ -#TEXT_BASE = 0x0 -#TEXT_BASE = 0xa1700000 -#TEXT_BASE = 0xa3080000 -#TEXT_BASE = 0x9ffe0000 TEXT_BASE = 0x83008000 - -# Compile the new NAND code (needed iff #ifdef CONFIG_NEW_NAND_CODE) -BOARDLIBS = drivers/nand/libnand.a diff --git a/board/delta/nand.c b/board/delta/nand.c index 5d2cd6585f6..fe648fc1ff8 100644 --- a/board/delta/nand.c +++ b/board/delta/nand.c @@ -23,7 +23,7 @@ #include <common.h> #if (CONFIG_COMMANDS & CFG_CMD_NAND) -#ifdef CONFIG_NEW_NAND_CODE +#if !defined(CFG_NAND_LEGACY) #include <nand.h> #include <asm/arch/pxa-regs.h> |