drivers/mtd: Move conditional compilation to Makefile

rename CFG_FLASH_CFI_DRIVER to CONFIG_FLASH_CFI_DRIVER

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

diff --git a/README b/README
index d4456e576b9eca2559125b44a00e50089302578c..37449d161014fe13d9a3c8b73f6b90768f94682e 100644 (file)
--- a/README
+++ b/README
@@ -2064,7 +2064,7 @@ Configuration Settings:
                Define if the flash driver uses extra elements in the
                common flash structure for storing flash geometry.
 
-- CFG_FLASH_CFI_DRIVER
+- CONFIG_FLASH_CFI_DRIVER
                This option also enables the building of the cfi_flash driver
                in the drivers directory
 

diff --git a/board/icecube/flash.c b/board/icecube/flash.c
index 15e86d34f394446925b786a05ea8f10c43cd9288..2d4026a9de7c92798d708bf29d300e84bda96ec7 100644 (file)
--- a/board/icecube/flash.c
+++ b/board/icecube/flash.c
@@ -23,7 +23,7 @@
 
 #include <common.h>
 
-#ifndef CFG_FLASH_CFI_DRIVER
+#ifndef CONFIG_FLASH_CFI_DRIVER
 flash_info_t   flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips        */
 
 /* NOTE - CONFIG_FLASH_16BIT means the CPU interface is 16-bit, it
@@ -490,4 +490,4 @@ static int write_word_amd (flash_info_t *info, FPWV *dest, FPW data)
 
        return (res);
 }
-#endif /*CFG_FLASH_CFI_DRIVER*/
+#endif /*CONFIG_FLASH_CFI_DRIVER*/

diff --git a/board/prodrive/pdnb3/flash.c b/board/prodrive/pdnb3/flash.c
index 518ea9c03148e78fc16c114f3f292fb6b2b631bb..0786324fba6ac7620dff84090c6d79c298b7ebfb 100644 (file)
--- a/board/prodrive/pdnb3/flash.c
+++ b/board/prodrive/pdnb3/flash.c
@@ -24,7 +24,7 @@
 #include <common.h>
 #include <asm/arch/ixp425.h>
 
-#if !defined(CFG_FLASH_CFI_DRIVER)
+#if !defined(CONFIG_FLASH_CFI_DRIVER)
 
 /*
  * include common flash code (for esd boards)
@@ -86,4 +86,4 @@ unsigned long flash_init(void)
        return size;
 }
 
-#endif /* CFG_FLASH_CFI_DRIVER */
+#endif /* CONFIG_FLASH_CFI_DRIVER */

diff --git a/board/tqc/tqm8xx/flash.c b/board/tqc/tqm8xx/flash.c
index 4342ebc8419321af0f821bb69d0c40aa932b91ec..1231c7c6f9347aa2598f94db1aa852cd88a94036 100644 (file)
--- a/board/tqc/tqm8xx/flash.c
+++ b/board/tqc/tqm8xx/flash.c
@@ -33,7 +33,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#if !defined(CFG_FLASH_CFI_DRIVER) /* do not use if CFI driver is configured */
+#if !defined(CONFIG_FLASH_CFI_DRIVER) /* do not use if CFI driver is configured */
 
 #if defined(CONFIG_TQM8xxL) && !defined(CONFIG_TQM866M) \
     && !defined(CONFIG_TQM885D)
@@ -831,4 +831,4 @@ static int write_word (flash_info_t *info, ulong dest, ulong data)
 /*-----------------------------------------------------------------------
  */
 
-#endif /* !defined(CFG_FLASH_CFI_DRIVER) */
+#endif /* !defined(CONFIG_FLASH_CFI_DRIVER) */

diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
index ff932a1b6bf02315d7fa7c167c4b904fa66b042d..6538f7a15864f915e14849434f90d5dcdc8ecb04 100644 (file)
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@ -25,11 +25,11 @@ include $(TOPDIR)/config.mk
 
 LIB    := $(obj)libmtd.a
 
-COBJS-y += at45.o
-COBJS-y += cfi_flash.o
+COBJS-$(CONFIG_HAS_DATAFLASH) += at45.o
+COBJS-$(CONFIG_FLASH_CFI_DRIVER) += cfi_flash.o
 COBJS-$(CONFIG_HAS_DATAFLASH) += dataflash.o
-COBJS-y += mw_eeprom.o
 COBJS-$(CONFIG_FLASH_CFI_LEGACY) += jedec_flash.o
+COBJS-$(CONFIG_MW_EEPROM) += mw_eeprom.o
 
 COBJS  := $(COBJS-y)
 SRCS   := $(COBJS:.o=.c)

diff --git a/drivers/mtd/at45.c b/drivers/mtd/at45.c
index a9d13ff90ef9fa4cf072ec846f13625c1fe4a845..d1a60aac90b38495dee178265cd951fd80692d72 100644 (file)
--- a/drivers/mtd/at45.c
+++ b/drivers/mtd/at45.c
@@ -20,8 +20,6 @@
 
 #include <config.h>
 #include <common.h>
-
-#ifdef CONFIG_HAS_DATAFLASH
 #include <dataflash.h>
 
 /*
@@ -559,4 +557,3 @@ int AT91F_DataflashProbe(int cs, AT91PS_DataflashDesc pDesc)
        AT91F_DataFlashGetStatus(pDesc);
        return ((pDesc->command[1] == 0xFF) ? 0 : pDesc->command[1] & 0x3C);
 }
-#endif

diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index 479075ccb19942d406ffa9bea3100c2bf55a711b..402d835bf98f14d9db3f7ebb70d414f38722959b 100644 (file)
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -39,7 +39,6 @@
 #include <asm/io.h>
 #include <asm/byteorder.h>
 #include <environment.h>
-#ifdef CFG_FLASH_CFI_DRIVER
 
 /*
  * This file implements a Common Flash Interface (CFI) driver for
@@ -2015,5 +2014,3 @@ unsigned long flash_init (void)
 #endif
        return (size);
 }
-
-#endif /* CFG_FLASH_CFI */

diff --git a/drivers/mtd/mw_eeprom.c b/drivers/mtd/mw_eeprom.c
index 2b3348810d2dea50dd14a425219fd176bd846b2c..f32ced4c2e083b939bf3effccaf582c1b7fb2b2f 100644 (file)
--- a/drivers/mtd/mw_eeprom.c
+++ b/drivers/mtd/mw_eeprom.c
@@ -1,9 +1,6 @@
 /* Three-wire (MicroWire) serial eeprom driver (for 93C46 and compatibles) */
 
 #include <common.h>
-
-#ifdef CONFIG_MW_EEPROM
-
 #include <ssi.h>
 
 /*
@@ -237,5 +234,3 @@ int mw_eeprom_probe(int dev)
        }
        return 0;
 }
-
-#endif

diff --git a/include/configs/APC405.h b/include/configs/APC405.h
index 2f266a242ffad0fece4ff5cb050d081ccc82d8ed..6ee0a3631fb5f36f4f011c0a5b340e543471efe2 100644 (file)
--- a/include/configs/APC405.h
+++ b/include/configs/APC405.h
@@ -269,7 +269,7 @@ extern int flash_banks;
 
 #define CFG_FLASH_BASE         0xFE000000
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use the common driver */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use the common driver */
 #define CFG_MAX_FLASH_SECT     256     /* max num of sects on one chip */
 #define CFG_MAX_FLASH_BANKS    flash_banks /* max num of flash banks */
                                            /* updated in board_early_init_r */

diff --git a/include/configs/ATUM8548.h b/include/configs/ATUM8548.h
index f05c1d592b0e2dcac5e91808c9d4bde753496a90..6aa881caca4bc92efca0d19a5bf4795cd2e7d11a 100644 (file)
--- a/include/configs/ATUM8548.h
+++ b/include/configs/ATUM8548.h
@@ -182,7 +182,7 @@
 
 #define CFG_MONITOR_BASE       TEXT_BASE       /* start of monitor */
 
-#define CFG_FLASH_CFI_DRIVER    1
+#define CONFIG_FLASH_CFI_DRIVER    1
 #define CFG_FLASH_CFI           1
 #define CFG_FLASH_EMPTY_INFO
 

diff --git a/include/configs/Adder.h b/include/configs/Adder.h
index cefdd29602d6b92d25865db1f49a977b2228081e..07a9f4e934530083253fe05f44fb6adc0bec2f7f 100644 (file)
--- a/include/configs/Adder.h
+++ b/include/configs/Adder.h
@@ -143,7 +143,7 @@
  */
 #define CFG_FLASH_BASE         0xFE000000
 #define CFG_FLASH_CFI                          /* The flash is CFI compatible  */
-#define CFG_FLASH_CFI_DRIVER                   /* Use common CFI driver        */
+#define CONFIG_FLASH_CFI_DRIVER                        /* Use common CFI driver        */
 #define CFG_MAX_FLASH_BANKS    1               /* Max number of flash banks    */
 #define CFG_MAX_FLASH_SECT     128             /* Max num of sects on one chip */
 

diff --git a/include/configs/BC3450.h b/include/configs/BC3450.h
index b7574bf1494b80f8eab7f12b03bc8f84a2f9f29c..3c5d03812eb2bf6c9a2c98e3aebca20c5b866945 100644 (file)
--- a/include/configs/BC3450.h
+++ b/include/configs/BC3450.h
@@ -328,7 +328,7 @@
 
 /* use CFI flash driver if no module variant is spezified */
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use the common driver */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use the common driver */
 #define CFG_FLASH_BANKS_LIST   { CFG_BOOTCS_START }
 #define CFG_FLASH_EMPTY_INFO
 #define CFG_FLASH_SIZE         0x04000000 /* 64 MByte */

diff --git a/include/configs/CPCI750.h b/include/configs/CPCI750.h
index 89edbde1de64baa44e469f6de0f84bffcef3dd63..03756c3b242ca8ca7dde1d3ac1c200c6184ff968 100644 (file)
--- a/include/configs/CPCI750.h
+++ b/include/configs/CPCI750.h
@@ -294,7 +294,7 @@
  * FLASH related
  *----------------------------------------------------------------------*/
 
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI          1          /* Flash is CFI conformant           */
 #define CFG_FLASH_PROTECTION   1          /* use hardware protection           */
 #define CFG_FLASH_USE_BUFFER_WRITE 1      /* use buffered writes (20x faster)  */

diff --git a/include/configs/DU440.h b/include/configs/DU440.h
index 64c9ac076da64b61c05611c4b14b0f685c49bdf8..c757523aec2b43bc8141922e8cf77682a35f1fa2 100644 (file)
--- a/include/configs/DU440.h
+++ b/include/configs/DU440.h
@@ -119,7 +119,7 @@
  * FLASH related
  */
 #define CFG_FLASH_CFI                  /* The flash is CFI compatible */
-#define CFG_FLASH_CFI_DRIVER           /* Use common CFI driver       */
+#define CONFIG_FLASH_CFI_DRIVER                /* Use common CFI driver       */
 
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE }
 

diff --git a/include/configs/EP88x.h b/include/configs/EP88x.h
index 7824b900ad4d46f47c90fd73986dc870f584e8a6..5f1743b2ff3a2dab5048a43ce88e4c663acbc06b 100644 (file)
--- a/include/configs/EP88x.h
+++ b/include/configs/EP88x.h
@@ -138,7 +138,7 @@
  */
 #define CFG_FLASH_BASE         0xFC000000
 #define CFG_FLASH_CFI                          /* The flash is CFI compatible  */
-#define CFG_FLASH_CFI_DRIVER                   /* Use common CFI driver        */
+#define CONFIG_FLASH_CFI_DRIVER                        /* Use common CFI driver        */
 #define CFG_MAX_FLASH_BANKS    1               /* Max number of flash banks    */
 #define CFG_MAX_FLASH_SECT     512             /* Max num of sects on one chip */
 

diff --git a/include/configs/FPS850L.h b/include/configs/FPS850L.h
index 79b71db75a69c16092d0001a2e1368f567a4b7a2..e694a0218fca7af702e1f835425c28cf2fc8f792 100644 (file)
--- a/include/configs/FPS850L.h
+++ b/include/configs/FPS850L.h
@@ -194,7 +194,7 @@
 
 /* use CFI flash driver */
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use the common driver */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use the common driver */
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE, CFG_FLASH_BASE+flash_info[0].size }
 #define CFG_FLASH_EMPTY_INFO
 #define CFG_FLASH_USE_BUFFER_WRITE     1

diff --git a/include/configs/FPS860L.h b/include/configs/FPS860L.h
index ec757e2ff65c6e07e207dc783dc2913e14869d92..84b682415d4f714113070088091bb6fbeefa2a32 100644 (file)
--- a/include/configs/FPS860L.h
+++ b/include/configs/FPS860L.h
@@ -194,7 +194,7 @@
 
 /* use CFI flash driver */
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use the common driver */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use the common driver */
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE, CFG_FLASH_BASE+flash_info[0].size }
 #define CFG_FLASH_EMPTY_INFO
 #define CFG_FLASH_USE_BUFFER_WRITE     1

diff --git a/include/configs/HMI10.h b/include/configs/HMI10.h
index 081ca6cc5ea7f009fb143dccc8a2761b8607204a..a7e7c5744ec381dfd72ec79bfe1ce5b32b36ef73 100644 (file)
--- a/include/configs/HMI10.h
+++ b/include/configs/HMI10.h
@@ -227,7 +227,7 @@
 
 /* use CFI flash driver */
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use the common driver */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use the common driver */
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE }
 #define CFG_FLASH_EMPTY_INFO
 #define CFG_FLASH_USE_BUFFER_WRITE     1

diff --git a/include/configs/IDS8247.h b/include/configs/IDS8247.h
index f7d4499f4f7042a2ef778df417e1d7963bc197b9..29dc6234ba7dc4d770bc2c202359d60a2b5a216d 100644 (file)
--- a/include/configs/IDS8247.h
+++ b/include/configs/IDS8247.h
@@ -227,7 +227,7 @@
 #define CFG_BOOTMAPSZ        (8 << 20)       /* Initial Memory map for Linux */
 
 #define CFG_FLASH_CFI                          /* The flash is CFI compatible  */
-#define CFG_FLASH_CFI_DRIVER                   /* Use common CFI driver        */
+#define CONFIG_FLASH_CFI_DRIVER                        /* Use common CFI driver        */
 #define CFG_FLASH_BANKS_LIST   { 0xFF800000 }
 #define CFG_MAX_FLASH_BANKS_DETECT     1
 /* What should the base address of the main FLASH be and how big is

diff --git a/include/configs/ISPAN.h b/include/configs/ISPAN.h
index 760f7cca6e9a62a4fbd872b10b34570fdc5d91c4..27e46a432bb6d2919195f0cf80705ef2eb8d76dd 100644 (file)
--- a/include/configs/ISPAN.h
+++ b/include/configs/ISPAN.h
@@ -180,7 +180,7 @@
  */
 #define CFG_FLASH_BASE         0xFE000000
 #define CFG_FLASH_CFI                          /* The flash is CFI compatible  */
-#define CFG_FLASH_CFI_DRIVER                   /* Use common CFI driver        */
+#define CONFIG_FLASH_CFI_DRIVER                        /* Use common CFI driver        */
 #define CFG_MAX_FLASH_BANKS    1               /* Max num of memory banks      */
 #define CFG_MAX_FLASH_SECT     142             /* Max num of sects on one chip */
 

diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h
index 3a347eac55e51c08f46fd9bdfe49065472873993..0b90946a364aa6fe6007ac5f523f41177963113f 100644 (file)
--- a/include/configs/IceCube.h
+++ b/include/configs/IceCube.h
@@ -246,7 +246,7 @@
 #undef CONFIG_FLASH_16BIT      /* Flash is 8-bit */
 
 #if defined(CONFIG_LITE5200B)
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI
 #define CFG_FLASH_BANKS_LIST   {CFG_CS1_START,CFG_CS0_START}
 #endif

diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h
index 3d2891354f882071f5681812d52c833eee48ea43..8713b02aaf9d3978827e961ef4916e08b8918e70 100644 (file)
--- a/include/configs/M52277EVB.h
+++ b/include/configs/M52277EVB.h
@@ -207,7 +207,7 @@
 #define CFG_FLASH_CFI
 #ifdef CFG_FLASH_CFI
 
-#      define CFG_FLASH_CFI_DRIVER     1
+#      define CONFIG_FLASH_CFI_DRIVER  1
 #      define CFG_FLASH_SIZE           0x1000000       /* Max size that the board might have */
 #      define CFG_FLASH_CFI_WIDTH      FLASH_CFI_16BIT
 #      define CFG_MAX_FLASH_BANKS      1       /* max number of memory banks */

diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index 8af1c52abf9aa4e6d52079b376f3b04f1b0a0032..e8361321f171cc8c2da333f72cf75b9a9def5c4e 100644 (file)
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -200,7 +200,7 @@
  */
 #define CFG_FLASH_CFI
 #ifdef CFG_FLASH_CFI
-#      define CFG_FLASH_CFI_DRIVER     1
+#      define CONFIG_FLASH_CFI_DRIVER  1
 #      define CFG_FLASH_SIZE           0x800000        /* Max size that the board might have */
 #ifdef NORFLASH_PS32BIT
 #      define CFG_FLASH_CFI_WIDTH      FLASH_CFI_32BIT

diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h
index de7ea42930f748aaebdca24bec88cd906af39d66..c2f5dd9fa47589846c826777de2ef02770b1eb56 100644 (file)
--- a/include/configs/M5249EVB.h
+++ b/include/configs/M5249EVB.h
@@ -150,7 +150,7 @@
 #define CFG_FLASH_CFI
 #ifdef CFG_FLASH_CFI
 
-#      define CFG_FLASH_CFI_DRIVER     1
+#      define CONFIG_FLASH_CFI_DRIVER  1
 #      define CFG_FLASH_SIZE           0x1000000       /* Max size that the board might have */
 #      define CFG_FLASH_CFI_WIDTH      FLASH_CFI_16BIT
 #      define CFG_MAX_FLASH_BANKS      1       /* max number of memory banks */

diff --git a/include/configs/M5253EVBE.h b/include/configs/M5253EVBE.h
index f5e1b646ca2e52000e1f8dd5b175e92c75869028..9dbd129763344118d984a3decb632d5e84c78ec0 100644 (file)
--- a/include/configs/M5253EVBE.h
+++ b/include/configs/M5253EVBE.h
@@ -172,7 +172,7 @@
 #define CFG_FLASH_ERASE_TOUT   1000
 
 #define CFG_FLASH_CFI          1
-#define CFG_FLASH_CFI_DRIVER   1
+#define CONFIG_FLASH_CFI_DRIVER        1
 #define CFG_FLASH_SIZE         0x200000
 #define CFG_FLASH_CFI_WIDTH    FLASH_CFI_16BIT
 

diff --git a/include/configs/M5271EVB.h b/include/configs/M5271EVB.h
index a6fac4cbf63cb88d068f78610179551241b103da..12f9783abe89499ab75b7a5d70771724b3ebf7ac 100644 (file)
--- a/include/configs/M5271EVB.h
+++ b/include/configs/M5271EVB.h
@@ -210,7 +210,7 @@
 #define CFG_FLASH_ERASE_TOUT   1000
 
 #define CFG_FLASH_CFI          1
-#define CFG_FLASH_CFI_DRIVER   1
+#define CONFIG_FLASH_CFI_DRIVER        1
 #define CFG_FLASH_SIZE         0x200000
 
 /* Cache Configuration */

diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h
index 283c873d8349fade56c556bb8ff552481eb96d19..30c70e5796fa0ebc97e85cbba756484ceab57b07 100644 (file)
--- a/include/configs/M5275EVB.h
+++ b/include/configs/M5275EVB.h
@@ -197,7 +197,7 @@
 #define CFG_FLASH_ERASE_TOUT   1000
 
 #define CFG_FLASH_CFI          1
-#define CFG_FLASH_CFI_DRIVER   1
+#define CONFIG_FLASH_CFI_DRIVER        1
 #define CFG_FLASH_SIZE         0x200000
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index df46ee443857084ab5a19dfa15b17a10ccfc8f2d..c2c7fab732c6cd6138d2f63bb7186d7ad5efbcc5 100644 (file)
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -194,7 +194,7 @@
 #define CFG_FLASH_CFI
 #ifdef CFG_FLASH_CFI
 
-#      define CFG_FLASH_CFI_DRIVER     1
+#      define CONFIG_FLASH_CFI_DRIVER  1
 #      define CFG_FLASH_SIZE           0x1000000       /* Max size that the board might have */
 #      define CFG_FLASH_CFI_WIDTH      FLASH_CFI_16BIT
 #      define CFG_MAX_FLASH_BANKS      1       /* max number of memory banks */

diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index b30d99c92e9440e791c02a285a81407c35e51670..58948a20a9c863c461e453dcfceb3e4422185fcf 100644 (file)
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -202,7 +202,7 @@
  */
 #define CFG_FLASH_CFI
 #ifdef CFG_FLASH_CFI
-#      define CFG_FLASH_CFI_DRIVER     1
+#      define CONFIG_FLASH_CFI_DRIVER  1
 #      define CFG_FLASH_SIZE           0x800000        /* Max size that the board might have */
 #      define CFG_FLASH_CFI_WIDTH      FLASH_CFI_16BIT
 #      define CFG_MAX_FLASH_BANKS      1       /* max number of memory banks */

diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index a710c6d9f8af1f30774cb13e7cf67d14427959a0..814c3a610d1645aac8d89cacc31c254a0f4d5f07 100644 (file)
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -202,7 +202,7 @@
  */
 #define CFG_FLASH_CFI
 #ifdef CFG_FLASH_CFI
-#      define CFG_FLASH_CFI_DRIVER     1
+#      define CONFIG_FLASH_CFI_DRIVER  1
 #      define CFG_FLASH_SIZE           0x800000        /* Max size that the board might have */
 #      define CFG_FLASH_CFI_WIDTH      FLASH_CFI_16BIT
 #      define CFG_MAX_FLASH_BANKS      1       /* max number of memory banks */

diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index 3a022afafd2014d79e74c6b0bf147784e35b4ada..6620f03d3d66c8d902fa47931b770638d2e9912a 100644 (file)
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -302,7 +302,7 @@
 #undef CFG_FLASH_CFI
 #ifdef CFG_FLASH_CFI
 
-#      define CFG_FLASH_CFI_DRIVER     1
+#      define CONFIG_FLASH_CFI_DRIVER  1
 #      define CFG_FLASH_SIZE           0x1000000       /* Max size that the board might have */
 #      define CFG_FLASH_CFI_WIDTH      FLASH_CFI_8BIT
 #      define CFG_MAX_FLASH_BANKS      2       /* max number of memory banks */

diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h
index e8804b56609ce7fcfe28e62ebc447334314ae143..4037efb733ef1b9ccbc7a8271705a5096f25ceb6 100644 (file)
--- a/include/configs/M5475EVB.h
+++ b/include/configs/M5475EVB.h
@@ -259,7 +259,7 @@
 #define CFG_FLASH_CFI
 #ifdef CFG_FLASH_CFI
 #      define CFG_FLASH_BASE           (CFG_CS0_BASE)
-#      define CFG_FLASH_CFI_DRIVER     1
+#      define CONFIG_FLASH_CFI_DRIVER  1
 #      define CFG_FLASH_CFI_WIDTH      FLASH_CFI_16BIT
 #      define CFG_MAX_FLASH_SECT       137     /* max number of sectors on one chip */
 #      define CFG_FLASH_PROTECTION     /* "Real" (hardware) sectors protection */

diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h
index 0f957fff58423d0714597d54e7891c97fc807e1f..a14c55bc336507c9d75a514e9551e640ce148bde 100644 (file)
--- a/include/configs/M5485EVB.h
+++ b/include/configs/M5485EVB.h
@@ -245,7 +245,7 @@
 #define CFG_FLASH_CFI
 #ifdef CFG_FLASH_CFI
 #      define CFG_FLASH_BASE           (CFG_CS0_BASE)
-#      define CFG_FLASH_CFI_DRIVER     1
+#      define CONFIG_FLASH_CFI_DRIVER  1
 #      define CFG_FLASH_CFI_WIDTH      FLASH_CFI_16BIT
 #      define CFG_MAX_FLASH_SECT       137     /* max number of sectors on one chip */
 #      define CFG_FLASH_PROTECTION     /* "Real" (hardware) sectors protection */

diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index 37f8cffd3d75d49c5fc22389af98f14bb7ac1253..a4c4240b651e33f8fa932565b3e4abd73ca093ae 100644 (file)
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -171,7 +171,7 @@
  * FLASH on the Local Bus
  */
 #define CFG_FLASH_CFI                          /* use the Common Flash Interface */
-#define CFG_FLASH_CFI_DRIVER                   /* use the CFI driver */
+#define CONFIG_FLASH_CFI_DRIVER                        /* use the CFI driver */
 #define CFG_FLASH_BASE         0xFE000000      /* start of FLASH   */
 #define CFG_FLASH_SIZE         8               /* flash size in MB */
 #define CFG_FLASH_EMPTY_INFO                   /* display empty sectors */

diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index 095f6658c1f06018ffd66f05350cd70605c6b6ca..b0cc36dce3922250bf7527dfdd161e2e3a7d4475 100644 (file)
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -188,7 +188,7 @@
  * FLASH on the Local Bus
  */
 #define CFG_FLASH_CFI          /* use the Common Flash Interface */
-#define CFG_FLASH_CFI_DRIVER   /* use the CFI driver */
+#define CONFIG_FLASH_CFI_DRIVER        /* use the CFI driver */
 #define CFG_FLASH_CFI_WIDTH    FLASH_CFI_16BIT
 
 #define CFG_FLASH_BASE         0xFE000000 /* FLASH base address */

diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index 977c041dca6e31f18f639e9f99534000e0bf2469..94b3d5a337dd0fd7a81ed9b0afcde6d3b216091d 100644 (file)
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -178,7 +178,7 @@
  * FLASH on the Local Bus
  */
 #define CFG_FLASH_CFI          /* use the Common Flash Interface */
-#define CFG_FLASH_CFI_DRIVER   /* use the CFI driver */
+#define CONFIG_FLASH_CFI_DRIVER        /* use the CFI driver */
 #define CFG_FLASH_BASE         0xFE000000      /* FLASH base address */
 #define CFG_FLASH_SIZE         16      /* FLASH size is 16M */
 

diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index 9ca2a2be04ed67c51519611b16463f14f75fcf73..401d0afc4d0f0cd00414a75426f653e986b8d055 100644 (file)
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -166,7 +166,7 @@
  * FLASH on the Local Bus
  */
 #define CFG_FLASH_CFI          /* use the Common Flash Interface */
-#define CFG_FLASH_CFI_DRIVER   /* use the CFI driver */
+#define CONFIG_FLASH_CFI_DRIVER        /* use the CFI driver */
 #define CFG_FLASH_BASE         0xFE000000      /* FLASH base address */
 #define CFG_FLASH_SIZE         16      /* FLASH size is 16M */
 

diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index 870583845d9ca706e6b492067a4e10f500196eec..a53f5cd2612b6fab2cd5bd50a173f353caa6755c 100644 (file)
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -148,7 +148,7 @@
  * FLASH on the Local Bus
  */
 #define CFG_FLASH_CFI                          /* use the Common Flash Interface */
-#define CFG_FLASH_CFI_DRIVER                   /* use the CFI driver */
+#define CONFIG_FLASH_CFI_DRIVER                        /* use the CFI driver */
 #define CFG_FLASH_BASE         0xFE000000      /* start of FLASH   */
 #define CFG_FLASH_SIZE         32              /* max flash size in MB */
 /* #define CFG_FLASH_USE_BUFFER_WRITE */

diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index 82d06867be791c2fa87081620266dc4f2921289d..45ddd5c45151333875c54234a6dd11ccec7d59e8 100644 (file)
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -175,7 +175,7 @@
  */
 
 #define CFG_FLASH_CFI                          /* use the Common Flash Interface */
-#define CFG_FLASH_CFI_DRIVER                   /* use the CFI driver */
+#define CONFIG_FLASH_CFI_DRIVER                        /* use the CFI driver */
 #define CFG_FLASH_BASE         0xFE000000      /* start of FLASH   */
 #define CFG_FLASH_EMPTY_INFO
 #define CFG_MAX_FLASH_SECT     135     /* 127 64KB sectors + 8 8KB sectors per device */
@@ -419,7 +419,7 @@ boards, we say we have two, but don't display a message if we find only one. */
   #define CFG_ENV_SIZE         0x2000
 #else
   #define CFG_NO_FLASH         /* Flash is not usable now */
-  #undef  CFG_FLASH_CFI_DRIVER
+  #undef  CONFIG_FLASH_CFI_DRIVER
   #define CFG_ENV_IS_NOWHERE   /* Store ENV in memory only */
   #define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
   #define CFG_ENV_SIZE         0x2000

diff --git a/include/configs/MPC8360EMDS.h b/include/configs/MPC8360EMDS.h
index b4bff9a2be38e286f86aa0962bbe7c13c767f08b..43d4118b66298f8303267cff10eba2c62299fb91 100644 (file)
--- a/include/configs/MPC8360EMDS.h
+++ b/include/configs/MPC8360EMDS.h
@@ -191,7 +191,7 @@
  * FLASH on the Local Bus
  */
 #define CFG_FLASH_CFI          /* use the Common Flash Interface */
-#define CFG_FLASH_CFI_DRIVER   /* use the CFI driver */
+#define CONFIG_FLASH_CFI_DRIVER        /* use the CFI driver */
 #define CFG_FLASH_BASE         0xFE000000 /* FLASH base address */
 #define CFG_FLASH_SIZE         32 /* max FLASH size is 32M */
 #define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */

diff --git a/include/configs/MPC8360ERDK.h b/include/configs/MPC8360ERDK.h
index ca8d53cf25303fb42ac1a9cec272dcd5de87b4e1..6898495b8db17e71e382615857a5303210c1abe9 100644 (file)
--- a/include/configs/MPC8360ERDK.h
+++ b/include/configs/MPC8360ERDK.h
@@ -184,7 +184,7 @@
  * FLASH on the Local Bus
  */
 #define CFG_FLASH_CFI          /* use the Common Flash Interface */
-#define CFG_FLASH_CFI_DRIVER   /* use the CFI driver */
+#define CONFIG_FLASH_CFI_DRIVER        /* use the CFI driver */
 #define CFG_FLASH_SIZE         8 /* max FLASH size is 32M */
 #define CFG_FLASH_PROTECTION   1 /* Use intel Flash protection. */
 

diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index 0dd02795a628ba40924004453d8fc2d004636517..f9c1b170d1d6eb690cabb56dcb66c994fc536949 100644 (file)
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -226,7 +226,7 @@
  * FLASH on the Local Bus
  */
 #define CFG_FLASH_CFI          /* use the Common Flash Interface */
-#define CFG_FLASH_CFI_DRIVER   /* use the CFI driver */
+#define CONFIG_FLASH_CFI_DRIVER        /* use the CFI driver */
 #define CFG_FLASH_BASE         0xFE000000 /* FLASH base address */
 #define CFG_FLASH_SIZE         32 /* max FLASH size is 32M */
 

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 29c2490e6b1915eddd1d77823a3f00c686842493..82b33530d903f6957047990ecf85227b927a3d13 100644 (file)
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -249,7 +249,7 @@
  * FLASH on the Local Bus
  */
 #define CFG_FLASH_CFI          /* use the Common Flash Interface */
-#define CFG_FLASH_CFI_DRIVER   /* use the CFI driver */
+#define CONFIG_FLASH_CFI_DRIVER        /* use the CFI driver */
 #define CFG_FLASH_BASE         0xFE000000 /* FLASH base address */
 #define CFG_FLASH_SIZE         8 /* max FLASH size is 32M */
 

diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index d1d3cc360692f02e3ead3714c44150f24d0ce4ac..6351925d7bb5a5390304cd958b5373b7b735c354 100644 (file)
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -152,7 +152,7 @@
 #undef  CFG_RAMBOOT
 #endif
 
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI
 #define CFG_FLASH_EMPTY_INFO
 

diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h
index a64565db931f5c2ecda6647c2f48361415ea6d6c..d948d76a79798bb023bc046945dacba29e4ad6c7 100644 (file)
--- a/include/configs/MPC8541CDS.h
+++ b/include/configs/MPC8541CDS.h
@@ -154,7 +154,7 @@ extern unsigned long get_clock_freq(void);
 
 #define CFG_MONITOR_BASE       TEXT_BASE       /* start of monitor */
 
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI
 #define CFG_FLASH_EMPTY_INFO
 

diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index 091fd2e870d1d53c674beeffe7e01e0ba2c3d2ee..9a77b7bcbc73436f4eb1498d14ebc7a462f0765b 100644 (file)
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -168,7 +168,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 #define CFG_MONITOR_BASE       TEXT_BASE       /* start of monitor */
 
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI
 #define CFG_FLASH_EMPTY_INFO
 

diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index acf6f0dce6a2d2cb00dbe4ddf92dc0a389a58673..33c5c933e0f6adf6f30413e36106d7a4ee7b2b9c 100644 (file)
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -172,7 +172,7 @@ extern unsigned long get_clock_freq(void);
 
 #define CFG_MONITOR_BASE       TEXT_BASE       /* start of monitor */
 
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI
 #define CFG_FLASH_EMPTY_INFO
 

diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h
index 1948c0d276fd1eb0a16d7cdcf1eac6e7be1c6b32..85c235c4eb06429fd4b99b1b80eb75fc4148ccab 100644 (file)
--- a/include/configs/MPC8555CDS.h
+++ b/include/configs/MPC8555CDS.h
@@ -154,7 +154,7 @@ extern unsigned long get_clock_freq(void);
 
 #define CFG_MONITOR_BASE       TEXT_BASE       /* start of monitor */
 
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI
 #define CFG_FLASH_EMPTY_INFO
 

diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index 27212162723ce601099728005d72305a6cb2619d..3567d1ce357c9d8c989808e07ba4ae08effdc6e0 100644 (file)
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -148,7 +148,7 @@
 #undef  CFG_RAMBOOT
 #endif
 
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI
 #define CFG_FLASH_EMPTY_INFO
 

diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h
index 9e6bb44ff925f93a529b6c4d9acc531858a22d8a..a82d528dc06f9ae8d760e06062cbf88bd86bcc33 100644 (file)
--- a/include/configs/MPC8568MDS.h
+++ b/include/configs/MPC8568MDS.h
@@ -167,7 +167,7 @@ extern unsigned long get_clock_freq(void);
 
 #define CFG_MONITOR_BASE       TEXT_BASE       /* start of monitor */
 
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI
 #define CFG_FLASH_EMPTY_INFO
 

diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index 06899b1aff6a53adadc6e863dde37d21bfb84e50..e9371a2f3641a13aee0a3684957f4d166b7921e5 100644 (file)
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -192,7 +192,7 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Flash Write Timeout (ms) */
 #define CFG_MONITOR_BASE       TEXT_BASE       /* start of monitor */
 
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI
 #define CFG_FLASH_EMPTY_INFO
 

diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index cd354948a115e4f8efb222a078b1732c1ab8fa03..468fd08b9db55acdd0ad410f9e9e537f46193f4b 100644 (file)
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -214,7 +214,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CFG_FLASH_WRITE_TOUT   500     /* Flash Write Timeout (ms) */
 #define CFG_MONITOR_BASE       TEXT_BASE       /* start of monitor */
 
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI
 #define CFG_FLASH_EMPTY_INFO
 

diff --git a/include/configs/MVBC_P.h b/include/configs/MVBC_P.h
index 2c27b978e0f8b9924b77a52e8af08fe0f5253e2f..0ce88d6be6fbeb5406a162aa0e35852bde132d97 100644 (file)
--- a/include/configs/MVBC_P.h
+++ b/include/configs/MVBC_P.h
@@ -198,7 +198,7 @@
  */
 #undef         CONFIG_FLASH_16BIT
 #define CFG_FLASH_CFI
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI_AMD_RESET 1
 #define CFG_FLASH_EMPTY_INFO
 

diff --git a/include/configs/MVBLM7.h b/include/configs/MVBLM7.h
index b412655b6dd05a42273ab46f4abac863768712fb..0dce9b46d629aadda845eea2587d192c6b4a2620 100644 (file)
--- a/include/configs/MVBLM7.h
+++ b/include/configs/MVBLM7.h
@@ -104,7 +104,7 @@
 
 /* Flash */
 #define CFG_FLASH_CFI
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI_WIDTH    FLASH_CFI_16BIT
 
 #define CFG_FLASH_BASE         0xFF800000

diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h
index ffa9b54e135c2725bf5ba2a31d1732dfe73de29b..40cf275786ba53530f40dab0060d8dd654253fed 100644 (file)
--- a/include/configs/MigoR.h
+++ b/include/configs/MigoR.h
@@ -103,7 +103,7 @@
 
 /* FLASH */
 #define CFG_FLASH_CFI
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #undef  CFG_FLASH_QUIET_TEST
 /* print 'E' for empty sector on flinfo */
 #define CFG_FLASH_EMPTY_INFO

diff --git a/include/configs/NSCU.h b/include/configs/NSCU.h
index 21d90c303a94c1ecf09f4466a0ed843f1cbad892..31762b9a368b46cbcac13539a011f3274e4f822c 100644 (file)
--- a/include/configs/NSCU.h
+++ b/include/configs/NSCU.h
@@ -200,7 +200,7 @@
 
 /* use CFI flash driver */
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use the common driver */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use the common driver */
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE, CFG_FLASH_BASE+flash_info[0].size }
 #define CFG_FLASH_EMPTY_INFO
 #define CFG_FLASH_USE_BUFFER_WRITE     1

diff --git a/include/configs/PM854.h b/include/configs/PM854.h
index bd058fc1551097317fabd714a5529967d59e8be8..f2c11b0bb086eea9574dde2ebdb040746fac0511 100644 (file)
--- a/include/configs/PM854.h
+++ b/include/configs/PM854.h
@@ -148,7 +148,7 @@
 #undef CFG_RAMBOOT
 #endif
 
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI
 #define CFG_FLASH_EMPTY_INFO
 

diff --git a/include/configs/PM856.h b/include/configs/PM856.h
index 9355aafa61bf79ccf9293334f89b38e0a80a6aa0..b2cf06000fda0a3ae53d2680934bdacbe8dfb096 100644 (file)
--- a/include/configs/PM856.h
+++ b/include/configs/PM856.h
@@ -149,7 +149,7 @@
 #undef  CFG_RAMBOOT
 #endif
 
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI
 #define CFG_FLASH_EMPTY_INFO
 

diff --git a/include/configs/PMC405.h b/include/configs/PMC405.h
index adbe8a9fba6d2ede7e3ee6d0d1de2d0b184b563e..966bbf9a3188ea6710114bfd5d2dfd86faf3218f 100644 (file)
--- a/include/configs/PMC405.h
+++ b/include/configs/PMC405.h
@@ -214,7 +214,7 @@
 #define CFG_FLASH_INCREMENT    0x01000000
 
 #define CFG_FLASH_CFI         1       /* Flash is CFI conformant */
-#define CFG_FLASH_CFI_DRIVER  1       /* Use the common driver */
+#define CONFIG_FLASH_CFI_DRIVER  1       /* Use the common driver */
 #define CFG_FLASH_PROTECTION  1       /* don't use hardware protection        */
 #define CFG_FLASH_USE_BUFFER_WRITE 1  /* use buffered writes (20x faster)     */
 #define CFG_MAX_FLASH_BANKS   2       /* max num of flash banks */

diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h
index 42f1d8d006283a30cb479b6f0d6648fc3a96f08c..9140287c873f59e25efcdbdb934989d52a9e6cf4 100644 (file)
--- a/include/configs/PMC440.h
+++ b/include/configs/PMC440.h
@@ -120,7 +120,7 @@
  * FLASH related
  *----------------------------------------------------------------------*/
 #define CFG_FLASH_CFI          /* The flash is CFI compatible  */
-#define CFG_FLASH_CFI_DRIVER   /* Use common CFI driver        */
+#define CONFIG_FLASH_CFI_DRIVER        /* Use common CFI driver        */
 
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE }
 

diff --git a/include/configs/Rattler.h b/include/configs/Rattler.h
index 01ebc8f6e07bf75944b1ffe6f88e796a53c2c573..e8ed0951c8b992ee9a858f85a465b0326c576bc3 100644 (file)
--- a/include/configs/Rattler.h
+++ b/include/configs/Rattler.h
@@ -187,7 +187,7 @@
 
 #define CFG_FLASH_BASE         0xFE000000
 #define CFG_FLASH_CFI
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_MAX_FLASH_BANKS    1       /* max num of flash banks       */
 #define CFG_MAX_FLASH_SECT     256     /* max num of sects on one chip */
 

diff --git a/include/configs/SBC8540.h b/include/configs/SBC8540.h
index 8a53fdd0cb875a26d664ff2af41726d1df860999..6033d93dd5493d1c9a5834afd9edab9c08c56d29 100644 (file)
--- a/include/configs/SBC8540.h
+++ b/include/configs/SBC8540.h
@@ -291,7 +291,7 @@
  */
 
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant              */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use the common driver                */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use the common driver                */
 #if 0
 #define CFG_FLASH_USE_BUFFER_WRITE 1    /* use buffered writes (20x faster)     */
 #define CFG_FLASH_PROTECTION           /* use hardware protection              */

diff --git a/include/configs/SX1.h b/include/configs/SX1.h
index 50ad7dd598de2d18806a2dc0ef1191ffae3eabbe..d23367979fbec805f2c704f29831645a2e96ad35 100644 (file)
--- a/include/configs/SX1.h
+++ b/include/configs/SX1.h
@@ -181,7 +181,7 @@
  * FLASH driver setup
  */
 #define CFG_FLASH_CFI          1       /* Flash memory is CFI compliant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use drivers/mtd/cfi_flash.c */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use drivers/mtd/cfi_flash.c */
 #define CFG_FLASH_USE_BUFFER_WRITE 1   /* Use buffered writes (~10x faster) */
 #define CFG_FLASH_PROTECTION   1       /* Use hardware sector protection */
 

diff --git a/include/configs/TB5200.h b/include/configs/TB5200.h
index d21783b838f897360bf90fc19c98431de4b7fc7a..3b6816675a21022534422f80999b4530d29f3d5f 100644 (file)
--- a/include/configs/TB5200.h
+++ b/include/configs/TB5200.h
@@ -255,7 +255,7 @@
 
 /* use CFI flash driver */
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use the common driver */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use the common driver */
 #define CFG_FLASH_BANKS_LIST   { CFG_BOOTCS_START }
 #define CFG_FLASH_EMPTY_INFO
 #define CFG_FLASH_SIZE         0x04000000 /* 64 MByte */

diff --git a/include/configs/TK885D.h b/include/configs/TK885D.h
index 7310abfa60048e0d499068a18557b48525243004..8073b7ec6e5e9de81c4e33404dc373a926e35a1a 100644 (file)
--- a/include/configs/TK885D.h
+++ b/include/configs/TK885D.h
@@ -247,7 +247,7 @@
 
 /* use CFI flash driver */
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use the common driver */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use the common driver */
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE }
 #define CFG_FLASH_EMPTY_INFO
 #define CFG_FLASH_USE_BUFFER_WRITE     1

diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index bfb478a86888f618857cb517cbe6d50368d6c4bb..992439f3b338dff4360fc1f437c19f03f66ed25d 100644 (file)
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -386,7 +386,7 @@
 #else
 /* use CFI flash driver */
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use the common driver */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use the common driver */
 #define CFG_FLASH_BANKS_LIST   { CFG_BOOTCS_START }
 #define CFG_MAX_FLASH_BANKS    1       /* max num of flash banks
                                           (= chip selects) */

diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h
index 9cc196410c39eec8fa5f7c4ce19c1837c5c24a5d..839b6be91b904c71af39852afb48a90d579a54ab 100644 (file)
--- a/include/configs/TQM823L.h
+++ b/include/configs/TQM823L.h
@@ -208,7 +208,7 @@
 
 /* use CFI flash driver */
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use the common driver */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use the common driver */
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE, CFG_FLASH_BASE+flash_info[0].size }
 #define CFG_FLASH_EMPTY_INFO
 #define CFG_FLASH_USE_BUFFER_WRITE     1

diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h
index 5edd37935d51d7308851b6cb66a7cf8cb72b10ff..b9a7a59c258da41c3dd769ee5c734010ec429e9f 100644 (file)
--- a/include/configs/TQM823M.h
+++ b/include/configs/TQM823M.h
@@ -203,7 +203,7 @@
 
 /* use CFI flash driver */
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use the common driver */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use the common driver */
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE }
 #define CFG_FLASH_EMPTY_INFO
 #define CFG_FLASH_USE_BUFFER_WRITE     1

diff --git a/include/configs/TQM8272.h b/include/configs/TQM8272.h
index ba0402d2978c7aaf2119e0fb465b0916282c9bb3..039ecf17bb8e631a26bccea988db56d8e429904c 100644 (file)
--- a/include/configs/TQM8272.h
+++ b/include/configs/TQM8272.h
@@ -372,7 +372,7 @@
 #define CFG_MAX_FLASH_SECT     128     /* max num of sects on one chip */
 
 #define CFG_FLASH_CFI                          /* flash is CFI compat. */
-#define CFG_FLASH_CFI_DRIVER                   /* Use common CFI driver*/
+#define CONFIG_FLASH_CFI_DRIVER                        /* Use common CFI driver*/
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector   */
 #define CFG_FLASH_QUIET_TEST   1       /* don't warn upon unknown flash*/
 

diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index 0d2ca7225b184e6e305b40a265c52b449db627ff..e8f69f6dc86f55ccfca771ae451a8d17b209869f 100644 (file)
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -78,7 +78,7 @@
  * FLASH on the Local Bus
  */
 #define CFG_FLASH_CFI                          /* use the Common Flash Interface */
-#define CFG_FLASH_CFI_DRIVER                   /* use the CFI driver */
+#define CONFIG_FLASH_CFI_DRIVER                        /* use the CFI driver */
 #undef CFG_FLASH_CHECKSUM
 #define CFG_FLASH_BASE         0x80000000      /* start of FLASH   */
 #define CFG_FLASH_SIZE         8               /* FLASH size in MB */

diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h
index 9edf0d8072f429b9c3500eed6748b0cff866db0a..388fafc555487794172647e1f6d512de623a95d4 100644 (file)
--- a/include/configs/TQM850L.h
+++ b/include/configs/TQM850L.h
@@ -193,7 +193,7 @@
 
 /* use CFI flash driver */
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use the common driver */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use the common driver */
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE, CFG_FLASH_BASE+flash_info[0].size }
 #define CFG_FLASH_EMPTY_INFO
 #define CFG_FLASH_USE_BUFFER_WRITE     1

diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h
index e2c1ce80fad2e726b68d9c2d4dfff4903712987b..6f0864f47ab716ec064fa1b7b7309482779d5bb1 100644 (file)
--- a/include/configs/TQM850M.h
+++ b/include/configs/TQM850M.h
@@ -192,7 +192,7 @@
 
 /* use CFI flash driver */
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use the common driver */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use the common driver */
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE }
 #define CFG_FLASH_EMPTY_INFO
 #define CFG_FLASH_USE_BUFFER_WRITE     1

diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h
index dd19d4e5785cbf60f2cea5bc01048446aea95a88..093d6599ea1569c51ede47b7ec657e556e309331 100644 (file)
--- a/include/configs/TQM855L.h
+++ b/include/configs/TQM855L.h
@@ -198,7 +198,7 @@
 
 /* use CFI flash driver */
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use the common driver */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use the common driver */
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE, CFG_FLASH_BASE+flash_info[0].size }
 #define CFG_FLASH_EMPTY_INFO
 #define CFG_FLASH_USE_BUFFER_WRITE     1

diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h
index 8a1c350cce37e81e9075d1b82318ed000badf5b8..64bbc39cf82ab444546ada21401f247eb5ec0c60 100644 (file)
--- a/include/configs/TQM855M.h
+++ b/include/configs/TQM855M.h
@@ -232,7 +232,7 @@
 
 /* use CFI flash driver */
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use the common driver */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use the common driver */
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE }
 #define CFG_FLASH_EMPTY_INFO
 #define CFG_FLASH_USE_BUFFER_WRITE     1

diff --git a/include/configs/TQM85xx.h b/include/configs/TQM85xx.h
index d18f2346c649997dee426f9b2bf57b97bab3390c..964193fc0659ba876fb33f8838a106b1fbae1db1 100644 (file)
--- a/include/configs/TQM85xx.h
+++ b/include/configs/TQM85xx.h
@@ -204,7 +204,7 @@
 #endif /* CONFIG_TQM_BIGFLASH */
 
 #define CFG_FLASH_CFI                  /* flash is CFI compat.         */
-#define CFG_FLASH_CFI_DRIVER           /* Use common CFI driver        */
+#define CONFIG_FLASH_CFI_DRIVER                /* Use common CFI driver        */
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector   */
 #define CFG_FLASH_QUIET_TEST   1       /* don't warn upon unknown flash*/
 #define CFG_FLASH_USE_BUFFER_WRITE     1 /* speed up output to Flash   */

diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h
index 803cdb854c4308c121deaed54b622b4c569c125b..dacc3406bb84ce55cb312a0a523b1da1050d7407 100644 (file)
--- a/include/configs/TQM860L.h
+++ b/include/configs/TQM860L.h
@@ -197,7 +197,7 @@
 
 /* use CFI flash driver */
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use the common driver */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use the common driver */
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE, CFG_FLASH_BASE+flash_info[0].size }
 #define CFG_FLASH_EMPTY_INFO
 #define CFG_FLASH_USE_BUFFER_WRITE     1

diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h
index 071da1e607d4ce9a0fa7db36386e69ec1ced8a92..3ec849c8bc811211982476bcd284d96f189a5eb2 100644 (file)
--- a/include/configs/TQM860M.h
+++ b/include/configs/TQM860M.h
@@ -197,7 +197,7 @@
  */
 /* use CFI flash driver */
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use the common driver */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use the common driver */
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE }
 #define CFG_FLASH_EMPTY_INFO
 #define CFG_FLASH_USE_BUFFER_WRITE     1

diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h
index d34f6bea6498271a165f113f7e8af9e4c239b108..6c610ee5904a8493658efbc797f53057b47a54bc 100644 (file)
--- a/include/configs/TQM862L.h
+++ b/include/configs/TQM862L.h
@@ -201,7 +201,7 @@
 
 /* use CFI flash driver */
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use the common driver */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use the common driver */
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE, CFG_FLASH_BASE+flash_info[0].size }
 #define CFG_FLASH_EMPTY_INFO
 #define CFG_FLASH_USE_BUFFER_WRITE     1

diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h
index 9270e449834254e176e39eb9bca62590640f40fd..2eca59b99dd6513675d2c262d71da882c797a51b 100644 (file)
--- a/include/configs/TQM862M.h
+++ b/include/configs/TQM862M.h
@@ -201,7 +201,7 @@
 
 /* use CFI flash driver */
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use the common driver */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use the common driver */
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE }
 #define CFG_FLASH_EMPTY_INFO
 #define CFG_FLASH_USE_BUFFER_WRITE     1

diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h
index d916d5337280726475e0db24e55f822de0538e6e..4683286d7a0af9040b097bbc6d49dde1cf5bb487 100644 (file)
--- a/include/configs/TQM866M.h
+++ b/include/configs/TQM866M.h
@@ -241,7 +241,7 @@
  */
 /* use CFI flash driver */
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use the common driver */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use the common driver */
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE }
 #define CFG_FLASH_EMPTY_INFO
 #define CFG_FLASH_USE_BUFFER_WRITE     1

diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h
index f075442f38113e3ba9c93d2bc1af94599d434c27..5daaf04be84c60c77dd850a4a74784076b378e65 100644 (file)
--- a/include/configs/TQM885D.h
+++ b/include/configs/TQM885D.h
@@ -244,7 +244,7 @@
 
 /* use CFI flash driver */
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use the common driver */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use the common driver */
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE }
 #define CFG_FLASH_EMPTY_INFO
 #define CFG_FLASH_USE_BUFFER_WRITE     1

diff --git a/include/configs/Total5200.h b/include/configs/Total5200.h
index 598fe7bf27823fd100ed8ccf362a467863acfdb8..25e98e249e5cd88e9dbf88415e0b2c2617bd94b4 100644 (file)
--- a/include/configs/Total5200.h
+++ b/include/configs/Total5200.h
@@ -204,7 +204,7 @@
  * Flash configuration
  */
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use the common driver */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use the common driver */
 #if CONFIG_TOTAL5200_REV==2
 #   define CFG_MAX_FLASH_BANKS 3       /* max num of flash banks */
 #   define CFG_FLASH_BANKS_LIST { CFG_CS5_START, CFG_CS4_START, CFG_BOOTCS_START }

diff --git a/include/configs/ZPC1900.h b/include/configs/ZPC1900.h
index b04be766f5723e378bb0e9f8c93db4e1cc4a963c..388c74768117e3a07d369007c4f59c5e6f9dcdd8 100644 (file)
--- a/include/configs/ZPC1900.h
+++ b/include/configs/ZPC1900.h
@@ -179,7 +179,7 @@
 #define CFG_FLSIMM_BASE                0xFF000000
 
 #define CFG_FLASH_CFI
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_MAX_FLASH_BANKS    2       /* max num of flash banks       */
 #define CFG_MAX_FLASH_SECT     32      /* max num of sects on one chip */
 

diff --git a/include/configs/acadia.h b/include/configs/acadia.h
index 9092a7c0962e5efea73d0d96d910a4c417c44f90..ed2754d66a8be39441b4defd5229bd1c61ad37c1 100644 (file)
--- a/include/configs/acadia.h
+++ b/include/configs/acadia.h
@@ -107,7 +107,7 @@
  *----------------------------------------------------------------------*/
 #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
 #define CFG_FLASH_CFI                  /* The flash is CFI compatible  */
-#define CFG_FLASH_CFI_DRIVER           /* Use common CFI driver        */
+#define CONFIG_FLASH_CFI_DRIVER                /* Use common CFI driver        */
 
 #define CFG_FLASH_BANKS_LIST    {CFG_FLASH_BASE}
 #define CFG_MAX_FLASH_BANKS    1       /* max number of memory banks           */

diff --git a/include/configs/actux1.h b/include/configs/actux1.h
index 4c4b1d145d2f59571a2f1157575887ea520a9db8..33a74949a541ff5ea014a8a9fa141254b6941f78 100644 (file)
--- a/include/configs/actux1.h
+++ b/include/configs/actux1.h
@@ -162,7 +162,7 @@
 
 /* Use common CFI driver */
 #define CFG_FLASH_CFI
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 /* no byte writes on IXP4xx */
 #define CFG_FLASH_CFI_WIDTH            FLASH_CFI_16BIT
 /* print 'E' for empty sector on flinfo */

diff --git a/include/configs/actux2.h b/include/configs/actux2.h
index 873fced007955884e00e5dcebeca15f97eff8197..75aaa1184213c8e5682ed83d1787ba92011ec23b 100644 (file)
--- a/include/configs/actux2.h
+++ b/include/configs/actux2.h
@@ -136,7 +136,7 @@
 
 /* Use common CFI driver */
 #define CFG_FLASH_CFI
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 /* no byte writes on IXP4xx */
 #define CFG_FLASH_CFI_WIDTH            FLASH_CFI_16BIT
 

diff --git a/include/configs/actux3.h b/include/configs/actux3.h
index 5e468e6101a47509751ab846cb7ce2704284437c..693c2847fdb0d7608637a9011bcc57844661099d 100644 (file)
--- a/include/configs/actux3.h
+++ b/include/configs/actux3.h
@@ -135,7 +135,7 @@
 
 /* Use common CFI driver */
 #define CFG_FLASH_CFI
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 /* no byte writes on IXP4xx */
 #define CFG_FLASH_CFI_WIDTH            FLASH_CFI_16BIT
 

diff --git a/include/configs/actux4.h b/include/configs/actux4.h
index e4dca2afac2e384731ebe96a3a3a4a45461667b8..7f8e0f4d0f96b3404c59f5fe702e0ec92310c905 100644 (file)
--- a/include/configs/actux4.h
+++ b/include/configs/actux4.h
@@ -134,7 +134,7 @@
 
 /* Use common CFI driver */
 #define CFG_FLASH_CFI
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 /* board provides its own flash_init code */
 #define CONFIG_FLASH_CFI_LEGACY                1
 /* no byte writes on IXP4xx */

diff --git a/include/configs/ads5121.h b/include/configs/ads5121.h
index 091da803a7823430423d655aa20b71faaa2d10b9..d129ea317dc59b4cfa8375ba69657f73f6f28f02 100644 (file)
--- a/include/configs/ads5121.h
+++ b/include/configs/ads5121.h
@@ -183,7 +183,7 @@
  */
 #undef CONFIG_BKUP_FLASH
 #define CFG_FLASH_CFI                          /* use the Common Flash Interface */
-#define CFG_FLASH_CFI_DRIVER                   /* use the CFI driver */
+#define CONFIG_FLASH_CFI_DRIVER                        /* use the CFI driver */
 #ifdef CONFIG_BKUP_FLASH
 #define CFG_FLASH_BASE         0xFF800000      /* start of FLASH   */
 #define CFG_FLASH_SIZE         0x00800000      /* max flash size in bytes */

diff --git a/include/configs/aev.h b/include/configs/aev.h
index c5e475921c430bc5ed60b1b287fc015a78d1156e..f27cc4a1500ac31339aac1b5ce8dc185cea9997d 100644 (file)
--- a/include/configs/aev.h
+++ b/include/configs/aev.h
@@ -225,7 +225,7 @@
 
 /* use CFI flash driver if no module variant is spezified */
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use the common driver */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use the common driver */
 #define CFG_FLASH_BANKS_LIST   { CFG_BOOTCS_START }
 #define CFG_FLASH_EMPTY_INFO
 #define CFG_FLASH_SIZE         0x04000000 /* 64 MByte */

diff --git a/include/configs/alpr.h b/include/configs/alpr.h
index fb6feb52749be94bd7560e54ecdfb91ce19e19ed..f342c7a6db6ffddfd53a5e14a1670db23e05b521 100644 (file)
--- a/include/configs/alpr.h
+++ b/include/configs/alpr.h
@@ -86,7 +86,7 @@
  * FLASH related
  *----------------------------------------------------------------------*/
 #define CFG_FLASH_CFI          1       /* The flash is CFI compatible          */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use common CFI driver                */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use common CFI driver                */
 #define CFG_MAX_FLASH_BANKS    1       /* max number of memory banks           */
 #define CFG_MAX_FLASH_SECT     512     /* max number of sectors on one chip    */
 #define CFG_FLASH_USE_BUFFER_WRITE 1   /* use buffered writes (20x faster)     */

diff --git a/include/configs/apollon.h b/include/configs/apollon.h
index 5884611b9ada30ff079de124145d8d13dd5ffff8..c93e77a2e22d253c10cf931fdd51c0e345dadb2c 100644 (file)
--- a/include/configs/apollon.h
+++ b/include/configs/apollon.h
@@ -215,7 +215,7 @@
  * CFI FLASH driver setup
  */
 # define       CFG_FLASH_CFI   1       /* Flash memory is CFI compliant */
-# define       CFG_FLASH_CFI_DRIVER    1       /* Use drivers/cfi_flash.c */
+# define       CONFIG_FLASH_CFI_DRIVER 1       /* Use drivers/cfi_flash.c */
 /* #define CFG_FLASH_USE_BUFFER_WRITE 1 */ /* Use buffered writes (~10x faster) */
 # define       CFG_FLASH_PROTECTION    1       /* Use h/w sector protection*/
 

diff --git a/include/configs/assabet.h b/include/configs/assabet.h
index d10f092f98530aa2a48d82ca79488b07decee742..ed7b5ef8ffd6b5c8c1bc7869fcb0daa2436f08d3 100644 (file)
--- a/include/configs/assabet.h
+++ b/include/configs/assabet.h
@@ -152,7 +152,7 @@
 #define CFG_FLASH_BASE         PHYS_FLASH_1
 #define CFG_FLASH_SIZE          PHYS_FLASH_SIZE
 #define CFG_FLASH_CFI           1      /* flash is CFI conformant      */
-#define CFG_FLASH_CFI_DRIVER    1      /* use common cfi driver        */
+#define CONFIG_FLASH_CFI_DRIVER    1   /* use common cfi driver        */
 #define CFG_FLASH_USE_BUFFER_WRITE 1   /* use buffered writes (20x faster) */
 #define CFG_MAX_FLASH_BANKS     1      /* max # of memory banks        */
 #define CFG_FLASH_INCREMENT     0      /* there is only one bank       */

diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h
index 342ce2a649d67640876a548246cefefaba2f3e53..520c67685dba52560ff75dc13b3cfda7da3e368d 100644 (file)
--- a/include/configs/at91cap9adk.h
+++ b/include/configs/at91cap9adk.h
@@ -109,7 +109,7 @@
 
 /* NOR flash */
 #define CFG_FLASH_CFI                  1
-#define CFG_FLASH_CFI_DRIVER           1
+#define CONFIG_FLASH_CFI_DRIVER                1
 #define PHYS_FLASH_1                   0x10000000
 #define CFG_FLASH_BASE                 PHYS_FLASH_1
 #define CFG_MAX_FLASH_SECT             256

diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index a8194b564d958c8b87c8b97b1f80bcef29c82a43..5f90d39d5caf83c79dd941430099afb695333a0d 100644 (file)
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -113,7 +113,7 @@
 #define CFG_NO_FLASH                   1
 #else
 #define CFG_FLASH_CFI                  1
-#define CFG_FLASH_CFI_DRIVER           1
+#define CONFIG_FLASH_CFI_DRIVER                1
 #define PHYS_FLASH_1                   0x10000000
 #define CFG_FLASH_BASE                 PHYS_FLASH_1
 #define CFG_MAX_FLASH_SECT             256

diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h
index f040b863c77fe97244f99e56869034b93da9d890..6d8c1b22a3878d4562d1eb33756729478b47168e 100644 (file)
--- a/include/configs/atngw100.h
+++ b/include/configs/atngw100.h
@@ -140,7 +140,7 @@
 #define CONFIG_NR_DRAM_BANKS           1
 
 #define CFG_FLASH_CFI                  1
-#define CFG_FLASH_CFI_DRIVER           1
+#define CONFIG_FLASH_CFI_DRIVER                1
 
 #define CFG_FLASH_BASE                 0x00000000
 #define CFG_FLASH_SIZE                 0x800000

diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h
index 68f0cecf39e8dc195f6eba6ccd9e8f8ead4702a9..3a7d27354f848fe588931328a714275c54c302aa 100644 (file)
--- a/include/configs/atstk1002.h
+++ b/include/configs/atstk1002.h
@@ -163,7 +163,7 @@
 /* External flash on STK1000 */
 #if 0
 #define CFG_FLASH_CFI                  1
-#define CFG_FLASH_CFI_DRIVER           1
+#define CONFIG_FLASH_CFI_DRIVER                1
 #endif
 
 #define CFG_FLASH_BASE                 0x00000000

diff --git a/include/configs/atstk1003.h b/include/configs/atstk1003.h
index d3a2f69edeacb3d841a6d0cacd27c59b4a6e1edd..55ea7f290f341ba7900e4c026808e8a4741941f1 100644 (file)
--- a/include/configs/atstk1003.h
+++ b/include/configs/atstk1003.h
@@ -146,7 +146,7 @@
 /* External flash on STK1000 */
 #if 0
 #define CFG_FLASH_CFI                  1
