summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2006-09-07 13:09:53 +0200
committerStefan Roese <sr@denx.de>2006-09-07 13:09:53 +0200
commit2d658967e1c0c75206fd218cf8bdb99022b4026a (patch)
tree41f6af6868466d8b11421924e82213b79eabab9f
parentefa20585b3ccfdde431c19c6a9d9d8dae46fe5bb (diff)
downloadu-boot-imx-2d658967e1c0c75206fd218cf8bdb99022b4026a.zip
u-boot-imx-2d658967e1c0c75206fd218cf8bdb99022b4026a.tar.gz
u-boot-imx-2d658967e1c0c75206fd218cf8bdb99022b4026a.tar.bz2
Fix build problem cpu/ppc4xx/ndfc.c
Patch by Stefan Roese, 07 Sep 2006
-rw-r--r--CHANGELOG3
-rwxr-xr-xMAKEALL28
-rw-r--r--cpu/ppc4xx/ndfc.c4
3 files changed, 20 insertions, 15 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 27d9226..8ff9410 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
Changes since U-Boot 1.1.4:
======================================================================
+* Fix build problem cpu/ppc4xx/ndfc.c
+ Patch by Stefan Roese, 07 Sep 2006
+
* Fix build problem with CPCI440
Patch by Stefan Roese, 07 Sep 2006
diff --git a/MAKEALL b/MAKEALL
index 8039f3d..9d0f6b9 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -75,20 +75,20 @@ LIST_8xx=" \
LIST_4xx=" \
ADCIOP AP1000 AR405 ASH405 \
- bubinga CANBT CMS700 CPCI2DP \
- CPCI405 CPCI4052 CPCI405AB CPCI405DT \
- CPCI440 CPCIISER4 CRAYL1 csb272 \
- csb472 DASA_SIM DP405 DU405 \
- ebony ERIC EXBITGEN G2000 \
- HH405 HUB405 JSE KAREF \
- luan METROBOX MIP405 MIP405T \
- ML2 ml300 ocotea OCRTC \
- ORSG p3p440 PCI405 pcs440ep \
- PIP405 PLU405 PMC405 PPChameleonEVB \
- sbc405 sequoia sequoia_nand VOH405 \
- VOM405 W7OLMC W7OLMG walnut \
- WUH405 XPEDITE1K yellowstone yosemite \
- yucca bamboo \
+ bamboo bubinga CANBT CMS700 \
+ CPCI2DP CPCI405 CPCI4052 CPCI405AB \
+ CPCI405DT CPCI440 CPCIISER4 CRAYL1 \
+ csb272 csb472 DASA_SIM DP405 \
+ DU405 ebony ERIC EXBITGEN \
+ G2000 HH405 HUB405 JSE \
+ KAREF luan METROBOX MIP405 \
+ MIP405T ML2 ml300 ocotea \
+ OCRTC ORSG p3p440 PCI405 \
+ pcs440ep PIP405 PLU405 PMC405 \
+ PPChameleonEVB sbc405 sequoia sequoia_nand \
+ VOH405 VOM405 W7OLMC W7OLMG \
+ walnut WUH405 XPEDITE1K yellowstone \
+ yosemite yucca bamboo \
"
#########################################################################
diff --git a/cpu/ppc4xx/ndfc.c b/cpu/ppc4xx/ndfc.c
index e4ab326..c255f93 100644
--- a/cpu/ppc4xx/ndfc.c
+++ b/cpu/ppc4xx/ndfc.c
@@ -31,7 +31,9 @@
#include <common.h>
-#if (CONFIG_COMMANDS & CFG_CMD_NAND) && !defined(CFG_NAND_LEGACY)
+#if (CONFIG_COMMANDS & CFG_CMD_NAND) && !defined(CFG_NAND_LEGACY) && \
+ (defined(CONFIG_440EP) || defined(CONFIG_440GR) || \
+ defined(CONFIG_440EPX) || defined(CONFIG_440GRX))
#include <nand.h>
#include <linux/mtd/ndfc.h>