[U-Boot] [PATCH 1/3] ppc4xx: Move definition for PPC4xx NAND FLASH controller to header

[Stefan Roese <sr@denx.de>]

This patch moves the definition for the PPC4xx NAND FLASH controller
(NDFC) CONFIG_NAND_NDFC into include/ppc4xx.h. This is needed for the
upcoming fix for the ECC byte ordering of the NDFC driver.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Scott Wood <scottwood@freescale.com>
---
Scott, please review this patchset. It fixes a problem with the 4xx NDFC
and it's compatibility with the Linux driver. I would really like to get
this into this 2009-06 release. Since this patchset also touches a file
in drivers/mtd/nand, how should we handle those patches? Should I push
those patches (after your ACK) via my ppc4xx repository?

BTW: My plan is to move this 4xx NAND driver to drivers/mtd/nand after the
next release.

Thanks,
Stefan


 cpu/ppc4xx/ndfc.c |    9 +++------
 include/ppc4xx.h  |    7 +++++++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/cpu/ppc4xx/ndfc.c b/cpu/ppc4xx/ndfc.c
index 3a5af12..ba481ad 100644
--- a/cpu/ppc4xx/ndfc.c
+++ b/cpu/ppc4xx/ndfc.c
@@ -1,9 +1,9 @@
 /*
  * Overview:
  *   Platform independend driver for NDFC (NanD Flash Controller)
- *   integrated into EP440 cores
+ *   integrated into IBM/AMCC PPC4xx cores
  *
- * (C) Copyright 2006-2007
+ * (C) Copyright 2006-2009
  * Stefan Roese, DENX Software Engineering, sr at denx.de.
  *
  * Based on original work by
@@ -32,10 +32,7 @@
 #include <common.h>
 
 #if defined(CONFIG_CMD_NAND) && !defined(CONFIG_NAND_LEGACY) && \
-	(defined(CONFIG_440EP) || defined(CONFIG_440GR) ||	     \
-	 defined(CONFIG_440EPX) || defined(CONFIG_440GRX) ||	     \
-	 defined(CONFIG_405EZ) || defined(CONFIG_405EX) ||	     \
-	 defined(CONFIG_460EX) || defined(CONFIG_460GT))
+    defined(CONFIG_NAND_NDFC)
 
 #include <nand.h>
 #include <linux/mtd/ndfc.h>
diff --git a/include/ppc4xx.h b/include/ppc4xx.h
index f147885..55ff323 100644
--- a/include/ppc4xx.h
+++ b/include/ppc4xx.h
@@ -46,6 +46,13 @@
 #define CONFIG_SDRAM_PPC4xx_IBM_DDR2	/* IBM DDR(2) controller */
 #endif
 
+#if defined(CONFIG_440EP) || defined(CONFIG_440GR) ||	\
+    defined(CONFIG_440EPX) || defined(CONFIG_440GRX) ||	\
+    defined(CONFIG_405EZ) || defined(CONFIG_405EX) ||	\
+    defined(CONFIG_460EX) || defined(CONFIG_460GT)
+#define CONFIG_NAND_NDFC
+#endif
+
 /* PLB4 CrossBar Arbiter Core supported across PPC4xx families */
 #if defined(CONFIG_405EX) || \
     defined(CONFIG_440EP) || defined(CONFIG_440EPX) || \
-- 
1.6.2.5