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/chromebook_samus_defconfig | 2 +- configs/chromebox_panther_defconfig | 2 +- configs/cm_fx6_defconfig | 4 +--- configs/cm_t43_defconfig | 5 +---- configs/conga-qeval20-qa3-e3845_defconfig | 2 +- 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 +- 84 files changed, 84 insertions(+), 94 deletions(-)
diff --git a/configs/C29XPCIE_NAND_defconfig b/configs/C29XPCIE_NAND_defconfig index 61ac704..c8d33f3 100644 --- a/configs/C29XPCIE_NAND_defconfig +++ b/configs/C29XPCIE_NAND_defconfig @@ -10,7 +10,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=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 9f816ff..0d49405 100644 --- a/configs/C29XPCIE_NOR_SECBOOT_defconfig +++ b/configs/C29XPCIE_NOR_SECBOOT_defconfig @@ -10,7 +10,7 @@ CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,36BIT,SECURE_BOOT" CONFIG_DM=y 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 e0dc4cc..eaaef7e 100644 --- a/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig +++ b/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig @@ -10,7 +10,7 @@ CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,36BIT,SPIFLASH,SECURE_BOOT" CONFIG_DM=y 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 fb593cf..1186ac3 100644 --- a/configs/C29XPCIE_SPIFLASH_defconfig +++ b/configs/C29XPCIE_SPIFLASH_defconfig @@ -8,7 +8,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=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 d139716..cf5a8f0 100644 --- a/configs/C29XPCIE_defconfig +++ b/configs/C29XPCIE_defconfig @@ -8,7 +8,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=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 11f7f13..33574ea 100644 --- a/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig +++ b/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig @@ -10,7 +10,7 @@ CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,SYS_FSL_DDR4,SECURE_BOOT" CONFIG_DM=y 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 32ea85f..93cd3e4 100644 --- a/configs/T1024QDS_DDR4_defconfig +++ b/configs/T1024QDS_DDR4_defconfig @@ -8,7 +8,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=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 b20f976..44740a2 100644 --- a/configs/T1024QDS_NAND_defconfig +++ b/configs/T1024QDS_NAND_defconfig @@ -9,7 +9,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=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 37868aa..4002e42 100644 --- a/configs/T1024QDS_SDCARD_defconfig +++ b/configs/T1024QDS_SDCARD_defconfig @@ -9,7 +9,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=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 f2073b4..6f3907e 100644 --- a/configs/T1024QDS_SECURE_BOOT_defconfig +++ b/configs/T1024QDS_SECURE_BOOT_defconfig @@ -10,7 +10,7 @@ CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,SECURE_BOOT" CONFIG_DM=y 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 4529f98..a4a77fa 100644 --- a/configs/T1024QDS_SPIFLASH_defconfig +++ b/configs/T1024QDS_SPIFLASH_defconfig @@ -9,7 +9,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=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 6cac3af..b4a9e71 100644 --- a/configs/T1024QDS_defconfig +++ b/configs/T1024QDS_defconfig @@ -8,7 +8,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=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 84c9925..e127791 100644 --- a/configs/T1040QDS_DDR4_defconfig +++ b/configs/T1040QDS_DDR4_defconfig @@ -8,7 +8,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=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 5577f0b..70379be 100644 --- a/configs/T1040QDS_SECURE_BOOT_defconfig +++ b/configs/T1040QDS_SECURE_BOOT_defconfig @@ -10,7 +10,7 @@ CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,SECURE_BOOT" CONFIG_DM=y 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 90c1332..ac4e5f0 100644 --- a/configs/T1040QDS_defconfig +++ b/configs/T1040QDS_defconfig @@ -8,7 +8,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=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 c527e7e..3205b2f 100644 --- a/configs/T2080QDS_NAND_defconfig +++ b/configs/T2080QDS_NAND_defconfig @@ -9,7 +9,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=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 5f3192f..740b74a 100644 --- a/configs/T2080QDS_SDCARD_defconfig +++ b/configs/T2080QDS_SDCARD_defconfig @@ -9,7 +9,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=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 1f1f1ad..cc06e4c 100644 --- a/configs/T2080QDS_SECURE_BOOT_defconfig +++ b/configs/T2080QDS_SECURE_BOOT_defconfig @@ -10,7 +10,7 @@ CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,SECURE_BOOT" CONFIG_DM=y 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 05494d2..fb87a6e 100644 --- a/configs/T2080QDS_SPIFLASH_defconfig +++ b/configs/T2080QDS_SPIFLASH_defconfig @@ -9,7 +9,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=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 1dd8aac..486dcdf 100644 --- a/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig +++ b/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig @@ -10,7 +10,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 1210137..f745b8c 100644 --- a/configs/T2080QDS_defconfig +++ b/configs/T2080QDS_defconfig @@ -8,7 +8,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=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 b0c0ad8..ac63b13 100644 --- a/configs/T2081QDS_NAND_defconfig +++ b/configs/T2081QDS_NAND_defconfig @@ -9,7 +9,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=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 09a15e7..81ed4ee 100644 --- a/configs/T2081QDS_SDCARD_defconfig +++ b/configs/T2081QDS_SDCARD_defconfig @@ -9,7 +9,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=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 921b879..b10642b 100644 --- a/configs/T2081QDS_SPIFLASH_defconfig +++ b/configs/T2081QDS_SPIFLASH_defconfig @@ -9,7 +9,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=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 792987e..44f5901 100644 --- a/configs/T2081QDS_SRIO_PCIE_BOOT_defconfig +++ b/configs/T2081QDS_SRIO_PCIE_BOOT_defconfig @@ -10,7 +10,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 ccfb10c..e4080e3 100644 --- a/configs/T2081QDS_defconfig +++ b/configs/T2081QDS_defconfig @@ -8,7 +8,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=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 9322456..45cbe40 100644 --- a/configs/at91sam9n12ek_mmc_defconfig +++ b/configs/at91sam9n12ek_mmc_defconfig @@ -9,5 +9,5 @@ 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 CONFIG_OF_LIBFDT=y diff --git a/configs/at91sam9n12ek_nandflash_defconfig b/configs/at91sam9n12ek_nandflash_defconfig index 17ebed6..c4187a6 100644 --- a/configs/at91sam9n12ek_nandflash_defconfig +++ b/configs/at91sam9n12ek_nandflash_defconfig @@ -10,5 +10,5 @@ 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 CONFIG_OF_LIBFDT=y diff --git a/configs/at91sam9n12ek_spiflash_defconfig b/configs/at91sam9n12ek_spiflash_defconfig index 323d7b7..014eeac 100644 --- a/configs/at91sam9n12ek_spiflash_defconfig +++ b/configs/at91sam9n12ek_spiflash_defconfig @@ -10,5 +10,5 @@ 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 CONFIG_OF_LIBFDT=y diff --git a/configs/at91sam9x5ek_dataflash_defconfig b/configs/at91sam9x5ek_dataflash_defconfig index 14a2a20..1668b53 100644 --- a/configs/at91sam9x5ek_dataflash_defconfig +++ b/configs/at91sam9x5ek_dataflash_defconfig @@ -10,5 +10,5 @@ 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 CONFIG_OF_LIBFDT=y diff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig index 5cc56ea..f3877c6 100644 --- a/configs/at91sam9x5ek_mmc_defconfig +++ b/configs/at91sam9x5ek_mmc_defconfig @@ -10,5 +10,5 @@ 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 CONFIG_OF_LIBFDT=y diff --git a/configs/at91sam9x5ek_nandflash_defconfig b/configs/at91sam9x5ek_nandflash_defconfig index 0ce027b..0e2d498 100644 --- a/configs/at91sam9x5ek_nandflash_defconfig +++ b/configs/at91sam9x5ek_nandflash_defconfig @@ -11,5 +11,5 @@ 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 CONFIG_OF_LIBFDT=y diff --git a/configs/at91sam9x5ek_spiflash_defconfig b/configs/at91sam9x5ek_spiflash_defconfig index 4c7fa59..f18deea 100644 --- a/configs/at91sam9x5ek_spiflash_defconfig +++ b/configs/at91sam9x5ek_spiflash_defconfig @@ -11,5 +11,5 @@ 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 CONFIG_OF_LIBFDT=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 c862e0a..86a5d39 100644 --- a/configs/bayleybay_defconfig +++ b/configs/bayleybay_defconfig @@ -25,7 +25,7 @@ CONFIG_SYSCON=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 05293ba..9808475 100644 --- a/configs/chromebook_link_defconfig +++ b/configs/chromebook_link_defconfig @@ -30,7 +30,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/chromebook_samus_defconfig b/configs/chromebook_samus_defconfig index 8da5932..1927707 100644 --- a/configs/chromebook_samus_defconfig +++ b/configs/chromebook_samus_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 ebf78bc..d806daf 100644 --- a/configs/chromebox_panther_defconfig +++ b/configs/chromebox_panther_defconfig @@ -24,7 +24,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_ETH=y diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig index 9fb9cff..57ac56f 100644 --- a/configs/cm_fx6_defconfig +++ b/configs/cm_fx6_defconfig @@ -20,9 +20,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/cm_t43_defconfig b/configs/cm_t43_defconfig index d829ba4..f3b26a4 100644 --- a/configs/cm_t43_defconfig +++ b/configs/cm_t43_defconfig @@ -16,12 +16,9 @@ CONFIG_DM_SERIAL=y CONFIG_MTD_SPI_NOR=y CONFIG_MTD_M25P80=y CONFIG_SPI_NOR_BAR=y +CONFIG_SPI_NOR_MISC=y CONFIG_SPI_NOR_WINBOND=y CONFIG_SPI_NOR_SST=y CONFIG_SPI_NOR_STMICRO=y CONFIG_SPI_NOR_SPANSION=y CONFIG_SPI_NOR_MACRONIX=y -CONFIG_SPI_FLASH_ISSI=y -CONFIG_SPI_FLASH_GIGADEVICE=y -CONFIG_SPI_FLASH_EON=y -CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig index 1d4251e..9edfc5d 100644 --- a/configs/conga-qeval20-qa3-e3845_defconfig +++ b/configs/conga-qeval20-qa3-e3845_defconfig @@ -26,7 +26,7 @@ CONFIG_CPU=y CONFIG_WINBOND_W83627=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/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig index b8b0305..ebc2cdb 100644 --- a/configs/coreboot-x86_defconfig +++ b/configs/coreboot-x86_defconfig @@ -14,7 +14,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 e347765..67b9ec4 100644 --- a/configs/crownbay_defconfig +++ b/configs/crownbay_defconfig @@ -23,7 +23,7 @@ CONFIG_SYSCON=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 13fc5e7..c966b99 100644 --- a/configs/galileo_defconfig +++ b/configs/galileo_defconfig @@ -19,7 +19,7 @@ CONFIG_SYSCON=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 816d99f..2ca5c99 100644 --- a/configs/gplugd_defconfig +++ b/configs/gplugd_defconfig @@ -6,7 +6,7 @@ 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 CONFIG_OF_LIBFDT=y diff --git a/configs/ls1021atwr_qspi_defconfig b/configs/ls1021atwr_qspi_defconfig index e02e6f0..55a8860 100644 --- a/configs/ls1021atwr_qspi_defconfig +++ b/configs/ls1021atwr_qspi_defconfig @@ -12,7 +12,7 @@ CONFIG_DM=y CONFIG_MTD=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 43635cc..c0e1d49 100644 --- a/configs/ls1021atwr_sdcard_qspi_defconfig +++ b/configs/ls1021atwr_sdcard_qspi_defconfig @@ -10,7 +10,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 2c31e40..f2d5d3d 100644 --- a/configs/minnowmax_defconfig +++ b/configs/minnowmax_defconfig @@ -25,7 +25,7 @@ CONFIG_SYSCON=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 7853f33..de03c39 100644 --- a/configs/peach-pi_defconfig +++ b/configs/peach-pi_defconfig @@ -24,7 +24,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 893680c..8fb6908 100644 --- a/configs/peach-pit_defconfig +++ b/configs/peach-pit_defconfig @@ -24,7 +24,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 c7ee19b..f3b856d 100644 --- a/configs/qemu-x86_defconfig +++ b/configs/qemu-x86_defconfig @@ -18,7 +18,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 82aa782..8061d76 100644 --- a/configs/sama5d3xek_mmc_defconfig +++ b/configs/sama5d3xek_mmc_defconfig @@ -8,5 +8,5 @@ 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 CONFIG_OF_LIBFDT=y diff --git a/configs/sama5d3xek_nandflash_defconfig b/configs/sama5d3xek_nandflash_defconfig index 0914ede..d071563 100644 --- a/configs/sama5d3xek_nandflash_defconfig +++ b/configs/sama5d3xek_nandflash_defconfig @@ -8,5 +8,5 @@ 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 CONFIG_OF_LIBFDT=y diff --git a/configs/sama5d3xek_spiflash_defconfig b/configs/sama5d3xek_spiflash_defconfig index 622e71a..78fa99b 100644 --- a/configs/sama5d3xek_spiflash_defconfig +++ b/configs/sama5d3xek_spiflash_defconfig @@ -8,5 +8,5 @@ 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 CONFIG_OF_LIBFDT=y diff --git a/configs/sama5d4_xplained_mmc_defconfig b/configs/sama5d4_xplained_mmc_defconfig index a6afa56..d9661f4 100644 --- a/configs/sama5d4_xplained_mmc_defconfig +++ b/configs/sama5d4_xplained_mmc_defconfig @@ -10,5 +10,5 @@ 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 CONFIG_OF_LIBFDT=y diff --git a/configs/sama5d4_xplained_nandflash_defconfig b/configs/sama5d4_xplained_nandflash_defconfig index b871d9b..3c3ef6f 100644 --- a/configs/sama5d4_xplained_nandflash_defconfig +++ b/configs/sama5d4_xplained_nandflash_defconfig @@ -10,5 +10,5 @@ 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 CONFIG_OF_LIBFDT=y diff --git a/configs/sama5d4_xplained_spiflash_defconfig b/configs/sama5d4_xplained_spiflash_defconfig index d8fdcf9..02c9b65 100644 --- a/configs/sama5d4_xplained_spiflash_defconfig +++ b/configs/sama5d4_xplained_spiflash_defconfig @@ -10,5 +10,5 @@ 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 CONFIG_OF_LIBFDT=y diff --git a/configs/sama5d4ek_mmc_defconfig b/configs/sama5d4ek_mmc_defconfig index 3ea5f85..d8accb7 100644 --- a/configs/sama5d4ek_mmc_defconfig +++ b/configs/sama5d4ek_mmc_defconfig @@ -10,5 +10,5 @@ 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 CONFIG_OF_LIBFDT=y diff --git a/configs/sama5d4ek_nandflash_defconfig b/configs/sama5d4ek_nandflash_defconfig index 8443781..e9fa96e 100644 --- a/configs/sama5d4ek_nandflash_defconfig +++ b/configs/sama5d4ek_nandflash_defconfig @@ -10,5 +10,5 @@ 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 CONFIG_OF_LIBFDT=y diff --git a/configs/sama5d4ek_spiflash_defconfig b/configs/sama5d4ek_spiflash_defconfig index 5c578dc..6cef420 100644 --- a/configs/sama5d4ek_spiflash_defconfig +++ b/configs/sama5d4ek_spiflash_defconfig @@ -10,5 +10,5 @@ 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 CONFIG_OF_LIBFDT=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index adfb266..cc457b3 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 a8ae3b6..f649774 100644 --- a/configs/smdk5250_defconfig +++ b/configs/smdk5250_defconfig @@ -16,7 +16,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 7c2e9fb..786197a 100644 --- a/configs/smdk5420_defconfig +++ b/configs/smdk5420_defconfig @@ -13,7 +13,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 6cb2a58..85121ce 100644 --- a/configs/snow_defconfig +++ b/configs/snow_defconfig @@ -25,7 +25,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 bff5722..bf7a6b3 100644 --- a/configs/spring_defconfig +++ b/configs/spring_defconfig @@ -25,7 +25,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 a4d768d..a8243b1 100644 --- a/include/configs/chromebook_jerry.h +++ b/include/configs/chromebook_jerry.h @@ -19,7 +19,7 @@ #define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SPL_MTD_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 515c3ff..b86845f 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -198,7 +198,7 @@ #define CONFIG_MTD #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 4dcf1a1..0107c91 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -69,7 +69,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 aa29ed9..b4146f7 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 3177297..bee8844 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -62,7 +62,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