[U-Boot] [PATCH v6 65/76] configs: Use CONFIG_SPI_NOR_MISC

Jagan Teki
2016-02-14T20:49:04Z

CONFIG_SPI_FLASH_ATMEL
CONFIG_SPI_FLASH_EON
CONFIG_SPI_FLASH_GIGADEVICE
CONFIG_SPI_FLASH_ISSI

All these configs are grouped in CONFIG_SPI_NOR_MISC

Cc: Simon Glass <sjg@chromium.org>
Cc: Bin Meng <bmeng.cn@gmail.com>
Cc: Mugunthan V N <mugunthanvnm@ti.com>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Jagan Teki <jteki@openedev.com>
---
configs/C29XPCIE_NAND_defconfig | 2 +-
configs/C29XPCIE_NOR_SECBOOT_defconfig | 2 +-
configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig | 2 +-
configs/C29XPCIE_SPIFLASH_defconfig | 2 +-
configs/C29XPCIE_defconfig | 2 +-
configs/M54418TWR_defconfig | 2 +-
configs/M54418TWR_nand_mii_defconfig | 2 +-
configs/M54418TWR_nand_rmii_defconfig | 2 +-
configs/M54418TWR_nand_rmii_lowfreq_defconfig | 2 +-
configs/M54418TWR_serial_mii_defconfig | 2 +-
configs/M54418TWR_serial_rmii_defconfig | 2 +-
configs/T1024QDS_DDR4_SECURE_BOOT_defconfig | 2 +-
configs/T1024QDS_DDR4_defconfig | 2 +-
configs/T1024QDS_NAND_defconfig | 2 +-
configs/T1024QDS_SDCARD_defconfig | 2 +-
configs/T1024QDS_SECURE_BOOT_defconfig | 2 +-
configs/T1024QDS_SPIFLASH_defconfig | 2 +-
configs/T1024QDS_defconfig | 2 +-
configs/T1040QDS_DDR4_defconfig | 2 +-
configs/T1040QDS_SECURE_BOOT_defconfig | 2 +-
configs/T1040QDS_defconfig | 2 +-
configs/T2080QDS_NAND_defconfig | 2 +-
configs/T2080QDS_SDCARD_defconfig | 2 +-
configs/T2080QDS_SECURE_BOOT_defconfig | 2 +-
configs/T2080QDS_SPIFLASH_defconfig | 2 +-
configs/T2080QDS_SRIO_PCIE_BOOT_defconfig | 2 +-
configs/T2080QDS_defconfig | 2 +-
configs/T2081QDS_NAND_defconfig | 2 +-
configs/T2081QDS_SDCARD_defconfig | 2 +-
configs/T2081QDS_SPIFLASH_defconfig | 2 +-
configs/T2081QDS_SRIO_PCIE_BOOT_defconfig | 2 +-
configs/T2081QDS_defconfig | 2 +-
configs/at91sam9n12ek_mmc_defconfig | 2 +-
configs/at91sam9n12ek_nandflash_defconfig | 2 +-
configs/at91sam9n12ek_spiflash_defconfig | 2 +-
configs/at91sam9x5ek_dataflash_defconfig | 2 +-
configs/at91sam9x5ek_mmc_defconfig | 2 +-
configs/at91sam9x5ek_nandflash_defconfig | 2 +-
configs/at91sam9x5ek_spiflash_defconfig | 2 +-
configs/atngw100_defconfig | 2 +-
configs/atngw100mkii_defconfig | 2 +-
configs/bayleybay_defconfig | 2 +-
configs/bf525-ucr2_defconfig | 2 +-
configs/bf527-sdp_defconfig | 3 +--
configs/bf537-stamp_defconfig | 3 +--
configs/bf561-acvilon_defconfig | 2 +-
configs/bf609-ezkit_defconfig | 3 +--
configs/chromebook_link_defconfig | 2 +-
configs/chromebox_panther_defconfig | 2 +-
configs/cm_fx6_defconfig | 4 +---
configs/coreboot-x86_defconfig | 2 +-
configs/crownbay_defconfig | 2 +-
configs/ethernut5_defconfig | 2 +-
configs/galileo_defconfig | 2 +-
configs/gplugd_defconfig | 2 +-
configs/ls1021atwr_qspi_defconfig | 2 +-
configs/ls1021atwr_sdcard_qspi_defconfig | 2 +-
configs/minnowmax_defconfig | 2 +-
configs/peach-pi_defconfig | 2 +-
configs/peach-pit_defconfig | 2 +-
configs/qemu-x86_defconfig | 2 +-
configs/sama5d3xek_mmc_defconfig | 2 +-
configs/sama5d3xek_nandflash_defconfig | 2 +-
configs/sama5d3xek_spiflash_defconfig | 2 +-
configs/sama5d4_xplained_mmc_defconfig | 2 +-
configs/sama5d4_xplained_nandflash_defconfig | 2 +-
configs/sama5d4_xplained_spiflash_defconfig | 2 +-
configs/sama5d4ek_mmc_defconfig | 2 +-
configs/sama5d4ek_nandflash_defconfig | 2 +-
configs/sama5d4ek_spiflash_defconfig | 2 +-
configs/sandbox_defconfig | 4 +---
configs/smdk5250_defconfig | 2 +-
configs/smdk5420_defconfig | 2 +-
configs/snow_defconfig | 2 +-
configs/spring_defconfig | 2 +-
examples/standalone/Makefile | 2 +-
include/configs/chromebook_jerry.h | 2 +-
include/configs/ls1043a_common.h | 2 +-
include/configs/rk3036_common.h | 2 +-
include/configs/sama5d2_xplained.h | 2 +-
include/configs/zynq-common.h | 2 +-
81 files changed, 81 insertions(+), 88 deletions(-)