-#define CFG_FLASH_CFI_DRIVER           1
+#define CONFIG_FLASH_CFI_DRIVER                1
 #endif
 
 #define CFG_FLASH_BASE                 0x00000000

diff --git a/include/configs/atstk1004.h b/include/configs/atstk1004.h
index a37ba92416bb2f9876b85851253855ebc8c50dc2..369c61964903c5e8064304a492f45fb9e40b9bb4 100644 (file)
--- a/include/configs/atstk1004.h
+++ b/include/configs/atstk1004.h
@@ -146,7 +146,7 @@
 /* External flash on STK1000 */
 #if 0
 #define CFG_FLASH_CFI                  1
-#define CFG_FLASH_CFI_DRIVER           1
+#define CONFIG_FLASH_CFI_DRIVER                1
 #endif
 
 #define CFG_FLASH_BASE                 0x00000000

diff --git a/include/configs/atstk1006.h b/include/configs/atstk1006.h
index a6c5b6e24eda239fd659090e5107c9fa5f307320..902f822e45fcda7da3aa485564d3473db14e0490 100644 (file)
--- a/include/configs/atstk1006.h
+++ b/include/configs/atstk1006.h
@@ -163,7 +163,7 @@
 /* External flash on STK1000 */
 #if 0
 #define CFG_FLASH_CFI                  1
-#define CFG_FLASH_CFI_DRIVER           1
+#define CONFIG_FLASH_CFI_DRIVER                1
 #endif
 
 #define CFG_FLASH_BASE                 0x00000000

diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h
index d70aa1087cb179bb8ae9aa004cf01a96215fe22f..9f5667bcb5283fea87c1fd927d3cabe5a1e7271c 100644 (file)
--- a/include/configs/bf533-stamp.h
+++ b/include/configs/bf533-stamp.h
@@ -94,7 +94,7 @@
  */
 
 #define CFG_FLASH_CFI          /* The flash is CFI compatible  */
-#define CFG_FLASH_CFI_DRIVER   /* Use common CFI driver        */
+#define CONFIG_FLASH_CFI_DRIVER        /* Use common CFI driver        */
 #define        CFG_FLASH_CFI_AMD_RESET
 
 #define CFG_FLASH_BASE         0x20000000

diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h
index a881d53289b10adc0f3168d4ca13a8966d1cc92d..a06c1dccfb4dcf03c57472fb89ea14c6f95b0edd 100644 (file)
--- a/include/configs/bf537-stamp.h
+++ b/include/configs/bf537-stamp.h
@@ -221,7 +221,7 @@
 
 #define CFG_FLASH_BASE         0x20000000
 #define CFG_FLASH_CFI          /* The flash is CFI compatible */
-#define CFG_FLASH_CFI_DRIVER   /* Use common CFI driver */
+#define CONFIG_FLASH_CFI_DRIVER        /* Use common CFI driver */
 #define CFG_FLASH_PROTECTION
 #define CFG_MAX_FLASH_BANKS    1
 #define CFG_MAX_FLASH_SECT     71      /* some have 67 sectors (M29W320DB), but newer have 71 (M29W320EB) */

diff --git a/include/configs/bf561-ezkit.h b/include/configs/bf561-ezkit.h
index e99e97924cde0e41a19ae608e3d0c115fef0609d..e4a7f9dbce3fe624b98052065391aad7cddaa1a2 100644 (file)
--- a/include/configs/bf561-ezkit.h
+++ b/include/configs/bf561-ezkit.h
@@ -77,7 +77,7 @@
  */
 
 #define CFG_FLASH_CFI          /* The flash is CFI compatible */
-#define CFG_FLASH_CFI_DRIVER   /* Use common CFI driver */
+#define CONFIG_FLASH_CFI_DRIVER        /* Use common CFI driver */
 #define CFG_FLASH_CFI_AMD_RESET
 #define        CFG_ENV_IS_IN_FLASH     1
 #define CFG_FLASH_BASE         0x20000000

diff --git a/include/configs/canmb.h b/include/configs/canmb.h
index f097e2c2f09042b7a085273b096ef030140bedbc..38714cc3069dfb42e7038c90f2426c8cc5ae2e4d 100644 (file)
--- a/include/configs/canmb.h
+++ b/include/configs/canmb.h
@@ -130,7 +130,7 @@
 #define CFG_FLASH_ERASE_TOUT   240000  /* Flash Erase Timeout (in ms)  */
 #define CFG_FLASH_WRITE_TOUT   500     /* Flash Write Timeout (in ms)  */
 
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI
 #define CFG_FLASH_EMPTY_INFO
 

diff --git a/include/configs/canyonlands.h b/include/configs/canyonlands.h
index ac2e5d99e01401234508a994bc2dba55bba810f9..3b5b2809359954d813f526aca1528cade8915d8e 100644 (file)
--- a/include/configs/canyonlands.h
+++ b/include/configs/canyonlands.h
@@ -188,7 +188,7 @@
  * FLASH related
  *----------------------------------------------------------------------*/
 #define CFG_FLASH_CFI                  /* The flash is CFI compatible  */
-#define CFG_FLASH_CFI_DRIVER           /* Use common CFI driver        */
+#define CONFIG_FLASH_CFI_DRIVER                /* Use common CFI driver        */
 #define CFG_FLASH_CFI_AMD_RESET        1       /* Use AMD (Spansion) reset cmd */
 
 #define CFG_FLASH_BANKS_LIST    {CFG_FLASH_BASE}

diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h
index ef50c7cabb7c2b2400b6779c785abb1ce2b6d662..0221dfeb8c1e02674293c1c4f39bd9fe39f93179 100644 (file)
--- a/include/configs/cm5200.h
+++ b/include/configs/cm5200.h
@@ -177,7 +177,7 @@
  * Flash configuration
  */
 #define CFG_FLASH_CFI          1
-#define CFG_FLASH_CFI_DRIVER   1
+#define CONFIG_FLASH_CFI_DRIVER        1
 #define CFG_FLASH_BASE         0xfc000000
 /* we need these despite using CFI */
 #define CFG_MAX_FLASH_BANKS    1       /* max num of flash banks */

diff --git a/include/configs/csb272.h b/include/configs/csb272.h
index 15bf1772b94975cf61a4d7bfb8c9d47ce258ba54..5145c004235ed83a915fac9aa42dec3bfc855c05 100644 (file)
--- a/include/configs/csb272.h
+++ b/include/configs/csb272.h
@@ -264,7 +264,7 @@
  *
  */
 #define CFG_FLASH_CFI          1       /* flash is CFI conformant      */
-#define CFG_FLASH_CFI_DRIVER   1       /* use common cfi driver        */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* use common cfi driver        */
 #define CFG_FLASH_USE_BUFFER_WRITE 1   /* use buffered writes (20x faster) */
 #define CFG_MAX_FLASH_BANKS    1       /* max # of memory banks        */
 #define CFG_FLASH_INCREMENT    0       /* there is only one bank       */

diff --git a/include/configs/csb472.h b/include/configs/csb472.h
index b06c0a269da282a04244f8565258bcc1ac94c00a..d3e5ea86b1b5d2e7b41548e8ee850e10057bfacc 100644 (file)
--- a/include/configs/csb472.h
+++ b/include/configs/csb472.h
@@ -263,7 +263,7 @@
  *
  */
 #define CFG_FLASH_CFI          1       /* flash is CFI conformant      */
-#define CFG_FLASH_CFI_DRIVER   1       /* use common cfi driver        */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* use common cfi driver        */
 #define CFG_FLASH_USE_BUFFER_WRITE 1   /* use buffered writes (20x faster) */
 #define CFG_MAX_FLASH_BANKS    1       /* max # of memory banks        */
 #define CFG_FLASH_INCREMENT    0       /* there is only one bank       */

diff --git a/include/configs/csb637.h b/include/configs/csb637.h
index 735a211e07e84c04d603809ef3d469d7b8825f7d..88c8fdbf7fdf98cd1692a2d58e8c5480a3181e76 100644 (file)
--- a/include/configs/csb637.h
+++ b/include/configs/csb637.h
@@ -179,7 +179,7 @@
 #define PHYS_FLASH_SIZE                        0x800000  /* 8 megs main flash */
 #define CFG_FLASH_BASE                 PHYS_FLASH_1
 #define CFG_FLASH_CFI          1       /* flash is CFI conformant      */
-#define CFG_FLASH_CFI_DRIVER   1       /* use common cfi driver        */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* use common cfi driver        */
 #define CFG_FLASH_EMPTY_INFO
 #define CFG_FLASH_USE_BUFFER_WRITE 1   /* use buffered writes (20x faster) */
 #define CFG_MAX_FLASH_BANKS    1       /* max # of memory banks        */

diff --git a/include/configs/davinci_dvevm.h b/include/configs/davinci_dvevm.h
index 632c4c2bf9d1f132a798a4ef99b4165f78467a17..c27ce18ff2b6e516b2892663070765d67befa80b 100644 (file)
--- a/include/configs/davinci_dvevm.h
+++ b/include/configs/davinci_dvevm.h
@@ -140,7 +140,7 @@
 #endif
 #define CFG_ENV_IS_IN_FLASH
 #undef CFG_NO_FLASH
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI
 #define CFG_MAX_FLASH_BANKS    1               /* max number of flash banks */
 #define CFG_FLASH_SECT_SZ      0x10000         /* 64KB sect size AMD Flash */

diff --git a/include/configs/davinci_sonata.h b/include/configs/davinci_sonata.h
index ba68605a0557edc6a1d43599398f41674956e655..c55766ce34f2d40018277ad6873c00fad001c3e7 100644 (file)
--- a/include/configs/davinci_sonata.h
+++ b/include/configs/davinci_sonata.h
@@ -135,7 +135,7 @@
 #endif
 #define CFG_ENV_IS_IN_FLASH
 #undef CFG_NO_FLASH
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI
 #define CFG_MAX_FLASH_BANKS    1               /* max number of flash banks */
 #define CFG_FLASH_SECT_SZ      0x20000         /* 128KB sect size AMD Flash */

diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h
index 0e10396dfa9659e91f7aeb871d3cba23d0f9d014..8941c5eb12a6fc4aa79459e52393b6edb5d76acb 100644 (file)
--- a/include/configs/dbau1x00.h
+++ b/include/configs/dbau1x00.h
@@ -183,7 +183,7 @@
 #define CFG_FLASH_BANKS_LIST {PHYS_FLASH_1, PHYS_FLASH_2}
 
 #define CFG_FLASH_CFI           1
-#define CFG_FLASH_CFI_DRIVER    1
+#define CONFIG_FLASH_CFI_DRIVER    1
 
 /* The following #defines are needed to get flash environment right */
 #define        CFG_MONITOR_BASE        TEXT_BASE

diff --git a/include/configs/eXalion.h b/include/configs/eXalion.h
index f8e2c885b064d6112dad78fb080fc19de68c9881..6ba0d3fe57d15c8d3f8d4e16f3ba9093535c7ea2 100644 (file)
--- a/include/configs/eXalion.h
+++ b/include/configs/eXalion.h
@@ -170,7 +170,7 @@
  */
 
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant              */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use the common driver                */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use the common driver                */
 #define CFG_MAX_FLASH_SECT     64      /* max number of sectors on one chip    */
 #define CFG_MAX_FLASH_BANKS    1       /* max number of memory banks           */
 #define CFG_FLASH_INCREMENT    0       /* there is only one bank               */

diff --git a/include/configs/ep8248.h b/include/configs/ep8248.h
index 8a220b681632db599cb55174415296a58c64b43f..ccc0d5d225be7f1228f36706ab52c264d36c902b 100644 (file)
--- a/include/configs/ep8248.h
+++ b/include/configs/ep8248.h
@@ -186,7 +186,7 @@
 
 #define CFG_FLASH_BASE         0xFF800000
 #define CFG_FLASH_CFI
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_MAX_FLASH_BANKS    1       /* max num of flash banks       */
 #define CFG_MAX_FLASH_SECT     256     /* max num of sects on one chip */
 

diff --git a/include/configs/ep82xxm.h b/include/configs/ep82xxm.h
index ac5847ce12c2126d3b83f30eea27ee5fb8974f82..ac68c869a732efc51259d0ab9fd77c483adf20bb 100644 (file)
--- a/include/configs/ep82xxm.h
+++ b/include/configs/ep82xxm.h
@@ -202,7 +202,7 @@
  *----------------------------------------------------------------------*/
 #define CFG_FLASH_BASE         0xFC000000
 #define CFG_FLASH_CFI
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_MAX_FLASH_BANKS    1       /* max num of flash banks       */
 #define CFG_MAX_FLASH_SECT     512     /* max num of sects on one chip */
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector in flinfo */

diff --git a/include/configs/gcplus.h b/include/configs/gcplus.h
index 3b1b4ab95063b2562978f44eba44d5f31d351a09..1d9c05b729bf20d737551ad2e65fceededf65da8 100644 (file)
--- a/include/configs/gcplus.h
+++ b/include/configs/gcplus.h
@@ -169,7 +169,7 @@
 #else
 /* REVISIT: This doesn't work on ADS GCPlus just yet: */
 #define CFG_FLASH_CFI           1       /* flash is CFI conformant      */
-#define CFG_FLASH_CFI_DRIVER    1       /* use common cfi driver        */
+#define CONFIG_FLASH_CFI_DRIVER    1       /* use common cfi driver        */
 #define CFG_FLASH_USE_BUFFER_WRITE 1    /* use buffered writes (20x faster) */
 #define CFG_MAX_FLASH_BANKS     1       /* max # of memory banks        */
 #define CFG_FLASH_INCREMENT     0       /* there is only one bank       */

diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h
index ffe7671ec03a12dd90b650266a676363f9e276d5..942609f8caf27d08a4e41addf7aad7f4fc6111d8 100644 (file)
--- a/include/configs/gr_cpci_ax2000.h
+++ b/include/configs/gr_cpci_ax2000.h
@@ -208,7 +208,7 @@
 
 /*** CFI CONFIG ***/
 #define CFG_FLASH_CFI_WIDTH    FLASH_CFI_8BIT
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI
 /* Bypass cache when reading regs from flash memory */
 #define CFG_FLASH_CFI_BYPASS_READ

diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h
index 7b1d582202e98d3f7be74f02e303e75175979e6f..ae25fb291e0d285b809734521447b7691388368a 100644 (file)
--- a/include/configs/gr_ep2s60.h
+++ b/include/configs/gr_ep2s60.h
@@ -196,7 +196,7 @@
 
 /*** CFI CONFIG ***/
 #define CFG_FLASH_CFI_WIDTH    FLASH_CFI_8BIT
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI
 /* Bypass cache when reading regs from flash memory */
 #define CFG_FLASH_CFI_BYPASS_READ

diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h
index 6fe2b7cc3bc28f9d7b1d26433e18a864d9340101..f019bb44eabd71729bb55274d0b2292747ad94de 100644 (file)
--- a/include/configs/gr_xc3s_1500.h
+++ b/include/configs/gr_xc3s_1500.h
@@ -172,7 +172,7 @@
 
 /*** CFI CONFIG ***/
 #define CFG_FLASH_CFI_WIDTH    FLASH_CFI_8BIT
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI
 /* Bypass cache when reading regs from flash memory */
 #define CFG_FLASH_CFI_BYPASS_READ

diff --git a/include/configs/grsim.h b/include/configs/grsim.h
index 3fb8eb3a618e57f94fc1deef9359fcffbe4700e8..f880a7b51985e496e2745bd9d32135d0f83e406b 100644 (file)
--- a/include/configs/grsim.h
+++ b/include/configs/grsim.h
@@ -202,7 +202,7 @@
 
 /*** CFI CONFIG ***/
 #define CFG_FLASH_CFI_WIDTH    FLASH_CFI_8BIT
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI
 #endif
 

diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h
index 406ce3df373b77672a590c5429848f0778b402d7..e5af9a6e97ffcb5d6e0b1e5906f7db2e242fbf84 100644 (file)
--- a/include/configs/grsim_leon2.h
+++ b/include/configs/grsim_leon2.h
@@ -199,7 +199,7 @@
 
 /*** CFI CONFIG ***/
 #define CFG_FLASH_CFI_WIDTH    FLASH_CFI_8BIT
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI
 #endif
 

diff --git a/include/configs/hcu4.h b/include/configs/hcu4.h
index 13b0358cb693e78edbed396335207a7af69fbe95..d99ac5355e64d00f0236d3cc51f509c4e6a68aac 100644 (file)
--- a/include/configs/hcu4.h
+++ b/include/configs/hcu4.h
@@ -105,7 +105,7 @@
 
 /* Use common CFI driver */
 #define CFG_FLASH_CFI
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 /* board provides its own flash_init code */
 #define CONFIG_FLASH_CFI_LEGACY                1
 #define CFG_FLASH_CFI_WIDTH            FLASH_CFI_8BIT

diff --git a/include/configs/hcu5.h b/include/configs/hcu5.h
index 20808681f3161f56cb69041aa846979a16ece11d..54d6721145d5260e565de08fb80f2fc7ca1ee011 100644 (file)
--- a/include/configs/hcu5.h
+++ b/include/configs/hcu5.h
@@ -351,7 +351,7 @@
 
 /* Use common CFI driver */
 #define CFG_FLASH_CFI
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 /* board provides its own flash_init code */
 #define CONFIG_FLASH_CFI_LEGACY                1
 #define CFG_FLASH_CFI_WIDTH            FLASH_CFI_8BIT

diff --git a/include/configs/hmi1001.h b/include/configs/hmi1001.h
index ad7cf76869a8c8e35e1939f5c833edf0481f4170..205f5ccb03ad0f6a1f93da8ec96db27eeed80c85 100644 (file)
--- a/include/configs/hmi1001.h
+++ b/include/configs/hmi1001.h
@@ -155,7 +155,7 @@
 #define CFG_FLASH_ERASE_TOUT   240000  /* Flash Erase Timeout (in ms)  */
 #define CFG_FLASH_WRITE_TOUT   500     /* Flash Write Timeout (in ms)  */
 
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI
 #define CFG_FLASH_EMPTY_INFO
 #define CFG_FLASH_CFI_AMD_RESET

diff --git a/include/configs/imx31_litekit.h b/include/configs/imx31_litekit.h
index ec4ed1eeb674191b01effb27aa21c9b98b444e64..c4763335b6e33999936916c1d7b14b4304cd2c31 100644 (file)
--- a/include/configs/imx31_litekit.h
+++ b/include/configs/imx31_litekit.h
@@ -158,7 +158,7 @@
  * CFI FLASH driver setup
  */
 #define CFG_FLASH_CFI          1       /* Flash memory is CFI compliant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use drivers/cfi_flash.c */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use drivers/cfi_flash.c */
 #define CFG_FLASH_USE_BUFFER_WRITE 1   /* Use buffered writes (~10x faster) */
 #define CFG_FLASH_PROTECTION   1       /* Use hardware sector protection */
 

diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index 7d6aaa1b54baef3d7155eca75efe18d9d4655281..237f3616af44401d52b9a1cbc85806ff98adc375 100644 (file)
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -164,7 +164,7 @@
  * CFI FLASH driver setup
  */
 #define CFG_FLASH_CFI          1       /* Flash memory is CFI compliant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use drivers/cfi_flash.c */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use drivers/cfi_flash.c */
 #define CFG_FLASH_USE_BUFFER_WRITE 1   /* Use buffered writes (~10x faster) */
 #define CFG_FLASH_PROTECTION   1       /* Use hardware sector protection */
 

diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h
index 6ec92c38c578580c8c001a1c5306c583e8ac48b8..efa2802fee22d9f643b1a36b2653695862c6ef20 100644 (file)
--- a/include/configs/inka4x0.h
+++ b/include/configs/inka4x0.h
@@ -160,7 +160,7 @@
  * Flash configuration
  */
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant */
-#define CFG_FLASH_CFI_DRIVER   1
+#define CONFIG_FLASH_CFI_DRIVER        1
 #define CFG_FLASH_BASE         0xffe00000
 #define CFG_FLASH_SIZE         0x00200000
 #define CFG_MAX_FLASH_BANKS    1       /* max num of memory banks */

diff --git a/include/configs/ixdp425.h b/include/configs/ixdp425.h
index b7c43fedf324428aa6a9a2e0146a9b7072f331bc..6b73abe1f6f8970ff05297f7ad57d95c1ecf24f9 100644 (file)
--- a/include/configs/ixdp425.h
+++ b/include/configs/ixdp425.h
@@ -181,7 +181,7 @@
 #define CFG_MAX_FLASH_SECT      128    /* max number of sectors on one chip    */
 
 #define CFG_FLASH_CFI                          /* The flash is CFI compatible  */
-#define CFG_FLASH_CFI_DRIVER                   /* Use common CFI driver        */
+#define CONFIG_FLASH_CFI_DRIVER                        /* Use common CFI driver        */
 #define        CFG_ENV_IS_IN_FLASH     1
 
 #define CFG_FLASH_BANKS_LIST   { PHYS_FLASH_1 }

diff --git a/include/configs/ixdpg425.h b/include/configs/ixdpg425.h
index 05dc841e35c281ea497f559d1df1cbfcbc395678..d4e487124b16835967006037348a11684502ace9 100644 (file)
--- a/include/configs/ixdpg425.h
+++ b/include/configs/ixdpg425.h
@@ -210,7 +210,7 @@
 #define CFG_MAX_FLASH_SECT      128    /* max number of sectors on one chip    */
 
 #define CFG_FLASH_CFI                          /* The flash is CFI compatible  */
-#define CFG_FLASH_CFI_DRIVER                   /* Use common CFI driver        */
+#define CONFIG_FLASH_CFI_DRIVER                        /* Use common CFI driver        */
 #define        CFG_ENV_IS_IN_FLASH     1
 
 #define CFG_FLASH_USE_BUFFER_WRITE 1   /* use buffered writes (20x faster)     */

diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h
index c9859270c00ed0de5666f63a9e06dd88dc559b8e..af88a3fa2d10b08185ad5dd8e11cfe1d2a638608 100644 (file)
--- a/include/configs/jupiter.h
+++ b/include/configs/jupiter.h
@@ -191,7 +191,7 @@
 
 #define CFG_MAX_FLASH_BANKS    1       /* max num of flash banks */
 
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI
 #define CFG_FLASH_EMPTY_INFO
 #define CFG_FLASH_CFI_WIDTH    FLASH_CFI_8BIT

diff --git a/include/configs/katmai.h b/include/configs/katmai.h
index f07e470683a61ef00789c2db48c5ef831757ac92..e056b011f2d3439c45d00b96f4d721ee1d9e8f38 100644 (file)
--- a/include/configs/katmai.h
+++ b/include/configs/katmai.h
@@ -208,7 +208,7 @@
  * FLASH related
  *----------------------------------------------------------------------*/
 #define CFG_FLASH_CFI
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 #define CFG_FLASH_USE_BUFFER_WRITE 1   /* use buffered writes (20x faster)     */
 

diff --git a/include/configs/kb9202.h b/include/configs/kb9202.h
index 7dcce836eb78bf0e466406e12f3b949f5a7fd30f..e775e60949b505eac3af6a98b67fb7866f1c4810 100644 (file)
--- a/include/configs/kb9202.h
+++ b/include/configs/kb9202.h
@@ -153,7 +153,7 @@
 #define CFG_MAXARGS            16              /* max number of command args */
 #define CFG_PBSIZE             (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* Print Buffer Size */
 
-#define        CFG_FLASH_CFI_DRIVER
+#define        CONFIG_FLASH_CFI_DRIVER
 #define        CFG_FLASH_CFI
 
 #ifndef __ASSEMBLY__

diff --git a/include/configs/kilauea.h b/include/configs/kilauea.h
index 9c1a3a4c1e5f4d042a23ae1592bd2358cfd215fe..d94f967ba2530e020916d57c316aa06d4f580817 100644 (file)
--- a/include/configs/kilauea.h
+++ b/include/configs/kilauea.h
@@ -131,7 +131,7 @@
  * FLASH related
  *----------------------------------------------------------------------*/
 #define CFG_FLASH_CFI                  /* The flash is CFI compatible  */
-#define CFG_FLASH_CFI_DRIVER           /* Use common CFI driver        */
+#define CONFIG_FLASH_CFI_DRIVER                /* Use common CFI driver        */
 
 #define CFG_FLASH_BANKS_LIST    {CFG_FLASH_BASE}
 #define CFG_MAX_FLASH_BANKS    1       /* max number of memory banks           */

diff --git a/include/configs/korat.h b/include/configs/korat.h
index 4ca4ed00667e0b0a650c51c8c2b6e3119a19397f..a887446f262050af2a96eea048b688e9d9bf7465 100644 (file)
--- a/include/configs/korat.h
+++ b/include/configs/korat.h
@@ -110,7 +110,7 @@
  * FLASH related
  */
 #define CFG_FLASH_CFI                  /* The flash is CFI compatible        */
-#define CFG_FLASH_CFI_DRIVER           /* Use common CFI driver              */
+#define CONFIG_FLASH_CFI_DRIVER                /* Use common CFI driver              */
 #define CONFIG_FLASH_CFI_LEGACY                /* Allow hard-coded config for FLASH0 */
 
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH1_ADDR, CFG_FLASH0_ADDR }

diff --git a/include/configs/kvme080.h b/include/configs/kvme080.h
index 569800aa2313c7ca308ef25fd26709749f72eafc..819e456e459d14f2cbef8105ac6ac608d7cbcfa4 100644 (file)
--- a/include/configs/kvme080.h
+++ b/include/configs/kvme080.h
@@ -142,7 +142,7 @@
 #define CFG_BOOTMAPSZ          (8 << 20)
 
 #define CFG_FLASH_CFI
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_USE_BUFFER_WRITE
 #define CFG_FLASH_PROTECTION
 #define CFG_FLASH_EMPTY_INFO

diff --git a/include/configs/linkstation.h b/include/configs/linkstation.h
index bc642941162c01f7fd3987ee202165bc58e5679b..e5a0fb9715367b5d6985011a8963e427d6a236cf 100644 (file)
--- a/include/configs/linkstation.h
+++ b/include/configs/linkstation.h
@@ -434,7 +434,7 @@
  * FLASH organization
  */
 #define CFG_FLASH_CFI                  /* The flash is CFI compatible  */
-#define CFG_FLASH_CFI_DRIVER           /* Use common CFI driver        */
+#define CONFIG_FLASH_CFI_DRIVER                /* Use common CFI driver        */
 
 #undef  CFG_FLASH_PROTECTION
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE }

diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h
index 2f3a066062871bc3565b502017a3bc12eea533c9..3d135c4eaa6914789d05d51c6a797609b5c7572a 100644 (file)
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -124,7 +124,7 @@
  * FLASH related
  *----------------------------------------------------------------------*/
 #define CFG_FLASH_CFI                          /* The flash is CFI compatible  */
-#define CFG_FLASH_CFI_DRIVER                   /* Use common CFI driver        */
+#define CONFIG_FLASH_CFI_DRIVER                        /* Use common CFI driver        */
 
 #define CFG_FLASH0             0xFC000000
 #define CFG_FLASH1             0xF8000000

diff --git a/include/configs/m501sk.h b/include/configs/m501sk.h
index e4be1ed33fe491e7f04a80263a85b0bc83c87559..bc94cf4a33253732f689ac4adbcec65165260a6e 100644 (file)
--- a/include/configs/m501sk.h
+++ b/include/configs/m501sk.h
@@ -57,7 +57,7 @@
  * Hardware drivers
  */
 #define CFG_FLASH_CFI          1
-#define CFG_FLASH_CFI_DRIVER   1
+#define CONFIG_FLASH_CFI_DRIVER        1
 #define CFG_ENV_SECT_SIZE      0x20000
 #define CFG_FLASH_USE_BUFFER_WRITE
 #define CFG_FLASH_PROTECTION   /*for Intel P30 Flash*/

diff --git a/include/configs/makalu.h b/include/configs/makalu.h
index 65b240e0f18e33a12706a27499a0e166f33b5780..ddfc5e39e3627ebdfa0482d726e86dc93db0aa8d 100644 (file)
--- a/include/configs/makalu.h
+++ b/include/configs/makalu.h
@@ -125,7 +125,7 @@
  * FLASH related
  *----------------------------------------------------------------------*/
 #define CFG_FLASH_CFI                  /* The flash is CFI compatible  */
-#define CFG_FLASH_CFI_DRIVER           /* Use common CFI driver        */
+#define CONFIG_FLASH_CFI_DRIVER                /* Use common CFI driver        */
 
 #define CFG_FLASH_BANKS_LIST    {CFG_FLASH_BASE}
 #define CFG_MAX_FLASH_BANKS    1       /* max number of memory banks           */

diff --git a/include/configs/mcc200.h b/include/configs/mcc200.h
index e4c3f7239be4fbd6bae717a027e49143e4219bfb..f5128474479a4208499f70bc7ea46f1a79decb60 100644 (file)
--- a/include/configs/mcc200.h
+++ b/include/configs/mcc200.h
@@ -211,7 +211,7 @@
 #define CFG_FLASH_SIZE         0x04000000
 
 #define CFG_FLASH_CFI                          /* The flash is CFI compatible  */
-#define CFG_FLASH_CFI_DRIVER                   /* Use common CFI driver        */
+#define CONFIG_FLASH_CFI_DRIVER                        /* Use common CFI driver        */
 
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE }
 

diff --git a/include/configs/mcu25.h b/include/configs/mcu25.h
index 4e9645e5851ac48482267a594eed8637aad7b891..6adba9616fc8441a7adda4abc46cc3f370141563 100644 (file)
--- a/include/configs/mcu25.h
+++ b/include/configs/mcu25.h
@@ -105,7 +105,7 @@
 
 /* Use common CFI driver */
 #define CFG_FLASH_CFI
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 /* board provides its own flash_init code */
 #define CONFIG_FLASH_CFI_LEGACY                1
 #define CFG_FLASH_CFI_WIDTH            FLASH_CFI_8BIT

diff --git a/include/configs/mecp5200.h b/include/configs/mecp5200.h
index 8dfb9aa8a96f859fc8e61ee2e120188c2220ee6c..75040fece6e8361eacd3085a60a105b2fd3e0d57 100644 (file)
--- a/include/configs/mecp5200.h
+++ b/include/configs/mecp5200.h
@@ -203,7 +203,7 @@
 #define CONFIG_ENV_OVERWRITE   1
 #endif
 
-#define CFG_FLASH_CFI_DRIVER   1          /* Flash is CFI conformant           */
+#define CONFIG_FLASH_CFI_DRIVER        1          /* Flash is CFI conformant           */
 #define CFG_FLASH_CFI          1          /* Flash is CFI conformant           */
 #define CFG_FLASH_PROTECTION   1          /* use hardware protection           */
 #if 0

diff --git a/include/configs/mgcoge.h b/include/configs/mgcoge.h
index 59ff96b5c54e1bd1847e67b3eca946a4a67892a7..5fe3075efc432569bc6c46cdef5c927822a79d4a 100644 (file)
--- a/include/configs/mgcoge.h
+++ b/include/configs/mgcoge.h
@@ -153,7 +153,7 @@
 #define CFG_FLASH_BASE         0xFE000000
 #define CFG_FLASH_SIZE         32
 #define CFG_FLASH_CFI
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_MAX_FLASH_BANKS    2       /* max num of flash banks       */
 #define CFG_MAX_FLASH_SECT     512     /* max num of sects on one chip */
 

