@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_B4420,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_B4860QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_B4420,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_B4860QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_B4420"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_B4860QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_B4860QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -6,7 +6,7 @@ CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860,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_SST=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_B4860QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -7,6 +7,6 @@ CONFIG_SYS_EXTRA_OPTIONS="BSC9131RDB,NAND,SYS_CLK_100"
# CONFIG_CMD_FLASH is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_SYS_NS16550=y
CONFIG_FSL_ESPI=y
@@ -7,6 +7,6 @@ CONFIG_SYS_EXTRA_OPTIONS="BSC9131RDB,NAND"
# CONFIG_CMD_FLASH is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_SYS_NS16550=y
CONFIG_FSL_ESPI=y
@@ -6,6 +6,6 @@ CONFIG_SYS_EXTRA_OPTIONS="BSC9131RDB,SPIFLASH,SYS_CLK_100"
# CONFIG_CMD_FLASH is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_SYS_NS16550=y
CONFIG_FSL_ESPI=y
@@ -6,6 +6,6 @@ CONFIG_SYS_EXTRA_OPTIONS="BSC9131RDB,SPIFLASH"
# CONFIG_CMD_FLASH is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_SYS_NS16550=y
CONFIG_FSL_ESPI=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,NAND_SECBOOT,SYS_CLK_100_DDR_100,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,NAND,SYS_CLK_100_DDR_100"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,NAND_SECBOOT,SYS_CLK_100_DDR_133,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,NAND,SYS_CLK_100_DDR_133"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SYS_CLK_100_DDR_100,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SYS_CLK_100_DDR_100"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SYS_CLK_100_DDR_133,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SYS_CLK_100_DDR_133"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SDCARD,SYS_CLK_100_DDR_100,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SDCARD,SYS_CLK_100_DDR_100"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SDCARD,SYS_CLK_100_DDR_133,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SDCARD,SYS_CLK_100_DDR_133"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SPIFLASH,SYS_CLK_100_DDR_100,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SPIFLASH,SYS_CLK_100_DDR_100"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SPIFLASH,SYS_CLK_100_DDR_133,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SPIFLASH,SYS_CLK_100_DDR_133"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -7,7 +7,7 @@ CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,36BIT,NAND"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_FLASH_EON=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,36BIT,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_FLASH_EON=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ 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_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,36BIT,SPIFLASH"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_FLASH_EON=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,36BIT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_FLASH_EON=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -8,4 +8,4 @@ CONFIG_SYS_PROMPT="-> "
# CONFIG_CMD_NFS is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
@@ -7,4 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_STMICRO_BOOT"
# CONFIG_CMD_NFS is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
@@ -8,4 +8,4 @@ CONFIG_SYS_PROMPT="-> "
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
@@ -7,4 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_STMICRO_BOOT,SYS_INPUT_CLKSRC=24000000"
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
@@ -7,4 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_ATMEL_BOOT,SYS_INPUT_CLKSRC=66666666"
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
@@ -8,4 +8,4 @@ CONFIG_SYS_PROMPT="-> "
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
@@ -7,4 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_INTEL_BOOT,SYS_INPUT_CLKSRC=66666666"
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
@@ -7,4 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_INTEL_BOOT,SYS_INPUT_CLKSRC=33333333"
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
@@ -7,4 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_STMICRO_BOOT,CF_SBF,SYS_INPUT_CLKSRC=33333333"
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_MPC8536DS=y
CONFIG_SYS_EXTRA_OPTIONS="36BIT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_MPC8536DS=y
CONFIG_SYS_EXTRA_OPTIONS="SDCARD"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_MPC8536DS=y
CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -3,7 +3,7 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8536DS=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P1010RDB=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT,NAND_SECBOOT,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -6,7 +6,7 @@ CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT,NAND"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P1010RDB=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P1010RDB=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT,SDCARD"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P1010RDB=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT,SPIFLASH,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT,SPIFLASH"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P1010RDB=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,NAND_SECBOOT,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -6,7 +6,7 @@ CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,NAND"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P1010RDB=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P1010RDB=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,SDCARD"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P1010RDB=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,SPIFLASH,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,SPIFLASH"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P1010RDB=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT,NAND_SECBOOT,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -6,7 +6,7 @@ CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT,NAND"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P1010RDB=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P1010RDB=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT,SDCARD"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P1010RDB=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT,SPIFLASH,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT,SPIFLASH"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P1010RDB=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,NAND_SECBOOT,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -6,7 +6,7 @@ CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,NAND"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P1010RDB=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P1010RDB=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,SDCARD"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P1010RDB=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,SPIFLASH,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,SPIFLASH"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -6,7 +6,7 @@ CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,36BIT,NAND"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,36BIT,SDCARD"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,36BIT,SPIFLASH"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,36BIT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -6,7 +6,7 @@ CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,NAND"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,SDCARD"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,SPIFLASH"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -6,7 +6,7 @@ CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PD,NAND"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PD,SDCARD"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PD,SPIFLASH"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PD"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -6,7 +6,7 @@ CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,36BIT,NAND"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,36BIT,SDCARD"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,36BIT,SPIFLASH"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,36BIT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -6,7 +6,7 @@ CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,NAND"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,SDCARD"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,SPIFLASH"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P1021RDB"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -6,7 +6,7 @@ CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="36BIT,NAND"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="36BIT,SDCARD"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="36BIT,SPIFLASH"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P1022DS=y
CONFIG_SYS_EXTRA_OPTIONS="36BIT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -6,7 +6,7 @@ CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="NAND"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SDCARD"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -3,7 +3,7 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1022DS=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P1024RDB,36BIT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -6,7 +6,7 @@ CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1024RDB,NAND"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1024RDB,SDCARD"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1024RDB,SPIFLASH"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P1024RDB"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P1025RDB,36BIT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -6,7 +6,7 @@ CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1025RDB,NAND"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1025RDB,SDCARD"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1025RDB,SPIFLASH"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P1025RDB"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -6,7 +6,7 @@ CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,36BIT,NAND"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,36BIT,SDCARD"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,36BIT,SPIFLASH"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,36BIT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -6,7 +6,7 @@ CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,NAND"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,SDCARD"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,SPIFLASH"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P2020RDB"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P2041RDB=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P2041RDB=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P2041RDB=y
CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P2041RDB=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -6,7 +6,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
# CONFIG_CMD_FLASH is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -3,7 +3,7 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P2041RDB=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P3041DS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SECURE_BOOT,SYS_TEXT_BASE=0xFFF40000"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P3041DS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P3041DS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P3041DS=y
CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P3041DS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -6,7 +6,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
# CONFIG_CMD_FLASH is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -3,7 +3,7 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P3041DS=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P4080DS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P4080DS=y
CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P4080DS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -6,7 +6,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
# CONFIG_CMD_FLASH is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -3,7 +3,7 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P4080DS=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P5020DS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SECURE_BOOT,SYS_TEXT_BASE=0xFFF40000"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P5020DS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P5020DS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P5020DS=y
CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P5020DS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -6,7 +6,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
# CONFIG_CMD_FLASH is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -3,7 +3,7 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P5020DS=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P5040DS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SECURE_BOOT,SYS_TEXT_BASE=0xFFF40000"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P5040DS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P5040DS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P5040DS=y
CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_P5040DS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -3,7 +3,7 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P5040DS=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -7,7 +7,7 @@ CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
# CONFIG_CMD_FLASH is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -7,7 +7,7 @@ CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
# CONFIG_CMD_FLASH is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_T102XRDB=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -7,7 +7,7 @@ CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
# CONFIG_CMD_FLASH is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_T102XRDB=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,8 +5,8 @@ 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_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ 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_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_SST=y
CONFIG_SYS_NS16550=y
CONFIG_FSL_ESPI=y
@@ -6,8 +6,8 @@ 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_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -6,8 +6,8 @@ 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_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,8 +5,8 @@ CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_FLASH_EON=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -6,8 +6,8 @@ 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_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,8 +5,8 @@ CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_FLASH_EON=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_T102XRDB=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_T102XRDB=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND,T104XD4RDB,SYS_FSL_DDR4"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD,T104XD4RDB,SYS_FSL_DDR4"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_T104XRDB=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,T104XD4RDB,SYS_FSL_DDR4,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH,T104XD4RDB,SYS_FSL_DDR4"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_T104XRDB=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,T104XD4RDB,SYS_FSL_DDR4"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,8 +5,8 @@ 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_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,8 +5,8 @@ CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_FLASH_EON=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,8 +5,8 @@ CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_FLASH_EON=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_T104XRDB=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,SECURE_BOOT,T1040RDB"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_T104XRDB=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND,T104XD4RDB,SYS_FSL_DDR4"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD,T104XD4RDB,SYS_FSL_DDR4"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_T104XRDB=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,T104XD4RDB,SYS_FSL_DDR4,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH,T104XD4RDB,SYS_FSL_DDR4"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_T104XRDB=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,T104XD4RDB,SYS_FSL_DDR4"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_T104XRDB=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_T104XRDB=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,SECURE_BOOT,T1042RDB"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_T104XRDB=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -6,8 +6,8 @@ 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_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -6,8 +6,8 @@ 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_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,8 +5,8 @@ CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_FLASH_EON=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -6,8 +6,8 @@ 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_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -7,8 +7,8 @@ CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF4000
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_FLASH_EON=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,8 +5,8 @@ CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_FLASH_EON=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -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_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -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_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_T208XRDB=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -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_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -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_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_T208XRDB=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -6,8 +6,8 @@ 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_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -6,8 +6,8 @@ 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_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -6,8 +6,8 @@ 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_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -7,8 +7,8 @@ CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF4000
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_FLASH_EON=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,8 +5,8 @@ CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_FLASH_EON=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T4160,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T4160,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_T4240QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T4160,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_T4240QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T4160"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_T4240RDB=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T4160"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_T4240QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240,SECURE_BOOT"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -6,7 +6,7 @@ CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240,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_SST=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_T4240QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -5,7 +5,7 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -4,7 +4,7 @@ CONFIG_TARGET_T4240RDB=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240"
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -8,9 +8,9 @@ CONFIG_AUTOBOOT_STOP_STR="\x1b"
CONFIG_CMD_GPIO=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_SST=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_SST=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -8,9 +8,9 @@ CONFIG_AUTOBOOT_STOP_STR="\x1b"
CONFIG_CMD_GPIO=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_SST=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_SST=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -20,4 +20,4 @@ CONFIG_SH_SDHI=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_NOR_BAR=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
@@ -15,5 +15,5 @@ CONFIG_CMD_GPIO=y
CONFIG_DFU_TFTP=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_SYS_NS16550=y
@@ -20,7 +20,7 @@ CONFIG_OF_CONTROL=y
CONFIG_DM_MMC=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_DM_ETH=y
CONFIG_SYS_NS16550=y
CONFIG_TIMER=y
@@ -14,5 +14,5 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_SYS_NS16550=y
@@ -10,5 +10,5 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_SYS_NS16550=y
@@ -7,5 +7,5 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_SYS_NS16550=y
@@ -10,5 +10,5 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_SYS_NS16550=y
@@ -10,5 +10,5 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_SYS_NS16550=y
@@ -13,7 +13,7 @@ CONFIG_OF_CONTROL=y
CONFIG_DM_MMC=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_DM_ETH=y
CONFIG_SYS_NS16550=y
CONFIG_RSA=y
@@ -16,7 +16,7 @@ CONFIG_DM=y
CONFIG_DM_MMC=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_NOR_MACRONIX=y
CONFIG_SYS_NS16550=y
CONFIG_TI_QSPI=y
CONFIG_TIMER=y
@@ -16,7 +16,7 @@ CONFIG_DM=y
CONFIG_DM_MMC=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_NOR_MACRONIX=y
CONFIG_SYS_NS16550=y
CONFIG_TI_QSPI=y
CONFIG_DM_SPI=y
@@ -9,6 +9,6 @@ CONFIG_CMD_GPIO=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_NOR_BAR=y
-CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_NOR_MACRONIX=y
CONFIG_SYS_NS16550=y
CONFIG_TI_QSPI=y
@@ -8,6 +8,6 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_NOR_MACRONIX=y
CONFIG_SYS_NS16550=y
CONFIG_TI_QSPI=y
@@ -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_MACRONIX=y
+CONFIG_SPI_NOR_MACRONIX=y
CONFIG_SYS_NS16550=y
CONFIG_TI_QSPI=y
@@ -8,6 +8,6 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_NOR_MACRONIX=y
CONFIG_SYS_NS16550=y
CONFIG_TI_QSPI=y
@@ -7,4 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos2.cfg,MX6DL"
CONFIG_CMD_GPIO=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
@@ -7,4 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos2.cfg,MX6DL"
CONFIG_CMD_GPIO=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
@@ -7,4 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos.cfg,MX6DL"
CONFIG_CMD_GPIO=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
@@ -12,5 +12,5 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,MACH_TYPE=2068,BOARD_AXM"
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_USE_TINY_PRINTF=y
@@ -23,8 +23,8 @@ CONFIG_CPU=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_MACRONIX=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_DM_ETH=y
CONFIG_E1000=y
CONFIG_DM_PCI=y
@@ -14,7 +14,7 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_NFS is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_PCI_TEGRA=y
CONFIG_SYS_NS16550=y
CONFIG_TEGRA20_SLINK=y
@@ -5,6 +5,6 @@ CONFIG_CMD_GPIO=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_SST=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
@@ -5,4 +5,4 @@ CONFIG_CMD_GPIO=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_SST=y
@@ -7,5 +7,5 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_NFS is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
@@ -5,5 +5,5 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_LIB_RAND=y
@@ -5,4 +5,4 @@ CONFIG_NET_RANDOM_ETHADDR=y
# CONFIG_NET_TFTP_VARS is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
@@ -9,9 +9,9 @@ CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_FLASH_ATMEL=y
CONFIG_SPI_FLASH_EON=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_SPANSION=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_SST=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_MACRONIX=y
+CONFIG_SPI_NOR_SPANSION=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_SST=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
@@ -7,4 +7,4 @@ CONFIG_SYS_PROMPT="minotaur> "
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
@@ -5,4 +5,4 @@ CONFIG_CMD_GPIO=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
@@ -7,4 +7,4 @@ CONFIG_SYS_PROMPT="srv1> "
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
@@ -7,8 +7,8 @@ CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_FLASH_ATMEL=y
CONFIG_SPI_FLASH_EON=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_SPANSION=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_SST=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_MACRONIX=y
+CONFIG_SPI_NOR_SPANSION=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_SST=y
+CONFIG_SPI_NOR_WINBOND=y
@@ -4,6 +4,6 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
CONFIG_LIB_RAND=y
@@ -6,11 +6,11 @@ CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_FLASH_ATMEL=y
CONFIG_SPI_FLASH_EON=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_SPANSION=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_SST=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_MACRONIX=y
+CONFIG_SPI_NOR_SPANSION=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_SST=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_NETDEVICES=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_LIB_RAND=y
@@ -7,4 +7,4 @@ CONFIG_CMD_GPIO=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_NOR_BAR=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
@@ -9,5 +9,5 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_SYS_NS16550=y
@@ -9,5 +9,5 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_SYS_NS16550=y
@@ -5,4 +5,4 @@ CONFIG_TARGET_BLACKSTAMP=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
@@ -5,4 +5,4 @@ CONFIG_TARGET_BLACKVME=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
@@ -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_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
CONFIG_LIB_RAND=y
@@ -14,7 +14,7 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_NFS is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_PCI_TEGRA=y
CONFIG_SYS_NS16550=y
CONFIG_TEGRA20_SLINK=y
@@ -30,8 +30,8 @@ CONFIG_CROS_EC_LPC=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_MACRONIX=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_DM_PCI=y
CONFIG_DM_RTC=y
CONFIG_DEBUG_UART=y
@@ -24,8 +24,8 @@ CONFIG_CROS_EC_LPC=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_MACRONIX=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_DM_PCI=y
CONFIG_DM_RTC=y
CONFIG_SYS_NS16550=y
@@ -22,11 +22,11 @@ CONFIG_MTD_M25P80=y
CONFIG_SPI_FLASH_ATMEL=y
CONFIG_SPI_FLASH_EON=y
CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_SPANSION=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_SST=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_MACRONIX=y
+CONFIG_SPI_NOR_SPANSION=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_SST=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
@@ -8,7 +8,7 @@ CONFIG_CMD_TPM=y
CONFIG_DM=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_SYS_NS16550=y
CONFIG_FSL_ESPI=y
CONFIG_TPM_AUTH_SESSIONS=y
@@ -8,7 +8,7 @@ CONFIG_CMD_TPM=y
CONFIG_DM=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_SYS_NS16550=y
CONFIG_FSL_ESPI=y
CONFIG_TPM_AUTH_SESSIONS=y
@@ -14,8 +14,8 @@ CONFIG_OF_CONTROL=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_MACRONIX=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_DM_ETH=y
CONFIG_E1000=y
CONFIG_DM_PCI=y
@@ -21,9 +21,9 @@ CONFIG_CPU=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_SST=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_MACRONIX=y
+CONFIG_SPI_NOR_SST=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_DM_ETH=y
CONFIG_E1000=y
CONFIG_PCH_GBE=y
@@ -7,5 +7,5 @@ CONFIG_SYS_EXTRA_OPTIONS="D2NET_V2"
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_NOR_MACRONIX=y
CONFIG_SYS_NS16550=y
@@ -8,6 +8,6 @@ CONFIG_SYS_EXTRA_OPTIONS="DA850_AM18X_EVM,MAC_ADDR_IN_EEPROM,SYS_I2C_EEPROM_ADDR
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_SYS_NS16550=y
@@ -9,6 +9,6 @@ CONFIG_SYS_PROMPT="U-Boot > "
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_SYS_NS16550=y
@@ -6,6 +6,6 @@ CONFIG_SYS_PROMPT="U-Boot > "
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_SYS_NS16550=y
@@ -14,7 +14,7 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_NFS is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_SYS_NS16550=y
CONFIG_TEGRA114_SPI=y
CONFIG_USB=y
@@ -11,8 +11,8 @@ CONFIG_CMD_USB=y
CONFIG_SPL_OF_TRANSLATE=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_MACRONIX=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_DEBUG_UART=y
CONFIG_DEBUG_UART_BASE=0xd0012000
CONFIG_DEBUG_UART_CLOCK=250000000
@@ -13,8 +13,8 @@ CONFIG_SPL_OF_TRANSLATE=y
CONFIG_NAND_PXA3XX=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_MACRONIX=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_DEBUG_UART=y
CONFIG_DEBUG_UART_BASE=0xd0012000
CONFIG_DEBUG_UART_CLOCK=250000000
@@ -18,7 +18,7 @@ CONFIG_DM=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_NOR_BAR=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_SYS_NS16550=y
CONFIG_TI_QSPI=y
CONFIG_DM_SPI=y
@@ -16,7 +16,7 @@ CONFIG_DM=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_NOR_BAR=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_DM_SERIAL=y
CONFIG_SYS_NS16550=y
CONFIG_TI_QSPI=y
@@ -12,6 +12,6 @@ CONFIG_CMD_GPIO=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_NOR_BAR=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_SYS_NS16550=y
CONFIG_TI_QSPI=y
@@ -12,6 +12,6 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_NFS is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_SYS_NS16550=y
CONFIG_TI_QSPI=y
@@ -13,6 +13,6 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_NFS is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_SYS_NS16550=y
CONFIG_TI_QSPI=y
@@ -11,5 +11,5 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_SYS_NS16550=y
@@ -11,5 +11,5 @@ CONFIG_CMD_DHCP=y
CONFIG_CMD_PING=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_NOR_MACRONIX=y
CONFIG_SYS_NS16550=y
@@ -11,7 +11,7 @@ CONFIG_SPL_OF_TRANSLATE=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_NOR_BAR=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_DEBUG_UART=y
CONFIG_DEBUG_UART_BASE=0xd0012000
CONFIG_DEBUG_UART_CLOCK=250000000
@@ -12,7 +12,7 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_NFS is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_SYS_NS16550=y
CONFIG_TEGRA114_SPI=y
CONFIG_USB=y
@@ -8,5 +8,5 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_SYS_NS16550=y
@@ -17,8 +17,8 @@ CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_MACRONIX=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_DM_ETH=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_DM_PCI=y
@@ -20,4 +20,4 @@ CONFIG_SH_SDHI=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_NOR_BAR=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
@@ -7,5 +7,5 @@ CONFIG_TARGET_GPLUGD=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_FLASH_ATMEL=y
-CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_NOR_MACRONIX=y
CONFIG_SYS_NS16550=y
@@ -7,5 +7,5 @@ CONFIG_SYS_EXTRA_OPTIONS="INETSPACE_V2"
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_NOR_MACRONIX=y
CONFIG_SYS_NS16550=y
@@ -7,6 +7,6 @@ CONFIG_CMD_GPIO=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
@@ -14,7 +14,7 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_NFS is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_PCI_TEGRA=y
CONFIG_SYS_NS16550=y
CONFIG_TEGRA114_SPI=y
@@ -12,5 +12,5 @@ CONFIG_OF_CONTROL=y
CONFIG_DM=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_SYS_NS16550=y
@@ -11,5 +11,5 @@ CONFIG_OF_CONTROL=y
CONFIG_DM=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_SYS_NS16550=y
@@ -12,5 +12,5 @@ CONFIG_OF_CONTROL=y
CONFIG_DM=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_SYS_NS16550=y
@@ -12,5 +12,5 @@ CONFIG_OF_CONTROL=y
CONFIG_DM=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_SYS_NS16550=y
@@ -6,5 +6,5 @@ CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_128M16"
# CONFIG_CMD_FLASH is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_SYS_NS16550=y
@@ -6,5 +6,5 @@ CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD"
# CONFIG_CMD_FLASH is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_SYS_NS16550=y
@@ -6,5 +6,5 @@ CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_PCI"
# CONFIG_CMD_FLASH is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_SYS_NS16550=y
@@ -6,8 +6,8 @@ CONFIG_SYS_EXTRA_OPTIONS="KMCOGE4"
# CONFIG_CMD_FLASH is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_SPANSION=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -6,5 +6,5 @@ CONFIG_SYS_EXTRA_OPTIONS="KM_COGE5UN"
# CONFIG_CMD_FLASH is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_SYS_NS16550=y
@@ -6,8 +6,8 @@ CONFIG_SYS_EXTRA_OPTIONS="KMLION1"
# CONFIG_CMD_FLASH is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_SPANSION=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -6,5 +6,5 @@ CONFIG_SYS_EXTRA_OPTIONS="KM_NUSA"
# CONFIG_CMD_FLASH is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_SYS_NS16550=y
@@ -6,5 +6,5 @@ CONFIG_SYS_EXTRA_OPTIONS="KM_SUGP1"
# CONFIG_CMD_FLASH is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_SYS_NS16550=y
@@ -6,5 +6,5 @@ CONFIG_SYS_EXTRA_OPTIONS="KM_SUV31"
# CONFIG_CMD_FLASH is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_SYS_NS16550=y
@@ -20,4 +20,4 @@ CONFIG_SH_SDHI=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_NOR_BAR=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
@@ -20,4 +20,4 @@ CONFIG_SH_SDHI=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_NOR_BAR=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
@@ -11,7 +11,7 @@ CONFIG_MTD=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_MTD_DATAFLASH=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -10,7 +10,7 @@ CONFIG_DM=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_FLASH_ATMEL=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -9,7 +9,7 @@ CONFIG_DM=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_FLASH_ATMEL=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
@@ -8,5 +8,5 @@ CONFIG_SYS_EXTRA_OPTIONS="LSCHLV2"
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_SYS_NS16550=y
@@ -8,5 +8,5 @@ CONFIG_SYS_EXTRA_OPTIONS="LSXHL"
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_SYS_NS16550=y
@@ -6,4 +6,4 @@ CONFIG_SPL=y
CONFIG_CMD_GPIO=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
@@ -8,5 +8,5 @@ CONFIG_CMD_GPIO=y
CONFIG_DM=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_SST=y
CONFIG_DM_THERMAL=y
@@ -11,9 +11,9 @@ CONFIG_SPL_OF_TRANSLATE=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_NOR_BAR=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_SPANSION=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_MACRONIX=y
+CONFIG_SPI_NOR_SPANSION=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_DEBUG_UART=y
CONFIG_DEBUG_UART_BASE=0xd0012000
CONFIG_DEBUG_UART_CLOCK=250000000
@@ -6,5 +6,5 @@ CONFIG_SYS_EXTRA_OPTIONS="KM_MGCOGE3UN"
# CONFIG_CMD_FLASH is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_SYS_NS16550=y
@@ -22,9 +22,9 @@ CONFIG_CPU=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_MACRONIX=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_DM_ETH=y
CONFIG_DM_PCI=y
CONFIG_DM_RTC=y
@@ -7,4 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MXS_AUART,MXS_AUART_BASE=MXS_UARTAPP3_BASE,ENV_IS_IN_M
CONFIG_CMD_GPIO=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_SST=y
@@ -7,4 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_MMC"
CONFIG_CMD_GPIO=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_SST=y
@@ -7,4 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_NAND"
CONFIG_CMD_GPIO=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_SST=y
@@ -7,4 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_SPI_FLASH"
CONFIG_CMD_GPIO=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_SST=y
@@ -7,4 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6dl.cfg,MX6
CONFIG_CMD_GPIO=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
@@ -7,4 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6dlsabresd.cfg
CONFIG_CMD_GPIO=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
@@ -5,4 +5,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6qp.cfg,MX6
CONFIG_CMD_GPIO=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
@@ -7,4 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,
CONFIG_CMD_GPIO=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
@@ -8,5 +8,5 @@ CONFIG_CMD_GPIO=y
CONFIG_DM=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_SST=y
CONFIG_DM_THERMAL=y
@@ -7,4 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6q_4x_mt41j128
CONFIG_CMD_GPIO=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
@@ -8,4 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6Q"
CONFIG_CMD_GPIO=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
@@ -9,5 +9,5 @@ CONFIG_CMD_GPIO=y
CONFIG_DM=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_DM_THERMAL=y
@@ -9,5 +9,5 @@ CONFIG_CMD_GPIO=y
CONFIG_DM=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_DM_THERMAL=y
@@ -7,5 +7,5 @@ CONFIG_CMD_GPIO=y
CONFIG_DM=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_DM_THERMAL=y
@@ -9,4 +9,4 @@ CONFIG_CMD_GPIO=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_NOR_BAR=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
@@ -7,5 +7,5 @@ CONFIG_SYS_EXTRA_OPTIONS="NET2BIG_V2"
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_NOR_MACRONIX=y
CONFIG_SYS_NS16550=y
@@ -7,5 +7,5 @@ CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_LITE_V2"
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_NOR_MACRONIX=y
CONFIG_SYS_NS16550=y
@@ -7,5 +7,5 @@ CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MAX_V2"
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_NOR_MACRONIX=y
CONFIG_SYS_NS16550=y
@@ -7,5 +7,5 @@ CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MINI_V2"
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_NOR_MACRONIX=y
CONFIG_SYS_NS16550=y
@@ -7,5 +7,5 @@ CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_V2"
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_NOR_MACRONIX=y
CONFIG_SYS_NS16550=y
@@ -7,4 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl2g.cfg
CONFIG_CMD_GPIO=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_SST=y
@@ -7,4 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,M
CONFIG_CMD_GPIO=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_SST=y
@@ -7,4 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,
CONFIG_CMD_GPIO=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_SST=y
@@ -7,4 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX
CONFIG_CMD_GPIO=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_SST=y
@@ -7,4 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,
CONFIG_CMD_GPIO=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_SST=y
@@ -7,4 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX
CONFIG_CMD_GPIO=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_SST=y
@@ -20,7 +20,7 @@ CONFIG_CROS_EC=y
CONFIG_CROS_EC_SPI=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_SYS_NS16550=y
CONFIG_TEGRA114_SPI=y
CONFIG_TPM_TIS_INFINEON=y
@@ -8,6 +8,6 @@ CONFIG_SYS_PROMPT="U-Boot > "
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_SYS_NS16550=y
@@ -7,7 +7,7 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/bachmann/ot1200/mx6q_4x_mt41j128.cfg,
CONFIG_CMD_GPIO=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_SST=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_MACRONIX=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_SST=y
+CONFIG_SPI_NOR_WINBOND=y
@@ -8,7 +8,7 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
CONFIG_CMD_GPIO=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_SST=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_MACRONIX=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_SST=y
+CONFIG_SPI_NOR_WINBOND=y
@@ -13,7 +13,7 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_NFS is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_SYS_NS16550=y
CONFIG_TEGRA114_SPI=y
CONFIG_USB=y
@@ -13,7 +13,7 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_NFS is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_SYS_NS16550=y
CONFIG_TEGRA114_SPI=y
CONFIG_PCI_TEGRA=y
@@ -13,7 +13,7 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_NFS is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_SYS_NS16550=y
CONFIG_TEGRA114_SPI=y
CONFIG_USB=y
@@ -8,5 +8,5 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_SYS_NS16550=y
@@ -8,5 +8,5 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_SYS_NS16550=y
@@ -23,7 +23,7 @@ CONFIG_CROS_EC_SPI=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_DM_PMIC=y
CONFIG_PMIC_TPS65090=y
CONFIG_DM_REGULATOR=y
@@ -23,7 +23,7 @@ CONFIG_CROS_EC_SPI=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_DM_PMIC=y
CONFIG_PMIC_TPS65090=y
CONFIG_DM_REGULATOR=y
@@ -20,4 +20,4 @@ CONFIG_SH_SDHI=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_NOR_BAR=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
@@ -6,5 +6,5 @@ CONFIG_SYS_EXTRA_OPTIONS="KM_PORTL2"
# CONFIG_CMD_FLASH is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_SYS_NS16550=y
@@ -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_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
CONFIG_LIB_RAND=y
@@ -11,5 +11,5 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_SYS_NS16550=y
@@ -17,8 +17,8 @@ CONFIG_CPU=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_MACRONIX=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_DM_ETH=y
CONFIG_E1000=y
CONFIG_DM_PCI=y
@@ -11,5 +11,5 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_SYS_NS16550=y
@@ -8,5 +8,5 @@ CONFIG_CMD_GPIO=y
CONFIG_DM=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_NOR_SST=y
CONFIG_DM_THERMAL=y
@@ -11,5 +11,5 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_SYS_NS16550=y
@@ -46,11 +46,11 @@ CONFIG_MTD_M25P80=y
CONFIG_SPI_FLASH_ATMEL=y
CONFIG_SPI_FLASH_EON=y
CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_SPANSION=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_SST=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_MACRONIX=y
+CONFIG_SPI_NOR_SPANSION=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_SST=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_DM_ETH=y
CONFIG_DM_PCI=y
CONFIG_PCI_SANDBOX=y
@@ -19,6 +19,6 @@ CONFIG_TARGET_SH7752EVB=y
# CONFIG_CMD_MISC is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_MACRONIX=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_USE_PRIVATE_LIBGCC=y
@@ -18,6 +18,6 @@ CONFIG_TARGET_SH7753EVB=y
# CONFIG_CMD_MISC is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_MACRONIX=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_USE_PRIVATE_LIBGCC=y
@@ -19,5 +19,5 @@ CONFIG_TARGET_SH7757LCR=y
# CONFIG_CMD_MISC is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_USE_PRIVATE_LIBGCC=y
@@ -20,4 +20,4 @@ CONFIG_SH_SDHI=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_NOR_BAR=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
@@ -15,7 +15,7 @@ CONFIG_DM_I2C_COMPAT=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_DM_PMIC=y
CONFIG_DM_PMIC_MAX77686=y
CONFIG_DM_REGULATOR=y
@@ -12,7 +12,7 @@ CONFIG_DM_I2C_COMPAT=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_DM_PMIC=y
CONFIG_DM_REGULATOR=y
CONFIG_EXYNOS_SPI=y
@@ -24,7 +24,7 @@ CONFIG_CROS_EC_I2C=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_DM_PMIC=y
CONFIG_DM_PMIC_MAX77686=y
CONFIG_PMIC_S5M8767=y
@@ -16,8 +16,8 @@ CONFIG_SPL_SIMPLE_BUS=y
CONFIG_DWAPB_GPIO=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_SPANSION=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_DM_ETH=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_SYS_NS16550=y
@@ -16,8 +16,8 @@ CONFIG_SPL_SIMPLE_BUS=y
CONFIG_DWAPB_GPIO=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_SPANSION=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_DM_ETH=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_SYS_NS16550=y
@@ -16,8 +16,8 @@ CONFIG_SPL_SIMPLE_BUS=y
CONFIG_DWAPB_GPIO=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_SPANSION=y
+CONFIG_SPI_NOR_STMICRO=y
# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
CONFIG_DM_ETH=y
CONFIG_ETH_DESIGNWARE=y
@@ -16,8 +16,8 @@ CONFIG_SPL_SIMPLE_BUS=y
CONFIG_DWAPB_GPIO=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_SPANSION=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_DM_ETH=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_SYS_NS16550=y
@@ -24,7 +24,7 @@ CONFIG_CROS_EC_I2C=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_DM_PMIC=y
CONFIG_DM_PMIC_MAX77686=y
CONFIG_PMIC_S5M8767=y
@@ -20,4 +20,4 @@ CONFIG_SH_SDHI=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_NOR_BAR=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
@@ -11,8 +11,8 @@ CONFIG_AUTOBOOT_STOP_STR=" "
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_OF_CONTROL=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_NETDEVICES=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_CADENCE_QSPI=y
@@ -13,5 +13,5 @@ CONFIG_SYS_PROMPT="U-Boot> "
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_USE_TINY_PRINTF=y
@@ -14,7 +14,7 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_NFS is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_SYS_NS16550=y
CONFIG_TEGRA20_SLINK=y
CONFIG_USB=y
@@ -15,8 +15,8 @@ CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_SPL_OF_TRANSLATE=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_MACRONIX=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_DEBUG_UART=y
CONFIG_DEBUG_UART_BASE=0xd0012000
CONFIG_DEBUG_UART_CLOCK=250000000
@@ -15,8 +15,8 @@ CONFIG_CMD_SF=y
CONFIG_SPL_OF_TRANSLATE=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_MACRONIX=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_DEBUG_UART=y
CONFIG_DEBUG_UART_BASE=0xd0012000
CONFIG_DEBUG_UART_CLOCK=250000000
@@ -11,5 +11,5 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_SYS_NS16550=y
@@ -6,4 +6,4 @@ CONFIG_TARGET_TQMA6=y
CONFIG_CMD_GPIO=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
@@ -7,4 +7,4 @@ CONFIG_TQMA6X_SPI_BOOT=y
CONFIG_CMD_GPIO=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
@@ -7,4 +7,4 @@ CONFIG_TQMA6S=y
CONFIG_CMD_GPIO=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
@@ -8,4 +8,4 @@ CONFIG_TQMA6X_SPI_BOOT=y
CONFIG_CMD_GPIO=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
@@ -14,7 +14,7 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_NFS is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_PCI_TEGRA=y
CONFIG_SYS_NS16550=y
CONFIG_TEGRA20_SFLASH=y
@@ -18,5 +18,5 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_NFS is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_NOR_STMICRO=y
CONFIG_SYS_NS16550=y
@@ -14,7 +14,7 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_NFS is not set
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_SYS_NS16550=y
CONFIG_TEGRA114_SPI=y
CONFIG_USB=y
@@ -13,9 +13,9 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_SPL_DM_SEQ_ALIAS=y
-CONFIG_SPI_FLASH_SPANSION=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_SPANSION=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_ZYNQ_GEM=y
CONFIG_ZYNQ_QSPI=y
CONFIG_MTD_M25P80=y
@@ -15,9 +15,9 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_NOR_BAR=y
-CONFIG_SPI_FLASH_SPANSION=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_SPANSION=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_ZYNQ_GEM=y
CONFIG_DEBUG_UART=y
CONFIG_DEBUG_UART_ZYNQ=y
@@ -16,8 +16,8 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_NOR_BAR=y
-CONFIG_SPI_FLASH_SPANSION=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_SPANSION=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_ZYNQ_GEM=y
CONFIG_ZYNQ_QSPI=y
@@ -17,10 +17,10 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_NOR_BAR=y
-CONFIG_SPI_FLASH_SPANSION=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_SST=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_SPANSION=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_SST=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_ZYNQ_GEM=y
CONFIG_ZYNQ_SPI=y
CONFIG_ZYNQ_QSPI=y
@@ -16,8 +16,8 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_NOR_BAR=y
-CONFIG_SPI_FLASH_SPANSION=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_NOR_SPANSION=y
+CONFIG_SPI_NOR_STMICRO=y
+CONFIG_SPI_NOR_WINBOND=y
CONFIG_ZYNQ_GEM=y
CONFIG_ZYNQ_QSPI=y
@@ -15,7 +15,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_SPL_DM_SEQ_ALIAS=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
-CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_NOR_SPANSION=y
CONFIG_ZYNQ_GEM=y
CONFIG_DEBUG_UART=y
CONFIG_DEBUG_UART_ZYNQ=y
@@ -62,27 +62,27 @@ config SPI_NOR_MISC
Add support for various Atmel, EON, ESMT, Everspin, Fujitsu,
GigaDevice, Intel, ISSI, PMC and non-JEDEC SPI NOR flash chips.
-config SPI_FLASH_MACRONIX
+config SPI_NOR_MACRONIX
bool "Macronix SPI flash support"
help
Add support for various Macronix SPI flash chips (MX25Lxxx)
-config SPI_FLASH_SPANSION
+config SPI_NOR_SPANSION
bool "Spansion SPI flash support"
help
Add support for various Spansion SPI flash chips (S25FLxxx)
-config SPI_FLASH_STMICRO
+config SPI_NOR_STMICRO
bool "STMicro SPI flash support"
help
Add support for various STMicro SPI flash chips (M25Pxxx and N25Qxxx)
-config SPI_FLASH_SST
+config SPI_NOR_SST
bool "SST SPI flash support"
help
Add support for various SST SPI flash chips (SST25xxx)
-config SPI_FLASH_WINBOND
+config SPI_NOR_WINBOND
bool "Winbond SPI flash support"
help
Add support for various Winbond SPI flash chips (W25xxx)
@@ -128,7 +128,7 @@ const struct spi_nor_info spi_nor_ids[] = {
{ "is25lp064", INFO(0x9d6017, 0, 64 * 1024, 128, SNOR_READ_BASE, 0) },
{ "is25lp128", INFO(0x9d6018, 0, 64 * 1024, 256, SNOR_READ_BASE, 0) },
#endif
-#ifdef CONFIG_SPI_FLASH_MACRONIX /* MACRONIX */
+#ifdef CONFIG_SPI_NOR_MACRONIX /* MACRONIX */
/* Macronix */
{ "mx25l512e", INFO(0xc22010, 0, 64 * 1024, 1, SNOR_READ_BASE, SECT_4K) },
{ "mx25l2005a", INFO(0xc22012, 0, 64 * 1024, 4, SNOR_READ_BASE, SECT_4K) },
@@ -146,7 +146,7 @@ const struct spi_nor_info spi_nor_ids[] = {
{ "mx66l51235l", INFO(0xc2201a, 0, 64 * 1024, 1024, SNOR_READ_FULL, SNOR_WRITE_QUAD) },
{ "mx66l1g55g", INFO(0xc2261b, 0, 64 * 1024, 2048, SNOR_READ_FULL, SNOR_WRITE_QUAD) },
#endif
-#ifdef CONFIG_SPI_FLASH_STMICRO /* STMICRO */
+#ifdef CONFIG_SPI_NOR_STMICRO /* STMICRO */
/* Micron */
{ "n25q032", INFO(0x20ba16, 0, 64 * 1024, 64, SNOR_READ_FULL, SNOR_WRITE_QUAD) },
{ "n25q064", INFO(0x20ba17, 0, 64 * 1024, 128, SNOR_READ_FULL, SNOR_WRITE_QUAD | SECT_4K) },
@@ -164,7 +164,7 @@ const struct spi_nor_info spi_nor_ids[] = {
{ "pm25lv010", INFO(0, 0, 32 * 1024, 4, SNOR_READ_BASE, SECT_4K_PMC) },
{ "pm25lq032", INFO(0x7f9d46, 0, 64 * 1024, 64, SNOR_READ_BASE, SECT_4K) },
#endif
-#ifdef CONFIG_SPI_FLASH_SPANSION /* SPANSION */
+#ifdef CONFIG_SPI_NOR_SPANSION /* SPANSION */
/* Spansion -- single (large) sector size only, at least
* for the chips listed here (without boot sectors).
*/
@@ -193,7 +193,7 @@ const struct spi_nor_info spi_nor_ids[] = {
{ "s25fl164k", INFO(0x014017, 0, 64 * 1024, 128, SNOR_READ_BASE, SECT_4K) },
{ "s25fl204k", INFO(0x014013, 0, 64 * 1024, 8, SNOR_READ_BASE, SECT_4K) },
#endif
-#ifdef CONFIG_SPI_FLASH_SST /* SST */
+#ifdef CONFIG_SPI_NOR_SST /* SST */
/* SST -- large erase sizes are "overlays", "sectors" are 4K */
{ "sst25vf040b", INFO(0xbf258d, 0, 64 * 1024, 8, SNOR_READ_BASE, SECT_4K | SST_WRITE) },
{ "sst25vf080b", INFO(0xbf258e, 0, 64 * 1024, 16, SNOR_READ_BASE, SECT_4K | SST_WRITE) },
@@ -209,7 +209,7 @@ const struct spi_nor_info spi_nor_ids[] = {
{ "sst25wf040", INFO(0xbf2504, 0, 64 * 1024, 8, SNOR_READ_BASE, SECT_4K | SST_WRITE) },
{ "sst25wf080", INFO(0xbf2505, 0, 64 * 1024, 16, SNOR_READ_BASE, SECT_4K | SST_WRITE) },
#endif
-#ifdef CONFIG_SPI_FLASH_STMICRO /* STMICRO */
+#ifdef CONFIG_SPI_NOR_STMICRO /* STMICRO */
/* ST Microelectronics -- newer production may have feature updates */
{ "m25p05", INFO(0x202010, 0, 32 * 1024, 2, SNOR_READ_BASE, 0) },
{ "m25p10", INFO(0x202011, 0, 32 * 1024, 4, SNOR_READ_BASE, 0) },
@@ -246,7 +246,7 @@ const struct spi_nor_info spi_nor_ids[] = {
{ "m25px64", INFO(0x207117, 0, 64 * 1024, 128, SNOR_READ_BASE, 0) },
{ "m25px80", INFO(0x207114, 0, 64 * 1024, 16, SNOR_READ_BASE, 0) },
#endif
-#ifdef CONFIG_SPI_FLASH_WINBOND /* WINBOND */
+#ifdef CONFIG_SPI_NOR_WINBOND /* WINBOND */
/* Winbond -- w25x "blocks" are 64K, "sectors" are 4KiB */
{ "W25P80", INFO(0xef2014, 0, 64 * 1024, 16, SNOR_READ_BASE, 0) },
{ "W25P16", INFO(0xef2015, 0, 64 * 1024, 32, SNOR_READ_BASE, 0) },
@@ -74,7 +74,7 @@ static int write_sr(struct spi_nor *nor, u8 ws)
return nor->write_reg(nor, SNOR_OP_WRSR, nor->cmd_buf, 1);
}
-#if defined(CONFIG_SPI_FLASH_SPANSION) || defined(CONFIG_SPI_FLASH_WINBOND)
+#if defined(CONFIG_SPI_NOR_SPANSION) || defined(CONFIG_SPI_NOR_WINBOND)
static int read_cr(struct spi_nor *nor)
{
u8 cr;
@@ -104,7 +104,7 @@ static int write_sr_cr(struct spi_nor *nor, u16 val)
}
#endif
-#ifdef CONFIG_SPI_FLASH_STMICRO
+#ifdef CONFIG_SPI_NOR_STMICRO
static int read_evcr(struct spi_nor *nor)
{
u8 evcr;
@@ -264,7 +264,7 @@ static void spi_nor_dual(struct spi_nor *nor, u32 *addr)
}
#endif
-#if defined(CONFIG_SPI_FLASH_STMICRO) || defined(CONFIG_SPI_FLASH_SST)
+#if defined(CONFIG_SPI_NOR_STMICRO) || defined(CONFIG_SPI_NOR_SST)
static void stm_get_locked_range(struct spi_nor *nor, u8 sr, loff_t *ofs,
uint64_t *len)
{
@@ -676,7 +676,7 @@ static int spi_nor_read(struct mtd_info *mtd, loff_t from, size_t len,
return ret;
}
-#ifdef CONFIG_SPI_FLASH_SST
+#ifdef CONFIG_SPI_NOR_SST
static int sst_byte_write(struct spi_nor *nor, u32 offset,
const void *buf, size_t *retlen)
{
@@ -784,7 +784,7 @@ static int sst_write_bp(struct mtd_info *mtd, loff_t offset, size_t len,
}
#endif
-#ifdef CONFIG_SPI_FLASH_MACRONIX
+#ifdef CONFIG_SPI_NOR_MACRONIX
static int macronix_quad_enable(struct spi_nor *nor)
{
int ret, val;
@@ -815,7 +815,7 @@ static int macronix_quad_enable(struct spi_nor *nor)
}
#endif
-#if defined(CONFIG_SPI_FLASH_SPANSION) || defined(CONFIG_SPI_FLASH_WINBOND)
+#if defined(CONFIG_SPI_NOR_SPANSION) || defined(CONFIG_SPI_NOR_WINBOND)
static int spansion_quad_enable(struct spi_nor *nor)
{
int ret, val;
@@ -847,7 +847,7 @@ static int spansion_quad_enable(struct spi_nor *nor)
}
#endif
-#ifdef CONFIG_SPI_FLASH_STMICRO
+#ifdef CONFIG_SPI_NOR_STMICRO
static int micron_quad_enable(struct spi_nor *nor)
{
int ret, val;
@@ -877,16 +877,16 @@ static int micron_quad_enable(struct spi_nor *nor)
static int set_quad_mode(struct spi_nor *nor, const struct spi_nor_info *info)
{
switch (JEDEC_MFR(info)) {
-#ifdef CONFIG_SPI_FLASH_MACRONIX
+#ifdef CONFIG_SPI_NOR_MACRONIX
case SNOR_MFR_MACRONIX:
return macronix_quad_enable(nor);
#endif
-#if defined(CONFIG_SPI_FLASH_SPANSION) || defined(CONFIG_SPI_FLASH_WINBOND)
+#if defined(CONFIG_SPI_NOR_SPANSION) || defined(CONFIG_SPI_NOR_WINBOND)
case SNOR_MFR_SPANSION:
case SNOR_MFR_WINBOND:
return spansion_quad_enable(nor);
#endif
-#ifdef CONFIG_SPI_FLASH_STMICRO
+#ifdef CONFIG_SPI_NOR_STMICRO
case SNOR_MFR_MICRON:
return micron_quad_enable(nor);
#endif
@@ -985,7 +985,7 @@ int spi_nor_scan(struct spi_nor *nor)
nor->flags |= SNOR_F_SST_WRITE;
mtd->_write = spi_nor_write;
-#if defined(CONFIG_SPI_FLASH_SST)
+#if defined(CONFIG_SPI_NOR_SST)
if (nor->flags & SNOR_F_SST_WRITE) {
if (nor->mode & SNOR_WRITE_1_1_BYTE)
mtd->_write = sst_write_bp;
@@ -994,7 +994,7 @@ int spi_nor_scan(struct spi_nor *nor)
}
#endif
-#if defined(CONFIG_SPI_FLASH_STMICRO) || defined(CONFIG_SPI_FLASH_SST)
+#if defined(CONFIG_SPI_NOR_STMICRO) || defined(CONFIG_SPI_NOR_SST)
/* NOR protection support for STmicro/Micron chips and similar */
if (JEDEC_MFR(info) == SNOR_MFR_MICRON ||
JEDEC_MFR(info) == SNOR_MFR_SST) {
@@ -44,8 +44,8 @@
#define CONFIG_CMD_SF
#define CONFIG_MTD_SPI_NOR
#define CONFIG_MTD_M25P80
-#define CONFIG_SPI_FLASH_STMICRO
-#define CONFIG_SPI_FLASH_SST
+#define CONFIG_SPI_NOR_STMICRO
+#define CONFIG_SPI_NOR_SST
#define CONFIG_MXC_SPI
#define CONFIG_SF_DEFAULT_BUS 0
#define CONFIG_SF_DEFAULT_SPEED 20000000
@@ -52,7 +52,7 @@
/* SPI NOR flash default params, used by sf commands */
#define CONFIG_SF_DEFAULT_SPEED 1000000
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_3
-#define CONFIG_SPI_FLASH_STMICRO
+#define CONFIG_SPI_NOR_STMICRO
/*
* SDIO/MMC Card Configuration
@@ -204,8 +204,8 @@
#ifdef CONFIG_FSL_DSPI
#define CONFIG_CMD_SF
#define CONFIG_DM_SPI_FLASH
-#define CONFIG_SPI_FLASH_STMICRO /* cs0 */
-#define CONFIG_SPI_FLASH_SST /* cs1 */
+#define CONFIG_SPI_NOR_STMICRO /* cs0 */
+#define CONFIG_SPI_NOR_SST /* cs1 */
#define CONFIG_SPI_FLASH_EON /* cs2 */
#if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI)
#define CONFIG_SF_DEFAULT_BUS 1
@@ -373,7 +373,7 @@ unsigned long get_board_ddr_clk(void);
#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
#define CONFIG_FSL_QSPI
#ifdef CONFIG_FSL_QSPI
-#define CONFIG_SPI_FLASH_SPANSION
+#define CONFIG_SPI_NOR_SPANSION
#define FSL_QSPI_FLASH_SIZE (1 << 24)
#define FSL_QSPI_FLASH_NUM 2
#endif
@@ -204,7 +204,7 @@
#define CONFIG_SF_DEFAULT_CS 0
#define CONFIG_SF_DEFAULT_SPEED 40000000
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
-#define CONFIG_SPI_FLASH_STMICRO
+#define CONFIG_SPI_NOR_STMICRO
#define FSL_QSPI_FLASH_NUM 1
#define FSL_QSPI_FLASH_SIZE SZ_32M
#endif
@@ -265,7 +265,7 @@
#define CONFIG_CMD_SF
#define CONFIG_MTD_SPI_NOR
#define CONFIG_MTD_M25P80
-#define CONFIG_SPI_FLASH_MACRONIX
+#define CONFIG_SPI_NOR_MACRONIX
#define CONFIG_SPI_NOR_BAR
#define CONFIG_SF_DEFAULT_BUS 0
#define CONFIG_SF_DEFAULT_CS 0
- CONFIG_SPI_FLASH_MACRONIX => CONFIG_SPI_NOR_MACRONIX - CONFIG_SPI_FLASH_STMICRO => CONFIG_SPI_NOR_STMICRO - CONFIG_SPI_FLASH_SPANSION => CONFIG_SPI_NOR_SPANSION - CONFIG_SPI_FLASH_SST => CONFIG_SPI_NOR_SST - CONFIG_SPI_FLASH_WINBOND => CONFIG_SPI_NOR_WINBOND 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/B4420QDS_NAND_defconfig | 2 +- configs/B4420QDS_SPIFLASH_defconfig | 2 +- configs/B4420QDS_defconfig | 2 +- configs/B4860QDS_NAND_defconfig | 2 +- configs/B4860QDS_SECURE_BOOT_defconfig | 2 +- configs/B4860QDS_SPIFLASH_defconfig | 2 +- configs/B4860QDS_SRIO_PCIE_BOOT_defconfig | 2 +- configs/B4860QDS_defconfig | 2 +- configs/BSC9131RDB_NAND_SYSCLK100_defconfig | 2 +- configs/BSC9131RDB_NAND_defconfig | 2 +- configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig | 2 +- configs/BSC9131RDB_SPIFLASH_defconfig | 2 +- configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig | 2 +- configs/BSC9132QDS_NAND_DDRCLK100_defconfig | 2 +- configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig | 2 +- configs/BSC9132QDS_NAND_DDRCLK133_defconfig | 2 +- configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig | 2 +- configs/BSC9132QDS_NOR_DDRCLK100_defconfig | 2 +- configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig | 2 +- configs/BSC9132QDS_NOR_DDRCLK133_defconfig | 2 +- .../BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig | 2 +- configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig | 2 +- .../BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig | 2 +- configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig | 2 +- .../BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig | 2 +- configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig | 2 +- .../BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig | 2 +- configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig | 2 +- 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/M52277EVB_defconfig | 2 +- configs/M52277EVB_stmicro_defconfig | 2 +- configs/M54451EVB_defconfig | 2 +- configs/M54451EVB_stmicro_defconfig | 2 +- configs/M54455EVB_a66_defconfig | 2 +- configs/M54455EVB_defconfig | 2 +- configs/M54455EVB_i66_defconfig | 2 +- configs/M54455EVB_intel_defconfig | 2 +- configs/M54455EVB_stm33_defconfig | 2 +- configs/MPC8536DS_36BIT_defconfig | 2 +- configs/MPC8536DS_SDCARD_defconfig | 2 +- configs/MPC8536DS_SPIFLASH_defconfig | 2 +- configs/MPC8536DS_defconfig | 2 +- configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig | 2 +- configs/P1010RDB-PA_36BIT_NAND_defconfig | 2 +- configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig | 2 +- configs/P1010RDB-PA_36BIT_NOR_defconfig | 2 +- configs/P1010RDB-PA_36BIT_SDCARD_defconfig | 2 +- .../P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig | 2 +- configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig | 2 +- configs/P1010RDB-PA_NAND_SECBOOT_defconfig | 2 +- configs/P1010RDB-PA_NAND_defconfig | 2 +- configs/P1010RDB-PA_NOR_SECBOOT_defconfig | 2 +- configs/P1010RDB-PA_NOR_defconfig | 2 +- configs/P1010RDB-PA_SDCARD_defconfig | 2 +- configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig | 2 +- configs/P1010RDB-PA_SPIFLASH_defconfig | 2 +- configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig | 2 +- configs/P1010RDB-PB_36BIT_NAND_defconfig | 2 +- configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig | 2 +- configs/P1010RDB-PB_36BIT_NOR_defconfig | 2 +- configs/P1010RDB-PB_36BIT_SDCARD_defconfig | 2 +- .../P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig | 2 +- configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig | 2 +- configs/P1010RDB-PB_NAND_SECBOOT_defconfig | 2 +- configs/P1010RDB-PB_NAND_defconfig | 2 +- configs/P1010RDB-PB_NOR_SECBOOT_defconfig | 2 +- configs/P1010RDB-PB_NOR_defconfig | 2 +- configs/P1010RDB-PB_SDCARD_defconfig | 2 +- configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig | 2 +- configs/P1010RDB-PB_SPIFLASH_defconfig | 2 +- configs/P1020RDB-PC_36BIT_NAND_defconfig | 2 +- configs/P1020RDB-PC_36BIT_SDCARD_defconfig | 2 +- configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig | 2 +- configs/P1020RDB-PC_36BIT_defconfig | 2 +- configs/P1020RDB-PC_NAND_defconfig | 2 +- configs/P1020RDB-PC_SDCARD_defconfig | 2 +- configs/P1020RDB-PC_SPIFLASH_defconfig | 2 +- configs/P1020RDB-PC_defconfig | 2 +- configs/P1020RDB-PD_NAND_defconfig | 2 +- configs/P1020RDB-PD_SDCARD_defconfig | 2 +- configs/P1020RDB-PD_SPIFLASH_defconfig | 2 +- configs/P1020RDB-PD_defconfig | 2 +- configs/P1021RDB-PC_36BIT_NAND_defconfig | 2 +- configs/P1021RDB-PC_36BIT_SDCARD_defconfig | 2 +- configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig | 2 +- configs/P1021RDB-PC_36BIT_defconfig | 2 +- configs/P1021RDB-PC_NAND_defconfig | 2 +- configs/P1021RDB-PC_SDCARD_defconfig | 2 +- configs/P1021RDB-PC_SPIFLASH_defconfig | 2 +- configs/P1021RDB-PC_defconfig | 2 +- configs/P1022DS_36BIT_NAND_defconfig | 2 +- configs/P1022DS_36BIT_SDCARD_defconfig | 2 +- configs/P1022DS_36BIT_SPIFLASH_defconfig | 2 +- configs/P1022DS_36BIT_defconfig | 2 +- configs/P1022DS_NAND_defconfig | 2 +- configs/P1022DS_SDCARD_defconfig | 2 +- configs/P1022DS_SPIFLASH_defconfig | 2 +- configs/P1022DS_defconfig | 2 +- configs/P1024RDB_36BIT_defconfig | 2 +- configs/P1024RDB_NAND_defconfig | 2 +- configs/P1024RDB_SDCARD_defconfig | 2 +- configs/P1024RDB_SPIFLASH_defconfig | 2 +- configs/P1024RDB_defconfig | 2 +- configs/P1025RDB_36BIT_defconfig | 2 +- configs/P1025RDB_NAND_defconfig | 2 +- configs/P1025RDB_SDCARD_defconfig | 2 +- configs/P1025RDB_SPIFLASH_defconfig | 2 +- configs/P1025RDB_defconfig | 2 +- configs/P2020RDB-PC_36BIT_NAND_defconfig | 2 +- configs/P2020RDB-PC_36BIT_SDCARD_defconfig | 2 +- configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig | 2 +- configs/P2020RDB-PC_36BIT_defconfig | 2 +- configs/P2020RDB-PC_NAND_defconfig | 2 +- configs/P2020RDB-PC_SDCARD_defconfig | 2 +- configs/P2020RDB-PC_SPIFLASH_defconfig | 2 +- configs/P2020RDB-PC_defconfig | 2 +- configs/P2041RDB_NAND_defconfig | 2 +- configs/P2041RDB_SDCARD_defconfig | 2 +- configs/P2041RDB_SECURE_BOOT_defconfig | 2 +- configs/P2041RDB_SPIFLASH_defconfig | 2 +- configs/P2041RDB_SRIO_PCIE_BOOT_defconfig | 2 +- configs/P2041RDB_defconfig | 2 +- configs/P3041DS_NAND_SECURE_BOOT_defconfig | 2 +- configs/P3041DS_NAND_defconfig | 2 +- configs/P3041DS_SDCARD_defconfig | 2 +- configs/P3041DS_SECURE_BOOT_defconfig | 2 +- configs/P3041DS_SPIFLASH_defconfig | 2 +- configs/P3041DS_SRIO_PCIE_BOOT_defconfig | 2 +- configs/P3041DS_defconfig | 2 +- configs/P4080DS_SDCARD_defconfig | 2 +- configs/P4080DS_SECURE_BOOT_defconfig | 2 +- configs/P4080DS_SPIFLASH_defconfig | 2 +- configs/P4080DS_SRIO_PCIE_BOOT_defconfig | 2 +- configs/P4080DS_defconfig | 2 +- configs/P5020DS_NAND_SECURE_BOOT_defconfig | 2 +- configs/P5020DS_NAND_defconfig | 2 +- configs/P5020DS_SDCARD_defconfig | 2 +- configs/P5020DS_SECURE_BOOT_defconfig | 2 +- configs/P5020DS_SPIFLASH_defconfig | 2 +- configs/P5020DS_SRIO_PCIE_BOOT_defconfig | 2 +- configs/P5020DS_defconfig | 2 +- configs/P5040DS_NAND_SECURE_BOOT_defconfig | 2 +- configs/P5040DS_NAND_defconfig | 2 +- configs/P5040DS_SDCARD_defconfig | 2 +- configs/P5040DS_SECURE_BOOT_defconfig | 2 +- configs/P5040DS_SPIFLASH_defconfig | 2 +- configs/P5040DS_defconfig | 2 +- configs/T1023RDB_NAND_defconfig | 2 +- configs/T1023RDB_SDCARD_defconfig | 2 +- configs/T1023RDB_SECURE_BOOT_defconfig | 2 +- configs/T1023RDB_SPIFLASH_defconfig | 2 +- configs/T1023RDB_defconfig | 2 +- configs/T1024QDS_DDR4_SECURE_BOOT_defconfig | 4 ++-- configs/T1024QDS_DDR4_defconfig | 4 ++-- configs/T1024QDS_NAND_defconfig | 4 ++-- configs/T1024QDS_SDCARD_defconfig | 4 ++-- configs/T1024QDS_SECURE_BOOT_defconfig | 4 ++-- configs/T1024QDS_SPIFLASH_defconfig | 4 ++-- configs/T1024QDS_defconfig | 4 ++-- configs/T1024RDB_NAND_defconfig | 2 +- configs/T1024RDB_SDCARD_defconfig | 2 +- configs/T1024RDB_SECURE_BOOT_defconfig | 2 +- configs/T1024RDB_SPIFLASH_defconfig | 2 +- configs/T1024RDB_defconfig | 2 +- configs/T1040D4RDB_NAND_defconfig | 2 +- configs/T1040D4RDB_SDCARD_defconfig | 2 +- configs/T1040D4RDB_SECURE_BOOT_defconfig | 2 +- configs/T1040D4RDB_SPIFLASH_defconfig | 2 +- configs/T1040D4RDB_defconfig | 2 +- configs/T1040QDS_DDR4_defconfig | 4 ++-- configs/T1040QDS_SECURE_BOOT_defconfig | 4 ++-- configs/T1040QDS_defconfig | 4 ++-- configs/T1040RDB_NAND_defconfig | 2 +- configs/T1040RDB_SDCARD_defconfig | 2 +- configs/T1040RDB_SECURE_BOOT_defconfig | 2 +- configs/T1040RDB_SPIFLASH_defconfig | 2 +- configs/T1040RDB_defconfig | 2 +- configs/T1042D4RDB_NAND_defconfig | 2 +- configs/T1042D4RDB_SDCARD_defconfig | 2 +- configs/T1042D4RDB_SECURE_BOOT_defconfig | 2 +- configs/T1042D4RDB_SPIFLASH_defconfig | 2 +- configs/T1042D4RDB_defconfig | 2 +- configs/T1042RDB_PI_NAND_defconfig | 2 +- configs/T1042RDB_PI_SDCARD_defconfig | 2 +- configs/T1042RDB_PI_SPIFLASH_defconfig | 2 +- configs/T1042RDB_PI_defconfig | 2 +- configs/T1042RDB_SECURE_BOOT_defconfig | 2 +- configs/T1042RDB_defconfig | 2 +- configs/T2080QDS_NAND_defconfig | 4 ++-- configs/T2080QDS_SDCARD_defconfig | 4 ++-- configs/T2080QDS_SECURE_BOOT_defconfig | 4 ++-- configs/T2080QDS_SPIFLASH_defconfig | 4 ++-- configs/T2080QDS_SRIO_PCIE_BOOT_defconfig | 4 ++-- configs/T2080QDS_defconfig | 4 ++-- configs/T2080RDB_NAND_defconfig | 2 +- configs/T2080RDB_SDCARD_defconfig | 2 +- configs/T2080RDB_SECURE_BOOT_defconfig | 2 +- configs/T2080RDB_SPIFLASH_defconfig | 2 +- configs/T2080RDB_SRIO_PCIE_BOOT_defconfig | 2 +- configs/T2080RDB_defconfig | 2 +- configs/T2081QDS_NAND_defconfig | 4 ++-- configs/T2081QDS_SDCARD_defconfig | 4 ++-- configs/T2081QDS_SPIFLASH_defconfig | 4 ++-- configs/T2081QDS_SRIO_PCIE_BOOT_defconfig | 4 ++-- configs/T2081QDS_defconfig | 4 ++-- configs/T4160QDS_NAND_defconfig | 2 +- configs/T4160QDS_SDCARD_defconfig | 2 +- configs/T4160QDS_SECURE_BOOT_defconfig | 2 +- configs/T4160QDS_defconfig | 2 +- configs/T4160RDB_defconfig | 2 +- configs/T4240QDS_NAND_defconfig | 2 +- configs/T4240QDS_SDCARD_defconfig | 2 +- configs/T4240QDS_SECURE_BOOT_defconfig | 2 +- configs/T4240QDS_SRIO_PCIE_BOOT_defconfig | 2 +- configs/T4240QDS_defconfig | 2 +- configs/T4240RDB_SDCARD_defconfig | 2 +- configs/T4240RDB_defconfig | 2 +- configs/UCP1020_SPIFLASH_defconfig | 6 +++--- configs/UCP1020_defconfig | 6 +++--- configs/alt_defconfig | 2 +- configs/am335x_boneblack_defconfig | 2 +- configs/am335x_boneblack_vboot_defconfig | 2 +- configs/am335x_evm_defconfig | 2 +- configs/am335x_evm_nor_defconfig | 2 +- configs/am335x_evm_norboot_defconfig | 2 +- configs/am335x_evm_spiboot_defconfig | 2 +- configs/am335x_evm_usbspl_defconfig | 2 +- configs/am335x_gp_evm_defconfig | 2 +- configs/am437x_gp_evm_defconfig | 2 +- configs/am437x_sk_evm_defconfig | 2 +- configs/am43xx_evm_defconfig | 2 +- configs/am43xx_evm_ethboot_defconfig | 2 +- configs/am43xx_evm_qspiboot_defconfig | 2 +- configs/am43xx_evm_usbhost_boot_defconfig | 2 +- configs/aristainetos2_defconfig | 2 +- configs/aristainetos2b_defconfig | 2 +- configs/aristainetos_defconfig | 2 +- configs/axm_defconfig | 2 +- configs/bayleybay_defconfig | 4 ++-- configs/beaver_defconfig | 2 +- configs/bf518f-ezbrd_defconfig | 4 ++-- configs/bf526-ezbrd_defconfig | 2 +- configs/bf527-ad7160-eval_defconfig | 2 +- configs/bf527-ezkit-v2_defconfig | 2 +- configs/bf527-ezkit_defconfig | 2 +- configs/bf527-sdp_defconfig | 10 ++++----- configs/bf537-minotaur_defconfig | 2 +- configs/bf537-pnav_defconfig | 2 +- configs/bf537-srv1_defconfig | 2 +- configs/bf537-stamp_defconfig | 10 ++++----- configs/bf548-ezkit_defconfig | 2 +- configs/bf609-ezkit_defconfig | 10 ++++----- configs/bg0900_defconfig | 2 +- configs/birdland_bav335a_defconfig | 2 +- configs/birdland_bav335b_defconfig | 2 +- configs/blackstamp_defconfig | 2 +- configs/blackvme_defconfig | 2 +- configs/br4_defconfig | 2 +- configs/cardhu_defconfig | 2 +- configs/chromebook_link_defconfig | 4 ++-- configs/chromebox_panther_defconfig | 4 ++-- configs/cm_fx6_defconfig | 10 ++++----- .../controlcenterd_36BIT_SDCARD_DEVELOP_defconfig | 2 +- configs/controlcenterd_36BIT_SDCARD_defconfig | 2 +- configs/coreboot-x86_defconfig | 4 ++-- configs/crownbay_defconfig | 6 +++--- configs/d2net_v2_defconfig | 2 +- configs/da850_am18xxevm_defconfig | 4 ++-- configs/da850evm_defconfig | 4 ++-- configs/da850evm_direct_nor_defconfig | 4 ++-- configs/dalmore_defconfig | 2 +- configs/db-88f6820-gp_defconfig | 4 ++-- configs/db-mv784mp-gp_defconfig | 4 ++-- configs/dra72_evm_defconfig | 2 +- configs/dra74_evm_defconfig | 2 +- configs/dra7xx_evm_defconfig | 2 +- configs/dra7xx_evm_qspiboot_defconfig | 2 +- configs/dra7xx_evm_uart3_defconfig | 2 +- configs/draco_defconfig | 2 +- configs/dreamplug_defconfig | 2 +- configs/ds414_defconfig | 2 +- configs/e2220-1170_defconfig | 2 +- configs/ea20_defconfig | 2 +- configs/galileo_defconfig | 4 ++-- configs/gose_defconfig | 2 +- configs/gplugd_defconfig | 2 +- configs/inetspace_v2_defconfig | 2 +- configs/ip04_defconfig | 4 ++-- configs/jetson-tk1_defconfig | 2 +- configs/k2e_evm_defconfig | 2 +- configs/k2g_evm_defconfig | 2 +- configs/k2hk_evm_defconfig | 2 +- configs/k2l_evm_defconfig | 2 +- configs/km_kirkwood_128m16_defconfig | 2 +- configs/km_kirkwood_defconfig | 2 +- configs/km_kirkwood_pci_defconfig | 2 +- configs/kmcoge4_defconfig | 4 ++-- configs/kmcoge5un_defconfig | 2 +- configs/kmlion1_defconfig | 4 ++-- configs/kmnusa_defconfig | 2 +- configs/kmsugp1_defconfig | 2 +- configs/kmsuv31_defconfig | 2 +- configs/koelsch_defconfig | 2 +- configs/lager_defconfig | 2 +- configs/ls1021aqds_qspi_defconfig | 2 +- configs/ls1021atwr_qspi_defconfig | 2 +- configs/ls1021atwr_sdcard_qspi_defconfig | 2 +- configs/lschlv2_defconfig | 2 +- configs/lsxhl_defconfig | 2 +- configs/m28evk_defconfig | 2 +- configs/marsboard_defconfig | 2 +- configs/maxbcm_defconfig | 6 +++--- configs/mgcoge3un_defconfig | 2 +- configs/minnowmax_defconfig | 6 +++--- configs/mx28evk_auart_console_defconfig | 2 +- configs/mx28evk_defconfig | 2 +- configs/mx28evk_nand_defconfig | 2 +- configs/mx28evk_spi_defconfig | 2 +- configs/mx6dlsabreauto_defconfig | 2 +- configs/mx6dlsabresd_defconfig | 2 +- configs/mx6qpsabreauto_defconfig | 2 +- configs/mx6qsabreauto_defconfig | 2 +- configs/mx6qsabrelite_defconfig | 2 +- configs/mx6qsabresd_defconfig | 2 +- configs/mx6sabresd_spl_defconfig | 2 +- configs/mx6slevk_defconfig | 2 +- configs/mx6slevk_spinor_defconfig | 2 +- configs/mx6slevk_spl_defconfig | 2 +- configs/mx6sxsabreauto_defconfig | 2 +- configs/net2big_v2_defconfig | 2 +- configs/netspace_lite_v2_defconfig | 2 +- configs/netspace_max_v2_defconfig | 2 +- configs/netspace_mini_v2_defconfig | 2 +- configs/netspace_v2_defconfig | 2 +- configs/nitrogen6dl2g_defconfig | 2 +- configs/nitrogen6dl_defconfig | 2 +- configs/nitrogen6q2g_defconfig | 2 +- configs/nitrogen6q_defconfig | 2 +- configs/nitrogen6s1g_defconfig | 2 +- configs/nitrogen6s_defconfig | 2 +- configs/nyan-big_defconfig | 2 +- configs/omapl138_lcdk_defconfig | 4 ++-- configs/ot1200_defconfig | 8 ++++---- configs/ot1200_spl_defconfig | 8 ++++---- configs/p2371-0000_defconfig | 2 +- configs/p2371-2180_defconfig | 2 +- configs/p2571_defconfig | 2 +- configs/pcm051_rev1_defconfig | 2 +- configs/pcm051_rev3_defconfig | 2 +- configs/peach-pi_defconfig | 2 +- configs/peach-pit_defconfig | 2 +- configs/porter_defconfig | 2 +- configs/portl2_defconfig | 2 +- configs/pr1_defconfig | 2 +- configs/pxm2_defconfig | 2 +- configs/qemu-x86_defconfig | 4 ++-- configs/rastaban_defconfig | 2 +- configs/riotboard_defconfig | 2 +- configs/rut_defconfig | 2 +- configs/sandbox_defconfig | 10 ++++----- configs/sh7752evb_defconfig | 4 ++-- configs/sh7753evb_defconfig | 4 ++-- configs/sh7757lcr_defconfig | 2 +- configs/silk_defconfig | 2 +- configs/smdk5250_defconfig | 2 +- configs/smdk5420_defconfig | 2 +- configs/snow_defconfig | 2 +- configs/socfpga_arria5_defconfig | 4 ++-- configs/socfpga_cyclone5_defconfig | 4 ++-- configs/socfpga_sockit_defconfig | 4 ++-- configs/socfpga_socrates_defconfig | 4 ++-- configs/spring_defconfig | 2 +- configs/stout_defconfig | 2 +- configs/stv0991_defconfig | 4 ++-- configs/taurus_defconfig | 2 +- configs/tec-ng_defconfig | 2 +- configs/theadorable_debug_defconfig | 4 ++-- configs/theadorable_defconfig | 4 ++-- configs/thuban_defconfig | 2 +- configs/tqma6q_mba6_mmc_defconfig | 2 +- configs/tqma6q_mba6_spi_defconfig | 2 +- configs/tqma6s_mba6_mmc_defconfig | 2 +- configs/tqma6s_mba6_spi_defconfig | 2 +- configs/trimslice_defconfig | 2 +- configs/tseries_spi_defconfig | 2 +- configs/venice2_defconfig | 2 +- configs/zynq_microzed_defconfig | 6 +++--- configs/zynq_zc702_defconfig | 6 +++--- configs/zynq_zc706_defconfig | 6 +++--- configs/zynq_zc770_xm010_defconfig | 8 ++++---- configs/zynq_zed_defconfig | 6 +++--- configs/zynq_zybo_defconfig | 2 +- drivers/mtd/spi-nor/Kconfig | 10 ++++----- drivers/mtd/spi-nor/spi-nor-ids.c | 12 +++++------ drivers/mtd/spi-nor/spi-nor.c | 24 +++++++++++----------- include/configs/cgtqmx6eval.h | 4 ++-- include/configs/clearfog.h | 2 +- include/configs/ls1043a_common.h | 4 ++-- include/configs/ls1043aqds.h | 2 +- include/configs/mx6ul_14x14_evk.h | 2 +- include/configs/mx7dsabresd.h | 2 +- 405 files changed, 520 insertions(+), 520 deletions(-)