Move conditional compilation to Makefile

PATCH New Jean-Christophe PLAGNIOL-VILLARD 2 participants 16 messages Aug 12, 2008 – Aug 13, 2008

Subsystems (11)

Arm i.MX and Layerscape Block layer PCI Memory technology devices (MTD) +7 more subsystems

lore

Share & tools

lore

Jean-Christophe PLAGNIOL-VILLARD

author

2008-08-12 21:32 UTC #0 lore raw

cover Move conditional compilation to Makefile

Hi,

This the first series of patch to Move conditional compilation to Makefile.

It will introduce the following major change of MACRO

rename CFG_FLASH_CFI_DRIVER to CONFIG_FLASH_CFI_DRIVER rename CFG_NAND_LEGACY to CONFIG_NAND_LEGACY rename CFG_NS9750_UART to CONFIG_NS9750_UART rename move CFG_SCIF_CONSOLE to CONFIG_SCIF_CONSOLE

Best Regards,
J.

Jean-Christophe PLAGNIOL-VILLARD

author

2008-08-12 21:35 UTC #1 lore raw

cover Move conditional compilation to Makefile

Quoted 11 lines · Jean-Christophe PLAGNIOL-VILLARD

Hi,
This the first series of patch to Move conditional compilation to Makefile.
It will introduce the following major change of MACRO
rename CFG_FLASH_CFI_DRIVER to CONFIG_FLASH_CFI_DRIVER rename CFG_NAND_LEGACY to CONFIG_NAND_LEGACY rename CFG_NS9750_UART to CONFIG_NS9750_UART rename move CFG_SCIF_CONSOLE to CONFIG_SCIF_CONSOLE

The patchset is applied to
git://git.denx.de/u-boot-arm.git branch Makefile

Best Regards,
J.

Wolfgang Denk

2008-08-13 21:24 UTC #2 lore raw

cover Move conditional compilation to Makefile

Dear Jean-Christophe PLAGNIOL-VILLARD,

Quoted 8 lines · In message <[email protected]> you wrote:

Quoted 7 lines · Jean-Christophe PLAGNIOL-VILLARD
Hi,
This the first series of patch to Move conditional compilation to Makefile.
It will introduce the following major change of MACRO

Quoted 7 lines

Quoted 4 lines
rename CFG_FLASH_CFI_DRIVER to CONFIG_FLASH_CFI_DRIVER rename CFG_NAND_LEGACY to CONFIG_NAND_LEGACY rename CFG_NS9750_UART to CONFIG_NS9750_UART rename move CFG_SCIF_CONSOLE to CONFIG_SCIF_CONSOLE
The patchset is applied to
git://git.denx.de/u-boot-arm.git branch Makefile

All 13 patches applied, thanks.

Best regards,

Wolfgang Denk

Signature · 5 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
As long as we're going to reinvent the wheel again, we might as  well
try making it round this time.                        - Mike Dennison

Jean-Christophe PLAGNIOL-VILLARD

author

2008-08-12 21:51 UTC #3 lore raw

PATCH 1/13 common: Move conditional compilation to Makefile

In reply to Jean-Christophe PLAGNIOL-VILLARD

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

---
 common/ACEX1K.c      |    4 ----
 common/Makefile      |   42 +++++++++++++++++++++++-------------------
 common/altera.c      |    4 ----
 common/bedbug.c      |    4 ----
 common/cmd_onenand.c |    4 ----
 common/cyclon2.c     |    4 ----
 common/docecc.c      |    4 ----
 common/fpga.c        |    4 ----
 common/lcd.c         |    4 ----
 common/lynxkdi.c     |    3 ---
 common/miiphybb.c    |    5 -----
 common/soft_i2c.c    |    5 -----
 common/soft_spi.c    |    4 ----
 common/spartan2.c    |    4 ----
 common/spartan3.c    |    4 ----
 common/stratixII.c   |    4 ----
 common/usb.c         |    4 ----
 common/usb_kbd.c     |    5 -----
 common/usb_storage.c |    7 -------
 common/virtex2.c     |    3 ---
 common/xilinx.c      |    4 ----
 21 files changed, 23 insertions(+), 103 deletions(-)

common/ACEX1K.c +0 -4

index 76dc166..53677b8 100644
@@ -28,8 +28,6 @@
 #include <common.h>		/* core U-Boot definitions */
 #include <ACEX1K.h>		/* ACEX device family */
 
-#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_ALTERA) && defined(CONFIG_FPGA_ACEX1K)
-
 /* Define FPGA_DEBUG to get debug printf's */
 #ifdef	FPGA_DEBUG
 #define PRINTF(fmt,args...)	printf (fmt ,##args)

@@ -362,5 +360,3 @@ static int ACEX1K_ps_reloc (Altera_desc * desc, ulong reloc_offset)
 	return ret_val;
 
 }
-
-#endif /* CONFIG_FPGA && CONFIG_FPGA_ALTERA && CONFIG_FPGA_ACEX1K */

common/Makefile +23 ~~-19~~

83 lines not on this page · raw message

common/altera.c +0 -4

index a2b5967..09dc0b2 100644
@@ -41,8 +41,6 @@
 #define PRINTF(fmt,args...)
 #endif
 
-#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_ALTERA)
-
 /* Local Static Functions */
 static int altera_validate (Altera_desc * desc, const char *fn);

@@ -283,5 +281,3 @@ static int altera_validate (Altera_desc * desc, const char *fn)
 }
 
 /* ------------------------------------------------------------------------- */
-
-#endif /* CONFIG_FPGA & CONFIG_FPGA_ALTERA */

common/bedbug.c +0 -4

index 3bf1fc3..60109cf 100644
@@ -2,8 +2,6 @@
 
 #include <common.h>
 
-#if defined(CONFIG_CMD_BEDBUG)
-
 #include <linux/ctype.h>
 #include <bedbug/bedbug.h>
 #include <bedbug/ppc.h>

@@ -1252,5 +1250,3 @@ int find_next_address (unsigned char *nextaddr, int step_over,
  * warranties of merchantability and fitness for a particular
  * purpose.
  */
-
-#endif

common/cmd_onenand.c +0 -4

index 419bf70..5e2062b 100644
@@ -12,8 +12,6 @@
 #include <common.h>
 #include <command.h>
 
-#ifdef CONFIG_CMD_ONENAND
-
 #include <linux/mtd/compat.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/onenand.h>

@@ -159,5 +157,3 @@ U_BOOT_CMD(
 	"onenand block[.oob] addr block [page] [len] - "
 		"read data with (block [, page]) to addr"
 );
-
-#endif /* CONFIG_CMD_ONENAND */

common/cyclon2.c +0 -4

index 06f5e8a..479bebb 100644
@@ -27,8 +27,6 @@
 #include <altera.h>
 #include <ACEX1K.h>		/* ACEX device family */
 
-#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_ALTERA) && defined(CONFIG_FPGA_CYCLON2)
-
 /* Define FPGA_DEBUG to get debug printf's */
 #ifdef	FPGA_DEBUG
 #define PRINTF(fmt,args...)	printf (fmt ,##args)

@@ -301,5 +299,3 @@ static int CYC2_ps_reloc (Altera_desc * desc, ulong reloc_offset)
 
 	return ret_val;
 }
-
-#endif /* CONFIG_FPGA && CONFIG_FPGA_ALTERA && CONFIG_FPGA_CYCLON2 */

common/docecc.c +0 -4

index 5daa6fc..3412aff 100644
@@ -31,8 +31,6 @@
 #undef ECC_DEBUG
 #undef PSYCHO_DEBUG
 
-#if defined(CONFIG_CMD_DOC)
-
 #include <linux/mtd/doc2000.h>
 
 /* need to undef it (from asm/termbits.h) */

@@ -513,5 +511,3 @@ int doc_decode_ecc(unsigned char sector[SECTOR_SIZE], unsigned char ecc1[6])
     free(Index_of);
     return nb_errors;
 }
-
-#endif

common/fpga.c +0 -4

index d16a92d..67a6c30 100644
@@ -29,8 +29,6 @@
 #include <xilinx.h>             /* xilinx specific definitions */
 #include <altera.h>             /* altera specific definitions */
 
-#if defined(CONFIG_FPGA)
-
 #if 0
 #define FPGA_DEBUG              /* define FPGA_DEBUG to get debug messages */
 #endif

@@ -335,5 +333,3 @@ int fpga_info( int devnum )
 }
 
 /* ------------------------------------------------------------------------- */
-
-#endif  /* CONFIG_FPGA */

common/lcd.c +0 -4

index 8d770f3..25f8664 100644
@@ -55,8 +55,6 @@
 #include <nand.h>
 #endif
 
-#ifdef CONFIG_LCD
-
 /************************************************************************/
 /* ** FONT DATA								*/
 /************************************************************************/

@@ -867,5 +865,3 @@ static void *lcd_logo (void)
 
 /************************************************************************/
 /************************************************************************/
-
-#endif /* CONFIG_LCD */

common/lynxkdi.c +0 -3

index a5dc887..5f12b0d 100644
@@ -17,7 +17,6 @@
 #include <asm/processor.h>
 #include <image.h>
 
-#if defined(CONFIG_LYNXKDI)
 #include <lynxkdi.h>
 
 DECLARE_GLOBAL_DATA_PTR;

@@ -66,5 +65,3 @@ void lynxkdi_boot (image_header_t *hdr)
 #else
 #error "Lynx KDI support not implemented for configured CPU"
 #endif
-
-#endif	/* CONFIG_LYNXKDI */

common/miiphybb.c +0 -5

index 537c15d..6446012 100644
@@ -30,9 +30,6 @@
 #include <ioports.h>
 #include <ppc_asm.tmpl>
 
-#ifdef CONFIG_BITBANGMII
-
-
 /*****************************************************************************
  *
  * Utility to send the preamble, address, and register (common to read

@@ -236,5 +233,3 @@ int bb_miiphy_write (char *devname, unsigned char addr,
 
 	return 0;
 }
-
-#endif /* CONFIG_BITBANGMII */

common/soft_i2c.c +0 -5

index 5ef7f30..23db2ee 100644
@@ -41,8 +41,6 @@
 #endif
 #include <i2c.h>
 
-#if defined(CONFIG_SOFT_I2C)
-
 /* #define	DEBUG_I2C	*/
 
 #ifdef DEBUG_I2C

@@ -423,6 +421,3 @@ void i2c_reg_write(uchar i2c_addr, uchar reg, uchar val)
 {
 	i2c_write(i2c_addr, reg, 1, &val, 1);
 }
-
-
-#endif	/* CONFIG_SOFT_I2C */

common/soft_spi.c +0 -4

index c131650..25b589a 100644
@@ -27,8 +27,6 @@
 #include <common.h>
 #include <spi.h>
 
-#if defined(CONFIG_SOFT_SPI)
-
 #include <malloc.h>
 
 /*-----------------------------------------------------------------------

@@ -193,5 +191,3 @@ int  spi_xfer(struct spi_slave *slave, unsigned int bitlen,
 
 	return(0);
 }
-
-#endif	/* CONFIG_SOFT_SPI */

common/spartan2.c +0 -4

index 2f1ea2c..ebac388 100644
@@ -25,8 +25,6 @@
 #include <common.h>		/* core U-Boot definitions */
 #include <spartan2.h>		/* Spartan-II device family */
 
-#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_SPARTAN2)
-
 /* Define FPGA_DEBUG to get debug printf's */
 #ifdef	FPGA_DEBUG
 #define PRINTF(fmt,args...)	printf (fmt ,##args)

@@ -663,5 +661,3 @@ static int Spartan2_ss_reloc (Xilinx_desc * desc, ulong reloc_offset)
 	return ret_val;
 
 }
-
-#endif

common/spartan3.c +0 -4

index d329e70..8f1ab80 100644
@@ -30,8 +30,6 @@
 #include <common.h>		/* core U-Boot definitions */
 #include <spartan3.h>		/* Spartan-II device family */
 
-#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_SPARTAN3)
-
 /* Define FPGA_DEBUG to get debug printf's */
 #ifdef	FPGA_DEBUG
 #define PRINTF(fmt,args...)	printf (fmt ,##args)

@@ -668,5 +666,3 @@ static int Spartan3_ss_reloc (Xilinx_desc * desc, ulong reloc_offset)
 	return ret_val;
 
 }
-
-#endif

common/stratixII.c +0 -4

index 85c461c..7556dbf 100644
@@ -25,8 +25,6 @@
 #include <common.h>		/* core U-Boot definitions */
 #include <altera.h>
 
-#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_ALTERA) && defined(CONFIG_FPGA_STRATIX_II)
-
 int StratixII_ps_fpp_load (Altera_desc * desc, void *buf, size_t bsize,
 			   int isSerial, int isSecure);
 int StratixII_ps_fpp_dump (Altera_desc * desc, void *buf, size_t bsize);

@@ -231,5 +229,3 @@ int StratixII_ps_fpp_load (Altera_desc * desc, void *buf, size_t bsize,
 
 	return FPGA_SUCCESS;
 }
-
-#endif				/* defined(CONFIG_FPGA) && defined(CONFIG_FPGA_ALTERA) && defined(CONFIG_FPGA_STRATIX_II) */

common/usb.c +0 -4

index a45d113..9502f39 100644
@@ -50,8 +50,6 @@
 #include <linux/ctype.h>
 #include <asm/byteorder.h>
 
-#if defined(CONFIG_CMD_USB)
-
 #include <usb.h>
 #ifdef CONFIG_4xx
 #include <asm/4xx_pci.h>

@@ -1247,6 +1245,4 @@ int usb_hub_probe(struct usb_device *dev, int ifnum)
 	return ret;
 }
 
-#endif
-
 /* EOF */

common/usb_kbd.c +0 -5

index c876495..04d9730 100644
@@ -28,8 +28,6 @@
 #include <devices.h>
 #include <asm/byteorder.h>
 
-#ifdef CONFIG_USB_KEYBOARD
-
 #include <usb.h>
 
 #undef USB_KBD_DEBUG

@@ -746,7 +744,4 @@ static int usb_kbd_get_hid_desc(struct usb_device *dev)
 
 }
 
-
 #endif
-
-#endif /* CONFIG_USB_KEYBOARD */

common/usb_storage.c +0 -7

index d8fbb69..94f659f 100644
@@ -55,13 +55,9 @@
 #include <asm/byteorder.h>
 #include <asm/processor.h>
 
-
-#if defined(CONFIG_CMD_USB)
 #include <part.h>
 #include <usb.h>
 
-#ifdef CONFIG_USB_STORAGE
-
 #undef USB_STOR_DEBUG
 #undef BBB_COMDAT_TRACE
 #undef BBB_XPORT_TRACE

@@ -1242,6 +1238,3 @@ int usb_stor_get_info(struct usb_device *dev,struct us_data *ss,block_dev_desc_t
 	USB_STOR_PRINTF("partype: %d\n",dev_desc->part_type);
 	return 1;
 }
-
-#endif /* CONFIG_USB_STORAGE */
-#endif

common/virtex2.c +0 -3

index 665a503..52da1b2 100644
@@ -31,8 +31,6 @@
 #include <common.h>
 #include <virtex2.h>
 
-#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_VIRTEX2)
-
 #if 0
 #define FPGA_DEBUG
 #endif

@@ -552,6 +550,5 @@ static int Virtex2_ss_reloc (Xilinx_desc * desc, ulong reloc_offset)
 	}
 	return ret_val;
 }
-#endif
 
 /* vim: set ts=4 tw=78: */

common/xilinx.c +0 -4

index c898238..7b5e8c5 100644
@@ -32,8 +32,6 @@
 #include <spartan2.h>
 #include <spartan3.h>
 
-#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_XILINX)
-
 #if 0
 #define FPGA_DEBUG
 #endif

@@ -307,5 +305,3 @@ static int xilinx_validate (Xilinx_desc * desc, char *fn)
 
 	return ret_val;
 }
-
-#endif	/* CONFIG_FPGA && CONFIG_FPGA_XILINX */

Signature · 1 line

1.5.6.2

Jean-Christophe PLAGNIOL-VILLARD

author

2008-08-12 21:51 UTC #4 lore raw

PATCH 2/13 serial: move CFG_SCIF_CONSOLE to CONFIG_SCIF_CONSOLE

move also conditional compilation to Makefile

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

---
 drivers/serial/Makefile     |    2 +-
 drivers/serial/serial_sh.c  |    4 ----
 include/configs/MigoR.h     |    2 +-
 include/configs/mpr2.h      |    2 +-
 include/configs/ms7720se.h  |    2 +-
 include/configs/ms7722se.h  |    2 +-
 include/configs/ms7750se.h  |    2 +-
 include/configs/r2dplus.h   |    2 +-
 include/configs/r7780mp.h   |    2 +-
 include/configs/sh7763rdp.h |    2 +-
 10 files changed, 9 insertions(+), 13 deletions(-)

drivers/serial/Makefile +1 -1

index de6fbab..3716974 100644
@@ -35,7 +35,7 @@ COBJS-$(CONFIG_MAX3100_SERIAL) += serial_max3100.o
 COBJS-y += serial_pl010.o
 COBJS-y += serial_pl011.o
 COBJS-$(CONFIG_XILINX_UARTLITE) += serial_xuartlite.o
-COBJS-y += serial_sh.o
+COBJS-$(CONFIG_SCIF_CONSOLE) += serial_sh.o
 COBJS-$(CONFIG_USB_TTY) += usbtty.o
 
 COBJS	:= $(COBJS-y)

drivers/serial/serial_sh.c +0 -4

index 0801ac4..2b9eeed 100644
@@ -20,8 +20,6 @@
 #include <common.h>
 #include <asm/processor.h>
 
-#ifdef CFG_SCIF_CONSOLE
-
 #if defined (CONFIG_CONS_SCIF0)
 #define SCIF_BASE	SCIF0_BASE
 #elif defined (CONFIG_CONS_SCIF1)

@@ -215,5 +213,3 @@ int serial_getc(void)
 
 	return ch;
 }
-
-#endif /* CFG_SCIF_CONSOLE */

include/configs/MigoR.h +1 -1

index fa0e5db..ffa9b54 100644
@@ -67,7 +67,7 @@
 #define CFG_BAUDRATE_TABLE	{ 115200 }	/* List of legal baudrate settings for this board */
 
 /* SCIF */
-#define CFG_SCIF_CONSOLE	1
+#define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_CONS_SCIF0	1
 #undef  CFG_CONSOLE_INFO_QUIET	/* Suppress display of console
 								   information at boot */

include/configs/mpr2.h +1 -1

index 0fc0b97..2598b34 100644
@@ -86,7 +86,7 @@
 #define CFG_HZ			(CONFIG_SYS_CLK_FREQ / TMU_CLK_DIVIDER)
 
 /* UART */
-#define CFG_SCIF_CONSOLE	1
+#define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_CONS_SCIF0	1
 
 #endif	/* __MPR2_H */

include/configs/ms7720se.h +1 -1

index 5e79a27..dc0af15 100644
@@ -63,7 +63,7 @@
 #define CFG_BAUDRATE_TABLE	{ 115200 }
 
 /* SCIF */
-#define CFG_SCIF_CONSOLE	1
+#define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_CONS_SCIF0	1
 
 #define CFG_MEMTEST_START	MS7720SE_SDRAM_BASE

include/configs/ms7722se.h +1 -1

index 7298e55..910a44e 100644
@@ -62,7 +62,7 @@
 #define CFG_BAUDRATE_TABLE	{ 115200 }	/* List of legal baudrate settings for this board */
 
 /* SCIF */
-#define CFG_SCIF_CONSOLE	1
+#define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_CONS_SCIF0	1
 #undef  CFG_CONSOLE_INFO_QUIET			/* Suppress display of console information at boot */
 #undef  CFG_CONSOLE_OVERWRITE_ROUTINE

include/configs/ms7750se.h +1 -1

index 3000c77..bee0aab 100644
@@ -42,7 +42,7 @@
 #define CONFIG_CMD_FLASH
 #define CONFIG_CMD_ENV
 
-#define CFG_SCIF_CONSOLE	1
+#define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_BAUDRATE		38400
 #define CONFIG_CONS_SCIF1	1
 #define BOARD_LATE_INIT		1

include/configs/r2dplus.h +1 -1

index e269336..414e8dc 100644
@@ -26,7 +26,7 @@
 #define CONFIG_DOS_PARTITION
 
 /* SCIF */
-#define CFG_SCIF_CONSOLE	1
+#define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_BAUDRATE		115200
 #define CONFIG_CONS_SCIF1	1
 #define BOARD_LATE_INIT		1

include/configs/r7780mp.h +1 -1

index 4c82c5a..0b08f18 100644
@@ -49,7 +49,7 @@
 #define CONFIG_CMD_EXT2
 #define CONFIG_DOS_PARTITION
 
-#define CFG_SCIF_CONSOLE	1
+#define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_BAUDRATE		115200
 #define CONFIG_CONS_SCIF0	1

include/configs/sh7763rdp.h +1 -1

index 5a65663..4723634 100644
@@ -52,7 +52,7 @@
 #undef  CONFIG_SHOW_BOOT_PROGRESS
 
 /* SCIF */
-#define CFG_SCIF_CONSOLE        1
+#define CONFIG_SCIF_CONSOLE        1
 #define CONFIG_BAUDRATE         115200
 #define CONFIG_CONS_SCIF2		1

Signature · 1 line

1.5.6.2

Jean-Christophe PLAGNIOL-VILLARD

author

2008-08-12 21:51 UTC #5 lore raw

PATCH 3/13 serial: move CFG_NS9750_UART to CONFIG_NS9750_UART

move also conditional compilation to Makefile

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

---
 drivers/serial/Makefile        |    2 +-
 drivers/serial/ns9750_serial.c |    4 ----
 include/configs/ns9750dev.h    |    2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

drivers/serial/Makefile +1 -1

index 3716974..2384735 100644
@@ -27,7 +27,7 @@ LIB	:= $(obj)libserial.a
 
 COBJS-$(CONFIG_ATMEL_USART) += atmel_usart.o
 COBJS-$(CONFIG_MCFUART) += mcfuart.o
-COBJS-y += ns9750_serial.o
+COBJS-$(CONFIG_NS9750_UART) += ns9750_serial.o
 COBJS-y += ns16550.o
 COBJS-$(CONFIG_DRIVER_S3C4510_UART) += s3c4510b_uart.o
 COBJS-y += serial.o

drivers/serial/ns9750_serial.c +0 -4

index 02c0d39..e9645a0 100644
@@ -28,8 +28,6 @@
 
 #include <common.h>
 
-#ifdef CFG_NS9750_UART
-
 #include "ns9750_bbus.h"	/* for GPIOs */
 #include "ns9750_ser.h"		/* for serial configuration */

@@ -210,5 +208,3 @@ static unsigned int calcRxCharGapRegister( void )
 {
 	return NS9750_SER_RX_CHAR_TIMER_TRUN;
 }
-
-#endif /* CFG_NS9750_UART */

include/configs/ns9750dev.h +1 -1

index f30cb46..746a56e 100644
@@ -56,7 +56,7 @@
 /*
  * Hardware drivers
  */
-#define CFG_NS9750_UART			1	/* use on-chip UART */
+#define CONFIG_NS9750_UART		1	/* use on-chip UART */
 #define CONFIG_DRIVER_NS9750_ETHERNET	1	/* use on-chip ethernet */
 
 /*

Signature · 1 line

1.5.6.2

Jean-Christophe PLAGNIOL-VILLARD

author

2008-08-12 21:51 UTC #6 lore raw

PATCH 4/13 drivers/block: Move conditional compilation to Makefile

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

---
 drivers/block/Makefile      |   10 +++++-----
 drivers/block/ahci.c        |    3 ---
 drivers/block/ata_piix.c    |    4 ----
 drivers/block/sil680.c      |    5 +----
 drivers/block/sym53c8xx.c   |    5 -----
 drivers/block/systemace.c   |    3 ---
 include/configs/sc520_cdp.h |    2 +-
 7 files changed, 7 insertions(+), 25 deletions(-)

drivers/block/Makefile +5 -5

index a09cd2a..642582b 100644
@@ -25,14 +25,14 @@ include $(TOPDIR)/config.mk
 
 LIB	:= $(obj)libblock.a
 
-COBJS-y += ahci.o
-COBJS-y += ata_piix.o
+COBJS-$(CONFIG_SCSI_AHCI) += ahci.o
+COBJS-$(CONFIG_ATA_PIIX) += ata_piix.o
 COBJS-$(CONFIG_FSL_SATA) += fsl_sata.o
 COBJS-$(CONFIG_LIBATA) += libata.o
 COBJS-$(CONFIG_SATA_SIL3114) += sata_sil3114.o
-COBJS-y += sil680.o
-COBJS-y += sym53c8xx.o
-COBJS-y += systemace.o
+COBJS-$(CONFIG_IDE_SIL680) += sil680.o
+COBJS-$(CONFIG_SCSI_SYM53C8XX) += sym53c8xx.o
+COBJS-$(CONFIG_SYSTEMACE) += systemace.o
 
 COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)

drivers/block/ahci.c +0 -3

index 3d82c62..52fd108 100644
@@ -26,8 +26,6 @@
  */
 #include <common.h>
 
-#ifdef CONFIG_SCSI_AHCI
-
 #include <command.h>
 #include <pci.h>
 #include <asm/processor.h>

@@ -700,4 +698,3 @@ void scsi_print_error(ccb * pccb)
 {
 	/*The ahci error info can be read in the ahci driver*/
 }
-#endif

drivers/block/ata_piix.c +0 -4

index 441a4dc..4c26b36 100644
@@ -35,8 +35,6 @@
 #include <ide.h>
 #include <ata.h>
 
-#ifdef CFG_ATA_PIIX		/*ata_piix driver */
-
 extern block_dev_desc_t sata_dev_desc[CFG_SATA_MAX_DEVICE];
 extern int curr_device;

@@ -756,5 +754,3 @@ int scan_sata(int dev)
 {
 	return 0;
 }
-
-#endif

drivers/block/sil680.c +1 -4

index a6143df..052c3d3 100644
@@ -27,7 +27,7 @@
  * The following parameters must be defined in the configuration file
  * of the target board:
  *
- * #define CFG_IDE_SIL680
+ * #define CONFIG_IDE_SIL680
  *
  * #define CONFIG_PCI_PNP
  * NOTE it may also be necessary to define this if the default of 8 is

@@ -54,7 +54,6 @@
  */
 
 #include <common.h>
-#if defined(CFG_IDE_SIL680)
 #include <ata.h>
 #include <ide.h>
 #include <pci.h>

@@ -106,5 +105,3 @@ int ide_preinit (void)
 void ide_set_reset (int flag) {
 	return;
 }
-
-#endif /* CFG_IDE_SIL680 */

drivers/block/sym53c8xx.c +0 -5

index b880435..44e998b 100644
@@ -35,8 +35,6 @@
 
 #include <common.h>
 
-#ifdef CONFIG_SCSI_SYM53C8XX
-
 #include <command.h>
 #include <pci.h>
 #include <asm/processor.h>

@@ -870,6 +868,3 @@ void scsi_chip_init(void)
 #endif
 }
 #endif
-
-
-#endif /* CONFIG_SCSI_SYM53C8XX */

drivers/block/systemace.c +0 -3

index 7d82c27..dfaab52 100644
@@ -44,8 +44,6 @@
 #include <part.h>
 #include <asm/io.h>
 
-#ifdef CONFIG_SYSTEMACE
-
 /*
  * The ace_readw and writew functions read/write 16bit words, but the
  * offset value is the BYTE offset as most used in the Xilinx

@@ -255,4 +253,3 @@ static unsigned long systemace_read(int dev, unsigned long start,
 
 	return blkcnt;
 }
-#endif /* CONFIG_SYSTEMACE */

include/configs/sc520_cdp.h +1 -1

index 0e830b8..e29655e 100644
@@ -178,7 +178,7 @@
 #define CFG_SATA_MAXBUS         2       /*Max Sata buses supported */
 #define CFG_SATA_DEVS_PER_BUS   2      /*Max no. of devices per bus/port */
 #define CFG_SATA_MAX_DEVICE     (CFG_SATA_MAXBUS* CFG_SATA_DEVS_PER_BUS)
-#define CFG_ATA_PIIX            1       /*Supports ata_piix driver */
+#define CONFIG_ATA_PIIX		1       /*Supports ata_piix driver */
 
 /************************************************************
  * DISK Partition support

Signature · 1 line

1.5.6.2

Jean-Christophe PLAGNIOL-VILLARD

author

2008-08-12 21:51 UTC #7 lore raw

PATCH 5/13 drivers/dma: Move conditional compilation to Makefile

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

---
 drivers/dma/MCD_dmaApi.c    |    3 ---
 drivers/dma/MCD_tasks.c     |    4 ----
 drivers/dma/MCD_tasksInit.c |    4 ----
 drivers/dma/Makefile        |    2 +-
 4 files changed, 1 insertions(+), 12 deletions(-)

drivers/dma/MCD_dmaApi.c +0 -3

index b0062b7..5c95651 100644
@@ -24,8 +24,6 @@
 
 #include <common.h>
 
-#ifdef CONFIG_FSLDMAFEC
-
 #include <MCD_dma.h>
 #include <MCD_tasksInit.h>
 #include <MCD_progCheck.h>

@@ -1023,4 +1021,3 @@ static void MCD_memcpy(int *dest, int *src, u32 size)
 	for (i = 0; i < size; i += sizeof(int), dest++, src++)
 		*dest = *src;
 }
-#endif				/* CONFIG_FSLDMAFEC */

drivers/dma/MCD_tasks.c +0 -4

index 06a2d53..4f6e346 100644
@@ -24,8 +24,6 @@
 
 #include <common.h>
 
-#ifdef CONFIG_FSLDMAFEC
-
 #include <MCD_dma.h>
 
 u32 MCD_varTab0[];

@@ -2430,5 +2428,3 @@ u32 MCD_ENetXmit_TDT[] = {
 #ifdef MCD_INCLUDE_EU
 MCD_bufDesc MCD_singleBufDescs[NCHANNELS];
 #endif
-
-#endif                          /* CONFIG_FSLDMAFEC */

drivers/dma/MCD_tasksInit.c +0 -4

index cf567db..2f19875 100644
@@ -28,8 +28,6 @@
  * Do not edit!
  */
 
-#ifdef CONFIG_FSLDMAFEC
-
 #include <MCD_dma.h>
 
 extern dmaRegs *MCD_dmaBar;

@@ -242,5 +240,3 @@ void MCD_startDmaENetXmit(char *bDBase, char *currBD, char *xmitFifoPtr,
 	/* Set the task's Enable bit in its Task Control Register */
 	MCD_dmaBar->taskControl[channel] |= (u16) 0x8000;
 }
-
-#endif			/* CONFIG_FSLDMAFEC */

drivers/dma/Makefile +1 -1

index 7e17360..cf29efa 100644
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB	:= $(obj)libdma.a
 
-COBJS-y += MCD_tasksInit.o MCD_dmaApi.o MCD_tasks.o
+COBJS-$(CONFIG_FSLDMAFEC) += MCD_tasksInit.o MCD_dmaApi.o MCD_tasks.o
 
 COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)

Signature · 1 line

1.5.6.2

Jean-Christophe PLAGNIOL-VILLARD

author

2008-08-12 21:51 UTC #8 lore raw

PATCH 6/13 drivers/input: Move conditional compilation to Makefile

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

---
 drivers/input/Makefile   |    8 +++++---
 drivers/input/i8042.c    |    4 ----
 drivers/input/keyboard.c |    4 ----
 drivers/input/pc_keyb.c  |    4 ----
 drivers/input/ps2mult.c  |    4 ----
 drivers/input/ps2ser.c   |    4 ----
 6 files changed, 5 insertions(+), 23 deletions(-)

drivers/input/Makefile +5 -3

index 2933cb6..9a14407 100644
@@ -25,9 +25,11 @@ include $(TOPDIR)/config.mk
 
 LIB	:= $(obj)libinput.a
 
-COBJS-y += i8042.o
-COBJS-y += keyboard.o
-COBJS-y += pc_keyb.o ps2ser.o ps2mult.o
+COBJS-$(CONFIG_I8042_KBD) += i8042.o
+ifdef CONFIG_PS2KBD
+COBJS-y += keyboard.o pc_keyb.o
+COBJS-$(CONFIG_PS2MULT) += ps2mult.o ps2ser.o
+endif
 
 COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)

drivers/input/i8042.c +0 -4

index 22c2a4e..d152768 100644
@@ -27,8 +27,6 @@
 
 #include <common.h>
 
-#ifdef CONFIG_I8042_KBD
-
 #ifdef CONFIG_USE_CPCIDVI
 extern u8  gt_cpcidvi_in8(u32 offset);
 extern void gt_cpcidvi_out8(u32 offset, u8 data);

@@ -670,5 +668,3 @@ static int kbd_reset (void)
 
     return 0;
 }
-
-#endif /* CONFIG_I8042_KBD */

drivers/input/keyboard.c +0 -4

index 54182a7..a634d76 100644
@@ -11,8 +11,6 @@
 
 #include <common.h>
 
-#ifdef CONFIG_PS2KBD
-
 #include <devices.h>
 #include <keyboard.h>

@@ -301,5 +299,3 @@ int kbd_init (void)
 	}
 	return error;
 }
-
-#endif /* CONFIG_PS2KBD */

drivers/input/pc_keyb.c +0 -4

index 33e7c5f..25ad3e4 100644
@@ -13,8 +13,6 @@
 
 #include <common.h>
 
-#ifdef CONFIG_PS2KBD
-
 #include <keyboard.h>
 #include <pc_keyb.h>

@@ -252,5 +250,3 @@ void pckbd_leds(unsigned char leds)
 	kbd_send_data(KBD_CMD_SET_LEDS);
 	kbd_send_data(leds);
 }
-
-#endif /* CONFIG_PS2KBD */

drivers/input/ps2mult.c +0 -4

index 9515a0f..ecd5853 100644
@@ -16,8 +16,6 @@
 
 #include <common.h>
 
-#ifdef CONFIG_PS2MULT
-
 #include <pc_keyb.h>
 #include <asm/atomic.h>
 #include <ps2mult.h>

@@ -462,5 +460,3 @@ int ps2mult_request_irq(void (*handler)(void *))
 
 	return 0;
 }
-
-#endif /* CONFIG_PS2MULT */

drivers/input/ps2ser.c +0 -4

index c1741ea..480ffa2 100644
@@ -15,8 +15,6 @@
 
 #include <common.h>
 
-#ifdef CONFIG_PS2SERIAL
-
 #include <asm/io.h>
 #include <asm/atomic.h>
 #include <ps2mult.h>

@@ -326,5 +324,3 @@ static void ps2ser_interrupt(void *dev_id)
 		ps2mult_callback(atomic_read(&ps2buf_cnt));
 	}
 }
-
-#endif /* CONFIG_PS2SERIAL */

Signature · 1 line

1.5.6.2

Jean-Christophe PLAGNIOL-VILLARD

author

2008-08-12 21:51 UTC #9 lore raw

PATCH 7/13 drivers/misc: Move conditional compilation to Makefile

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

---
 drivers/misc/Makefile           |    6 +++---
 drivers/misc/ali512x.c          |    5 -----
 drivers/misc/ns87308.c          |    4 ----
 drivers/misc/status_led.c       |    4 ----
 drivers/serial/serial.c         |    4 ++--
 include/configs/BAB7xx.h        |    2 +-
 include/configs/HIDDEN_DRAGON.h |    2 +-
 include/configs/Sandpoint8240.h |    2 +-
 include/configs/Sandpoint8245.h |    2 +-
 9 files changed, 9 insertions(+), 22 deletions(-)

drivers/misc/Makefile +3 -3

index fe8d3d8..01e0f39 100644
@@ -25,10 +25,10 @@ include $(TOPDIR)/config.mk
 
 LIB	:= $(obj)libmisc.a
 
-COBJS-y += ali512x.o
-COBJS-y += ns87308.o
-COBJS-y += status_led.o
+COBJS-$(CONFIG_ALI152X) += ali512x.o
 COBJS-$(CONFIG_FSL_LAW) += fsl_law.o
+COBJS-$(CONFIG_NS87308) += ns87308.o
+COBJS-$(CONFIG_STATUS_LED) += status_led.o
 
 COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)

drivers/misc/ali512x.c +0 -5

index 90b45d9..d6a2c1f 100644
@@ -32,8 +32,6 @@
 
 #include <config.h>
 
-#ifdef CONFIG_ALI152X
-
 #include <common.h>
 #include <asm/io.h>
 #include <asm/ic/ali512x.h>

@@ -418,6 +416,3 @@ int ali512x_cio_in(int pin)
 
 	return data & bit;
 }
-
-
-#endif

drivers/misc/ns87308.c +0 -4

index cf4d359..6642c2e 100644
@@ -23,8 +23,6 @@
 
 #include <config.h>
 
-#ifdef CFG_NS87308
-
 #include <ns87308.h>
 
 void initialise_ns87308 (void)

@@ -117,5 +115,3 @@ void initialise_ns87308 (void)
 	PNP_PGCS_CSLINE_CONF(2, CFG_NS87308_CS2_CONF);
 #endif
 }
-
-#endif

drivers/misc/status_led.c +0 -4

index ddb6c22..4ba3e18 100644
@@ -35,8 +35,6 @@
 
 /* ------------------------------------------------------------------------- */
 
-#ifdef CONFIG_STATUS_LED
-
 typedef struct {
 	led_id_t mask;
 	int state;

@@ -127,5 +125,3 @@ void status_led_set (int led, int state)
 	}
 	__led_set (ld->mask, state);
 }
-
-#endif	/* CONFIG_STATUS_LED */

drivers/serial/serial.c +2 -2

index 8bbfcf9..b361eef 100644
@@ -26,7 +26,7 @@
 #ifdef CFG_NS16550_SERIAL
 
 #include <ns16550.h>
-#ifdef CFG_NS87308
+#ifdef CONFIG_NS87308
 #include <ns87308.h>
 #endif

@@ -159,7 +159,7 @@ int serial_init (void)
 {
 	int clock_divisor;
 
-#ifdef CFG_NS87308
+#ifdef CONFIG_NS87308
 	initialise_ns87308();
 #endif

include/configs/BAB7xx.h +1 -1

index 8ec70aa..799ce38 100644
@@ -346,7 +346,7 @@ extern unsigned char   scsi_sym53c8xx_ccf;
 /*
  * NS87308 Configuration
  */
-#define CFG_NS87308                    /* Nat Semi super-io cntr on ISA bus */
+#define CONFIG_NS87308                    /* Nat Semi super-io cntr on ISA bus */
 #define CFG_NS87308_BADDR_10    1
 #define CFG_NS87308_DEVS        (CFG_NS87308_UART1   | \
 				 CFG_NS87308_UART2   | \

include/configs/HIDDEN_DRAGON.h +1 -1

index 26dd954..fea1f6c 100644
@@ -214,7 +214,7 @@
 /*
  * NS87308 Configuration
  */
-#define CFG_NS87308			/* Nat Semi super-io controller on ISA bus */
+#define CONFIG_NS87308			/* Nat Semi super-io controller on ISA bus */
 
 #define CFG_NS87308_BADDR_10	1

include/configs/Sandpoint8240.h +1 -1

index 5bbe3c5..c5a57d3 100644
@@ -246,7 +246,7 @@
 /*
  * NS87308 Configuration
  */
-#define CFG_NS87308			/* Nat Semi super-io controller on ISA bus */
+#define CONFIG_NS87308			/* Nat Semi super-io controller on ISA bus */
 
 #define CFG_NS87308_BADDR_10	1

include/configs/Sandpoint8245.h +1 -1

index a08451e..5685314 100644
@@ -214,7 +214,7 @@
 /*
  * NS87308 Configuration
  */
-#define CFG_NS87308			/* Nat Semi super-io controller on ISA bus */
+#define CONFIG_NS87308			/* Nat Semi super-io controller on ISA bus */
 
 #define CFG_NS87308_BADDR_10	1

Signature · 1 line

1.5.6.2

Jean-Christophe PLAGNIOL-VILLARD

author

2008-08-12 21:51 UTC #10 lore raw

PATCH 8/13 drivers/pci: Move conditional compilation to Makefile

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

---
 drivers/pci/Makefile            |   10 ++++------
 drivers/pci/fsl_pci_init.c      |    4 ----
 drivers/pci/pci.c               |    4 ----
 drivers/pci/pci_auto.c          |    4 ----
 drivers/pci/pci_indirect.c      |    2 --
 drivers/pci/tsi108_pci.c        |    4 ----
 drivers/pci/w83c553f.c          |    4 ----
 include/configs/BAB7xx.h        |    2 +-
 include/configs/HIDDEN_DRAGON.h |    2 +-
 include/configs/Sandpoint8240.h |    2 +-
 include/configs/Sandpoint8245.h |    2 +-
 11 files changed, 8 insertions(+), 32 deletions(-)

drivers/pci/Makefile +4 -6

index dec93b9..bffb1eb 100644
@@ -25,15 +25,13 @@ include $(TOPDIR)/config.mk
 
 LIB	:= $(obj)libpci.a
 
-COBJS-y += fsl_pci_init.o
-COBJS-y += pci.o
-COBJS-y += pci_auto.o
-COBJS-y += pci_indirect.o
-COBJS-y += tsi108_pci.o
-COBJS-y += w83c553f.o
+COBJS-$(CONFIG_FSL_PCI_INIT) += fsl_pci_init.o
+COBJS-$(CONFIG_PCI) += pci.o pci_auto.o pci_indirect.o
 COBJS-$(CONFIG_SH4_PCI) += pci_sh4.o
 COBJS-$(CONFIG_SH7751_PCI) +=pci_sh7751.o
 COBJS-$(CONFIG_SH7780_PCI) +=pci_sh7780.o
+COBJS-$(CONFIG_TSI108_PCI) += tsi108_pci.o
+COBJS-$(CONFIG_WINBOND_83C553) += w83c553f.o
 
 COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)

drivers/pci/fsl_pci_init.c +0 -4

index a7afa90..bb2813f 100644
@@ -18,8 +18,6 @@
 
 #include <common.h>
 
-#ifdef CONFIG_FSL_PCI_INIT
-
 /*
  * PCI/PCIE Controller initialization for mpc85xx/mpc86xx soc's
  *

@@ -197,5 +195,3 @@ fsl_pci_init(struct pci_controller *hose)
 		pci_hose_write_config_word(hose, dev, PCI_SEC_STATUS, 0xffff);
 	}
 }
-
-#endif /* CONFIG_FSL_PCI */

drivers/pci/pci.c +0 -4

index 16180cb..b5eea89 100644
@@ -30,8 +30,6 @@
 
 #include <common.h>
 
-#ifdef CONFIG_PCI
-
 #include <command.h>
 #include <asm/processor.h>
 #include <asm/io.h>

@@ -544,5 +542,3 @@ void pci_init(void)
 	/* now call board specific pci_init()... */
 	pci_init_board();
 }
-
-#endif /* CONFIG_PCI */

drivers/pci/pci_auto.c +0 -4

index eb69593..2acf9bf 100644
@@ -15,8 +15,6 @@
 
 #include <common.h>
 
-#ifdef CONFIG_PCI
-
 #include <pci.h>
 
 #undef DEBUG

@@ -408,5 +406,3 @@ int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev)
 
 	return sub_bus;
 }
-
-#endif /* CONFIG_PCI */

drivers/pci/pci_indirect.c +0 -2

index 55517a8..ab51f8d 100644
@@ -11,7 +11,6 @@
 
 #include <common.h>
 
-#ifdef CONFIG_PCI
 #if (!defined(__I386__) && !defined(CONFIG_IXDP425))
 
 #include <asm/processor.h>

@@ -135,4 +134,3 @@ void pci_setup_indirect(struct pci_controller* hose, u32 cfg_addr, u32 cfg_data)
 }
 
 #endif	/* !__I386__ && !CONFIG_IXDP425 */
-#endif	/* CONFIG_PCI */

drivers/pci/tsi108_pci.c +0 -4

index 4f02cb8..edd614f 100644
@@ -27,8 +27,6 @@
 
 #include <config.h>
 
-#ifdef CONFIG_TSI108_PCI
-
 #include <common.h>
 #include <pci.h>
 #include <asm/io.h>

@@ -182,5 +180,3 @@ void ft_pci_setup(void *blob, bd_t *bd)
 	}
 }
 #endif /* CONFIG_OF_LIBFDT */
-
-#endif	/* CONFIG_TSI108_PCI */

drivers/pci/w83c553f.c +0 -4

index 9ea08a2..d7355a4 100644
@@ -30,8 +30,6 @@
 #include <common.h>
 #include <config.h>
 
-#ifdef CFG_WINBOND_83C553
-
 #include <asm/io.h>
 #include <pci.h>

@@ -222,5 +220,3 @@ void initialise_dma(void)
 	out8(W83C553F_DMA1 + W83C553F_DMA1_CS, 0x00);
 	out16(W83C553F_DMA2 + W83C553F_DMA2_CS, 0x0000);
 }
-
-#endif /* CFG_WINBOND_83C553 */

include/configs/BAB7xx.h +1 -1

index 799ce38..26a1a2d 100644
@@ -338,7 +338,7 @@ extern unsigned char   scsi_sym53c8xx_ccf;
 /*
  * Winbond Configuration
  */
-#define CFG_WINBOND_83C553      1                       /* has a winbond bridge */
+#define CONFIG_WINBOND_83C553      1                       /* has a winbond bridge */
 #define CFG_USE_WINBOND_IDE     0                       /* use winbond 83c553 internal ide */
 #define CFG_WINBOND_ISA_CFG_ADDR    0x80005800          /* pci-isa bridge config addr */
 #define CFG_WINBOND_IDE_CFG_ADDR    0x80005900          /* ide config addr */

include/configs/HIDDEN_DRAGON.h +1 -1

index fea1f6c..5deb84d 100644
@@ -201,7 +201,7 @@
  */
 
 
-#define CFG_WINBOND_83C553	1	/*has a winbond bridge			*/
+#define CONFIG_WINBOND_83C553	1	/*has a winbond bridge			*/
 #define CFG_USE_WINBOND_IDE	0	/*use winbond 83c553 internal IDE ctrlr */
 #define CFG_WINBOND_ISA_CFG_ADDR    0x80005800	/*pci-isa bridge config addr	*/
 #define CFG_WINBOND_IDE_CFG_ADDR    0x80005900	/*ide config addr		*/

include/configs/Sandpoint8240.h +1 -1

index c5a57d3..cfd16d3 100644
@@ -235,7 +235,7 @@
  */
 
 
-#define CFG_WINBOND_83C553	1	/*has a winbond bridge			*/
+#define CONFIG_WINBOND_83C553	1	/*has a winbond bridge			*/
 #define CFG_USE_WINBOND_IDE	0	/*use winbond 83c553 internal IDE ctrlr */
 #define CFG_WINBOND_ISA_CFG_ADDR    0x80005800	/*pci-isa bridge config addr	*/
 #define CFG_WINBOND_IDE_CFG_ADDR    0x80005900	/*ide config addr		*/

include/configs/Sandpoint8245.h +1 -1

index 5685314..c0f2c57 100644
@@ -203,7 +203,7 @@
  */
 
 
-#define CFG_WINBOND_83C553	1	/*has a winbond bridge			*/
+#define CONFIG_WINBOND_83C553	1	/*has a winbond bridge			*/
 #define CFG_USE_WINBOND_IDE	0	/*use winbond 83c553 internal IDE ctrlr */
 #define CFG_WINBOND_ISA_CFG_ADDR    0x80005800	/*pci-isa bridge config addr	*/
 #define CFG_WINBOND_IDE_CFG_ADDR    0x80005900	/*ide config addr		*/

Signature · 1 line

1.5.6.2

Jean-Christophe PLAGNIOL-VILLARD

author

2008-08-12 21:51 UTC #11 lore raw

PATCH 9/13 drivers/qe: Move conditional compilation to Makefile

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

---
 drivers/qe/Makefile  |    3 ++-
 drivers/qe/qe.c      |    3 ---
 drivers/qe/uccf.c    |    2 --
 drivers/qe/uec.c     |    5 -----
 drivers/qe/uec_phy.c |    3 ---
 5 files changed, 2 insertions(+), 14 deletions(-)

drivers/qe/Makefile +2 -1

index 45a2fff..18fe9ce 100644
@@ -25,8 +25,9 @@ include $(TOPDIR)/config.mk
 LIB	:= $(obj)qe.a
 
 COBJS-$(CONFIG_OF_LIBFDT) += fdt.o
-COBJS	:= qe.o uccf.o uec.o uec_phy.o $(COBJS-y)
+COBJS-$(CONFIG_QE) += qe.o uccf.o uec.o uec_phy.o
 
+COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))

drivers/qe/qe.c +0 -3

index 7b6ecd7..e914d01 100644
@@ -27,7 +27,6 @@
 #include "asm/immap_qe.h"
 #include "qe.h"
 
-#if defined(CONFIG_QE)
 qe_map_t		*qe_immr = NULL;
 static qe_snum_t	snums[QE_NUM_OF_SNUM];

@@ -466,5 +465,3 @@ U_BOOT_CMD(
 	"fw <addr> [<length>] - Upload firmware binary at address <addr> to "
 		"the QE,\n\twith optional length <length> verification.\n"
 	);
-
-#endif /* CONFIG_QE */

drivers/qe/uccf.c +0 -2

index 4a327ab..7f6337b 100644
@@ -28,7 +28,6 @@
 #include "qe.h"
 #include "uccf.h"
 
-#if defined(CONFIG_QE)
 void ucc_fast_transmit_on_demand(ucc_fast_private_t *uccf)
 {
 	out_be16(&uccf->uf_regs->utodr, UCC_FAST_TOD);

@@ -401,4 +400,3 @@ int ucc_fast_init(ucc_fast_info_t *uf_info, ucc_fast_private_t  **uccf_ret)
 	*uccf_ret = uccf;
 	return 0;
 }
-#endif /* CONFIG_QE */

drivers/qe/uec.c +0 -5

index ba89247..344c649 100644
@@ -31,8 +31,6 @@
 #include "uec_phy.h"
 #include "miiphy.h"
 
-#if defined(CONFIG_QE)
-
 #ifdef CONFIG_UEC_ETH1
 static uec_info_t eth1_uec_info = {
 	.uf_info		= {

@@ -1406,6 +1404,3 @@ int uec_initialize(int index)
 
 	return 1;
 }
-
-
-#endif /* CONFIG_QE */

drivers/qe/uec_phy.c +0 -3

index 423ba78..186922e 100644
@@ -26,8 +26,6 @@
 #include "uec_phy.h"
 #include "miiphy.h"
 
-#if defined(CONFIG_QE)
-
 #define ugphy_printk(format, arg...)  \
 	printf(format "\n", ## arg)

@@ -677,4 +675,3 @@ void change_phy_interface_mode (struct eth_device *dev, enet_interface_e mode)
 	marvell_phy_interface_mode (dev, mode);
 #endif
 }
-#endif /* CONFIG_QE */

Signature · 1 line

1.5.6.2

Jean-Christophe PLAGNIOL-VILLARD

author

2008-08-12 21:51 UTC #12 lore raw

PATCH 10/13 drivers/mtd: Move conditional compilation to Makefile

rename CFG_FLASH_CFI_DRIVER to CONFIG_FLASH_CFI_DRIVER

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

---
 README                           |    2 +-
 board/icecube/flash.c            |    4 ++--
 board/prodrive/pdnb3/flash.c     |    4 ++--
 board/tqc/tqm8xx/flash.c         |    4 ++--
 drivers/mtd/Makefile             |    6 +++---
 drivers/mtd/at45.c               |    3 ---
 drivers/mtd/cfi_flash.c          |    3 ---
 drivers/mtd/mw_eeprom.c          |    5 -----
 include/configs/APC405.h         |    2 +-
 include/configs/ATUM8548.h       |    2 +-
 include/configs/Adder.h          |    2 +-
 include/configs/BC3450.h         |    2 +-
 include/configs/CPCI750.h        |    2 +-
 include/configs/DU440.h          |    2 +-
 include/configs/EP88x.h          |    2 +-
 include/configs/FPS850L.h        |    2 +-
 include/configs/FPS860L.h        |    2 +-
 include/configs/HMI10.h          |    2 +-
 include/configs/IDS8247.h        |    2 +-
 include/configs/ISPAN.h          |    2 +-
 include/configs/IceCube.h        |    2 +-
 include/configs/M52277EVB.h      |    2 +-
 include/configs/M5235EVB.h       |    2 +-
 include/configs/M5249EVB.h       |    2 +-
 include/configs/M5253EVBE.h      |    2 +-
 include/configs/M5271EVB.h       |    2 +-
 include/configs/M5275EVB.h       |    2 +-
 include/configs/M5282EVB.h       |    2 +-
 include/configs/M5329EVB.h       |    2 +-
 include/configs/M5373EVB.h       |    2 +-
 include/configs/M54455EVB.h      |    2 +-
 include/configs/M5475EVB.h       |    2 +-
 include/configs/M5485EVB.h       |    2 +-
 include/configs/MPC8313ERDB.h    |    2 +-
 include/configs/MPC8315ERDB.h    |    2 +-
 include/configs/MPC8323ERDB.h    |    2 +-
 include/configs/MPC832XEMDS.h    |    2 +-
 include/configs/MPC8349EMDS.h    |    2 +-
 include/configs/MPC8349ITX.h     |    4 ++--
 include/configs/MPC8360EMDS.h    |    2 +-
 include/configs/MPC8360ERDK.h    |    2 +-
 include/configs/MPC837XEMDS.h    |    2 +-
 include/configs/MPC837XERDB.h    |    2 +-
 include/configs/MPC8540ADS.h     |    2 +-
 include/configs/MPC8541CDS.h     |    2 +-
 include/configs/MPC8544DS.h      |    2 +-
 include/configs/MPC8548CDS.h     |    2 +-
 include/configs/MPC8555CDS.h     |    2 +-
 include/configs/MPC8560ADS.h     |    2 +-
 include/configs/MPC8568MDS.h     |    2 +-
 include/configs/MPC8610HPCD.h    |    2 +-
 include/configs/MPC8641HPCN.h    |    2 +-
 include/configs/MVBC_P.h         |    2 +-
 include/configs/MVBLM7.h         |    2 +-
 include/configs/MigoR.h          |    2 +-
 include/configs/NSCU.h           |    2 +-
 include/configs/PM854.h          |    2 +-
 include/configs/PM856.h          |    2 +-
 include/configs/PMC405.h         |    2 +-
 include/configs/PMC440.h         |    2 +-
 include/configs/Rattler.h        |    2 +-
 include/configs/SBC8540.h        |    2 +-
 include/configs/SX1.h            |    2 +-
 include/configs/TB5200.h         |    2 +-
 include/configs/TK885D.h         |    2 +-
 include/configs/TQM5200.h        |    2 +-
 include/configs/TQM823L.h        |    2 +-
 include/configs/TQM823M.h        |    2 +-
 include/configs/TQM8272.h        |    2 +-
 include/configs/TQM834x.h        |    2 +-
 include/configs/TQM850L.h        |    2 +-
 include/configs/TQM850M.h        |    2 +-
 include/configs/TQM855L.h        |    2 +-
 include/configs/TQM855M.h        |    2 +-
 include/configs/TQM85xx.h        |    2 +-
 include/configs/TQM860L.h        |    2 +-
 include/configs/TQM860M.h        |    2 +-
 include/configs/TQM862L.h        |    2 +-
 include/configs/TQM862M.h        |    2 +-
 include/configs/TQM866M.h        |    2 +-
 include/configs/TQM885D.h        |    2 +-
 include/configs/Total5200.h      |    2 +-
 include/configs/ZPC1900.h        |    2 +-
 include/configs/acadia.h         |    2 +-
 include/configs/actux1.h         |    2 +-
 include/configs/actux2.h         |    2 +-
 include/configs/actux3.h         |    2 +-
 include/configs/actux4.h         |    2 +-
 include/configs/ads5121.h        |    2 +-
 include/configs/aev.h            |    2 +-
 include/configs/alpr.h           |    2 +-
 include/configs/apollon.h        |    2 +-
 include/configs/assabet.h        |    2 +-
 include/configs/at91cap9adk.h    |    2 +-
 include/configs/at91sam9263ek.h  |    2 +-
 include/configs/atngw100.h       |    2 +-
 include/configs/atstk1002.h      |    2 +-
 include/configs/atstk1003.h      |    2 +-
 include/configs/atstk1004.h      |    2 +-
 include/configs/atstk1006.h      |    2 +-
 include/configs/bf533-stamp.h    |    2 +-
 include/configs/bf537-stamp.h    |    2 +-
 include/configs/bf561-ezkit.h    |    2 +-
 include/configs/canmb.h          |    2 +-
 include/configs/canyonlands.h    |    2 +-
 include/configs/cm5200.h         |    2 +-
 include/configs/csb272.h         |    2 +-
 include/configs/csb472.h         |    2 +-
 include/configs/csb637.h         |    2 +-
 include/configs/davinci_dvevm.h  |    2 +-
 include/configs/davinci_sonata.h |    2 +-
 include/configs/dbau1x00.h       |    2 +-
 include/configs/eXalion.h        |    2 +-
 include/configs/ep8248.h         |    2 +-
 include/configs/ep82xxm.h        |    2 +-
 include/configs/gcplus.h         |    2 +-
 include/configs/gr_cpci_ax2000.h |    2 +-
 include/configs/gr_ep2s60.h      |    2 +-
 include/configs/gr_xc3s_1500.h   |    2 +-
 include/configs/grsim.h          |    2 +-
 include/configs/grsim_leon2.h    |    2 +-
 include/configs/hcu4.h           |    2 +-
 include/configs/hcu5.h           |    2 +-
 include/configs/hmi1001.h        |    2 +-
 include/configs/imx31_litekit.h  |    2 +-
 include/configs/imx31_phycore.h  |    2 +-
 include/configs/inka4x0.h        |    2 +-
 include/configs/ixdp425.h        |    2 +-
 include/configs/ixdpg425.h       |    2 +-
 include/configs/jupiter.h        |    2 +-
 include/configs/katmai.h         |    2 +-
 include/configs/kb9202.h         |    2 +-
 include/configs/kilauea.h        |    2 +-
 include/configs/korat.h          |    2 +-
 include/configs/kvme080.h        |    2 +-
 include/configs/linkstation.h    |    2 +-
 include/configs/lwmon5.h         |    2 +-
 include/configs/m501sk.h         |    2 +-
 include/configs/makalu.h         |    2 +-
 include/configs/mcc200.h         |    2 +-
 include/configs/mcu25.h          |    2 +-
 include/configs/mecp5200.h       |    2 +-
 include/configs/mgcoge.h         |    2 +-
 include/configs/mgsuvd.h         |    2 +-
 include/configs/ml401.h          |    2 +-
 include/configs/motionpro.h      |    2 +-
 include/configs/mpc7448hpc2.h    |    2 +-
 include/configs/mpr2.h           |    2 +-
 include/configs/ms7720se.h       |    2 +-
 include/configs/ms7722se.h       |    2 +-
 include/configs/ms7750se.h       |    2 +-
 include/configs/munices.h        |    2 +-
 include/configs/mx31ads.h        |    2 +-
 include/configs/omap1510inn.h    |    2 +-
 include/configs/omap2420h4.h     |    2 +-
 include/configs/omap5912osk.h    |    2 +-
 include/configs/p3mx.h           |    2 +-
 include/configs/p3p440.h         |    2 +-
 include/configs/pdnb3.h          |    2 +-
 include/configs/ppmc8260.h       |    2 +-
 include/configs/pxa255_idp.h     |    2 +-
 include/configs/qemu-mips.h      |    2 +-
 include/configs/quad100hd.h      |    2 +-
 include/configs/quantum.h        |    6 +++---
 include/configs/r2dplus.h        |    2 +-
 include/configs/r7780mp.h        |    2 +-
 include/configs/sbc8349.h        |    2 +-
 include/configs/sbc8548.h        |    2 +-
 include/configs/sbc8560.h        |    2 +-
 include/configs/sbc8641d.h       |    2 +-
 include/configs/sc3.h            |    2 +-
 include/configs/sequoia.h        |    2 +-
 include/configs/sh7763rdp.h      |    2 +-
 include/configs/smmaco4.h        |    2 +-
 include/configs/socrates.h       |    2 +-
 include/configs/sorcery.h        |    2 +-
 include/configs/spc1920.h        |    2 +-
 include/configs/spieval.h        |    2 +-
 include/configs/stxssa.h         |    2 +-
 include/configs/stxxtc.h         |    2 +-
 include/configs/taishan.h        |    2 +-
 include/configs/trizepsiv.h      |    2 +-
 include/configs/uc100.h          |    2 +-
 include/configs/uc101.h          |    2 +-
 include/configs/v38b.h           |    2 +-
 include/configs/virtlab2.h       |    2 +-
 include/configs/voiceblue.h      |    2 +-
 include/configs/yosemite.h       |    2 +-
 include/configs/zeus.h           |    2 +-
 189 files changed, 194 insertions(+), 205 deletions(-)

README +1 -1

index d4456e5..37449d1 100644
@@ -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

board/icecube/flash.c +2 -2

index 15e86d3..2d4026a 100644
@@ -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*/

board/prodrive/pdnb3/flash.c +2 -2

index 518ea9c..0786324 100644
@@ -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 */

board/tqc/tqm8xx/flash.c +2 -2

index 4342ebc..1231c7c 100644
@@ -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) */

drivers/mtd/Makefile +3 -3

index ff932a1..6538f7a 100644
@@ -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)

drivers/mtd/at45.c +0 -3

index a9d13ff..d1a60aa 100644
@@ -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

drivers/mtd/cfi_flash.c +0 -3

index 479075c..402d835 100644
@@ -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 */

drivers/mtd/mw_eeprom.c +0 -5

index 2b33488..f32ced4 100644
@@ -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

include/configs/APC405.h +1 -1

index 2f266a2..6ee0a36 100644
@@ -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 */

include/configs/ATUM8548.h +1 -1

index f05c1d5..6aa881c 100644
@@ -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

include/configs/Adder.h +1 -1

index cefdd29..07a9f4e 100644
@@ -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 */

include/configs/BC3450.h +1 -1

index b7574bf..3c5d038 100644
@@ -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 */

include/configs/CPCI750.h +1 -1

index 89edbde..03756c3 100644
@@ -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)	*/

include/configs/DU440.h +1 -1

index 64c9ac0..c757523 100644
@@ -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 }

include/configs/EP88x.h +1 -1

index 7824b90..5f1743b 100644
@@ -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 */

include/configs/FPS850L.h +1 -1

index 79b71db..e694a02 100644
@@ -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

include/configs/FPS860L.h +1 -1

index ec757e2..84b6824 100644
@@ -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

include/configs/HMI10.h +1 -1

index 081ca6c..a7e7c57 100644
@@ -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

include/configs/IDS8247.h +1 -1

index f7d4499..29dc623 100644
@@ -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

include/configs/ISPAN.h +1 -1

index 760f7cc..27e46a4 100644
@@ -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 */

include/configs/IceCube.h +1 -1

index 3a347ea..0b90946 100644
@@ -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

include/configs/M52277EVB.h +1 -1

index 3d28913..8713b02 100644
@@ -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 */

include/configs/M5235EVB.h +1 -1

index 8af1c52..e836132 100644
@@ -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

include/configs/M5249EVB.h +1 -1

index de7ea42..c2f5dd9 100644
@@ -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 */

include/configs/M5253EVBE.h +1 -1

index f5e1b64..9dbd129 100644
@@ -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

include/configs/M5271EVB.h +1 -1

index a6fac4c..12f9783 100644
@@ -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 */

include/configs/M5275EVB.h +1 -1

index 283c873..30c70e5 100644
@@ -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
 
 /*-----------------------------------------------------------------------

include/configs/M5282EVB.h +1 -1

index df46ee4..c2c7fab 100644
@@ -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 */

include/configs/M5329EVB.h +1 -1

index b30d99c..58948a2 100644
@@ -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 */

include/configs/M5373EVB.h +1 -1

index a710c6d..814c3a6 100644
@@ -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 */

include/configs/M54455EVB.h +1 -1

index 3a022af..6620f03 100644
@@ -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 */

include/configs/M5475EVB.h +1 -1

index e8804b5..4037efb 100644
@@ -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 */

include/configs/M5485EVB.h +1 -1

index 0f957ff..a14c55b 100644
@@ -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 */

include/configs/MPC8313ERDB.h +1 -1

index 37f8cff..a4c4240 100644
@@ -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 */

include/configs/MPC8315ERDB.h +1 -1

index 095f665..b0cc36d 100644
@@ -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 */

include/configs/MPC8323ERDB.h +1 -1

index 977c041..94b3d5a 100644
@@ -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 */

include/configs/MPC832XEMDS.h +1 -1

index 9ca2a2b..401d0af 100644
@@ -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 */

include/configs/MPC8349EMDS.h +1 -1

index 8705838..a53f5cd 100644
@@ -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 */

include/configs/MPC8349ITX.h +2 -2

index 82d0686..45ddd5c 100644
@@ -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

include/configs/MPC8360EMDS.h +1 -1

index b4bff9a..43d4118 100644
@@ -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 */

include/configs/MPC8360ERDK.h +1 -1

index ca8d53c..6898495 100644
@@ -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. */

include/configs/MPC837XEMDS.h +1 -1

index 0dd0279..f9c1b17 100644
@@ -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 */

include/configs/MPC837XERDB.h +1 -1

index 29c2490..82b3353 100644
@@ -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 */

include/configs/MPC8540ADS.h +1 -1

index d1d3cc3..6351925 100644
@@ -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

include/configs/MPC8541CDS.h +1 -1

index a64565d..d948d76 100644
@@ -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

include/configs/MPC8544DS.h +1 -1

index 091fd2e..9a77b7b 100644
@@ -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

include/configs/MPC8548CDS.h +1 -1

index acf6f0d..33c5c93 100644
@@ -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

include/configs/MPC8555CDS.h +1 -1

index 1948c0d..85c235c 100644
@@ -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

include/configs/MPC8560ADS.h +1 -1

index 2721216..3567d1c 100644
@@ -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

include/configs/MPC8568MDS.h +1 -1

index 9e6bb44..a82d528 100644
@@ -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

include/configs/MPC8610HPCD.h +1 -1

index 06899b1..e9371a2 100644
@@ -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

include/configs/MPC8641HPCN.h +1 -1

index cd35494..468fd08 100644
@@ -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

include/configs/MVBC_P.h +1 -1

index 2c27b97..0ce88d6 100644
@@ -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

include/configs/MVBLM7.h +1 -1

index b412655..0dce9b4 100644
@@ -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

include/configs/MigoR.h +1 -1

index ffa9b54..40cf275 100644
@@ -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

include/configs/NSCU.h +1 -1

index 21d90c3..31762b9 100644
@@ -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

include/configs/PM854.h +1 -1

index bd058fc..f2c11b0 100644
@@ -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

include/configs/PM856.h +1 -1

index 9355aaf..b2cf060 100644
@@ -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

include/configs/PMC405.h +1 -1

index adbe8a9..966bbf9 100644
@@ -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 */

include/configs/PMC440.h +1 -1

index 42f1d8d..9140287 100644
@@ -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 }

include/configs/Rattler.h +1 -1

index 01ebc8f..e8ed095 100644
@@ -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 */

include/configs/SBC8540.h +1 -1

index 8a53fdd..6033d93 100644
@@ -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		*/

include/configs/SX1.h +1 -1

index 50ad7dd..d233679 100644
@@ -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 */

include/configs/TB5200.h +1 -1

index d21783b..3b68166 100644
@@ -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 */

include/configs/TK885D.h +1 -1

index 7310abf..8073b7e 100644
@@ -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

include/configs/TQM5200.h +1 -1

index bfb478a..992439f 100644
@@ -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) */

include/configs/TQM823L.h +1 -1

index 9cc1964..839b6be 100644
@@ -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

include/configs/TQM823M.h +1 -1

index 5edd379..b9a7a59 100644
@@ -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

include/configs/TQM8272.h +1 -1

index ba0402d..039ecf1 100644
@@ -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*/

include/configs/TQM834x.h +1 -1

index 0d2ca72..e8f69f6 100644
@@ -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 */

include/configs/TQM850L.h +1 -1

index 9edf0d8..388fafc 100644
@@ -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

include/configs/TQM850M.h +1 -1

index e2c1ce8..6f0864f 100644
@@ -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

include/configs/TQM855L.h +1 -1

index dd19d4e..093d659 100644
@@ -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

include/configs/TQM855M.h +1 -1

index 8a1c350..64bbc39 100644
@@ -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

include/configs/TQM85xx.h +1 -1

index d18f234..964193f 100644
@@ -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	*/

include/configs/TQM860L.h +1 -1

index 803cdb8..dacc340 100644
@@ -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

include/configs/TQM860M.h +1 -1

index 071da1e..3ec849c 100644
@@ -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

include/configs/TQM862L.h +1 -1

index d34f6be..6c610ee 100644
@@ -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

include/configs/TQM862M.h +1 -1

index 9270e44..2eca59b 100644
@@ -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

include/configs/TQM866M.h +1 -1

index d916d53..4683286 100644
@@ -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

include/configs/TQM885D.h +1 -1

index f075442..5daaf04 100644
@@ -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

include/configs/Total5200.h +1 -1

index 598fe7b..25e98e2 100644
@@ -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 }

include/configs/ZPC1900.h +1 -1

index b04be76..388c747 100644
@@ -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 */

include/configs/acadia.h +1 -1

index 9092a7c..ed2754d 100644
@@ -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		*/

include/configs/actux1.h +1 -1

index 4c4b1d1..33a7494 100644
@@ -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 */

include/configs/actux2.h +1 -1

index 873fced..75aaa11 100644
@@ -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

include/configs/actux3.h +1 -1

index 5e468e6..693c284 100644
@@ -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

include/configs/actux4.h +1 -1

index e4dca2a..7f8e0f4 100644
@@ -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 */

include/configs/ads5121.h +1 -1

index 091da80..d129ea3 100644
@@ -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 */

include/configs/aev.h +1 -1

index c5e4759..f27cc4a 100644
@@ -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 */

include/configs/alpr.h +1 -1

index fb6feb5..f342c7a 100644
@@ -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)	*/

include/configs/apollon.h +1 -1

index 5884611..c93e77a 100644
@@ -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*/

include/configs/assabet.h +1 -1

index d10f092..ed7b5ef 100644
@@ -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       */

include/configs/at91cap9adk.h +1 -1

index 342ce2a..520c676 100644
@@ -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

include/configs/at91sam9263ek.h +1 -1

index a8194b5..5f90d39 100644
@@ -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

include/configs/atngw100.h +1 -1

index f040b86..6d8c1b2 100644
@@ -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

include/configs/atstk1002.h +1 -1

index 68f0cec..3a7d273 100644
@@ -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

include/configs/atstk1003.h +1 -1

index d3a2f69..55ea7f2 100644
@@ -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

include/configs/atstk1004.h +1 -1

index a37ba92..369c619 100644
@@ -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

include/configs/atstk1006.h +1 -1

index a6c5b6e..902f822 100644
@@ -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

include/configs/bf533-stamp.h +1 -1

index d70aa10..9f5667b 100644
@@ -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

include/configs/bf537-stamp.h +1 -1

index a881d53..a06c1dc 100644
@@ -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) */

include/configs/bf561-ezkit.h +1 -1

index e99e979..e4a7f9d 100644
@@ -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

include/configs/canmb.h +1 -1

index f097e2c..38714cc 100644
@@ -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

include/configs/canyonlands.h +1 -1

index ac2e5d9..3b5b280 100644
@@ -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}

include/configs/cm5200.h +1 -1

index ef50c7c..0221dfe 100644
@@ -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 */

include/configs/csb272.h +1 -1

index 15bf177..5145c00 100644
@@ -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	*/

include/configs/csb472.h +1 -1

index b06c0a2..d3e5ea8 100644
@@ -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	*/

include/configs/csb637.h +1 -1

index 735a211..88c8fdb 100644
@@ -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	*/

include/configs/davinci_dvevm.h +1 -1

index 632c4c2..c27ce18 100644
@@ -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 */

include/configs/davinci_sonata.h +1 -1

index ba68605..c55766c 100644
@@ -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 */

include/configs/dbau1x00.h +1 -1

index 0e10396..8941c5e 100644
@@ -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

include/configs/eXalion.h +1 -1

index f8e2c88..6ba0d3f 100644
@@ -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		*/

include/configs/ep8248.h +1 -1

index 8a220b6..ccc0d5d 100644
@@ -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 */

include/configs/ep82xxm.h +1 -1

index ac5847c..ac68c86 100644
@@ -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 */

include/configs/gcplus.h +1 -1

index 3b1b4ab..1d9c05b 100644
@@ -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       */

include/configs/gr_cpci_ax2000.h +1 -1

index ffe7671..942609f 100644
@@ -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

include/configs/gr_ep2s60.h +1 -1

index 7b1d582..ae25fb2 100644
@@ -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

include/configs/gr_xc3s_1500.h +1 -1

index 6fe2b7c..f019bb4 100644
@@ -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

include/configs/grsim.h +1 -1

index 3fb8eb3..f880a7b 100644
@@ -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

include/configs/grsim_leon2.h +1 -1

index 406ce3d..e5af9a6 100644
@@ -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

include/configs/hcu4.h +1 -1

index 13b0358..d99ac53 100644
@@ -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

include/configs/hcu5.h +1 -1

index 2080868..54d6721 100644
@@ -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

include/configs/hmi1001.h +1 -1

index ad7cf76..205f5cc 100644
@@ -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

include/configs/imx31_litekit.h +1 -1

index ec4ed1e..c476333 100644
@@ -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 */

include/configs/imx31_phycore.h +1 -1

index 7d6aaa1..237f361 100644
@@ -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 */

include/configs/inka4x0.h +1 -1

index 6ec92c3..efa2802 100644
@@ -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 */

include/configs/ixdp425.h +1 -1

index b7c43fe..6b73abe 100644
@@ -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 }

include/configs/ixdpg425.h +1 -1

index 05dc841..d4e4871 100644
@@ -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)	*/

include/configs/jupiter.h +1 -1

index c985927..af88a3f 100644
@@ -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

include/configs/katmai.h +1 -1

index f07e470..e056b01 100644
@@ -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)	*/

include/configs/kb9202.h +1 -1

index 7dcce83..e775e60 100644
@@ -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__

include/configs/kilauea.h +1 -1

index 9c1a3a4..d94f967 100644
@@ -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		*/

include/configs/korat.h +1 -1

index 4ca4ed0..a887446 100644
@@ -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 }

include/configs/kvme080.h +1 -1

index 569800a..819e456 100644
@@ -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

include/configs/linkstation.h +1 -1

index bc64294..e5a0fb9 100644
@@ -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 }

include/configs/lwmon5.h +1 -1

index 2f3a066..3d135c4 100644
@@ -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

include/configs/m501sk.h +1 -1

index e4be1ed..bc94cf4 100644
@@ -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*/

include/configs/makalu.h +1 -1

index 65b240e..ddfc5e3 100644
@@ -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		*/

include/configs/mcc200.h +1 -1

index e4c3f72..f512847 100644
@@ -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 }

include/configs/mcu25.h +1 -1

index 4e9645e..6adba96 100644
@@ -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

include/configs/mecp5200.h +1 -1

index 8dfb9aa..75040fe 100644
@@ -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

include/configs/mgcoge.h +1 -1

index 59ff96b..5fe3075 100644
@@ -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 */

include/configs/mgsuvd.h +1 -1

index 9cbc9cc..6f1c640 100644
@@ -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 */

include/configs/ml401.h +1 -1

index 7e0df87..36a42ba 100644
@@ -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 */

include/configs/motionpro.h +1 -1

index 3d1eafe..f2a35ee 100644
@@ -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 */

include/configs/mpc7448hpc2.h +1 -1

index 2f24967..d379b1f 100644
@@ -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

include/configs/mpr2.h +1 -1

index 2598b34..3df6e39 100644
@@ -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

include/configs/ms7720se.h +1 -1

index dc0af15..1c3d277 100644
@@ -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 */

include/configs/ms7722se.h +1 -1

index 910a44e..3809e71 100644
@@ -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 */

include/configs/ms7750se.h +1 -1

index bee0aab..4356a67 100644
@@ -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 */

include/configs/munices.h +1 -1

index e0046ec..cea2834 100644
@@ -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 */

include/configs/mx31ads.h +1 -1

index 37ba872..9ede764 100644
@@ -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 */

include/configs/omap1510inn.h +1 -1

index 0be46ea..46b30e0 100644
@@ -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 */

include/configs/omap2420h4.h +1 -1

index 88a3f6e..aac5d0f 100644
@@ -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 */

include/configs/omap5912osk.h +1 -1

index e3bde4f..1c44ce0 100644
@@ -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 }

include/configs/p3mx.h +1 -1

index 0913b14..33a94bc 100644
@@ -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)	*/

include/configs/p3p440.h +1 -1

index 82f2391..ac0d83a 100644
@@ -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 }

include/configs/pdnb3.h +1 -1

index aca70dc..889207a 100644
@@ -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

include/configs/ppmc8260.h +1 -1

index dee6643..6f1195b 100644
@@ -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		*/

include/configs/pxa255_idp.h +1 -1

index a2f3650..179ff7a 100644
@@ -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

include/configs/qemu-mips.h +1 -1

index 3dfd218..19e627b 100644
@@ -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

include/configs/quad100hd.h +1 -1

index 622a5d4..d464734 100644
@@ -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 }

include/configs/quantum.h +3 -3

index cc261c3..34a1ea6 100644
@@ -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}

include/configs/r2dplus.h +1 -1

index 414e8dc..06ede3e 100644
@@ -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

include/configs/r7780mp.h +1 -1

index 0b08f18..77881e7 100644
@@ -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 */

include/configs/sbc8349.h +1 -1

index 7481556..261229c 100644
@@ -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 */

include/configs/sbc8548.h +1 -1

index 358fc02..b4238e5 100644
@@ -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

include/configs/sbc8560.h +1 -1

index 6345cce..b244eef 100644
@@ -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	*/

include/configs/sbc8641d.h +1 -1

index ebfcb46..efc787e 100644
@@ -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

include/configs/sc3.h +1 -1

index 87311ea..659f74e 100644
@@ -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)	*/

include/configs/sequoia.h +1 -1

index 730037e..18675c2 100644
@@ -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 }

include/configs/sh7763rdp.h +1 -1

index 4723634..1306702 100644
@@ -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) */

include/configs/smmaco4.h +1 -1

index 3e47eb8..1d202d4 100644
@@ -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 */

include/configs/socrates.h +1 -1

index 1627413..8a64942 100644
@@ -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	*/

include/configs/sorcery.h +1 -1

index 18f5533..f4e4608 100644
@@ -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 */

include/configs/spc1920.h +1 -1

index f46c464..daaa23f 100644
@@ -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 */

include/configs/spieval.h +1 -1

index 69d2d67..93798a4 100644
@@ -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 */

include/configs/stxssa.h +1 -1

index a1e9789..4f1c156 100644
@@ -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	*/

include/configs/stxxtc.h +1 -1

index fcafba5..2bdce30 100644
@@ -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	*/

include/configs/taishan.h +1 -1

index ba42192..81133bb 100644
@@ -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)	*/

include/configs/trizepsiv.h +1 -1

index f77dd14..6367f87 100644
@@ -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

include/configs/uc100.h +1 -1

index e74b1bb..106e6f2 100644
@@ -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		*/

include/configs/uc101.h +1 -1

index 042750e..a186188 100644
@@ -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

include/configs/v38b.h +1 -1

index c203522..3574548 100644
@@ -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 */

include/configs/virtlab2.h +1 -1

index f104886..1a125f1 100644
@@ -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

include/configs/voiceblue.h +1 -1

index 8c827af..20917ee 100644
@@ -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

include/configs/yosemite.h +1 -1

index 891b515..cb2042c 100644
@@ -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		*/

include/configs/zeus.h +1 -1

index cd120df..b50cba5 100644
@@ -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 }

Signature · 1 line

1.5.6.2

Jean-Christophe PLAGNIOL-VILLARD

author

2008-08-12 21:51 UTC #13 lore raw

PATCH 11/13 drivers/mtd/onenand: Move conditional compilation to Makefile

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

---
 drivers/mtd/onenand/Makefile        |    3 ++-
 drivers/mtd/onenand/onenand_base.c  |    5 -----
 drivers/mtd/onenand/onenand_bbt.c   |    5 -----
 drivers/mtd/onenand/onenand_uboot.c |    5 -----
 4 files changed, 2 insertions(+), 16 deletions(-)

drivers/mtd/onenand/Makefile +2 -1

index 92074b2..1d35a57 100644
@@ -25,8 +25,9 @@ include $(TOPDIR)/config.mk
 
 LIB	:= $(obj)libonenand.a
 
-COBJS	:= onenand_uboot.o onenand_base.o onenand_bbt.o
+COBJS-$(CONFIG_CMD_ONENAND)	:= onenand_uboot.o onenand_base.o onenand_bbt.o
 
+COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))

drivers/mtd/onenand/onenand_base.c +0 -5

index ded1706..7c9438b 100644
@@ -10,9 +10,6 @@
  */
 
 #include <common.h>
-
-#ifdef CONFIG_CMD_ONENAND
-
 #include <linux/mtd/compat.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/onenand.h>

@@ -1304,5 +1301,3 @@ int onenand_scan(struct mtd_info *mtd, int maxchips)
 void onenand_release(struct mtd_info *mtd)
 {
 }
-
-#endif /* CONFIG_CMD_ONENAND */

drivers/mtd/onenand/onenand_bbt.c +0 -5

index 87344ab..0abaa1a 100644
@@ -15,9 +15,6 @@
  */
 
 #include <common.h>
-
-#ifdef CONFIG_CMD_ONENAND
-
 #include <linux/mtd/compat.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/onenand.h>

@@ -261,5 +258,3 @@ int onenand_default_bbt(struct mtd_info *mtd)
 
 	return onenand_scan_bbt(mtd, bbm->badblock_pattern);
 }
-
-#endif /* CFG_CMD_ONENAND */

drivers/mtd/onenand/onenand_uboot.c +0 -5

index bd7466a..d614450 100644
@@ -14,9 +14,6 @@
  */
 
 #include <common.h>
-
-#ifdef CONFIG_CMD_ONENAND
-
 #include <linux/mtd/compat.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/onenand.h>

@@ -37,5 +34,3 @@ void onenand_init(void)
 	puts("OneNAND: ");
 	print_size(onenand_mtd.size, "\n");
 }
-
-#endif	/* CONFIG_CMD_ONENAND */

Signature · 1 line

1.5.6.2

Jean-Christophe PLAGNIOL-VILLARD

author

2008-08-12 21:51 UTC #14 lore raw

PATCH 12/13 drivers/mtd/nand: Move conditional compilation to Makefile

rename CFG_NAND_LEGACY to CONFIG_NAND_LEGACY

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

---
 board/delta/nand.c                    |    2 +-
 board/esd/common/auto_update.c        |   12 ++++++------
 board/netta/netta.c                   |    2 +-
 common/cmd_jffs2.c                    |   12 ++++++------
 common/cmd_nand.c                     |    6 +++---
 cpu/arm920t/s3c24x0/nand.c            |    2 +-
 cpu/arm926ejs/davinci/nand.c          |    2 +-
 cpu/ppc4xx/ndfc.c                     |    2 +-
 doc/README.nand                       |    2 +-
 drivers/mtd/nand/Makefile             |   10 +++++++---
 drivers/mtd/nand/diskonchip.c         |    2 +-
 drivers/mtd/nand/fsl_upm.c            |    3 ---
 drivers/mtd/nand/nand.c               |    5 -----
 drivers/mtd/nand/nand_base.c          |    5 -----
 drivers/mtd/nand/nand_bbt.c           |    5 -----
 drivers/mtd/nand/nand_ecc.c           |    4 ----
 drivers/mtd/nand/nand_ids.c           |    4 ----
 drivers/mtd/nand/nand_util.c          |    5 -----
 drivers/mtd/nand_legacy/nand_legacy.c |    2 +-
 fs/jffs2/jffs2_1pass.c                |    6 +++---
 fs/jffs2/jffs2_nand_1pass.c           |    2 +-
 include/configs/BMW.h                 |    2 +-
 include/configs/CPU87.h               |    2 +-
 include/configs/GEN860T.h             |    2 +-
 include/configs/IDS8247.h             |    2 +-
 include/configs/MIP405.h              |    2 +-
 include/configs/NETPHONE.h            |    2 +-
 include/configs/NETTA.h               |    2 +-
 include/configs/NETTA2.h              |    2 +-
 include/configs/NETVIA.h              |    2 +-
 include/configs/PCIPPC2.h             |    2 +-
 include/configs/PCIPPC6.h             |    2 +-
 include/configs/PIP405.h              |    2 +-
 include/configs/PM520.h               |    2 +-
 include/configs/PM826.h               |    2 +-
 include/configs/PM828.h               |    2 +-
 include/configs/SXNI855T.h            |    2 +-
 include/configs/TQM85xx.h             |    2 +-
 include/configs/VCMA9.h               |    2 +-
 include/configs/at91rm9200dk.h        |    2 +-
 include/configs/delta.h               |    2 +-
 include/configs/omap2420h4.h          |    2 +-
 include/configs/stxxtc.h              |    2 +-
 include/configs/svm_sc8xx.h           |    2 +-
 include/linux/mtd/nand_ids.h          |    2 +-
 include/linux/mtd/nand_legacy.h       |    2 +-
 include/nand.h                        |    4 ++--
 lib_generic/crc32.c                   |    2 +-
 48 files changed, 62 insertions(+), 89 deletions(-)