diff --git a/include/configs/mgsuvd.h b/include/configs/mgsuvd.h
index 9cbc9ccf93f428d9c91191c074f91ea92547e05d..6f1c640b1a329fd6969679b4be9c985d7597aeba 100644 (file)
--- a/include/configs/mgsuvd.h
+++ b/include/configs/mgsuvd.h
@@ -189,7 +189,7 @@
 #define CFG_MAX_FLASH_BANKS    1       /* max number of memory banks           */
 #define CFG_FLASH_SIZE         32
 #define CFG_FLASH_CFI
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_MAX_FLASH_SECT     256     /* max num of sects on one chip */
 
 

diff --git a/include/configs/ml401.h b/include/configs/ml401.h
index 7e0df870191871e690f31053a437d56473658311..36a42ba6fc25509724ca2f518e8aa92eb8b9d557 100644 (file)
--- a/include/configs/ml401.h
+++ b/include/configs/ml401.h
@@ -154,7 +154,7 @@
        #define CFG_FLASH_BASE          XILINX_FLASH_START
        #define CFG_FLASH_SIZE          XILINX_FLASH_SIZE
        #define CFG_FLASH_CFI           1
-       #define CFG_FLASH_CFI_DRIVER    1
+       #define CONFIG_FLASH_CFI_DRIVER 1
        #define CFG_FLASH_EMPTY_INFO    1       /* ?empty sector */
        #define CFG_MAX_FLASH_BANKS     1       /* max number of memory banks */
        #define CFG_MAX_FLASH_SECT      128     /* max number of sectors on one chip */

diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h
index 3d1eafee6966d8626a3a3a6d3125894f2eb6e746..f2a35ee2b39ad72055483d142c2acca8a0dd9cc3 100644 (file)
--- a/include/configs/motionpro.h
+++ b/include/configs/motionpro.h
@@ -263,7 +263,7 @@
  * Flash configuration
  */
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant */
-#define CFG_FLASH_CFI_DRIVER   1
+#define CONFIG_FLASH_CFI_DRIVER        1
 #define CFG_FLASH_BASE         0xff000000
 #define CFG_FLASH_SIZE         0x01000000
 #define CFG_MAX_FLASH_BANKS    1       /* max num of memory banks */

diff --git a/include/configs/mpc7448hpc2.h b/include/configs/mpc7448hpc2.h
index 2f249674050f701c66bf993270e06034ae32a4df..d379b1fb05322f58db511c73084ccc2819b1c3c6 100644 (file)
--- a/include/configs/mpc7448hpc2.h
+++ b/include/configs/mpc7448hpc2.h
@@ -374,7 +374,7 @@
 #define FLASH_BANK_SIZE                0x01000000      /* 16 MB Total */
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE, /* CFG_FLASH_BASE2 */ }
 
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI
 #define CFG_WRITE_SWAPPED_DATA
 

diff --git a/include/configs/mpr2.h b/include/configs/mpr2.h
index 2598b342f4143a11148ed4f86d73e50be7f999ed..3df6e39f49decf2dfbb0ca766cd96f9d5e455de7 100644 (file)
--- a/include/configs/mpr2.h
+++ b/include/configs/mpr2.h
@@ -67,7 +67,7 @@
 
 /* Flash */
 #define CFG_FLASH_CFI
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_EMPTY_INFO
 #define CFG_FLASH_BASE         0xA0000000
 #define CFG_MAX_FLASH_SECT     256

diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h
index dc0af1594ee6a56f70f3412e82b2176bfe1bb4bd..1c3d2771b08497eab1f51ae5388097a899bacfe0 100644 (file)
--- a/include/configs/ms7720se.h
+++ b/include/configs/ms7720se.h
@@ -82,7 +82,7 @@
 
 /* FLASH */
 #define CFG_FLASH_CFI
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #undef  CFG_FLASH_QUIET_TEST
 #define CFG_FLASH_EMPTY_INFO   /* print 'E' for empty sector on flinfo */
 

diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h
index 910a44eb4a5466f40cebb8799210a64ab13bcb53..3809e7120cd6745380be433bfc2d30a51bf452c8 100644 (file)
--- a/include/configs/ms7722se.h
+++ b/include/configs/ms7722se.h
@@ -90,7 +90,7 @@
 
 /* FLASH */
 #define CFG_FLASH_CFI
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #undef  CFG_FLASH_QUIET_TEST
 #define CFG_FLASH_EMPTY_INFO                   /* print 'E' for empty sector on flinfo */
 

diff --git a/include/configs/ms7750se.h b/include/configs/ms7750se.h
index bee0aab1334b116aed2f5417224ce29bb30faff2..4356a671e8369e402fd2c62832c910da7c086aea 100644 (file)
--- a/include/configs/ms7750se.h
+++ b/include/configs/ms7750se.h
@@ -86,7 +86,7 @@
 #define CFG_RX_ETH_BUFFER      (8)
 
 #define CFG_FLASH_CFI
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #undef CFG_FLASH_CFI_BROKEN_TABLE
 #undef  CFG_FLASH_QUIET_TEST
 #define CFG_FLASH_EMPTY_INFO                           /* print 'E' for empty sector on flinfo */

diff --git a/include/configs/munices.h b/include/configs/munices.h
index e0046ec2d38efb8e2066d50a846d0a5270a92e0e..cea2834305dd6a78f88c0695518ba5e12bf1b0b6 100644 (file)
--- a/include/configs/munices.h
+++ b/include/configs/munices.h
@@ -133,7 +133,7 @@
  */
 #define CFG_FLASH_BASE         0xFF000000
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use the common driver */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use the common driver */
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE }
 #define CFG_FLASH_EMPTY_INFO
 #define CFG_FLASH_SIZE         0x01000000 /* 16 MByte */

diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h
index 37ba872a43923249c8149aeb3236fd639187286d..9ede7645d9e1230d97cdf99caa35c8fe68b39e02 100644 (file)
--- a/include/configs/mx31ads.h
+++ b/include/configs/mx31ads.h
@@ -185,7 +185,7 @@
  * CFI FLASH driver setup
  */
 #define CFG_FLASH_CFI                  1 /* Flash memory is CFI compliant */
-#define CFG_FLASH_CFI_DRIVER           1 /* Use drivers/cfi_flash.c */
+#define CONFIG_FLASH_CFI_DRIVER                1 /* Use drivers/cfi_flash.c */
 #define CONFIG_FLASH_SPANSION_S29WS_N  1 /* A non-standard buffered write algorithm */
 #define CFG_FLASH_USE_BUFFER_WRITE     1 /* Use buffered writes (~10x faster) */
 #define CFG_FLASH_PROTECTION           1 /* Use hardware sector protection */

diff --git a/include/configs/omap1510inn.h b/include/configs/omap1510inn.h
index 0be46eacec77fb5c6833fbeaaede3f90d1d62131..46b30e025a440429aec6ae3400eeb9fc542e9212 100644 (file)
--- a/include/configs/omap1510inn.h
+++ b/include/configs/omap1510inn.h
@@ -179,7 +179,7 @@
  * FLASH driver setup
  */
 #define CFG_FLASH_CFI          1       /* Flash memory is CFI compliant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use drivers/mtd/cfi_flash.c */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use drivers/mtd/cfi_flash.c */
 #define CFG_FLASH_USE_BUFFER_WRITE     1       /* Use buffered writes (~10x faster) */
 #define CFG_FLASH_PROTECTION   1       /* Use hardware sector protection */
 

diff --git a/include/configs/omap2420h4.h b/include/configs/omap2420h4.h
index 88a3f6eb95b73daaa366f2dd031133293ef9386e..aac5d0fc7e5b1f82c4b02f9b47215c3229e0a955 100644 (file)
--- a/include/configs/omap2420h4.h
+++ b/include/configs/omap2420h4.h
@@ -283,7 +283,7 @@
  * CFI FLASH driver setup
  */
 #define CFG_FLASH_CFI          1       /* Flash memory is CFI compliant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use drivers/mtd/cfi_flash.c */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use drivers/mtd/cfi_flash.c */
 #define CFG_FLASH_USE_BUFFER_WRITE 1   /* Use buffered writes (~10x faster) */
 #define CFG_FLASH_PROTECTION   1       /* Use hardware sector protection */
 

diff --git a/include/configs/omap5912osk.h b/include/configs/omap5912osk.h
index e3bde4ff81d6875b441c68511a8af598e45c1e88..1c44ce032fee13bccaf23c0ac67bb522ea008e1e 100644 (file)
--- a/include/configs/omap5912osk.h
+++ b/include/configs/omap5912osk.h
@@ -174,7 +174,7 @@
  * FLASH driver setup
  */
 #define CFG_FLASH_CFI          1       /* Flash memory is CFI compliant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use drivers/mtd/cfi_flash.c */
+#define CONFIG_FLASH_CFI_DRIVER   1       /* Use drivers/mtd/cfi_flash.c */
 
 #define CFG_FLASH_BANKS_LIST { PHYS_FLASH_1, PHYS_FLASH_2 }
 

diff --git a/include/configs/p3mx.h b/include/configs/p3mx.h
index 0913b14a4ca9f22adef465244d4b4ca9abe8b03c..33a94bc2ca79fc65b74f4b15f03745837dc6f47d 100644 (file)
--- a/include/configs/p3mx.h
+++ b/include/configs/p3mx.h
@@ -128,7 +128,7 @@
  * FLASH related
  *----------------------------------------------------------------------*/
 #define CFG_FLASH_CFI                  /* The flash is CFI compatible          */
-#define CFG_FLASH_CFI_DRIVER           /* Use common CFI driver                */
+#define CONFIG_FLASH_CFI_DRIVER                /* Use common CFI driver                */
 #define CFG_MAX_FLASH_BANKS    1       /* max number of memory banks           */
 #define CFG_MAX_FLASH_SECT     512     /* max number of sectors on one chip    */
 #define CFG_FLASH_ERASE_TOUT   120000  /* Timeout for Flash Erase (in ms)      */

diff --git a/include/configs/p3p440.h b/include/configs/p3p440.h
index 82f239117e388ea5116c0dd7a43f7012b68324de..ac0d83ac1c5883b4d0958e340b9474818163d033 100644 (file)
--- a/include/configs/p3p440.h
+++ b/include/configs/p3p440.h
@@ -279,7 +279,7 @@
  * FLASH related
  *----------------------------------------------------------------------*/
 #define CFG_FLASH_CFI                          /* The flash is CFI compatible  */
-#define CFG_FLASH_CFI_DRIVER                   /* Use common CFI driver        */
+#define CONFIG_FLASH_CFI_DRIVER                        /* Use common CFI driver        */
 
 #define CFG_FLASH_BANKS_LIST { CFG_FLASH3, CFG_FLASH2, CFG_FLASH1, CFG_FLASH0 }
 

diff --git a/include/configs/pdnb3.h b/include/configs/pdnb3.h
index aca70dce69bce4c41dd0c646f414a82e056eaa5f..889207a94e633cde9bfae9ed8d6f960729dc6ae8 100644 (file)
--- a/include/configs/pdnb3.h
+++ b/include/configs/pdnb3.h
@@ -218,7 +218,7 @@
  */
 #if defined(CONFIG_SCPU)
 #define CFG_FLASH_CFI                          /* The flash is CFI compatible  */
-#define CFG_FLASH_CFI_DRIVER                   /* Use common CFI driver        */
+#define CONFIG_FLASH_CFI_DRIVER                        /* Use common CFI driver        */
 #define CFG_FLASH_CFI_WIDTH    FLASH_CFI_16BIT /* no byte writes on IXP4xx     */
 #endif
 

diff --git a/include/configs/ppmc8260.h b/include/configs/ppmc8260.h
index dee664361f92b046266c0f100d242a3d8be411e3..6f1195b1e50211f713abd949de4e43333dc5c56e 100644 (file)
--- a/include/configs/ppmc8260.h
+++ b/include/configs/ppmc8260.h
@@ -452,7 +452,7 @@
  */
 
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant              */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use the common driver                */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use the common driver                */
 #define CFG_MAX_FLASH_SECT     128     /* max number of sectors on one chip    */
 #define CFG_MAX_FLASH_BANKS    1       /* max number of memory banks           */
 #define CFG_FLASH_INCREMENT    0       /* there is only one bank               */

diff --git a/include/configs/pxa255_idp.h b/include/configs/pxa255_idp.h
index a2f365042c98b3135d4dea162cfb283b6afb87d7..179ff7ad50a60da0e2ef8c08279936e8daec59da 100644 (file)
--- a/include/configs/pxa255_idp.h
+++ b/include/configs/pxa255_idp.h
@@ -333,7 +333,7 @@
  * FLASH and environment organization
  */
 #define CFG_FLASH_CFI
-#define CFG_FLASH_CFI_DRIVER   1
+#define CONFIG_FLASH_CFI_DRIVER        1
 
 #define CFG_MONITOR_BASE       0
 #define CFG_MONITOR_LEN                PHYS_FLASH_SECT_SIZE

diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h
index 3dfd2181f4844fef4436442f5ef481359ecb4f5e..19e627b61ca6e77f2c44fa91c5600f7e038ce4a2 100644 (file)
--- a/include/configs/qemu-mips.h
+++ b/include/configs/qemu-mips.h
@@ -146,7 +146,7 @@
 #define CFG_MAX_FLASH_BANKS    1
 #define CFG_MAX_FLASH_SECT     128
 #define CFG_FLASH_CFI          1       /* Flash memory is CFI compliant */
-#define CFG_FLASH_CFI_DRIVER   1
+#define CONFIG_FLASH_CFI_DRIVER        1
 #define CFG_FLASH_USE_BUFFER_WRITE     1
 
 #define CFG_ENV_IS_IN_FLASH    1

diff --git a/include/configs/quad100hd.h b/include/configs/quad100hd.h
index 622a5d4cccdc7f54e64450f95d5aaa179e164362..d464734dadccd35c53d6f17cdfa11876b29d6d80 100644 (file)
--- a/include/configs/quad100hd.h
+++ b/include/configs/quad100hd.h
@@ -182,7 +182,7 @@
  * FLASH organization
  */
 #define CFG_FLASH_CFI                  /* The flash is CFI compatible  */
-#define        CFG_FLASH_CFI_DRIVER
+#define        CONFIG_FLASH_CFI_DRIVER
 
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE }
 

diff --git a/include/configs/quantum.h b/include/configs/quantum.h
index cc261c33e100de6935665f56d33f062ca9f8ae87..34a1ea6e2c6d7750d4f5e1ec9d9796daba954e80 100644 (file)
--- a/include/configs/quantum.h
+++ b/include/configs/quantum.h
@@ -170,13 +170,13 @@
 #define CFG_FLASH_BASE 0xFF000000
 
 #if 1
-    #define CFG_FLASH_CFI_DRIVER
+    #define CONFIG_FLASH_CFI_DRIVER
 #else
-    #undef CFG_FLASH_CFI_DRIVER
+    #undef CONFIG_FLASH_CFI_DRIVER
 #endif
 
 
-#ifdef CFG_FLASH_CFI_DRIVER
+#ifdef CONFIG_FLASH_CFI_DRIVER
     #define CFG_FLASH_CFI 1
     #undef CFG_FLASH_USE_BUFFER_WRITE
     #define CFG_FLASH_BANKS_LIST {CFG_FLASH_BASE}

diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h
index 414e8dca571faef21e5a03d0f6ada01f4f85b348..06ede3e039a171ad034118576d3615388223ead2 100644 (file)
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -65,7 +65,7 @@
  * NOR Flash ( Spantion S29GL256P )
  */
 #define CFG_FLASH_CFI
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_BASE         (0xA0000000)
 #define CFG_MAX_FLASH_BANKS (1)
 #define CFG_MAX_FLASH_SECT  256

diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h
index 0b08f18be178a744a3129c7f64dce2e0f9a62509..77881e7a28d673d0032d2ce7adb904100a3582c4 100644 (file)
--- a/include/configs/r7780mp.h
+++ b/include/configs/r7780mp.h
@@ -106,7 +106,7 @@
 #define CFG_RX_ETH_BUFFER      (8)
 
 #define CFG_FLASH_CFI
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #undef CFG_FLASH_CFI_BROKEN_TABLE
 #undef  CFG_FLASH_QUIET_TEST
 /* print 'E' for empty sector on flinfo */

diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index 74815567ff922a4daf7422c48b9e716ac611cb9f..261229c489c5b061b0df6d795ef12161c3cdace9 100644 (file)
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -133,7 +133,7 @@
  * FLASH on the Local Bus
  */
 #define CFG_FLASH_CFI                          /* use the Common Flash Interface */
-#define CFG_FLASH_CFI_DRIVER                   /* use the CFI driver */
+#define CONFIG_FLASH_CFI_DRIVER                        /* use the CFI driver */
 #define CFG_FLASH_BASE         0xFF800000      /* start of FLASH   */
 #define CFG_FLASH_SIZE         8               /* flash size in MB */
 /* #define CFG_FLASH_USE_BUFFER_WRITE */

diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h
index 358fc0208e9b0af82221e35efbdd4df194454c04..b4238e566f30d460aa64d109941cb7ba6faa9412 100644 (file)
--- a/include/configs/sbc8548.h
+++ b/include/configs/sbc8548.h
@@ -178,7 +178,7 @@
 
 #define CFG_MONITOR_BASE       TEXT_BASE       /* start of monitor */
 
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI
 #define CFG_FLASH_EMPTY_INFO
 

diff --git a/include/configs/sbc8560.h b/include/configs/sbc8560.h
index 6345cce635e3d8766226f9472f3062233503ca29..b244eef950c1c9ff080d487b2f7e866b5ffe37a5 100644 (file)
--- a/include/configs/sbc8560.h
+++ b/include/configs/sbc8560.h
@@ -290,7 +290,7 @@
  */
 
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant      */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use the common driver        */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use the common driver        */
 #if 0
 #define CFG_FLASH_USE_BUFFER_WRITE 1    /* use buffered writes (20x faster)   */
 #define CFG_FLASH_PROTECTION           /* use hardware protection      */

diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h
index ebfcb463247574f1c5e93d6a50762e48b394bf76..efc787e999382ae9f6266fd8dbf0752371522442 100644 (file)
--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@@ -223,7 +223,7 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Flash Write Timeout (ms) */
 #define CFG_MONITOR_BASE       TEXT_BASE       /* start of monitor */
 
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI
 #define CFG_WRITE_SWAPPED_DATA
 #define CFG_FLASH_EMPTY_INFO

diff --git a/include/configs/sc3.h b/include/configs/sc3.h
index 87311ea6c7af0200894ed4edbc70f668c52fd122..659f74ed9541a382e06219bc082ed6f3e0c4079b 100644 (file)
--- a/include/configs/sc3.h
+++ b/include/configs/sc3.h
@@ -397,7 +397,7 @@ extern unsigned long offsetOfEnvironment;
 #define CFG_MAX_FLASH_SECT     256     /* max number of sectors on one chip    */
 
 #define CFG_FLASH_CFI                  /* flash is CFI compat. */
-#define CFG_FLASH_CFI_DRIVER           /* Use common CFI driver*/
+#define CONFIG_FLASH_CFI_DRIVER                /* Use common CFI driver*/
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector   */
 #define CFG_FLASH_QUIET_TEST   1       /* don't warn upon unknown flash*/
 #define CFG_FLASH_ERASE_TOUT   120000  /* Timeout for Flash Erase (in ms)      */

diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h
index 730037e6f30362bee83dd6dbc8a71c3d00da25f9..18675c2d536f176cc29d3ea43edddd331c3436b2 100644 (file)
--- a/include/configs/sequoia.h
+++ b/include/configs/sequoia.h
@@ -123,7 +123,7 @@
  * FLASH related
  */
 #define CFG_FLASH_CFI                  /* The flash is CFI compatible  */
-#define CFG_FLASH_CFI_DRIVER           /* Use common CFI driver        */
+#define CONFIG_FLASH_CFI_DRIVER                /* Use common CFI driver        */
 
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE }
 

diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h
index 47236341bdf72d38b6530dfbdd7e9b44c7c61fae..1306702fcbb23b74985fbce6a05c10cd1d495008 100644 (file)
--- a/include/configs/sh7763rdp.h
+++ b/include/configs/sh7763rdp.h
@@ -89,7 +89,7 @@
 #define CFG_BOOTMAPSZ          (8 * 1024 * 1024)
 
 #define CFG_FLASH_CFI
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #undef  CFG_FLASH_QUIET_TEST
 #define CFG_FLASH_EMPTY_INFO   /* print 'E' for empty sector on flinfo */
 /* Timeout for Flash erase operations (in ms) */

diff --git a/include/configs/smmaco4.h b/include/configs/smmaco4.h
index 3e47eb88a7cba31331ab87eacda42d18197f271c..1d202d4b2f8381ea402f9205abc1d1a0a6dce737 100644 (file)
--- a/include/configs/smmaco4.h
+++ b/include/configs/smmaco4.h
@@ -196,7 +196,7 @@
 
 /* use CFI flash driver if no module variant is spezified */
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use the common driver */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use the common driver */
 #define CFG_FLASH_BANKS_LIST   { CFG_BOOTCS_START }
 #define CFG_FLASH_EMPTY_INFO
 #define CFG_FLASH_SIZE         0x04000000 /* 64 MByte */

diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 16274137dc6ba01a4c40428a070aa3acaaf1fc3c..8a649425b4a237c750ede5bddfbdd3fcfe7f39cb 100644 (file)
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -139,7 +139,7 @@
 #define CFG_OR1_PRELIM         0xfe000ff7      /* 32MB Flash           */
 
 #define CFG_FLASH_CFI                          /* flash is CFI compat. */
-#define CFG_FLASH_CFI_DRIVER                   /* Use common CFI driver*/
+#define CONFIG_FLASH_CFI_DRIVER                        /* Use common CFI driver*/
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector   */
 
 #define CFG_MAX_FLASH_BANKS    2               /* number of banks      */

diff --git a/include/configs/sorcery.h b/include/configs/sorcery.h
index 18f553373709cc448c1c6cfdba8cc97d67cfe80b..f4e460800cfe5f1a7a025e33d7dc82755d598d7e 100644 (file)
--- a/include/configs/sorcery.h
+++ b/include/configs/sorcery.h
@@ -189,7 +189,7 @@
 #define CFG_MAX_FLASH_BANKS    2       /* max num of flash banks */
 #define CFG_MAX_FLASH_SECT     512     /* max num of sects on one chip */
 
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE,  \
                                CFG_FLASH_BASE+0x04000000 } /* two banks */

diff --git a/include/configs/spc1920.h b/include/configs/spc1920.h
index f46c464cbc04e358cd2924f8b4d8b3b2a41fe8a3..daaa23f48e7ca2a2869c3f75c03fd37d9c943230 100644 (file)
--- a/include/configs/spc1920.h
+++ b/include/configs/spc1920.h
@@ -180,7 +180,7 @@
  */
 #define CFG_FLASH_BASE          0xFE000000
 #define CFG_FLASH_CFI                           /* The flash is CFI compatible  */
-#define CFG_FLASH_CFI_DRIVER                    /* Use common CFI driver        */
+#define CONFIG_FLASH_CFI_DRIVER                    /* Use common CFI driver        */
 #define CFG_MAX_FLASH_BANKS     1               /* Max number of flash banks    */
 #define CFG_MAX_FLASH_SECT      128             /* Max num of sects on one chip */
 

diff --git a/include/configs/spieval.h b/include/configs/spieval.h
index 69d2d67ab1cdbfe4b45b66d682e48cfb7bc01e39..93798a46f963c0b8d9f537e7b42b9f5bb6ef0f15 100644 (file)
--- a/include/configs/spieval.h
+++ b/include/configs/spieval.h
@@ -287,7 +287,7 @@
 
 /* use CFI flash driver if no module variant is spezified */
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use the common driver */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use the common driver */
 #define CFG_FLASH_BANKS_LIST   { CFG_BOOTCS_START }
 #define CFG_FLASH_EMPTY_INFO
 #define CFG_FLASH_SIZE         0x04000000 /* 64 MByte */

diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h
index a1e9789ea01b512b1a1ea64c428ffc9f067c549e..4f1c1563553d462b013ce73494f9ef851c65a2b5 100644 (file)
--- a/include/configs/stxssa.h
+++ b/include/configs/stxssa.h
@@ -98,7 +98,7 @@
 #define CFG_OR0_PRELIM (CFG_FLASH_BASE | 0x0FF7)
 
 #define CFG_FLASH_CFI          1
-#define CFG_FLASH_CFI_DRIVER   1
+#define CONFIG_FLASH_CFI_DRIVER        1
 #undef CFG_FLASH_USE_BUFFER_WRITE      /* use buffered writes (20x faster) */
 #define CFG_MAX_FLASH_SECT     256     /* max number of sectors on one chip */
 #define CFG_MAX_FLASH_BANKS    1       /* max number of memory banks   */

diff --git a/include/configs/stxxtc.h b/include/configs/stxxtc.h
index fcafba59379402c48950185741498c071e738411..2bdce303cf7d4144c547dc842a0c9c4e4f4badfb 100644 (file)
--- a/include/configs/stxxtc.h
+++ b/include/configs/stxxtc.h
@@ -213,7 +213,7 @@
 #define CFG_ENV_SIZE_REDUND    CFG_ENV_SIZE
 
 #define CFG_FLASH_CFI          1
-#define CFG_FLASH_CFI_DRIVER   1
+#define CONFIG_FLASH_CFI_DRIVER        1
 #undef CFG_FLASH_USE_BUFFER_WRITE      /* use buffered writes (20x faster) */
 #define CFG_MAX_FLASH_SECT     128     /* max number of sectors on one chip */
 #define CFG_MAX_FLASH_BANKS    2       /* max number of memory banks   */

diff --git a/include/configs/taishan.h b/include/configs/taishan.h
index ba421925edcd1b2d400ca47cc7cdeaab8d89ae7a..81133bb5c8689eaadd8956badc49e3f0fb20e1eb 100644 (file)
--- a/include/configs/taishan.h
+++ b/include/configs/taishan.h
@@ -89,7 +89,7 @@
  * FLASH related
  *----------------------------------------------------------------------*/
 #define CFG_FLASH_CFI
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 #define CFG_FLASH_USE_BUFFER_WRITE 1   /* use buffered writes (20x faster)     */
 

diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h
index f77dd14f1a857d27124beb65412ca2269fe54ac1..6367f873ef94414c5273d675abba39d133fc9e8a 100644 (file)
--- a/include/configs/trizepsiv.h
+++ b/include/configs/trizepsiv.h
@@ -293,7 +293,7 @@
  */
 
 #define CFG_FLASH_CFI
-#define CFG_FLASH_CFI_DRIVER   1
+#define CONFIG_FLASH_CFI_DRIVER        1
 
 #define CFG_MONITOR_BASE       0
 #define CFG_MONITOR_LEN                0x40000

diff --git a/include/configs/uc100.h b/include/configs/uc100.h
index e74b1bb85ba7bae503783db32f11615f2c85f791..106e6f27591dcb4fd3d59d68d02ef168a9fc8cd2 100644 (file)
--- a/include/configs/uc100.h
+++ b/include/configs/uc100.h
@@ -230,7 +230,7 @@
  * FLASH organization
  */
 #define CFG_FLASH_CFI                          /* The flash is CFI compatible  */
-#define CFG_FLASH_CFI_DRIVER                   /* Use common CFI driver        */
+#define CONFIG_FLASH_CFI_DRIVER                        /* Use common CFI driver        */
 #define CFG_FLASH_CFI_AMD_RESET        1               /* AMD RESET for STM 29W320DB!  */
 
 #define CFG_MAX_FLASH_BANKS    1       /* max number of memory banks           */

diff --git a/include/configs/uc101.h b/include/configs/uc101.h
index 042750e2fe9a98f5623b0e833d9e501b912e45a2..a18618893cd132de4df0bc96338389d20a2027df 100644 (file)
--- a/include/configs/uc101.h
+++ b/include/configs/uc101.h
@@ -168,7 +168,7 @@
 #define CFG_FLASH_ERASE_TOUT   240000  /* Flash Erase Timeout (in ms)  */
 #define CFG_FLASH_WRITE_TOUT   500     /* Flash Write Timeout (in ms)  */
 
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI
 #define CFG_FLASH_EMPTY_INFO
 #define CFG_FLASH_CFI_AMD_RESET

diff --git a/include/configs/v38b.h b/include/configs/v38b.h
index c2035225526092a941654ba85579acee301006b9..35745484d44ddb570b36f95f80a5088bce376357 100644 (file)
--- a/include/configs/v38b.h
+++ b/include/configs/v38b.h
@@ -201,7 +201,7 @@
  * Flash configuration - use CFI driver
  */
 #define CFG_FLASH_CFI          1               /* Flash is CFI conformant */
-#define CFG_FLASH_CFI_DRIVER   1               /* Use the common driver */
+#define CONFIG_FLASH_CFI_DRIVER        1               /* Use the common driver */
 #define CFG_FLASH_CFI_AMD_RESET        1
 #define CFG_FLASH_BASE         0xFF000000
 #define CFG_MAX_FLASH_BANKS    1               /* max num of flash banks */

diff --git a/include/configs/virtlab2.h b/include/configs/virtlab2.h
index f1048861d869285eeb70c11bbf1a60bec1e4a9a7..1a125f16ce8c7106a2016d0365beb8992de1a6ed 100644 (file)
--- a/include/configs/virtlab2.h
+++ b/include/configs/virtlab2.h
@@ -202,7 +202,7 @@
 
 /* use CFI flash driver */
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use the common driver */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use the common driver */
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE, CFG_FLASH_BASE+flash_info[0].size }
 #define CFG_FLASH_EMPTY_INFO
 #define CFG_FLASH_USE_BUFFER_WRITE     1

diff --git a/include/configs/voiceblue.h b/include/configs/voiceblue.h
index 8c827af315e0ea9c176ce57c3f580d35f96e99c8..20917ee9a5cfdc5273f7fa33ad8404893551e2d5 100644 (file)
--- a/include/configs/voiceblue.h
+++ b/include/configs/voiceblue.h
@@ -60,7 +60,7 @@
  * FLASH organization
  */
 #define CFG_FLASH_CFI                  /* Flash is CFI conformant */
-#define CFG_FLASH_CFI_DRIVER           /* Use the common driver */
+#define CONFIG_FLASH_CFI_DRIVER                /* Use the common driver */
 #define CFG_MAX_FLASH_BANKS    1
 #define CFG_FLASH_BASE         PHYS_FLASH_1
 

diff --git a/include/configs/yosemite.h b/include/configs/yosemite.h
index 891b515d4ec56e0a020c0547fa7bd3c4335f05d7..cb2042ce6ce0fb9f5113cce4e1e4235ed43c0898 100644 (file)
--- a/include/configs/yosemite.h
+++ b/include/configs/yosemite.h
@@ -105,7 +105,7 @@
  * FLASH related
  *----------------------------------------------------------------------*/
 #define CFG_FLASH_CFI                          /* The flash is CFI compatible  */
-#define CFG_FLASH_CFI_DRIVER                   /* Use common CFI driver        */
+#define CONFIG_FLASH_CFI_DRIVER                        /* Use common CFI driver        */
 #define CFG_FLASH_CFI_AMD_RESET 1              /* AMD RESET for STM 29W320DB!  */
 
 #define CFG_MAX_FLASH_BANKS    1       /* max number of memory banks           */

diff --git a/include/configs/zeus.h b/include/configs/zeus.h
index cd120dfbf1344ee0a9c93c1a5f104743bf386279..b50cba556cf79dfe77d3a7e6ab9836d259859b6f 100644 (file)
--- a/include/configs/zeus.h
+++ b/include/configs/zeus.h
@@ -210,7 +210,7 @@
  * FLASH organization
  */
 #define CFG_FLASH_CFI                          /* The flash is CFI compatible  */
-#define CFG_FLASH_CFI_DRIVER                   /* Use common CFI driver        */
+#define CONFIG_FLASH_CFI_DRIVER                        /* Use common CFI driver        */
 
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE }