diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index b91d7d6997dd5ef7a6b3e94b03721a1b050652b8..f2c2317f50c0af797f559e4f126a43897eb424f3 100644
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -206,7 +206,7 @@
  * Amd/Atmel use 0x30 for sector erase, SST use 0x50.
  * 0x30 is block erase in SST
  */
-#	define CFG_FLASH_CFI_DRIVER	1
+#	define CONFIG_FLASH_CFI_DRIVER	1
 #	define CFG_FLASH_SIZE		0x800000
 #	define CFG_FLASH_CFI_WIDTH	FLASH_CFI_16BIT
 #	define CONFIG_FLASH_CFI_LEGACY
diff --git a/include/configs/ml507.h b/include/configs/ml507.h
index c653a5105cfcee697f6091edf5eb8803d5589943..f8cd499985bdaca014f49600d62834bf35583a58 100644
--- a/include/configs/ml507.h
+++ b/include/configs/ml507.h
@@ -110,7 +110,7 @@
 #define	CFG_FLASH_BASE		XPAR_FLASH_MEM0_BASEADDR
 #define	CFG_FLASH_SIZE		(32*1024*1024)
 #define	CFG_FLASH_CFI		1
-#define	CFG_FLASH_CFI_DRIVER	1
+#define	CONFIG_FLASH_CFI_DRIVER	1
 #define	CFG_FLASH_EMPTY_INFO	1
 #define	CFG_MAX_FLASH_BANKS	1
 #define	CFG_MAX_FLASH_SECT	259
diff --git a/include/configs/redwood.h b/include/configs/redwood.h
index 32ed5746c564d3426531295b0a1a79fce7f84eea..78ca1b3b0b97fdeaa4b8f3987fd2915c4d58e7f3 100644
--- a/include/configs/redwood.h
+++ b/include/configs/redwood.h
@@ -165,7 +165,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_MAX_FLASH_BANKS	3	/* number of banks		*/