diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 726920f..27bf386 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -182,7 +182,6 @@
 config MACH_SCB9328
 	bool "Synertronixx scb9328"
 	select HAS_DM9000
-	select HAS_CFI
 	select MACH_HAS_LOWLEVEL_INIT
 	help
 	  Say Y here if you are using the Synertronixx scb9328 board
@@ -201,7 +200,6 @@
 
 config MACH_IMX21ADS
 	bool "Freescale i.MX21ADS"
-	select HAS_CFI
 	select MACH_HAS_LOWLEVEL_INIT
 	select HAS_CS8900
 	help
@@ -229,7 +227,6 @@
 
 config MACH_FREESCALE_MX25_3STACK
 	bool "Freescale MX25 3stack"
-	select HAS_CFI
 	select MACH_HAS_LOWLEVEL_INIT
 	select I2C
 	select I2C_MC34704
@@ -257,7 +254,6 @@
 
 config MACH_EUKREA_CPUIMX27
 	bool "EUKREA CPUIMX27"
-	select HAS_CFI
 	select MACH_HAS_LOWLEVEL_INIT
 	help
 	  Say Y here if you are using Eukrea's CPUIMX27 equipped
@@ -265,7 +261,6 @@
 
 config MACH_IMX27ADS
 	bool "Freescale i.MX27ADS"
-	select HAS_CFI
 	select MACH_HAS_LOWLEVEL_INIT
 	help
 	  Say Y here if you are using the Freescale i.MX27ads board equipped
@@ -280,7 +275,6 @@
 
 config MACH_PCM038
 	bool "phyCORE-i.MX27"
-	select HAS_CFI
 	select MACH_HAS_LOWLEVEL_INIT
 	select SPI
 	select DRIVER_SPI_IMX
@@ -339,7 +333,6 @@
 
 config MACH_FREESCALE_MX35_3STACK
 	bool "Freescale MX35 3stack"
-	select HAS_CFI
 	select MACH_HAS_LOWLEVEL_INIT
 	select I2C
 	select I2C_IMX
@@ -351,7 +344,6 @@
 
 config MACH_PCM043
 	bool "phyCORE-i.MX35"
-	select HAS_CFI
 	select MACH_HAS_LOWLEVEL_INIT
 	select ARCH_HAS_L2X0
 	help
diff --git a/drivers/nor/Kconfig b/drivers/nor/Kconfig
index 84ce0d0..8652d27 100644
--- a/drivers/nor/Kconfig
+++ b/drivers/nor/Kconfig
@@ -8,9 +8,6 @@
 
 if DRIVER_CFI
 
-config HAS_CFI
-	bool
-
 config DRIVER_CFI_INTEL
 	default y
 	depends on DRIVER_CFI