Fix build problem cpu/ppc4xx/ndfc.c

Patch by Stefan Roese, 07 Sep 2006

diff --git a/CHANGELOG b/CHANGELOG
index 27d9226fde935e7191971ed3597b9e1085d5d526..8ff9410c7f1bfc47fc51b2f407b88c3c6dad4ac7 100644 (file)
--- 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 8039f3d7082ccd6cf91b9885ba1263dfc25700d8..9d0f6b9129e8641cd7bc4abfce53fdb698781743 100755 (executable)
--- 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 e4ab326bbfc491d68939f3bfc13a17069acc7aa8..c255f93e6bba1cdf6470f728856bbce189ee6592 100644 (file)
--- 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>