diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 10:42:05 -0600 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 10:42:05 -0600 |
commit | f8edca2e9a128f526b1fe6f997f7adb852cf5b3c (patch) | |
tree | 92deb9ddf1153c64ff1ced9392816e60b4ecaa03 /board/dave/PPChameleonEVB/config.mk | |
parent | 79582020313e6d992a3bac71cf3a9b337f9ac7f7 (diff) | |
parent | 7b4fd36b0322ec98836a8459d9be80e2777fdc05 (diff) | |
download | u-boot-imx-f8edca2e9a128f526b1fe6f997f7adb852cf5b3c.zip u-boot-imx-f8edca2e9a128f526b1fe6f997f7adb852cf5b3c.tar.gz u-boot-imx-f8edca2e9a128f526b1fe6f997f7adb852cf5b3c.tar.bz2 |
Merge branch 'origin'
Conflicts:
CHANGELOG
Diffstat (limited to 'board/dave/PPChameleonEVB/config.mk')
-rw-r--r-- | board/dave/PPChameleonEVB/config.mk | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/board/dave/PPChameleonEVB/config.mk b/board/dave/PPChameleonEVB/config.mk index 5856aec..1dc635f 100644 --- a/board/dave/PPChameleonEVB/config.mk +++ b/board/dave/PPChameleonEVB/config.mk @@ -1,5 +1,5 @@ # -# (C) Copyright 2000 +# (C) Copyright 2000, 2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # # See file CREDITS for list of people who contributed to this @@ -22,7 +22,13 @@ # # Reserve 256 kB for Monitor -TEXT_BASE = 0xFFFC0000 +#TEXT_BASE = 0xFFFC0000 # Reserve 320 kB for Monitor -#TEXT_BASE = 0xFFFB0000 +TEXT_BASE = 0xFFFB0000 + +# Compile the new NAND code (CFG_NAND_LEGACY mustn't be defined) +BOARDLIBS = drivers/nand/libnand.a + +# Compile the legacy NAND code (CFG_NAND_LEGACY must be defined) +#BOARDLIBS = drivers/nand_legacy/libnand_legacy.a |