diff --git a/drivers/Kconfig b/drivers/Kconfig
index 49bb3b066..126e59706 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -11,9 +11,16 @@ config HAS_CFI
 
 config DRIVER_CFI
 	bool "cfi flash driver"
-	depends on HAS_CFI
+config DRIVER_CFI_NEW
+	bool "new cfi flash driver"
+config DRIVER_CFI_INTEL
+	depends on DRIVER_CFI_NEW
+	bool "Support Intel flash chips"
+config DRIVER_CFI_AMD
+	depends on DRIVER_CFI_NEW
+	bool "support AMD flash chips"
 config CFI_BUFFER_WRITE
 	bool "use cfi driver with buffer write"
-	depends on DRIVER_CFI
+	depends on DRIVER_CFI || DRIVER_CFI_NEW
 
 endmenu
diff --git a/drivers/Makefile b/drivers/Makefile
index 42225896d..9d6a9691a 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -1,6 +1,8 @@
 obj-y	+= net/
 obj-y	+= serial/
 obj-y	+= video/
-obj-$(CONFIG_DRIVER_CFI) += cfi_flash.o
+obj-$(CONFIG_DRIVER_CFI_NEW) += cfi_flash.o
+obj-$(CONFIG_DRIVER_CFI_INTEL) += cfi_flash_intel.o
+obj-$(CONFIG_DRIVER_CFI_AMD) += cfi_flash_amd.o
 obj-y += usb/