board/delta/nand.c +1 -1

index b007b09..4ce78a1 100644
@@ -23,7 +23,7 @@
 #include <common.h>
 
 #if defined(CONFIG_CMD_NAND)
-#if !defined(CFG_NAND_LEGACY)
+#if !defined(CONFIG_NAND_LEGACY)
 
 #include <nand.h>
 #include <asm/arch/pxa-regs.h>

board/esd/common/auto_update.c +6 -6

index 7e6eea0..a1e0ce5 100644
@@ -27,7 +27,7 @@
 #include <command.h>
 #include <image.h>
 #include <asm/byteorder.h>
-#if defined(CFG_NAND_LEGACY)
+#if defined(CONFIG_NAND_LEGACY)
 #include <linux/mtd/nand_legacy.h>
 #endif
 #include <fat.h>

@@ -58,7 +58,7 @@ extern int flash_sect_erase(ulong, ulong);
 extern int flash_sect_protect (int, ulong, ulong);
 extern int flash_write (char *, ulong, ulong);
 
-#if defined(CONFIG_CMD_NAND) && defined(CFG_NAND_LEGACY)
+#if defined(CONFIG_CMD_NAND) && defined(CONFIG_NAND_LEGACY)
 /* references to names in cmd_nand.c */
 #define NANDRW_READ	0x01
 #define NANDRW_WRITE	0x00

@@ -158,7 +158,7 @@ int au_do_update(int i, long sz)
 	int off, rc;
 	uint nbytes;
 	int k;
-#if defined(CONFIG_CMD_NAND) && defined(CFG_NAND_LEGACY)
+#if defined(CONFIG_CMD_NAND) && defined(CONFIG_NAND_LEGACY)
 	int total;
 #endif

@@ -241,7 +241,7 @@ int au_do_update(int i, long sz)
 			debug ("flash_sect_erase(%lx, %lx);\n", start, end);
 			flash_sect_erase (start, end);
 		} else {
-#if defined(CONFIG_CMD_NAND) && defined(CFG_NAND_LEGACY)
+#if defined(CONFIG_CMD_NAND) && defined(CONFIG_NAND_LEGACY)
 			printf ("Updating NAND FLASH with image %s\n",
 				au_image[i].name);
 			debug ("nand_legacy_erase(%lx, %lx);\n", start, end);

@@ -273,7 +273,7 @@ int au_do_update(int i, long sz)
 			rc = flash_write ((char *)addr, start,
 					  (nbytes + 1) & ~1);
 		} else {
-#if defined(CONFIG_CMD_NAND) && defined(CFG_NAND_LEGACY)
+#if defined(CONFIG_CMD_NAND) && defined(CONFIG_NAND_LEGACY)
 			debug ("nand_legacy_rw(%p, %lx, %x)\n",
 			       addr, start, nbytes);
 			rc = nand_legacy_rw (nand_dev_desc,

@@ -298,7 +298,7 @@ int au_do_update(int i, long sz)
 			rc = crc32 (0, (uchar *)(start + off),
 				    image_get_data_size (hdr));
 		} else {
-#if defined(CONFIG_CMD_NAND) && defined(CFG_NAND_LEGACY)
+#if defined(CONFIG_CMD_NAND) && defined(CONFIG_NAND_LEGACY)
 			rc = nand_legacy_rw (nand_dev_desc,
 					     NANDRW_READ | NANDRW_JFFS2 |
 					     NANDRW_JFFS2_SKIP,

board/netta/netta.c +1 -1

index 1183f33..bc31386 100644
@@ -555,7 +555,7 @@ int board_early_init_f(void)
 	return 0;
 }
 
-#if defined(CONFIG_CMD_NAND) && defined(CFG_NAND_LEGACY)
+#if defined(CONFIG_CMD_NAND) && defined(CONFIG_NAND_LEGACY)
 
 #include <linux/mtd/nand_legacy.h>

common/cmd_jffs2.c +6 -6

index b4698be..c031d80 100644
@@ -96,12 +96,12 @@
 #include <cramfs/cramfs_fs.h>
 
 #if defined(CONFIG_CMD_NAND)
-#ifdef CFG_NAND_LEGACY
+#ifdef CONFIG_NAND_LEGACY
 #include <linux/mtd/nand_legacy.h>
-#else /* !CFG_NAND_LEGACY */
+#else /* !CONFIG_NAND_LEGACY */
 #include <linux/mtd/nand.h>
 #include <nand.h>
-#endif /* !CFG_NAND_LEGACY */
+#endif /* !CONFIG_NAND_LEGACY */
 #endif
 /* enable/disable debugging messages */
 #define	DEBUG_JFFS

@@ -476,7 +476,7 @@ static int part_del(struct mtd_device *dev, struct part_info *part)
 		}
 	}
 
-#ifdef CFG_NAND_LEGACY
+#ifdef CONFIG_NAND_LEGACY
 	jffs2_free_cache(part);
 #endif
 	list_del(&part->link);

@@ -505,7 +505,7 @@ static void part_delall(struct list_head *head)
 	list_for_each_safe(entry, n, head) {
 		part_tmp = list_entry(entry, struct part_info, link);
 
-#ifdef CFG_NAND_LEGACY
+#ifdef CONFIG_NAND_LEGACY
 		jffs2_free_cache(part_tmp);
 #endif
 		list_del(entry);

@@ -741,7 +741,7 @@ static int device_validate(u8 type, u8 num, u32 *size)
 	} else if (type == MTD_DEV_TYPE_NAND) {
 #if defined(CONFIG_JFFS2_NAND) && defined(CONFIG_CMD_NAND)
 		if (num < CFG_MAX_NAND_DEVICE) {
-#ifndef CFG_NAND_LEGACY
+#ifndef CONFIG_NAND_LEGACY
 			*size = nand_info[num].size;
 #else
 			extern struct nand_chip nand_dev_desc[CFG_MAX_NAND_DEVICE];

common/cmd_nand.c +3 -3

index 520c152..fa7a438 100644
@@ -11,7 +11,7 @@
 #include <common.h>
 
 
-#ifndef CFG_NAND_LEGACY
+#ifndef CONFIG_NAND_LEGACY
 /*
  *
  * New NAND support

@@ -667,7 +667,7 @@ U_BOOT_CMD(nboot, 4, 1, do_nandboot,
 
 #endif
 
-#else /* CFG_NAND_LEGACY */
+#else /* CONFIG_NAND_LEGACY */
 /*
  *
  * Legacy NAND support - to be phased out

@@ -1077,4 +1077,4 @@ U_BOOT_CMD(
 
 #endif
 
-#endif /* CFG_NAND_LEGACY */
+#endif /* CONFIG_NAND_LEGACY */

cpu/arm920t/s3c24x0/nand.c +1 -1

index e1bf128..14882cb 100644
@@ -27,7 +27,7 @@
 #endif
 
 #if defined(CONFIG_CMD_NAND)
-#if !defined(CFG_NAND_LEGACY)
+#if !defined(CONFIG_NAND_LEGACY)
 
 #include <nand.h>
 #include <s3c2410.h>

cpu/arm926ejs/davinci/nand.c +1 -1

index 8fd784e..2aa01d6 100644
@@ -45,7 +45,7 @@
 #include <asm/io.h>
 
 #ifdef CFG_USE_NAND
-#if !defined(CFG_NAND_LEGACY)
+#if !defined(CONFIG_NAND_LEGACY)
 
 #include <nand.h>
 #include <asm/arch/nand_defs.h>

cpu/ppc4xx/ndfc.c +1 -1

index 4f083d9..72acfd0 100644
@@ -31,7 +31,7 @@
 
 #include <common.h>
 
-#if defined(CONFIG_CMD_NAND) && !defined(CFG_NAND_LEGACY) && \
+#if defined(CONFIG_CMD_NAND) && !defined(CONFIG_NAND_LEGACY) && \
 	(defined(CONFIG_440EP) || defined(CONFIG_440GR) ||	     \
 	 defined(CONFIG_440EPX) || defined(CONFIG_440GRX) ||	     \
 	 defined(CONFIG_405EZ) || defined(CONFIG_405EX) ||	     \

doc/README.nand +1 -1

index 0ad5e18..171380e 100644
@@ -184,7 +184,7 @@ We now use a complete rewrite of the NAND code based on what is in
 The old NAND handling code has been re-factored and is now confined
 to only board-specific files and - unfortunately - to the DoC code
 (see below). A new configuration variable has been introduced:
-CFG_NAND_LEGACY, which has to be defined in the board config file if
+CONFIG_NAND_LEGACY, which has to be defined in the board config file if
 that board uses legacy code.
 
 The necessary changes have been made to all affected boards, and no

drivers/mtd/nand/Makefile +7 -3

index ffb3169..1923310 100644
@@ -25,15 +25,19 @@ include $(TOPDIR)/config.mk
 
 LIB	:= $(obj)libnand.a
 
+ifdef CONFIG_CMD_NAND
+ifndef CONFIG_NAND_LEGACY
 COBJS-y += nand.o
 COBJS-y += nand_base.o
-COBJS-y += nand_ids.o
-COBJS-y += nand_ecc.o
 COBJS-y += nand_bbt.o
+COBJS-y += nand_ecc.o
+COBJS-y += nand_ids.o
 COBJS-y += nand_util.o
+endif
 
 COBJS-$(CONFIG_NAND_FSL_ELBC) += fsl_elbc_nand.o
-COBJS-y += fsl_upm.o
+COBJS-$(CONFIG_NAND_FSL_UPM) += fsl_upm.o
+endif
 
 COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)

drivers/mtd/nand/diskonchip.c +1 -1

index ce197f5..4cba810 100644
@@ -21,7 +21,7 @@
 
 #include <common.h>
 
-#if !defined(CFG_NAND_LEGACY)
+#if !defined(CONFIG_NAND_LEGACY)
 
 #include <linux/kernel.h>
 #include <linux/init.h>

drivers/mtd/nand/fsl_upm.c +0 -3

index e651903..1a1d8c4 100644
@@ -11,8 +11,6 @@
  */
 
 #include <config.h>
-
-#if defined(CONFIG_CMD_NAND) && defined(CONFIG_NAND_FSL_UPM)
 #include <common.h>
 #include <asm/io.h>
 #include <asm/errno.h>

@@ -150,4 +148,3 @@ int fsl_upm_nand_init(struct nand_chip *chip, struct fsl_upm_nand *fun)
 
 	return 0;
 }
-#endif /* CONFIG_CMD_NAND */

drivers/mtd/nand/nand.c +0 -5

index e44470e..ebd2acd 100644
@@ -22,9 +22,6 @@
  */
 
 #include <common.h>
-
-#if defined(CONFIG_CMD_NAND) && !defined(CFG_NAND_LEGACY)
-
 #include <nand.h>
 
 #ifndef CFG_NAND_BASE_LIST

@@ -79,5 +76,3 @@ void nand_init(void)
 	board_nand_select_device(nand_info[nand_curr_device].priv, nand_curr_device);
 #endif
 }
-
-#endif

drivers/mtd/nand/nand_base.c +0 -5

index a29ff11..0913bb8 100644
@@ -59,8 +59,6 @@
 
 #define ENOTSUPP	524	/* Operation is not supported */
 
-#if defined(CONFIG_CMD_NAND) && !defined(CFG_NAND_LEGACY)
-
 #include <malloc.h>
 #include <watchdog.h>
 #include <linux/err.h>

@@ -2822,6 +2820,3 @@ MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Steven J. Hill <[email protected]>, Thomas Gleixner <[email protected]>");
 MODULE_DESCRIPTION("Generic NAND flash driver code");
 #endif
-
-#endif
-

drivers/mtd/nand/nand_bbt.c +0 -5

index 8447947..b3b740d 100644
@@ -53,9 +53,6 @@
  */
 
 #include <common.h>
-
-#if defined(CONFIG_CMD_NAND) && !defined(CFG_NAND_LEGACY)
-
 #include <malloc.h>
 #include <linux/mtd/compat.h>
 #include <linux/mtd/mtd.h>

@@ -1237,5 +1234,3 @@ int nand_isbad_bbt(struct mtd_info *mtd, loff_t offs, int allowbbt)
 EXPORT_SYMBOL(nand_scan_bbt);
 EXPORT_SYMBOL(nand_default_bbt);
 #endif
-
-#endif

drivers/mtd/nand/nand_ecc.c +0 -4

index e1d5154..ee1f6cc 100644
@@ -39,8 +39,6 @@
 
 #include <common.h>
 
-#if defined(CONFIG_CMD_NAND) && !defined(CFG_NAND_LEGACY)
-
 /* XXX U-BOOT XXX */
 #if 0
 #include <linux/types.h>

@@ -215,5 +213,3 @@ int nand_correct_data(struct mtd_info *mtd, u_char *dat,
 #if 0
 EXPORT_SYMBOL(nand_correct_data);
 #endif
-
-#endif

drivers/mtd/nand/nand_ids.c +0 -4

index f8b96cf..2ff75c9 100644
@@ -12,9 +12,6 @@
  */
 
 #include <common.h>
-
-#if defined(CONFIG_CMD_NAND) && !defined(CFG_NAND_LEGACY)
-
 #include <linux/mtd/nand.h>
 /*
 *	Chip ID list

@@ -147,4 +144,3 @@ struct nand_manufacturers nand_manuf_ids[] = {
 	{NAND_MFR_MICRON, "Micron"},
 	{0x0, "Unknown"}
 };
-#endif

drivers/mtd/nand/nand_util.c +0 -5

index 02fe914..22820d5 100644
@@ -31,9 +31,6 @@
  */
 
 #include <common.h>
-
-#if defined(CONFIG_CMD_NAND) && !defined(CFG_NAND_LEGACY)
-
 #include <command.h>
 #include <watchdog.h>
 #include <malloc.h>

@@ -606,5 +603,3 @@ int nand_read_skip_bad(nand_info_t *nand, size_t offset, size_t *length,
 
 	return 0;
 }
-
-#endif /* defined(CONFIG_CMD_NAND) && !defined(CFG_NAND_LEGACY) */

drivers/mtd/nand_legacy/nand_legacy.c +1 -1

index fafefad..8f7dc39 100644
@@ -15,7 +15,7 @@
 #include <asm/io.h>
 #include <watchdog.h>
 
-#if defined(CONFIG_CMD_NAND) && defined(CFG_NAND_LEGACY)
+#if defined(CONFIG_CMD_NAND) && defined(CONFIG_NAND_LEGACY)
 
 #include <linux/mtd/nand_legacy.h>
 #include <linux/mtd/nand_ids.h>

fs/jffs2/jffs2_1pass.c +3 -3

index 8a06777..b5e7ab8 100644
@@ -146,7 +146,7 @@ static struct part_info *current_part;
 
 #if (defined(CONFIG_JFFS2_NAND) && \
      defined(CONFIG_CMD_NAND) )
