From: Stefan Roese Date: Wed, 20 May 2009 08:58:01 +0000 (+0200) Subject: ppc4xx: Move definition for PPC4xx NAND FLASH controller to header X-Git-Tag: v2009.06-rc3~26 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5d841fac8249a2b3f9a814da2140132be0a9f60d;p=oweals%2Fu-boot.git ppc4xx: Move definition for PPC4xx NAND FLASH controller to header 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 Acked-by: Scott Wood --- diff --git a/cpu/ppc4xx/ndfc.c b/cpu/ppc4xx/ndfc.c index 3a5af12db9..ba481ad558 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@denx.de. * * Based on original work by @@ -32,10 +32,7 @@ #include #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 #include diff --git a/include/ppc4xx.h b/include/ppc4xx.h index f1478854d1..55ff32353a 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) || \