diff --git a/configs/C29XPCIE_NAND_defconfig b/configs/C29XPCIE_NAND_defconfig
index dfd8f91..8b9de28 100644
--- a/configs/C29XPCIE_NAND_defconfig
+++ b/configs/C29XPCIE_NAND_defconfig
@@ -6,7 +6,7 @@ CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,36BIT,NAND"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
diff --git a/configs/C29XPCIE_NOR_SECBOOT_defconfig b/configs/C29XPCIE_NOR_SECBOOT_defconfig
index 199b339..c9753c2 100644
--- a/configs/C29XPCIE_NOR_SECBOOT_defconfig
+++ b/configs/C29XPCIE_NOR_SECBOOT_defconfig
@@ -4,7 +4,7 @@ CONFIG_TARGET_C29XPCIE=y
CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,36BIT,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
diff --git a/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig b/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig
index 31b3e30..fed39c2 100644
--- a/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig
+++ b/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig
@@ -4,7 +4,7 @@ CONFIG_TARGET_C29XPCIE=y
CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,36BIT,SPIFLASH,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
diff --git a/configs/C29XPCIE_SPIFLASH_defconfig b/configs/C29XPCIE_SPIFLASH_defconfig
index 13b67a2..c68fde5 100644
--- a/configs/C29XPCIE_SPIFLASH_defconfig
+++ b/configs/C29XPCIE_SPIFLASH_defconfig
@@ -4,7 +4,7 @@ CONFIG_TARGET_C29XPCIE=y
CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,36BIT,SPIFLASH"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
diff --git a/configs/C29XPCIE_defconfig b/configs/C29XPCIE_defconfig
index 4af50fa..238666f 100644
--- a/configs/C29XPCIE_defconfig
+++ b/configs/C29XPCIE_defconfig
@@ -4,7 +4,7 @@ CONFIG_TARGET_C29XPCIE=y
CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,36BIT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
diff --git a/configs/M54418TWR_defconfig b/configs/M54418TWR_defconfig
index b019b63..da95871 100644
--- a/configs/M54418TWR_defconfig
+++ b/configs/M54418TWR_defconfig
@@ -10,4 +10,4 @@ CONFIG_SYS_PROMPT="-> "
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_NOR_MISC=y
diff --git a/configs/M54418TWR_nand_mii_defconfig b/configs/M54418TWR_nand_mii_defconfig
index eedee6c..14e36ce 100644
--- a/configs/M54418TWR_nand_mii_defconfig
+++ b/configs/M54418TWR_nand_mii_defconfig
@@ -10,4 +10,4 @@ CONFIG_SYS_PROMPT="-> "
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_NOR_MISC=y
diff --git a/configs/M54418TWR_nand_rmii_defconfig b/configs/M54418TWR_nand_rmii_defconfig
index c8000a8..528b706 100644
--- a/configs/M54418TWR_nand_rmii_defconfig
+++ b/configs/M54418TWR_nand_rmii_defconfig
@@ -10,4 +10,4 @@ CONFIG_SYS_PROMPT="-> "
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_NOR_MISC=y
diff --git a/configs/M54418TWR_nand_rmii_lowfreq_defconfig b/configs/M54418TWR_nand_rmii_lowfreq_defconfig
index 184936b..2e9e945 100644
--- a/configs/M54418TWR_nand_rmii_lowfreq_defconfig
+++ b/configs/M54418TWR_nand_rmii_lowfreq_defconfig
@@ -10,4 +10,4 @@ CONFIG_SYS_PROMPT="-> "
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_NOR_MISC=y
diff --git a/configs/M54418TWR_serial_mii_defconfig b/configs/M54418TWR_serial_mii_defconfig
index fd827e3..83bf3fd 100644
--- a/configs/M54418TWR_serial_mii_defconfig
+++ b/configs/M54418TWR_serial_mii_defconfig
@@ -10,4 +10,4 @@ CONFIG_SYS_PROMPT="-> "
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_NOR_MISC=y
diff --git a/configs/M54418TWR_serial_rmii_defconfig b/configs/M54418TWR_serial_rmii_defconfig
index b019b63..da95871 100644
--- a/configs/M54418TWR_serial_rmii_defconfig
+++ b/configs/M54418TWR_serial_rmii_defconfig
@@ -10,4 +10,4 @@ CONFIG_SYS_PROMPT="-> "
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_NOR_MISC=y
diff --git a/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig b/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig
index 9b2d38c..9709d6a 100644
--- a/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig
+++ b/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig
@@ -4,7 +4,7 @@ CONFIG_TARGET_T102XQDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,SYS_FSL_DDR4,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_STMICRO=y
CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
diff --git a/configs/T1024QDS_DDR4_defconfig b/configs/T1024QDS_DDR4_defconfig
index 4dc0b3b..d37dd1f 100644
--- a/configs/T1024QDS_DDR4_defconfig
+++ b/configs/T1024QDS_DDR4_defconfig
@@ -4,7 +4,7 @@ CONFIG_TARGET_T102XQDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,SYS_FSL_DDR4"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_STMICRO=y
CONFIG_SPI_NOR_SST=y
CONFIG_SYS_NS16550=y
diff --git a/configs/T1024QDS_NAND_defconfig b/configs/T1024QDS_NAND_defconfig
index 8f16084..30c116e 100644
--- a/configs/T1024QDS_NAND_defconfig
+++ b/configs/T1024QDS_NAND_defconfig
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_STMICRO=y
CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
diff --git a/configs/T1024QDS_SDCARD_defconfig b/configs/T1024QDS_SDCARD_defconfig
index a4dee46..75a49f3 100644
--- a/configs/T1024QDS_SDCARD_defconfig
+++ b/configs/T1024QDS_SDCARD_defconfig
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_STMICRO=y
CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
diff --git a/configs/T1024QDS_SECURE_BOOT_defconfig b/configs/T1024QDS_SECURE_BOOT_defconfig
index b16a71a..f535b98 100644
--- a/configs/T1024QDS_SECURE_BOOT_defconfig
+++ b/configs/T1024QDS_SECURE_BOOT_defconfig
@@ -4,7 +4,7 @@ CONFIG_TARGET_T102XQDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_STMICRO=y
CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
diff --git a/configs/T1024QDS_SPIFLASH_defconfig b/configs/T1024QDS_SPIFLASH_defconfig
index 442a242..bef3e71 100644
--- a/configs/T1024QDS_SPIFLASH_defconfig
+++ b/configs/T1024QDS_SPIFLASH_defconfig
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_STMICRO=y
CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
diff --git a/configs/T1024QDS_defconfig b/configs/T1024QDS_defconfig
index e6b351a..e8eb5d1 100644
--- a/configs/T1024QDS_defconfig
+++ b/configs/T1024QDS_defconfig
@@ -4,7 +4,7 @@ CONFIG_TARGET_T102XQDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_STMICRO=y
CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
diff --git a/configs/T1040QDS_DDR4_defconfig b/configs/T1040QDS_DDR4_defconfig
index 20c71da..0694e43 100644
--- a/configs/T1040QDS_DDR4_defconfig
+++ b/configs/T1040QDS_DDR4_defconfig
@@ -4,7 +4,7 @@ CONFIG_TARGET_T1040QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,SYS_FSL_DDR4"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_STMICRO=y
CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
diff --git a/configs/T1040QDS_SECURE_BOOT_defconfig b/configs/T1040QDS_SECURE_BOOT_defconfig
index 7652128..685c9f1 100644
--- a/configs/T1040QDS_SECURE_BOOT_defconfig
+++ b/configs/T1040QDS_SECURE_BOOT_defconfig
@@ -4,7 +4,7 @@ CONFIG_TARGET_T1040QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_STMICRO=y
CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
diff --git a/configs/T1040QDS_defconfig b/configs/T1040QDS_defconfig
index f1cc4f0..af45eaa 100644
--- a/configs/T1040QDS_defconfig
+++ b/configs/T1040QDS_defconfig
@@ -4,7 +4,7 @@ CONFIG_TARGET_T1040QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_STMICRO=y
CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
diff --git a/configs/T2080QDS_NAND_defconfig b/configs/T2080QDS_NAND_defconfig
index b8dca69..815a613 100644
--- a/configs/T2080QDS_NAND_defconfig
+++ b/configs/T2080QDS_NAND_defconfig
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_STMICRO=y
CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
diff --git a/configs/T2080QDS_SDCARD_defconfig b/configs/T2080QDS_SDCARD_defconfig
index 70e681f..b114453 100644
--- a/configs/T2080QDS_SDCARD_defconfig
+++ b/configs/T2080QDS_SDCARD_defconfig
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_STMICRO=y
CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
diff --git a/configs/T2080QDS_SECURE_BOOT_defconfig b/configs/T2080QDS_SECURE_BOOT_defconfig
index 4b965a0..f7888b7 100644
--- a/configs/T2080QDS_SECURE_BOOT_defconfig
+++ b/configs/T2080QDS_SECURE_BOOT_defconfig
@@ -4,7 +4,7 @@ CONFIG_TARGET_T208XQDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_STMICRO=y
CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
diff --git a/configs/T2080QDS_SPIFLASH_defconfig b/configs/T2080QDS_SPIFLASH_defconfig
index d703ddb..d6f05bb 100644
--- a/configs/T2080QDS_SPIFLASH_defconfig
+++ b/configs/T2080QDS_SPIFLASH_defconfig
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_STMICRO=y
CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
diff --git a/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig b/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig
index 6293533..50f81c0 100644
--- a/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig
@@ -6,7 +6,7 @@ CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF4000
# CONFIG_CMD_FLASH is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_STMICRO=y
CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
diff --git a/configs/T2080QDS_defconfig b/configs/T2080QDS_defconfig
index 5cd1724..e25956c 100644
--- a/configs/T2080QDS_defconfig
+++ b/configs/T2080QDS_defconfig
@@ -4,7 +4,7 @@ CONFIG_TARGET_T208XQDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_STMICRO=y
CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
diff --git a/configs/T2081QDS_NAND_defconfig b/configs/T2081QDS_NAND_defconfig
index e93ca08..9be89c0 100644
--- a/configs/T2081QDS_NAND_defconfig
+++ b/configs/T2081QDS_NAND_defconfig
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_STMICRO=y
CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
diff --git a/configs/T2081QDS_SDCARD_defconfig b/configs/T2081QDS_SDCARD_defconfig
index 80fbb87..435ac20 100644
--- a/configs/T2081QDS_SDCARD_defconfig
+++ b/configs/T2081QDS_SDCARD_defconfig
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_STMICRO=y
CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
diff --git a/configs/T2081QDS_SPIFLASH_defconfig b/configs/T2081QDS_SPIFLASH_defconfig
index af7e5e3..b155254 100644
--- a/configs/T2081QDS_SPIFLASH_defconfig
+++ b/configs/T2081QDS_SPIFLASH_defconfig
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_STMICRO=y
CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
diff --git a/configs/T2081QDS_SRIO_PCIE_BOOT_defconfig b/configs/T2081QDS_SRIO_PCIE_BOOT_defconfig
index d58f75f..5196759 100644
--- a/configs/T2081QDS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/T2081QDS_SRIO_PCIE_BOOT_defconfig
@@ -6,7 +6,7 @@ CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF4000
# CONFIG_CMD_FLASH is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_STMICRO=y
CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
diff --git a/configs/T2081QDS_defconfig b/configs/T2081QDS_defconfig
index 7f1c69b..03362f6 100644
--- a/configs/T2081QDS_defconfig
+++ b/configs/T2081QDS_defconfig
@@ -4,7 +4,7 @@ CONFIG_TARGET_T208XQDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_STMICRO=y
CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
diff --git a/configs/at91sam9n12ek_mmc_defconfig b/configs/at91sam9n12ek_mmc_defconfig
index fb7d1d8..eb74314 100644
--- a/configs/at91sam9n12ek_mmc_defconfig
+++ b/configs/at91sam9n12ek_mmc_defconfig
@@ -9,4 +9,4 @@ CONFIG_SYS_PROMPT="U-Boot> "
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_NOR_MISC=y
diff --git a/configs/at91sam9n12ek_nandflash_defconfig b/configs/at91sam9n12ek_nandflash_defconfig
index c70568d..642ff38 100644
--- a/configs/at91sam9n12ek_nandflash_defconfig
+++ b/configs/at91sam9n12ek_nandflash_defconfig
@@ -10,4 +10,4 @@ CONFIG_SYS_PROMPT="U-Boot> "
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_NOR_MISC=y
diff --git a/configs/at91sam9n12ek_spiflash_defconfig b/configs/at91sam9n12ek_spiflash_defconfig
index cf6bc9b..aff0fb1 100644
--- a/configs/at91sam9n12ek_spiflash_defconfig
+++ b/configs/at91sam9n12ek_spiflash_defconfig
@@ -10,4 +10,4 @@ CONFIG_SYS_PROMPT="U-Boot> "
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_NOR_MISC=y
diff --git a/configs/at91sam9x5ek_dataflash_defconfig b/configs/at91sam9x5ek_dataflash_defconfig
index 17d8643..5216ffc 100644
--- a/configs/at91sam9x5ek_dataflash_defconfig
+++ b/configs/at91sam9x5ek_dataflash_defconfig
@@ -10,4 +10,4 @@ CONFIG_SYS_PROMPT="U-Boot> "
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_NOR_MISC=y
diff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig
index b759cfe..8ed396d 100644
--- a/configs/at91sam9x5ek_mmc_defconfig
+++ b/configs/at91sam9x5ek_mmc_defconfig
@@ -10,4 +10,4 @@ CONFIG_SYS_PROMPT="U-Boot> "
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_NOR_MISC=y
diff --git a/configs/at91sam9x5ek_nandflash_defconfig b/configs/at91sam9x5ek_nandflash_defconfig
index 5db48d1..0abdaf5 100644
--- a/configs/at91sam9x5ek_nandflash_defconfig
+++ b/configs/at91sam9x5ek_nandflash_defconfig
@@ -11,4 +11,4 @@ CONFIG_SYS_PROMPT="U-Boot> "
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_NOR_MISC=y
diff --git a/configs/at91sam9x5ek_spiflash_defconfig b/configs/at91sam9x5ek_spiflash_defconfig
index 98e5b88..efcf106 100644
--- a/configs/at91sam9x5ek_spiflash_defconfig
+++ b/configs/at91sam9x5ek_spiflash_defconfig
@@ -11,4 +11,4 @@ CONFIG_SYS_PROMPT="U-Boot> "
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_NOR_MISC=y
diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig
index 56ab790..668b49e 100644
--- a/configs/atngw100_defconfig
+++ b/configs/atngw100_defconfig
@@ -12,4 +12,4 @@ CONFIG_AUTOBOOT_STOP_STR=" "
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_NOR_MISC=y
diff --git a/configs/atngw100mkii_defconfig b/configs/atngw100mkii_defconfig
index fa6e3f8..09904be 100644
--- a/configs/atngw100mkii_defconfig
+++ b/configs/atngw100mkii_defconfig
@@ -11,4 +11,4 @@ CONFIG_AUTOBOOT_STOP_STR=" "
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_NOR_MISC=y
diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig
index eade706..32d567b 100644
--- a/configs/bayleybay_defconfig
+++ b/configs/bayleybay_defconfig
@@ -22,7 +22,7 @@ CONFIG_OF_CONTROL=y
CONFIG_CPU=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_MACRONIX=y
CONFIG_SPI_NOR_WINBOND=y
CONFIG_DM_ETH=y
diff --git a/configs/bf525-ucr2_defconfig b/configs/bf525-ucr2_defconfig
index 416ffc0..644002f 100644
--- a/configs/bf525-ucr2_defconfig
+++ b/configs/bf525-ucr2_defconfig
@@ -7,4 +7,4 @@ CONFIG_TARGET_BF525_UCR2=y
# CONFIG_CMD_NFS is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_NOR_MISC=y
diff --git a/configs/bf527-sdp_defconfig b/configs/bf527-sdp_defconfig
index d74f1df..6f8aa33 100644
--- a/configs/bf527-sdp_defconfig
+++ b/configs/bf527-sdp_defconfig
@@ -7,8 +7,7 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_NFS is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_ATMEL=y
-CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_MACRONIX=y
CONFIG_SPI_NOR_SPANSION=y
CONFIG_SPI_NOR_STMICRO=y
diff --git a/configs/bf537-stamp_defconfig b/configs/bf537-stamp_defconfig
index c3161fa..6e98854 100644
--- a/configs/bf537-stamp_defconfig
+++ b/configs/bf537-stamp_defconfig
@@ -5,8 +5,7 @@ CONFIG_CMD_GPIO=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_ATMEL=y
-CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_MACRONIX=y
CONFIG_SPI_NOR_SPANSION=y
CONFIG_SPI_NOR_STMICRO=y
diff --git a/configs/bf561-acvilon_defconfig b/configs/bf561-acvilon_defconfig
index 171de78..3207107 100644
--- a/configs/bf561-acvilon_defconfig
+++ b/configs/bf561-acvilon_defconfig
@@ -7,6 +7,6 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
CONFIG_LIB_RAND=y
diff --git a/configs/bf609-ezkit_defconfig b/configs/bf609-ezkit_defconfig
index de8d28c..4f76941 100644
--- a/configs/bf609-ezkit_defconfig
+++ b/configs/bf609-ezkit_defconfig
@@ -4,8 +4,7 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_ATMEL=y
-CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_MACRONIX=y
CONFIG_SPI_NOR_SPANSION=y
CONFIG_SPI_NOR_STMICRO=y
diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig
index 97c50f0..408aef1 100644
--- a/configs/chromebook_link_defconfig
+++ b/configs/chromebook_link_defconfig
@@ -29,7 +29,7 @@ CONFIG_CROS_EC=y
CONFIG_CROS_EC_LPC=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_MACRONIX=y
CONFIG_SPI_NOR_WINBOND=y
CONFIG_DM_PCI=y
diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig
index 8b9f04a..3be3103 100644
--- a/configs/chromebox_panther_defconfig
+++ b/configs/chromebox_panther_defconfig
@@ -23,7 +23,7 @@ CONFIG_CROS_EC=y
CONFIG_CROS_EC_LPC=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_MACRONIX=y
CONFIG_SPI_NOR_WINBOND=y
CONFIG_DM_PCI=y
diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
index 0029445..4033e4b 100644
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -19,9 +19,7 @@ CONFIG_CMD_DHCP=y
CONFIG_CMD_PING=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_ATMEL=y
-CONFIG_SPI_FLASH_EON=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_MACRONIX=y
CONFIG_SPI_NOR_SPANSION=y
CONFIG_SPI_NOR_STMICRO=y
diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig
index 48a8fa8..76af89c 100644
--- a/configs/coreboot-x86_defconfig
+++ b/configs/coreboot-x86_defconfig
@@ -13,7 +13,7 @@ CONFIG_CMD_TPM_TEST=y
CONFIG_OF_CONTROL=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_MACRONIX=y
CONFIG_SPI_NOR_WINBOND=y
CONFIG_DM_ETH=y
diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig
index dfc6b0f..2ebee29 100644
--- a/configs/crownbay_defconfig
+++ b/configs/crownbay_defconfig
@@ -20,7 +20,7 @@ CONFIG_OF_CONTROL=y
CONFIG_CPU=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_MACRONIX=y
CONFIG_SPI_NOR_SST=y
CONFIG_SPI_NOR_WINBOND=y
diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig
index b3d4f82..de50435 100644
--- a/configs/ethernut5_defconfig
+++ b/configs/ethernut5_defconfig
@@ -8,4 +8,4 @@ CONFIG_SYS_PROMPT="U-Boot> "
# CONFIG_CMD_FPGA is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_NOR_MISC=y
diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig
index d111024..465500e 100644
--- a/configs/galileo_defconfig
+++ b/configs/galileo_defconfig
@@ -16,7 +16,7 @@ CONFIG_OF_CONTROL=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_MACRONIX=y
CONFIG_SPI_NOR_WINBOND=y
CONFIG_DM_ETH=y
diff --git a/configs/gplugd_defconfig b/configs/gplugd_defconfig
index 7c3de52..59fbfb1 100644
--- a/configs/gplugd_defconfig
+++ b/configs/gplugd_defconfig
@@ -6,6 +6,6 @@ CONFIG_TARGET_GPLUGD=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_MACRONIX=y
CONFIG_SYS_NS16550=y
diff --git a/configs/ls1021atwr_qspi_defconfig b/configs/ls1021atwr_qspi_defconfig
index a850276..2e8e951 100644
--- a/configs/ls1021atwr_qspi_defconfig
+++ b/configs/ls1021atwr_qspi_defconfig
@@ -9,7 +9,7 @@ CONFIG_OF_CONTROL=y
CONFIG_DM=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
diff --git a/configs/ls1021atwr_sdcard_qspi_defconfig b/configs/ls1021atwr_sdcard_qspi_defconfig
index 6be898d..05f0806 100644
--- a/configs/ls1021atwr_sdcard_qspi_defconfig
+++ b/configs/ls1021atwr_sdcard_qspi_defconfig
@@ -8,7 +8,7 @@ CONFIG_OF_CONTROL=y
CONFIG_DM=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig
index 839cd63..58115ac 100644
--- a/configs/minnowmax_defconfig
+++ b/configs/minnowmax_defconfig
@@ -21,7 +21,7 @@ CONFIG_OF_CONTROL=y
CONFIG_CPU=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_MACRONIX=y
CONFIG_SPI_NOR_STMICRO=y
CONFIG_SPI_NOR_WINBOND=y
diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig
index 33fc805..7e77fec 100644
--- a/configs/peach-pi_defconfig
+++ b/configs/peach-pi_defconfig
@@ -22,7 +22,7 @@ CONFIG_CROS_EC=y
CONFIG_CROS_EC_SPI=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_WINBOND=y
CONFIG_DM_PMIC=y
CONFIG_PMIC_TPS65090=y
diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig
index 3889628..ad38604 100644
--- a/configs/peach-pit_defconfig
+++ b/configs/peach-pit_defconfig
@@ -22,7 +22,7 @@ CONFIG_CROS_EC=y
CONFIG_CROS_EC_SPI=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_WINBOND=y
CONFIG_DM_PMIC=y
CONFIG_PMIC_TPS65090=y
diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig
index d20d579..b9de008 100644
--- a/configs/qemu-x86_defconfig
+++ b/configs/qemu-x86_defconfig
@@ -16,7 +16,7 @@ CONFIG_OF_CONTROL=y
CONFIG_CPU=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_MACRONIX=y
CONFIG_SPI_NOR_WINBOND=y
CONFIG_DM_ETH=y
diff --git a/configs/sama5d3xek_mmc_defconfig b/configs/sama5d3xek_mmc_defconfig
index 72796db..acfbff8 100644
--- a/configs/sama5d3xek_mmc_defconfig
+++ b/configs/sama5d3xek_mmc_defconfig
@@ -8,4 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_MMC"
# CONFIG_CMD_FPGA is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_NOR_MISC=y
diff --git a/configs/sama5d3xek_nandflash_defconfig b/configs/sama5d3xek_nandflash_defconfig
index b84ba0f..f2e1270 100644
--- a/configs/sama5d3xek_nandflash_defconfig
+++ b/configs/sama5d3xek_nandflash_defconfig
@@ -8,4 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_NANDFLASH"
# CONFIG_CMD_FPGA is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_NOR_MISC=y
diff --git a/configs/sama5d3xek_spiflash_defconfig b/configs/sama5d3xek_spiflash_defconfig
index 623680d..623bcaa 100644
--- a/configs/sama5d3xek_spiflash_defconfig
+++ b/configs/sama5d3xek_spiflash_defconfig
@@ -8,4 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_SERIALFLASH"
# CONFIG_CMD_FPGA is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_NOR_MISC=y
diff --git a/configs/sama5d4_xplained_mmc_defconfig b/configs/sama5d4_xplained_mmc_defconfig
index db69bdb..57267f6 100644
--- a/configs/sama5d4_xplained_mmc_defconfig
+++ b/configs/sama5d4_xplained_mmc_defconfig
@@ -10,4 +10,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_MMC"
# CONFIG_CMD_FPGA is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_NOR_MISC=y
diff --git a/configs/sama5d4_xplained_nandflash_defconfig b/configs/sama5d4_xplained_nandflash_defconfig
index 1faf841..7da4f57 100644
--- a/configs/sama5d4_xplained_nandflash_defconfig
+++ b/configs/sama5d4_xplained_nandflash_defconfig
@@ -10,4 +10,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_NANDFLASH"
# CONFIG_CMD_FPGA is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_NOR_MISC=y
diff --git a/configs/sama5d4_xplained_spiflash_defconfig b/configs/sama5d4_xplained_spiflash_defconfig
index 9af4b41..da2737f 100644
--- a/configs/sama5d4_xplained_spiflash_defconfig
+++ b/configs/sama5d4_xplained_spiflash_defconfig
@@ -10,4 +10,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_SERIALFLASH"
# CONFIG_CMD_FPGA is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_NOR_MISC=y
diff --git a/configs/sama5d4ek_mmc_defconfig b/configs/sama5d4ek_mmc_defconfig
index 7f307ac..4eb9246 100644
--- a/configs/sama5d4ek_mmc_defconfig
+++ b/configs/sama5d4ek_mmc_defconfig
@@ -10,4 +10,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_MMC"
# CONFIG_CMD_FPGA is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_NOR_MISC=y
diff --git a/configs/sama5d4ek_nandflash_defconfig b/configs/sama5d4ek_nandflash_defconfig
index 549d70d..1c02423 100644
--- a/configs/sama5d4ek_nandflash_defconfig
+++ b/configs/sama5d4ek_nandflash_defconfig
@@ -10,4 +10,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_NANDFLASH"
# CONFIG_CMD_FPGA is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_NOR_MISC=y
diff --git a/configs/sama5d4ek_spiflash_defconfig b/configs/sama5d4ek_spiflash_defconfig
index d8fb502..61ae45f 100644
--- a/configs/sama5d4ek_spiflash_defconfig
+++ b/configs/sama5d4ek_spiflash_defconfig
@@ -10,4 +10,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_SERIALFLASH"
# CONFIG_CMD_FPGA is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_NOR_MISC=y
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index dfc3190..0d1825f 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -43,9 +43,7 @@ CONFIG_DM_MMC=y
CONFIG_SPI_NOR_SANDBOX=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_ATMEL=y
-CONFIG_SPI_FLASH_EON=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_MACRONIX=y
CONFIG_SPI_NOR_SPANSION=y
CONFIG_SPI_NOR_STMICRO=y
diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig
index c48a519..813584e 100644
--- a/configs/smdk5250_defconfig
+++ b/configs/smdk5250_defconfig
@@ -14,7 +14,7 @@ CONFIG_CMD_REGULATOR=y
CONFIG_DM_I2C_COMPAT=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_WINBOND=y
CONFIG_DM_PMIC=y
CONFIG_DM_PMIC_MAX77686=y
diff --git a/configs/smdk5420_defconfig b/configs/smdk5420_defconfig
index c3e8bbd..dddaa60 100644
--- a/configs/smdk5420_defconfig
+++ b/configs/smdk5420_defconfig
@@ -11,7 +11,7 @@ CONFIG_CMD_GPIO=y
CONFIG_DM_I2C_COMPAT=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_WINBOND=y
CONFIG_DM_PMIC=y
CONFIG_DM_REGULATOR=y
diff --git a/configs/snow_defconfig b/configs/snow_defconfig
index 85699e2..2c17432 100644
--- a/configs/snow_defconfig
+++ b/configs/snow_defconfig
@@ -23,7 +23,7 @@ CONFIG_CROS_EC=y
CONFIG_CROS_EC_I2C=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_WINBOND=y
CONFIG_DM_PMIC=y
CONFIG_DM_PMIC_MAX77686=y
diff --git a/configs/spring_defconfig b/configs/spring_defconfig
index ad0b5d9..9f289d5 100644
--- a/configs/spring_defconfig
+++ b/configs/spring_defconfig
@@ -23,7 +23,7 @@ CONFIG_CROS_EC=y
CONFIG_CROS_EC_I2C=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_NOR_MISC=y
CONFIG_SPI_NOR_WINBOND=y
CONFIG_DM_PMIC=y
CONFIG_DM_PMIC_MAX77686=y
diff --git a/examples/standalone/Makefile b/examples/standalone/Makefile
index 5a6ae00..ef51f21 100644
--- a/examples/standalone/Makefile
+++ b/examples/standalone/Makefile
@@ -8,7 +8,7 @@
extra-y := hello_world
extra-$(CONFIG_SMC91111) += smc91111_eeprom
extra-$(CONFIG_SMC911X) += smc911x_eeprom
-extra-$(CONFIG_SPI_FLASH_ATMEL) += atmel_df_pow2
+extra-$(CONFIG_SPI_NOR_MISC) += atmel_df_pow2
extra-$(CONFIG_MPC5xxx) += interrupt
extra-$(CONFIG_8xx) += test_burst timer
extra-$(CONFIG_MPC8260) += mem_to_mem_idma2intr
diff --git a/include/configs/chromebook_jerry.h b/include/configs/chromebook_jerry.h
index 67f45c0..ff17e1c 100644
--- a/include/configs/chromebook_jerry.h
+++ b/include/configs/chromebook_jerry.h
@@ -18,7 +18,7 @@
#define CONFIG_SPL_SPI_SUPPORT
#define CONFIG_SPL_SPI_FLASH_SUPPORT
#define CONFIG_SPL_SPI_LOAD
-#define CONFIG_SPI_FLASH_GIGADEVICE
+#define CONFIG_SPI_NOR_MISC

#define CONFIG_CMD_SF_TEST
#define CONFIG_CMD_TIME
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index e5e2793..22b2692 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -206,7 +206,7 @@
#define CONFIG_DM_SPI_FLASH
#define CONFIG_SPI_NOR_STMICRO /* cs0 */
#define CONFIG_SPI_NOR_SST /* cs1 */
-#define CONFIG_SPI_FLASH_EON /* cs2 */
+#define CONFIG_SPI_NOR_MISC /* cs2 */
#if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI)
#define CONFIG_SF_DEFAULT_BUS 1
#define CONFIG_SF_DEFAULT_CS 0
diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h
index c38d0e2..a9b0367 100644
--- a/include/configs/rk3036_common.h
+++ b/include/configs/rk3036_common.h
@@ -70,7 +70,7 @@
#define CONFIG_SPI
#define CONFIG_CMD_SF
#define CONFIG_CMD_SPI
-#define CONFIG_SPI_FLASH_GIGADEVICE
+#define CONFIG_SPI_NOR_MISC
#define CONFIG_SF_DEFAULT_SPEED 20000000

#define CONFIG_CMD_I2C
diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h
index 272257e..b08829f 100644
--- a/include/configs/sama5d2_xplained.h
+++ b/include/configs/sama5d2_xplained.h
@@ -41,7 +41,7 @@
#ifdef CONFIG_CMD_SF
#define CONFIG_ATMEL_SPI
#define CONFIG_ATMEL_SPI0
-#define CONFIG_SPI_FLASH_ATMEL
+#define CONFIG_SPI_NOR_MISC
#define CONFIG_SF_DEFAULT_BUS 0
#define CONFIG_SF_DEFAULT_CS 0
#define CONFIG_SF_DEFAULT_SPEED 30000000
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 582b2a3..6feb912 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -65,7 +65,7 @@
/* QSPI */
#ifdef CONFIG_ZYNQ_QSPI
# define CONFIG_SF_DEFAULT_SPEED 30000000
-# define CONFIG_SPI_FLASH_ISSI
+# define CONFIG_SPI_NOR_MISC
# define CONFIG_CMD_SF
#endif

--
1.9.1