-#if defined(CFG_NAND_LEGACY)
+#if defined(CONFIG_NAND_LEGACY)
 #include <linux/mtd/nand_legacy.h>
 #else
 #include <nand.h>

@@ -161,7 +161,7 @@ static struct part_info *current_part;
  *
  */
 
-#if defined(CFG_NAND_LEGACY)
+#if defined(CONFIG_NAND_LEGACY)
 /* this one defined in nand_legacy.c */
 int read_jffs2_nand(size_t start, size_t len,
 		size_t * retlen, u_char * buf, int nanddev);

@@ -201,7 +201,7 @@ static int read_nand_cached(u32 off, u32 size, u_char *buf)
 				}
 			}
 
-#if defined(CFG_NAND_LEGACY)
+#if defined(CONFIG_NAND_LEGACY)
 			if (read_jffs2_nand(nand_cache_off, NAND_CACHE_SIZE,
 						&retlen, nand_cache, id->num) < 0 ||
 					retlen != NAND_CACHE_SIZE) {

fs/jffs2/jffs2_nand_1pass.c +1 -1

index 3ce9c98..9f6de7d 100644
@@ -1,6 +1,6 @@
 #include <common.h>
 
-#if !defined(CFG_NAND_LEGACY) && defined(CONFIG_CMD_JFFS2)
+#if !defined(CONFIG_NAND_LEGACY) && defined(CONFIG_CMD_JFFS2)
 
 #include <malloc.h>
 #include <linux/stat.h>

include/configs/BMW.h +1 -1

index bb7856f..11d19c6 100644
@@ -86,7 +86,7 @@
 
 
 /* CONFIG_CMD_DOC required legacy NAND support */
-#define CFG_NAND_LEGACY
+#define CONFIG_NAND_LEGACY
 
 #if 0
 #define CONFIG_PCI		1

include/configs/CPU87.h +1 -1

index 3879d9b..d325c4d 100644
@@ -191,7 +191,7 @@
 #endif
 
 
-#define CFG_NAND_LEGACY
+#define CONFIG_NAND_LEGACY
 
 /*
  * Miscellaneous configurable options

include/configs/GEN860T.h +1 -1

index 037b115..422ed32 100644
@@ -280,7 +280,7 @@
 #define CFG_FPGA_PROG_FEEDBACK
 
 
-#define CFG_NAND_LEGACY
+#define CONFIG_NAND_LEGACY
 
 /*
  * Verbose help from command monitor.

include/configs/IDS8247.h +1 -1

index 29dc623..029bb99 100644
@@ -262,7 +262,7 @@
  */
 #if defined(CONFIG_CMD_NAND)
 
-#define CFG_NAND_LEGACY
+#define CONFIG_NAND_LEGACY
 #define CFG_NAND0_BASE 0xE1000000
 
 #define CFG_MAX_NAND_DEVICE     1       /* Max number of NAND devices           */

include/configs/MIP405.h +1 -1

index d683b87..66235e3 100644
@@ -88,7 +88,7 @@
 #endif
 
 
-#define CFG_NAND_LEGACY
+#define CONFIG_NAND_LEGACY
 
 #define	 CFG_HUSH_PARSER
 #define	 CFG_PROMPT_HUSH_PS2 "> "

include/configs/NETPHONE.h +1 -1

index 27e7ab9..6c18b81 100644
@@ -502,7 +502,7 @@
 /****************************************************************/
 
 /* NAND */
-#define CFG_NAND_LEGACY
+#define CONFIG_NAND_LEGACY
 #define CFG_NAND_BASE		NAND_BASE
 #define CONFIG_MTD_NAND_ECC_JFFS2
 #define CONFIG_MTD_NAND_VERIFY_WRITE

include/configs/NETTA.h +1 -1

index 56c76d3..1f1bc54 100644
@@ -621,7 +621,7 @@
 /****************************************************************/
 
 /* NAND */
-#define CFG_NAND_LEGACY
+#define CONFIG_NAND_LEGACY
 #define CFG_NAND_BASE			NAND_BASE
 #define CONFIG_MTD_NAND_VERIFY_WRITE
 #define CONFIG_MTD_NAND_UNSAFE

include/configs/NETTA2.h +1 -1

index b8c4848..9a1f1d6 100644
@@ -503,7 +503,7 @@
 /****************************************************************/
 
 /* NAND */
-#define CFG_NAND_LEGACY
+#define CONFIG_NAND_LEGACY
 #define CFG_NAND_BASE		NAND_BASE
 #define CONFIG_MTD_NAND_ECC_JFFS2
 #define CONFIG_MTD_NAND_VERIFY_WRITE

include/configs/NETVIA.h +1 -1

index 1293fb0..c029594 100644
@@ -397,7 +397,7 @@
 
 /*****************************************************************************/
 
-#define CFG_NAND_LEGACY
+#define CONFIG_NAND_LEGACY
 
 #if defined(CONFIG_NETVIA_VERSION) && CONFIG_NETVIA_VERSION >= 2

include/configs/PCIPPC2.h +1 -1

index 268b034..6ebaa85 100644
@@ -84,7 +84,7 @@
 #define CONFIG_PCI		1
 #define CONFIG_PCI_PNP		1	/* PCI plug-and-play */
 
-#define CFG_NAND_LEGACY
+#define CONFIG_NAND_LEGACY
 
 /*
  * Miscellaneous configurable options

include/configs/PCIPPC6.h +1 -1

index 250b586..9202794 100644
@@ -86,7 +86,7 @@
 #define CONFIG_PCI		1
 #define CONFIG_PCI_PNP		1	/* PCI plug-and-play */
 
-#define CFG_NAND_LEGACY
+#define CONFIG_NAND_LEGACY
 
 /*
  * Miscellaneous configurable options

include/configs/PIP405.h +1 -1

index 5890012..2ceda00 100644
@@ -77,7 +77,7 @@
 #define CONFIG_CMD_BSP
 
 
-#define CFG_NAND_LEGACY
+#define CONFIG_NAND_LEGACY
 
 #define	 CFG_HUSH_PARSER
 #define	 CFG_PROMPT_HUSH_PS2 "> "

include/configs/PM520.h +1 -1

index 259178f..5e0bb05 100644
@@ -88,7 +88,7 @@
 
 #if !defined(CONFIG_BOOT_ROM)
 /* DoC requires legacy NAND for now */
-#define CFG_NAND_LEGACY
+#define CONFIG_NAND_LEGACY
 #endif

include/configs/PM826.h +1 -1

index 36e9aa5..190e2a4 100644
@@ -180,7 +180,7 @@
 #endif
 
 
-#define CFG_NAND_LEGACY
+#define CONFIG_NAND_LEGACY
 
 /*
  * Disk-On-Chip configuration

include/configs/PM828.h +1 -1

index abf593c..96c0edf 100644
@@ -183,7 +183,7 @@
 /*
  * Disk-On-Chip configuration
  */
-#define CFG_NAND_LEGACY
+#define CONFIG_NAND_LEGACY
 
 #define CFG_DOC_SHORT_TIMEOUT
 #define CFG_MAX_DOC_DEVICE	1	/* Max number of DOC devices	*/

include/configs/SXNI855T.h +1 -1

index aefc7ee..c5d5386 100644
@@ -195,7 +195,7 @@
 */
 
 /* NAND flash support */
-#define CFG_NAND_LEGACY
+#define CONFIG_NAND_LEGACY
 #define CONFIG_MTD_NAND_ECC_JFFS2
 #define CFG_MAX_NAND_DEVICE	1	/* Max number of NAND devices	*/
 #define SECTORSIZE 512

include/configs/TQM85xx.h +1 -1

index 964193f..d84554e 100644
@@ -345,7 +345,7 @@
 /* NAND FLASH */
 #ifdef CONFIG_NAND
 
-#undef CFG_NAND_LEGACY
+#undef CONFIG_NAND_LEGACY
 
 #define CONFIG_NAND_FSL_UPM	1

include/configs/VCMA9.h +1 -1

index ad8db61..02cabb2 100644
@@ -254,7 +254,7 @@
  */
 #if defined(CONFIG_CMD_NAND)
 
-#define CFG_NAND_LEGACY
+#define CONFIG_NAND_LEGACY
 #define CFG_MAX_NAND_DEVICE	1	/* Max number of NAND devices		*/
 #define SECTORSIZE 512

include/configs/at91rm9200dk.h +1 -1

index cd2eae2..fca431e 100644
@@ -116,7 +116,7 @@
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_NAND
 
-#define CFG_NAND_LEGACY
+#define CONFIG_NAND_LEGACY
 
 #define CFG_MAX_NAND_DEVICE	1	/* Max number of NAND devices		*/
 #define SECTORSIZE 512

include/configs/delta.h +1 -1

index 14fde1a..1db962a 100644
@@ -217,7 +217,7 @@
 /*
  * NAND Flash
  */
-#undef CFG_NAND_LEGACY
+#undef CONFIG_NAND_LEGACY
 
 #define CFG_NAND0_BASE		0x0 /* 0x43100040 */ /* 0x10000000 */
 #undef CFG_NAND1_BASE

include/configs/omap2420h4.h +1 -1

index aac5d0f..afdcba4 100644
@@ -151,7 +151,7 @@
 /*
  *  Board NAND Info.
  */
-#define CFG_NAND_LEGACY
+#define CONFIG_NAND_LEGACY
 #define CFG_NAND_ADDR 0x04000000  /* physical address to access nand at CS0*/
 
 #define CFG_MAX_NAND_DEVICE 1	/* Max number of NAND devices */

include/configs/stxxtc.h +1 -1

index 2bdce30..37a52cf 100644
@@ -449,7 +449,7 @@
 /****************************************************************/
 
 /* NAND */
-#define CFG_NAND_LEGACY
+#define CONFIG_NAND_LEGACY
 #define CFG_NAND_BASE		NAND_BASE
 #define CONFIG_MTD_NAND_ECC_JFFS2
 #define CONFIG_MTD_NAND_VERIFY_WRITE

include/configs/svm_sc8xx.h +1 -1

index 70336b5..bbbfa15 100644
@@ -151,7 +151,7 @@
 #define CONFIG_CMD_DATE
 
 
-#define CFG_NAND_LEGACY
+#define CONFIG_NAND_LEGACY
 
 /*
  * Miscellaneous configurable options

include/linux/mtd/nand_ids.h +1 -1

index d9eb911..e7aa26d 100644
@@ -28,7 +28,7 @@
 #ifndef __LINUX_MTD_NAND_IDS_H
 #define __LINUX_MTD_NAND_IDS_H
 
-#ifndef CFG_NAND_LEGACY
+#ifndef CONFIG_NAND_LEGACY
 #error This module is for the legacy NAND support
 #endif

include/linux/mtd/nand_legacy.h +1 -1

index b05e726..4494bc5 100644
@@ -36,7 +36,7 @@
 #ifndef __LINUX_MTD_NAND_LEGACY_H
 #define __LINUX_MTD_NAND_LEGACY_H
 
-#ifndef CFG_NAND_LEGACY
+#ifndef CONFIG_NAND_LEGACY
 #error This module is for the legacy NAND support
 #endif

include/nand.h +2 -2

index 764e9f9..4c2b76d 100644
@@ -26,7 +26,7 @@
 
 extern void nand_init(void);
 
-#ifndef CFG_NAND_LEGACY
+#ifndef CONFIG_NAND_LEGACY
 #include <linux/mtd/compat.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>

@@ -128,5 +128,5 @@ void board_nand_select_device(struct nand_chip *nand, int chip);
 
 __attribute__((noreturn)) void nand_boot(void);
 
-#endif /* !CFG_NAND_LEGACY */
+#endif /* !CONFIG_NAND_LEGACY */
 #endif

lib_generic/crc32.c +1 -1

index 83d1d1d..b6a7a91 100644
@@ -174,7 +174,7 @@ uint32_t ZEXPORT crc32 (uint32_t crc, const Bytef *buf, uInt len)
 
 #if defined(CONFIG_CMD_JFFS2) || \
 	(defined(CONFIG_CMD_NAND) \
-	&& !defined(CFG_NAND_LEGACY))
+	&& !defined(CONFIG_NAND_LEGACY))
 
 /* No ones complement version. JFFS2 (and other things ?)
  * don't use ones compliment in their CRC calculations.

Signature · 1 line

1.5.6.2

Jean-Christophe PLAGNIOL-VILLARD

author

2008-08-12 21:51 UTC #15 lore raw

PATCH 13/13 drivers/mtd/nand_legacy: Move conditional compilation to Makefile

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

---
 drivers/mtd/nand_legacy/Makefile      |    5 ++++-
 drivers/mtd/nand_legacy/nand_legacy.c |    5 -----
 2 files changed, 4 insertions(+), 6 deletions(-)

drivers/mtd/nand_legacy/Makefile +4 -1

index 4e29c36..a1a9cc9 100644
@@ -25,8 +25,11 @@ include $(TOPDIR)/config.mk
 
 LIB	:= $(obj)libnand_legacy.a
 
-COBJS	:= nand_legacy.o
+ifdef CONFIG_CMD_NAND
+COBJS-$(CONFIG_NAND_LEGACY)	:= nand_legacy.o
+endif
 
+COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))

drivers/mtd/nand_legacy/nand_legacy.c +0 -5

index 8f7dc39..bf5565a 100644
@@ -14,9 +14,6 @@
 #include <malloc.h>
 #include <asm/io.h>
 #include <watchdog.h>
-
-#if defined(CONFIG_CMD_NAND) && defined(CONFIG_NAND_LEGACY)
-
 #include <linux/mtd/nand_legacy.h>
 #include <linux/mtd/nand_ids.h>
 #include <jffs2/jffs2.h>

@@ -1608,5 +1605,3 @@ int read_jffs2_nand(size_t start, size_t len,
 			start, len, retlen, buf);
 }
 #endif /* CONFIG_JFFS2_NAND */
-
-#endif

Signature · 1 line

1.5.6.2