Convert CONFIG_ENV_SPI_* to Kconfig

This converts the following to Kconfig:
  CONFIG_ENV_SPI_BUS
  CONFIG_ENV_SPI_CS
  CONFIG_ENV_SPI_MAX_HZ
  CONFIG_ENV_SPI_MODE

Most of time these value are not needed, CONFIG_SF_DEFAULT
with same value is used, so I introduced CONFIG_USE_ENV_SPI_*
to force the associated value for the environment.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>

diff --git a/arch/arm/mach-kirkwood/include/mach/config.h b/arch/arm/mach-kirkwood/include/mach/config.h
index aea60688c2d3c3f3d5c2548cfbd6519506f925b1..893bd3f7634a056ee6b38445bede78537e5117ed 100644 (file)
--- a/arch/arm/mach-kirkwood/include/mach/config.h
+++ b/arch/arm/mach-kirkwood/include/mach/config.h
@@ -60,21 +60,6 @@
 #define NAND_ALLOW_ERASE_ALL           1
 #endif
 
-/*
- * SPI Flash configuration
- */
-#ifdef CONFIG_CMD_SF
-#ifndef CONFIG_ENV_SPI_BUS
-# define CONFIG_ENV_SPI_BUS            0
-#endif
-#ifndef CONFIG_ENV_SPI_CS
-# define CONFIG_ENV_SPI_CS             0
-#endif
-#ifndef CONFIG_ENV_SPI_MAX_HZ
-# define CONFIG_ENV_SPI_MAX_HZ         50000000
-#endif
-#endif
-
 /*
  * Ethernet Driver configuration
  */

diff --git a/arch/arm/mach-mvebu/include/mach/config.h b/arch/arm/mach-mvebu/include/mach/config.h
index e3235fc67ecdac3c5cca951dc6268456b6d08f4b..71c4f70efc9e56b0cde72e5b636f735ed9cee539 100644 (file)
--- a/arch/arm/mach-mvebu/include/mach/config.h
+++ b/arch/arm/mach-mvebu/include/mach/config.h
@@ -45,21 +45,6 @@
 
 #define MV_UART_CONSOLE_BASE           MVEBU_UART0_BASE
 
-/*
- * SPI Flash configuration
- */
-#ifdef CONFIG_CMD_SF
-#ifndef CONFIG_ENV_SPI_BUS
-# define CONFIG_ENV_SPI_BUS            0
-#endif
-#ifndef CONFIG_ENV_SPI_CS
-# define CONFIG_ENV_SPI_CS             0
-#endif
-#ifndef CONFIG_ENV_SPI_MAX_HZ
-# define CONFIG_ENV_SPI_MAX_HZ         50000000
-#endif
-#endif
-
 /* Needed for SPI NOR booting in SPL */
 #define CONFIG_DM_SEQ_ALIAS            1
 

diff --git a/configs/M52277EVB_stmicro_defconfig b/configs/M52277EVB_stmicro_defconfig
index 3628729a48ffe6c27834363f9438343a0b00bc71..cafc8611678cc23ce221e5c077d5e8f164de4229 100644 (file)
--- a/configs/M52277EVB_stmicro_defconfig
+++ b/configs/M52277EVB_stmicro_defconfig
@@ -15,6 +15,8 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_JFFS2=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_CS=y
+CONFIG_ENV_SPI_CS=2
 # CONFIG_NET is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y

diff --git a/configs/M54418TWR_defconfig b/configs/M54418TWR_defconfig
index f69f405d5ad379cab61d9b74d386fedbd8045c70..a239f4a02f42253703613ffaeb5a38f0ed36b277 100644 (file)
--- a/configs/M54418TWR_defconfig
+++ b/configs/M54418TWR_defconfig
@@ -20,6 +20,8 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_CS=y
+CONFIG_ENV_SPI_CS=1
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_MII=y

diff --git a/configs/M54418TWR_serial_mii_defconfig b/configs/M54418TWR_serial_mii_defconfig
index b2266a05771a87a4ba80b5b1094fe91508b0bf0a..8b72bd35d31a8ead0521324cd7db439275db3dc3 100644 (file)
--- a/configs/M54418TWR_serial_mii_defconfig
+++ b/configs/M54418TWR_serial_mii_defconfig
@@ -20,6 +20,8 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_CS=y
+CONFIG_ENV_SPI_CS=1
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_MII=y

diff --git a/configs/M54418TWR_serial_rmii_defconfig b/configs/M54418TWR_serial_rmii_defconfig
index f69f405d5ad379cab61d9b74d386fedbd8045c70..a239f4a02f42253703613ffaeb5a38f0ed36b277 100644 (file)
--- a/configs/M54418TWR_serial_rmii_defconfig
+++ b/configs/M54418TWR_serial_rmii_defconfig
@@ -20,6 +20,8 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_CS=y
+CONFIG_ENV_SPI_CS=1
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_MII=y

diff --git a/configs/M54451EVB_stmicro_defconfig b/configs/M54451EVB_stmicro_defconfig
index ce5f65666cbed37ad66b56e018f0ee2b6e35152d..b614ca716dea13be2409bc321bab2e470bede3f7 100644 (file)
--- a/configs/M54451EVB_stmicro_defconfig
+++ b/configs/M54451EVB_stmicro_defconfig
@@ -20,6 +20,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_DATE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_CS=y
+CONFIG_ENV_SPI_CS=1
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y

diff --git a/configs/M54455EVB_stm33_defconfig b/configs/M54455EVB_stm33_defconfig
index fc19de50d12bbf1bde5ebd57cfb562522b067d33..467bfaee9ad83b25728b9ac2479e66110b97d81e 100644 (file)
--- a/configs/M54455EVB_stm33_defconfig
+++ b/configs/M54455EVB_stm33_defconfig
@@ -25,6 +25,8 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_JFFS2=y
 CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_CS=y
+CONFIG_ENV_SPI_CS=1
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y

diff --git a/configs/SBx81LIFKW_defconfig b/configs/SBx81LIFKW_defconfig
index e0ce1595c5ee5b3e0f85b7058b4dd556224f2fe4..afda7eda59728e3d9861d4fe5e5edd2b123c4873 100644 (file)
--- a/configs/SBx81LIFKW_defconfig
+++ b/configs/SBx81LIFKW_defconfig
@@ -20,6 +20,8 @@ CONFIG_CMD_SNTP=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-atl-sbx81lifkw"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_DM=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_PCA953X=y

diff --git a/configs/SBx81LIFXCAT_defconfig b/configs/SBx81LIFXCAT_defconfig
index 4a6e05844fec187c627ab79149ab7adde075c574..4cb4797a11b97d5771ea5ee133c526e398b8c127 100644 (file)
--- a/configs/SBx81LIFXCAT_defconfig
+++ b/configs/SBx81LIFXCAT_defconfig
@@ -22,6 +22,8 @@ CONFIG_CMD_SNTP=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-atl-sbx81lifxcat"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_DM=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_PCA953X=y

diff --git a/configs/ap121_defconfig b/configs/ap121_defconfig
index c9dbe4d72174f31873710aa99ca21a917bc595c2..eca24e9d2555c6904c66c21b54331289da4c0703 100644 (file)
--- a/configs/ap121_defconfig
+++ b/configs/ap121_defconfig
@@ -32,6 +32,8 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=spi-flash.0:256k(u-boot),64k(u-boot-env),6144k
 # CONFIG_ISO_PARTITION is not set
 CONFIG_DEFAULT_DEVICE_TREE="ap121"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=25000000
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y

diff --git a/configs/ap143_defconfig b/configs/ap143_defconfig
index 7c1a296e2775e652ec682567610618287e5254cc..9a5a9f89c69bf442fef0efb656749a1676684f4b 100644 (file)
--- a/configs/ap143_defconfig
+++ b/configs/ap143_defconfig
@@ -31,6 +31,8 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=spi-flash.0:256k(u-boot),64k(u-boot-env),6336k
 # CONFIG_ISO_PARTITION is not set
 CONFIG_DEFAULT_DEVICE_TREE="ap143"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=25000000
 # CONFIG_NET is not set
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y

diff --git a/configs/at91sam9260ek_dataflash_cs0_defconfig b/configs/at91sam9260ek_dataflash_cs0_defconfig
index 7fd844c94beaee027caccf17641fa596d2a88c63..9b0aa0714e58ca791fc64428238ff80b69652c88 100644 (file)
--- a/configs/at91sam9260ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9260ek_dataflash_cs0_defconfig
@@ -29,6 +29,8 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="at91sam9260ek"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=15000000
 CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y

diff --git a/configs/at91sam9260ek_dataflash_cs1_defconfig b/configs/at91sam9260ek_dataflash_cs1_defconfig
index c2fc77d78c0d834bf5d2b96c3237a90f069de614..1e5d5409303e735daaabf575e55c0c20d7bb7f7a 100644 (file)
--- a/configs/at91sam9260ek_dataflash_cs1_defconfig
+++ b/configs/at91sam9260ek_dataflash_cs1_defconfig
@@ -29,6 +29,8 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="at91sam9260ek"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=15000000
 CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y

diff --git a/configs/at91sam9261ek_dataflash_cs0_defconfig b/configs/at91sam9261ek_dataflash_cs0_defconfig
index 431cf280eb867409f9fce079b3c45cf99d485f7e..e036ebcad4eef1f02e4c8670e3ebf33e8ea25e2a 100644 (file)
--- a/configs/at91sam9261ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9261ek_dataflash_cs0_defconfig
@@ -30,6 +30,8 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="at91sam9261ek"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=15000000
 CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y

diff --git a/configs/at91sam9261ek_dataflash_cs3_defconfig b/configs/at91sam9261ek_dataflash_cs3_defconfig
index e5efad80de54ea4953a0c34e9f38f86266291042..b67aa90fc9404ece957cca2c30b3fc2ec030a9ec 100644 (file)
--- a/configs/at91sam9261ek_dataflash_cs3_defconfig
+++ b/configs/at91sam9261ek_dataflash_cs3_defconfig
@@ -30,6 +30,8 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="at91sam9261ek"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=15000000
 CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y

diff --git a/configs/at91sam9263ek_dataflash_cs0_defconfig b/configs/at91sam9263ek_dataflash_cs0_defconfig
index a19f309c4a943be476f2e30ec39abc3c58961771..4f8694f78d80b1ce688c904347318d87cf1ba424 100644 (file)
--- a/configs/at91sam9263ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9263ek_dataflash_cs0_defconfig
@@ -33,6 +33,8 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=15000000
 CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y

diff --git a/configs/at91sam9263ek_dataflash_defconfig b/configs/at91sam9263ek_dataflash_defconfig
index a19f309c4a943be476f2e30ec39abc3c58961771..4f8694f78d80b1ce688c904347318d87cf1ba424 100644 (file)
--- a/configs/at91sam9263ek_dataflash_defconfig
+++ b/configs/at91sam9263ek_dataflash_defconfig
@@ -33,6 +33,8 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=15000000
 CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y

diff --git a/configs/at91sam9g10ek_dataflash_cs0_defconfig b/configs/at91sam9g10ek_dataflash_cs0_defconfig
index 7bf0b79e34cbcc2f5e9d9e0341d3a24f9ec24b73..6f71d34126dec522f32d4bd9411b36d7e6696cd9 100644 (file)
--- a/configs/at91sam9g10ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9g10ek_dataflash_cs0_defconfig
@@ -30,6 +30,8 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="at91sam9261ek"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=15000000
 CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y

diff --git a/configs/at91sam9g10ek_dataflash_cs3_defconfig b/configs/at91sam9g10ek_dataflash_cs3_defconfig
index b4e8892ccabd7a8c80a711e4b170592328b269ee..644d59de73fc641685f8e23f9aba6bab382423c7 100644 (file)
--- a/configs/at91sam9g10ek_dataflash_cs3_defconfig
+++ b/configs/at91sam9g10ek_dataflash_cs3_defconfig
@@ -30,6 +30,8 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="at91sam9261ek"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=15000000
 CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y

diff --git a/configs/at91sam9g20ek_dataflash_cs0_defconfig b/configs/at91sam9g20ek_dataflash_cs0_defconfig
index 688c1828f40764e50baa22397aa5947539d0c21e..c064d01d8985262dec0d9a287a2f2d03251697f5 100644 (file)
--- a/configs/at91sam9g20ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9g20ek_dataflash_cs0_defconfig
@@ -29,6 +29,8 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20ek"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=15000000
 CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y

diff --git a/configs/at91sam9g20ek_dataflash_cs1_defconfig b/configs/at91sam9g20ek_dataflash_cs1_defconfig
index 1eb437936dcc74a2acf8db2b10ba4b767de4db24..1e409eac39af5d1738b5cc9481d49a587a637458 100644 (file)
--- a/configs/at91sam9g20ek_dataflash_cs1_defconfig
+++ b/configs/at91sam9g20ek_dataflash_cs1_defconfig
@@ -29,6 +29,8 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20ek"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=15000000
 CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y

diff --git a/configs/at91sam9rlek_dataflash_defconfig b/configs/at91sam9rlek_dataflash_defconfig
index 800a92cf818652b10829ad5038c9b9d99346ec6e..88c0a430daf3425f7d954f69d8b420ce3c0a3cb1 100644 (file)
--- a/configs/at91sam9rlek_dataflash_defconfig
+++ b/configs/at91sam9rlek_dataflash_defconfig
@@ -30,6 +30,8 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="at91sam9rlek"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=15000000
 # CONFIG_NET is not set
 CONFIG_DM=y
 CONFIG_CLK=y

diff --git a/configs/at91sam9xeek_dataflash_cs0_defconfig b/configs/at91sam9xeek_dataflash_cs0_defconfig
index ac6d9def8c36f249b8538e92b44d5a21fecc62fb..b125182b535425e74ea25267bc723889ff966108 100644 (file)
--- a/configs/at91sam9xeek_dataflash_cs0_defconfig
+++ b/configs/at91sam9xeek_dataflash_cs0_defconfig
@@ -29,6 +29,8 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="at91sam9260ek"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=15000000
 CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y

diff --git a/configs/at91sam9xeek_dataflash_cs1_defconfig b/configs/at91sam9xeek_dataflash_cs1_defconfig
index 56c6f12c47e88cb9d35b1bfaf0cec6c2e2a70265..c07008a9df23d70e25caecdbf153c4e0c3c63be8 100644 (file)
--- a/configs/at91sam9xeek_dataflash_cs1_defconfig
+++ b/configs/at91sam9xeek_dataflash_cs1_defconfig
@@ -29,6 +29,8 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="at91sam9260ek"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=15000000
 CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y

diff --git a/configs/controlcenterdc_defconfig b/configs/controlcenterdc_defconfig
index b2b61b2ca5aa942b11e74dd193874b3b4d518ad0..08fdc55be26c166ea425e659805cce19bf250422 100644 (file)
--- a/configs/controlcenterdc_defconfig
+++ b/configs/controlcenterdc_defconfig
@@ -44,6 +44,8 @@ CONFIG_EFI_PARTITION=y
 CONFIG_OF_BOARD_FIXUP=y
 CONFIG_DEFAULT_DEVICE_TREE="armada-38x-controlcenterdc"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=50000000
 CONFIG_SPL_OF_TRANSLATE=y
 CONFIG_SCSI_AHCI=y
 CONFIG_DM_GPIO=y

diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig
index 0b27bd7596f0819303dfcb5310538f90e797cb19..28c5c83d3c19f4485a33a5d5f3e5da8146158b3d 100644 (file)
--- a/configs/d2net_v2_defconfig
+++ b/configs/d2net_v2_defconfig
@@ -31,6 +31,8 @@ CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-d2net"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y

diff --git a/configs/da850_am18xxevm_defconfig b/configs/da850_am18xxevm_defconfig
index 419224104af4469b6eb99f634dda425f9069ade3..b8c16baf9a9fb0c476e484633f46b095323e353f 100644 (file)
--- a/configs/da850_am18xxevm_defconfig
+++ b/configs/da850_am18xxevm_defconfig
@@ -39,6 +39,10 @@ CONFIG_SPL_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="da850-evm"
 CONFIG_SPL_OF_PLATDATA=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=0
+CONFIG_USE_ENV_SPI_MODE=y
+CONFIG_ENV_SPI_MODE=0
 CONFIG_DM=y
 CONFIG_SPL_DM=y
 CONFIG_DA8XX_GPIO=y

diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig
index 41dae05fb904e5e446415c62ed2664a3c8227c4a..3ee79432ca8c6d69d337792fb8db6415fcc14916 100644 (file)
--- a/configs/da850evm_defconfig
+++ b/configs/da850evm_defconfig
@@ -41,6 +41,10 @@ CONFIG_SPL_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="da850-evm"
 CONFIG_SPL_OF_PLATDATA=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=0
+CONFIG_USE_ENV_SPI_MODE=y
+CONFIG_ENV_SPI_MODE=0
 CONFIG_DM=y
 CONFIG_SPL_DM=y
 CONFIG_DM_GPIO=y

diff --git a/configs/db-88f6720_defconfig b/configs/db-88f6720_defconfig
index 2c9254b5cfe6651063ccfb702891aeb5f3cfabe8..3de9766dd14c647c3a5acf47f20074603b80f885 100644 (file)
--- a/configs/db-88f6720_defconfig
+++ b/configs/db-88f6720_defconfig
@@ -39,6 +39,8 @@ CONFIG_CMD_FS_GENERIC=y
 # CONFIG_DOS_PARTITION is not set
 CONFIG_DEFAULT_DEVICE_TREE="armada-375-db"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=50000000
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_OF_TRANSLATE=y
 CONFIG_MISC=y

diff --git a/configs/db-88f6820-amc_defconfig b/configs/db-88f6820-amc_defconfig
index 422e8539af55840a6fe96cd6b59b9bf0f7b11bc9..dcf2a25395e22714e83106beb9f3acda27aaa961 100644 (file)
--- a/configs/db-88f6820-amc_defconfig
+++ b/configs/db-88f6820-amc_defconfig
@@ -43,6 +43,8 @@ CONFIG_EFI_PARTITION=y
 # CONFIG_SPL_PARTITION_UUIDS is not set
 CONFIG_DEFAULT_DEVICE_TREE="armada-385-amc"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=50000000
 CONFIG_SPL_OF_TRANSLATE=y
 CONFIG_BLK=y
 # CONFIG_SPL_BLK is not set

diff --git a/configs/db-88f6820-gp_defconfig b/configs/db-88f6820-gp_defconfig
index b36b7c3b2c316ba5aef92c3caba2020fdbe4d0a7..a4c00e983d3e560411178bd854fbe4a099e804c4 100644 (file)
--- a/configs/db-88f6820-gp_defconfig
+++ b/configs/db-88f6820-gp_defconfig
@@ -43,6 +43,8 @@ CONFIG_EFI_PARTITION=y
 # CONFIG_SPL_PARTITION_UUIDS is not set
 CONFIG_DEFAULT_DEVICE_TREE="armada-388-gp"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=50000000
 CONFIG_SPL_OF_TRANSLATE=y
 CONFIG_SCSI_AHCI=y
 CONFIG_MMC_SDHCI=y

diff --git a/configs/db-mv784mp-gp_defconfig b/configs/db-mv784mp-gp_defconfig
index b6c61c3a48436212c9e5e8f03e3165e603ec6824..98e47ee956361c7ecd0fac20f93340efe5b94519 100644 (file)
--- a/configs/db-mv784mp-gp_defconfig
+++ b/configs/db-mv784mp-gp_defconfig
@@ -42,6 +42,8 @@ CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
 # CONFIG_SPL_PARTITION_UUIDS is not set
 CONFIG_DEFAULT_DEVICE_TREE="armada-xp-gp"
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=50000000
 CONFIG_SPL_OF_TRANSLATE=y
 CONFIG_SATA_MV=y
 # CONFIG_MMC is not set

diff --git a/configs/dreamplug_defconfig b/configs/dreamplug_defconfig
index d3263cf9cd3fb0e4f946d112316bfffaad8aefc6..8202848ebf72018dfcc7e4673f63f3a1a283a8b8 100644 (file)
--- a/configs/dreamplug_defconfig
+++ b/configs/dreamplug_defconfig
@@ -23,6 +23,8 @@ CONFIG_ISO_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-dreamplug"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=50000000
 CONFIG_DM=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set

diff --git a/configs/ds109_defconfig b/configs/ds109_defconfig
index 3e4e71bcbf4e3e2c174ea4b1ec0fab2e3feebf0d..29d5f98d76cbf73f2e9f9cce4099b000a04701d2 100644 (file)
--- a/configs/ds109_defconfig
+++ b/configs/ds109_defconfig
@@ -18,6 +18,8 @@ CONFIG_ISO_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ds109"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=50000000
 CONFIG_DM=y
 CONFIG_MVSATA_IDE=y
 CONFIG_DM_I2C=y

diff --git a/configs/ds414_defconfig b/configs/ds414_defconfig
index ce42f23867c374a663faf748a6a22b9008f9a014..62cad538883b57b8ff27a1024e65df9ffbc4dc24 100644 (file)
--- a/configs/ds414_defconfig
+++ b/configs/ds414_defconfig
@@ -39,6 +39,8 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_UBI=y
 CONFIG_ISO_PARTITION=y
 CONFIG_DEFAULT_DEVICE_TREE="armada-xp-synology-ds414"
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=50000000
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_OF_TRANSLATE=y
 # CONFIG_MMC is not set

diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig
index b14cf6c8e41ac7e191edeec8ff61aa85b4fdff8f..2ec3aae337975740ef13946d961c8efba255a99b 100644 (file)
--- a/configs/ethernut5_defconfig
+++ b/configs/ethernut5_defconfig
@@ -45,6 +45,8 @@ CONFIG_CMD_UBI=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="ethernut5"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=15000000
 CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y

diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig
index cebe4a55ea5e07cc138789d9461667c986ab7e7b..ca85973fc2c66cf0d61285bf982b585fd3607a28 100644 (file)
--- a/configs/inetspace_v2_defconfig
+++ b/configs/inetspace_v2_defconfig
@@ -31,6 +31,8 @@ CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-is2"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y

diff --git a/configs/ls1012aqds_qspi_defconfig b/configs/ls1012aqds_qspi_defconfig
index d2c3eea43bb7a4e4e82a80ea8f045e5c3ef2eea1..3212f376211d15965e4a128b87ea2c30214b7da9 100644 (file)
--- a/configs/ls1012aqds_qspi_defconfig
+++ b/configs/ls1012aqds_qspi_defconfig
@@ -28,7 +28,6 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_SPI=y
-CONFIG_DEFAULT_SPI_BUS=1
 CONFIG_CMD_USB=y
 CONFIG_DEFAULT_SPI_BUS=1
 # CONFIG_CMD_SETEXPR is not set
@@ -37,6 +36,12 @@ CONFIG_CMD_DATE=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-qds"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_BUS=y
+CONFIG_ENV_SPI_BUS=0
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=1000000
+CONFIG_USE_ENV_SPI_MODE=y
+CONFIG_ENV_SPI_MODE=0x03
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_SCSI_AHCI=y

diff --git a/configs/ls1012aqds_tfa_defconfig b/configs/ls1012aqds_tfa_defconfig
index d18d40a28f0c9497226e842f5bbbf0e26d34a11b..99188d3e589a9cbd0acec7aebfecd590435eedb0 100644 (file)
--- a/configs/ls1012aqds_tfa_defconfig
+++ b/configs/ls1012aqds_tfa_defconfig
@@ -36,6 +36,12 @@ CONFIG_CMD_DATE=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-qds"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_BUS=y
+CONFIG_ENV_SPI_BUS=0
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=1000000
+CONFIG_USE_ENV_SPI_MODE=y
+CONFIG_ENV_SPI_MODE=0x03
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_SCSI_AHCI=y

diff --git a/configs/ls1043aqds_tfa_defconfig b/configs/ls1043aqds_tfa_defconfig
index 712e1673ebb131affacdf0b3f03950cad56dca21..e615f7562503e7365c4644d216b6957dfa444b45 100644 (file)
--- a/configs/ls1043aqds_tfa_defconfig
+++ b/configs/ls1043aqds_tfa_defconfig
@@ -34,6 +34,8 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_BUS=y
+CONFIG_ENV_SPI_BUS=0
 CONFIG_DM=y
 CONFIG_SATA_CEVA=y
 CONFIG_FSL_CAAM=y

diff --git a/configs/ls1046aqds_tfa_defconfig b/configs/ls1046aqds_tfa_defconfig
index 352da8ab761b3b33480993dccabfd6c66f8672c6..ede5df6224a524b70becb06ee93ea9e501a7794c 100644 (file)
--- a/configs/ls1046aqds_tfa_defconfig
+++ b/configs/ls1046aqds_tfa_defconfig
@@ -35,6 +35,8 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_BUS=y
+CONFIG_ENV_SPI_BUS=0
 CONFIG_DM=y
 CONFIG_SATA_CEVA=y
 CONFIG_FSL_CAAM=y

diff --git a/configs/maxbcm_defconfig b/configs/maxbcm_defconfig
index 5c716cdec8b8fdb81a905afb98ca0505b9d28ce8..1521392987e6f6d3446e37662661796a28d7f8bd 100644 (file)
--- a/configs/maxbcm_defconfig
+++ b/configs/maxbcm_defconfig
@@ -30,6 +30,8 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_TIME=y
 CONFIG_DEFAULT_DEVICE_TREE="armada-xp-maxbcm"
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=50000000
 CONFIG_SPL_OF_TRANSLATE=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y

diff --git a/configs/meesc_dataflash_defconfig b/configs/meesc_dataflash_defconfig
index 54adab920373f8d79b0c675e1dcf3802db98bf6a..476700c7edf11ecdea34c9d9963f230ef28f274b 100644 (file)
--- a/configs/meesc_dataflash_defconfig
+++ b/configs/meesc_dataflash_defconfig
@@ -20,6 +20,8 @@ CONFIG_CMD_PING=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=15000000
 CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y

diff --git a/configs/mscc_jr2_defconfig b/configs/mscc_jr2_defconfig
index 9276df22a5a52f93eea6336d7c077eb8b7a3e48d..95562b7cd85f1bf46083402aa768f33a52a458c8 100644 (file)
--- a/configs/mscc_jr2_defconfig
+++ b/configs/mscc_jr2_defconfig
@@ -38,6 +38,10 @@ CONFIG_OF_LIST="jr2_pcb110 jr2_pcb111 serval2_pcb112"
 CONFIG_DTB_RESELECT=y
 CONFIG_MULTI_DTB_FIT=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=0
+CONFIG_USE_ENV_SPI_MODE=y
+CONFIG_ENV_SPI_MODE=0
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_CLK=y
 CONFIG_DM_GPIO=y

diff --git a/configs/mscc_luton_defconfig b/configs/mscc_luton_defconfig
index 0fdd9b8f3f7a6e59f61a7a658f3cde70157ad8c8..162a514248931e8b2f0d254623976bd32bc8ee42 100644 (file)
--- a/configs/mscc_luton_defconfig
+++ b/configs/mscc_luton_defconfig
@@ -44,6 +44,10 @@ CONFIG_OF_LIST="luton_pcb090 luton_pcb091"
 CONFIG_DTB_RESELECT=y
 CONFIG_MULTI_DTB_FIT=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=0
+CONFIG_USE_ENV_SPI_MODE=y
+CONFIG_ENV_SPI_MODE=0
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_CLK=y
 CONFIG_DM_GPIO=y

diff --git a/configs/mscc_ocelot_defconfig b/configs/mscc_ocelot_defconfig
index edc476d143f59b4863bd670dfd1cf24faab8e84b..b0dcfaf2df8e59ad32b2c003276a4174c1be8ae3 100644 (file)
--- a/configs/mscc_ocelot_defconfig
+++ b/configs/mscc_ocelot_defconfig
@@ -43,6 +43,10 @@ CONFIG_OF_LIST="ocelot_pcb120 ocelot_pcb123"
 CONFIG_DTB_RESELECT=y
 CONFIG_MULTI_DTB_FIT=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=0
+CONFIG_USE_ENV_SPI_MODE=y
+CONFIG_ENV_SPI_MODE=0
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_CLK=y
 CONFIG_DM_GPIO=y

diff --git a/configs/mscc_serval_defconfig b/configs/mscc_serval_defconfig
index 146188bb0c90f73af7188e573681e3b1573165cf..f2c95632bd0669c106d239498758a9e0fd94a844 100644 (file)
--- a/configs/mscc_serval_defconfig
+++ b/configs/mscc_serval_defconfig
@@ -35,6 +35,10 @@ CONFIG_OF_LIST="serval_pcb106 serval_pcb105"
 CONFIG_DTB_RESELECT=y
 CONFIG_MULTI_DTB_FIT=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=0
+CONFIG_USE_ENV_SPI_MODE=y
+CONFIG_ENV_SPI_MODE=0
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_CLK=y
 CONFIG_DM_GPIO=y

diff --git a/configs/mscc_servalt_defconfig b/configs/mscc_servalt_defconfig
index a450f48018957ca8f6563462eab5057d1080f698..027aaa44d562fbb541ee0c9e747ae77381b7516c 100644 (file)
--- a/configs/mscc_servalt_defconfig
+++ b/configs/mscc_servalt_defconfig
@@ -33,6 +33,10 @@ CONFIG_DEFAULT_DEVICE_TREE="servalt_pcb116"
 CONFIG_DTB_RESELECT=y
 CONFIG_MULTI_DTB_FIT=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=0
+CONFIG_USE_ENV_SPI_MODE=y
+CONFIG_ENV_SPI_MODE=0
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_CLK=y
 CONFIG_DM_GPIO=y

diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig
index 8996d5214fc96abbfa4518aa443b4be7cebceae7..44c8d5b35d0c69e7c1fd985c33e18b50f8501670 100644 (file)
--- a/configs/net2big_v2_defconfig
+++ b/configs/net2big_v2_defconfig
@@ -31,6 +31,8 @@ CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-net2big"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y

diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig
index e6d772490a350d9912c36a08f3f7b27e76bc1a76..ac103c3f225f4f0d9717128d5f20dae2bb16455a 100644 (file)
--- a/configs/netspace_lite_v2_defconfig
+++ b/configs/netspace_lite_v2_defconfig
@@ -31,6 +31,8 @@ CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ns2lite"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y

diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig
index 89df1f35a666b1d4920176f1a2ff9ee6bb46fb6b..9eded365b8ee6ce4a8e1cc082424c370efdbf766 100644 (file)
--- a/configs/netspace_max_v2_defconfig
+++ b/configs/netspace_max_v2_defconfig
@@ -31,6 +31,8 @@ CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ns2max"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y

diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig
index 9a5cf19ced5784276778129bf5bbf0ef18dd5329..4b0fff4486f2f761f96d1d87d71bb240a6d28a67 100644 (file)
--- a/configs/netspace_mini_v2_defconfig
+++ b/configs/netspace_mini_v2_defconfig
@@ -29,6 +29,8 @@ CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ns2mini"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y

diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig
index bd879abfe70aa1cf303d1556cb2fe5564aacdcb9..24749f824eef9c9d1b686c7133ec07e5d6c40d10 100644 (file)
--- a/configs/netspace_v2_defconfig
+++ b/configs/netspace_v2_defconfig
@@ -31,6 +31,8 @@ CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ns2"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y

diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig
index cb818c5ecffc640d3991e8d012044da069653d68..6fc89cd06b36b6b040a11402f324087ad2c6c02b 100644 (file)
--- a/configs/peach-pi_defconfig
+++ b/configs/peach-pi_defconfig
@@ -29,6 +29,8 @@ CONFIG_CMD_TPM_TEST=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5800-peach-pi"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_BUS=y
+CONFIG_ENV_SPI_BUS=1
 CONFIG_I2C_CROS_EC_TUNNEL=y
 CONFIG_I2C_MUX=y
 CONFIG_I2C_ARB_GPIO_CHALLENGE=y

diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig
index bb1558b267f741953cb873ad50f5fe5d1f5b4e47..f091d24f4f3a35442c242090d04bcca75580f543 100644 (file)
--- a/configs/peach-pit_defconfig
+++ b/configs/peach-pit_defconfig
@@ -28,6 +28,8 @@ CONFIG_CMD_TPM_TEST=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5420-peach-pit"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_BUS=y
+CONFIG_ENV_SPI_BUS=1
 CONFIG_I2C_CROS_EC_TUNNEL=y
 CONFIG_I2C_MUX=y
 CONFIG_I2C_ARB_GPIO_CHALLENGE=y

diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig
index d24e9e21c55ae4d22f03905896002c8731f11765..67413874b96f9b21f68d3abc240d4de227fb49ec 100644 (file)
--- a/configs/smdk5250_defconfig
+++ b/configs/smdk5250_defconfig
@@ -30,6 +30,8 @@ CONFIG_CMD_REGULATOR=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-smdk5250"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_BUS=y
+CONFIG_ENV_SPI_BUS=1
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_S5P=y

diff --git a/configs/smdk5420_defconfig b/configs/smdk5420_defconfig
index 704786a47318b76ae53df3575c5723d2d99b4206..6a919628d91de99b79949c7269ae0006ce145b03 100644 (file)
--- a/configs/smdk5420_defconfig
+++ b/configs/smdk5420_defconfig
@@ -25,6 +25,8 @@ CONFIG_CMD_TIME=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5420-smdk5420"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_BUS=y
+CONFIG_ENV_SPI_BUS=1
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_S5P=y

diff --git a/configs/snow_defconfig b/configs/snow_defconfig
index 6179a640e13e12c0593ff56db25495f3829bc52e..54bf740577d4023eefeec86860bd0edf765b40a0 100644 (file)
--- a/configs/snow_defconfig
+++ b/configs/snow_defconfig
@@ -34,6 +34,8 @@ CONFIG_CMD_TPM_TEST=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-snow"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_BUS=y
+CONFIG_ENV_SPI_BUS=1
 CONFIG_I2C_CROS_EC_LDO=y
 CONFIG_I2C_MUX=y
 CONFIG_I2C_ARB_GPIO_CHALLENGE=y

diff --git a/configs/spring_defconfig b/configs/spring_defconfig
index 2bbfa6dcb8674516d44be6b2cde54bf8e59bf648..c24aa2ed0dd7af28f3dcc59f58ff4d7bc9edd5de 100644 (file)
--- a/configs/spring_defconfig
+++ b/configs/spring_defconfig
@@ -34,6 +34,8 @@ CONFIG_CMD_TPM_TEST=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-spring"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_BUS=y
+CONFIG_ENV_SPI_BUS=1
 CONFIG_I2C_CROS_EC_LDO=y
 CONFIG_I2C_MUX=y
 CONFIG_I2C_ARB_GPIO_CHALLENGE=y

diff --git a/configs/stmark2_defconfig b/configs/stmark2_defconfig
index d74ba67a1b31f9187b40e43922471c84b0d15e27..630b01c2333247678448664a0993846fe1003fe7 100644 (file)
--- a/configs/stmark2_defconfig
+++ b/configs/stmark2_defconfig
@@ -20,6 +20,8 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nor0=spi-flash.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=spi-flash.0:1m(u-boot),7m(kernel),-(rootfs)"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_CS=y
+CONFIG_ENV_SPI_CS=1
 # CONFIG_NET is not set
 CONFIG_MTD_DEVICE=y
 CONFIG_SPI_FLASH=y

diff --git a/configs/theadorable_debug_defconfig b/configs/theadorable_debug_defconfig
index cd52220f972b0f45863f29011471d7408684f7c9..fb9307aaf58014f2b7f0fd5ea34c60ecaa654132 100644 (file)
--- a/configs/theadorable_debug_defconfig
+++ b/configs/theadorable_debug_defconfig
@@ -46,6 +46,8 @@ CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
 # CONFIG_SPL_PARTITION_UUIDS is not set
 CONFIG_DEFAULT_DEVICE_TREE="armada-xp-theadorable"
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=50000000
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_OF_TRANSLATE=y
 CONFIG_SATA_MV=y

diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig
index 23034e860f2a1d15449a213e32b9a1d5a46325b6..bd08adb78899fe3d03f586461a19c9a4e7292179 100644 (file)
--- a/configs/trimslice_defconfig
+++ b/configs/trimslice_defconfig
@@ -24,6 +24,8 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-trimslice"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=48000000
 CONFIG_SPL_DM=y
 CONFIG_SYS_I2C_TEGRA=y
 CONFIG_SPI_FLASH=y

diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig
index 7e5943b108519df298a9ddbdf1039068e48ef9e2..c406b257533e4bae66497cb39b0ef53823967aa8 100644 (file)
--- a/configs/turris_omnia_defconfig
+++ b/configs/turris_omnia_defconfig
@@ -35,6 +35,8 @@ CONFIG_CMD_BTRFS=y
 # CONFIG_SPL_PARTITION_UUIDS is not set
 CONFIG_DEFAULT_DEVICE_TREE="armada-385-turris-omnia"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=50000000
 CONFIG_SPL_OF_TRANSLATE=y
 CONFIG_SCSI_AHCI=y
 CONFIG_ATSHA204A=y

diff --git a/configs/usb_a9263_dataflash_defconfig b/configs/usb_a9263_dataflash_defconfig
index 9f7506f70b4e6d2ee9c1a94b14eb8755382a089a..3b9e4a535f998896339286747ae069c5a9e63c94 100644 (file)
--- a/configs/usb_a9263_dataflash_defconfig
+++ b/configs/usb_a9263_dataflash_defconfig
@@ -25,6 +25,8 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=atmel_nand:16m(kernel)ro,120m(root1),-(root2)"
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="usb_a9263"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=15000000
 CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y

diff --git a/env/Kconfig b/env/Kconfig
index c22cbbdadcb6cae865685356a5873b8d03474c0d..78300660c720ffe4276560fed17aa3e6408b6d7f 100644 (file)
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -324,18 +324,57 @@ config ENV_IS_IN_SPI_FLASH
          during a "saveenv" operation. CONFIG_ENV_OFFSET_REDUND must be
          aligned to an erase sector boundary.
 
-         - CONFIG_ENV_SPI_BUS (optional):
-         - CONFIG_ENV_SPI_CS (optional):
+config USE_ENV_SPI_BUS
+       bool "SPI flash bus for environment"
+       depends on ENV_IS_IN_SPI_FLASH
+       help
+         Force the SPI bus for environment.
+         If not defined, use CONFIG_SF_DEFAULT_BUS.
+
+config ENV_SPI_BUS
+       int "Value of SPI flash bus for environment"
+       depends on USE_ENV_SPI_BUS
+       help
+         Value the SPI bus and chip select for environment.
+
+config USE_ENV_SPI_CS
+       bool "SPI flash chip select for environment"
+       depends on ENV_IS_IN_SPI_FLASH
+       help
+         Force the SPI chip select for environment.
+         If not defined, use CONFIG_SF_DEFAULT_CS.
 
-         Define the SPI bus and chip select. If not defined they will be 0.
+config ENV_SPI_CS
+       int "Value of SPI flash chip select for environment"
+       depends on USE_ENV_SPI_CS
+       help
+         Value of the SPI chip select for environment.
 
-         - CONFIG_ENV_SPI_MAX_HZ (optional):
+config USE_ENV_SPI_MAX_HZ
+       bool "SPI flash bus for environment"
+       depends on ENV_IS_IN_SPI_FLASH
+       help
+         Force the SPI max work clock for environment.
+         If not defined, use CONFIG_SF_DEFAULT_SPEED.
 
-         Define the SPI max work clock. If not defined then use 1MHz.
+config ENV_SPI_MAX_HZ
+       int "Value of SPI flash max work for environment"
+       depends on USE_ENV_SPI_MAX_HZ
+       help
+         Value of the SPI max work clock for environment.
 
-         - CONFIG_ENV_SPI_MODE (optional):
+config USE_ENV_SPI_MODE
+       bool "SPI flash mode for environment"
+       depends on ENV_IS_IN_SPI_FLASH
+       help
+         Force the SPI work mode for environment.
 
-         Define the SPI work mode. If not defined then use SPI_MODE_3.
+config ENV_SPI_MODE
+       hex "Value of SPI flash work mode for environment"
+       depends on USE_ENV_SPI_MODE
+       help
+         Value of the SPI work mode for environment.
+         See include/spi.h for value.
 
 config ENV_IS_IN_UBI
        bool "Environment in a UBI volume"

diff --git a/env/sf.c b/env/sf.c
index 23cbad5d8885c54168237dc8fcb14b719faeb4ad..4f92ae0568edbb9c04a9a771f8736224f29948e9 100644 (file)
--- a/env/sf.c
+++ b/env/sf.c
@@ -18,19 +18,6 @@
 #include <errno.h>
 #include <dm/device-internal.h>
 
-#ifndef CONFIG_ENV_SPI_BUS
-# define CONFIG_ENV_SPI_BUS    CONFIG_SF_DEFAULT_BUS
-#endif
-#ifndef CONFIG_ENV_SPI_CS
-# define CONFIG_ENV_SPI_CS     CONFIG_SF_DEFAULT_CS
-#endif
-#ifndef CONFIG_ENV_SPI_MAX_HZ
-# define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
-#endif
-#ifndef CONFIG_ENV_SPI_MODE
-# define CONFIG_ENV_SPI_MODE   CONFIG_SF_DEFAULT_MODE
-#endif
-
 #ifndef CONFIG_SPL_BUILD
 #define CMD_SAVEENV
 #define INITENV

diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h
index 25705ccee3152ba0be7d6749fe3ab58d31282d49..e8c9cdd73ddee991deed7f119f080eb6a54a384b 100644 (file)
--- a/include/configs/B4860QDS.h
+++ b/include/configs/B4860QDS.h
@@ -99,10 +99,6 @@
 #define CONFIG_ENV_OVERWRITE
 
 #if defined(CONFIG_SPIFLASH)
-#define CONFIG_ENV_SPI_BUS              0
-#define CONFIG_ENV_SPI_CS               0
-#define CONFIG_ENV_SPI_MAX_HZ           10000000
-#define CONFIG_ENV_SPI_MODE             0
 #define CONFIG_ENV_SIZE                 0x2000          /* 8KB */
 #define CONFIG_ENV_OFFSET               0x100000        /* 1MB */
 #define CONFIG_ENV_SECT_SIZE            0x10000

diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h
index 49bea98d35fbe4017ebb041bdd5dcf53e32fc59d..c01071e60da09403847b174d85b85e92004d3ad0 100644 (file)
--- a/include/configs/BSC9131RDB.h
+++ b/include/configs/BSC9131RDB.h
@@ -253,10 +253,6 @@ extern unsigned long get_sdram_size(void);
  * Environment
  */
 #if defined(CONFIG_RAMBOOT_SPIFLASH)
-#define CONFIG_ENV_SPI_BUS     0
-#define CONFIG_ENV_SPI_CS      0
-#define CONFIG_ENV_SPI_MAX_HZ  10000000
-#define CONFIG_ENV_SPI_MODE    0
 #define CONFIG_ENV_OFFSET      0x100000        /* 1MB */
 #define CONFIG_ENV_SECT_SIZE   0x10000
 #define CONFIG_ENV_SIZE                0x2000

diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h
index 73cc353082a0883632aab62f1be2eef3323004af..68100f1d5237261f52bdd69e6548049593be13dd 100644 (file)
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@@ -454,10 +454,6 @@ combinations. this should be removed later
 #define CONFIG_SYS_MMC_ENV_DEV         0
 #define CONFIG_ENV_SIZE                        0x2000
 #elif defined(CONFIG_RAMBOOT_SPIFLASH)
-#define CONFIG_ENV_SPI_BUS     0
-#define CONFIG_ENV_SPI_CS      0
-#define CONFIG_ENV_SPI_MAX_HZ  10000000
-#define CONFIG_ENV_SPI_MODE    0
 #define CONFIG_ENV_OFFSET      0x100000        /* 1MB */
 #define CONFIG_ENV_SECT_SIZE   0x10000
 #define CONFIG_ENV_SIZE                0x2000

diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h
index a18d0412ce1f1b6a90c4d796188b0f8745ecf4dc..9b83a50fdf436ec7010a422cbffa239510305f18 100644 (file)
--- a/include/configs/C29XPCIE.h
+++ b/include/configs/C29XPCIE.h
@@ -380,10 +380,6 @@
  */
 #if defined(CONFIG_SYS_RAMBOOT)
 #if defined(CONFIG_RAMBOOT_SPIFLASH)
-#define CONFIG_ENV_SPI_BUS     0
-#define CONFIG_ENV_SPI_CS      0
-#define CONFIG_ENV_SPI_MAX_HZ  10000000
-#define CONFIG_ENV_SPI_MODE    0
 #define CONFIG_ENV_OFFSET      0x100000        /* 1MB */
 #define CONFIG_ENV_SECT_SIZE   0x10000
 #define CONFIG_ENV_SIZE                0x2000

diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h
index 83d774527adcfc6ad39d621990d31a98f3da1925..514733eef77c46f3abcc64cecead1505b6557c93 100644 (file)
--- a/include/configs/M52277EVB.h
+++ b/include/configs/M52277EVB.h
@@ -177,9 +177,6 @@
  * Environment is not embedded in u-boot. First time runing may have env
  * crc error warning if there is no correct environment on the flash.
  */
-#ifdef CONFIG_CF_SBF
-#      define CONFIG_ENV_SPI_CS        2
-#endif
 #define CONFIG_ENV_OVERWRITE           1
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h
index 4b8ef38c0befc7fb6b3cc4d31515fb474b45adcf..f7b0669fc5e654a600a2fcfa435e387279c9c03b 100644 (file)
--- a/include/configs/M54418TWR.h
+++ b/include/configs/M54418TWR.h
@@ -238,7 +238,6 @@
 #endif
 
 #if defined(CONFIG_CF_SBF)
-#define CONFIG_ENV_SPI_CS              1
 #define CONFIG_ENV_OFFSET              0x40000
 #define CONFIG_ENV_SIZE                0x2000
 #define CONFIG_ENV_SECT_SIZE           0x10000

diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h
index 87cdbae1dbf56e0ffdc5a54abec1fa89c8660143..57c8572aba25b0b0501cc4f2c0835d23b0ba4fd3 100644 (file)
--- a/include/configs/M54451EVB.h
+++ b/include/configs/M54451EVB.h
@@ -198,7 +198,6 @@
  * crc error warning if there is no correct environment on the flash.
  */
 #if defined(CONFIG_SYS_STMICRO_BOOT)
-#      define CONFIG_ENV_SPI_CS                1
 #      define CONFIG_ENV_OFFSET                0x20000
 #      define CONFIG_ENV_SIZE          0x2000
 #      define CONFIG_ENV_SECT_SIZE     0x10000

diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index d41b7c4492953de1e382da7f7ea3b3184a91ba95..448dfc98a95285071bc0c1dd31bdafb05678482b 100644 (file)
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -248,9 +248,6 @@
  * Environment is not embedded in u-boot. First time runing may have env
  * crc error warning if there is no correct environment on the flash.
  */
-#ifdef CONFIG_CF_SBF
-#      define CONFIG_ENV_SPI_CS                1
-#endif
 #undef CONFIG_ENV_OVERWRITE
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index 11dcf23b81eeae0e6e2dae4ba4d2911475c6bae4..819129033f686bcd4afa01c6afeef6603e0f4338 100644 (file)
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -524,10 +524,6 @@
 
 #if defined(CONFIG_SYS_RAMBOOT)
 #if defined(CONFIG_RAMBOOT_SPIFLASH)
-#define CONFIG_ENV_SPI_BUS     0
-#define CONFIG_ENV_SPI_CS      0
-#define CONFIG_ENV_SPI_MAX_HZ  10000000
-#define CONFIG_ENV_SPI_MODE    0
 #define CONFIG_ENV_SIZE                0x2000  /* 8KB */
 #define CONFIG_ENV_OFFSET      0xF0000
 #define CONFIG_ENV_SECT_SIZE   0x10000

diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index cefa598e8dced194bae1ca334a3f562b3b9a22cb..4be40d0d02375a0b6f01a28884b159be5ea44db9 100644 (file)
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -644,10 +644,6 @@ extern unsigned long get_sdram_size(void);
 #define CONFIG_SYS_MMC_ENV_DEV         0
 #define CONFIG_ENV_SIZE                        0x2000
 #elif defined(CONFIG_SPIFLASH)
-#define CONFIG_ENV_SPI_BUS     0
-#define CONFIG_ENV_SPI_CS      0
-#define CONFIG_ENV_SPI_MAX_HZ  10000000
-#define CONFIG_ENV_SPI_MODE    0
 #define CONFIG_ENV_OFFSET      0x100000        /* 1MB */
 #define CONFIG_ENV_SECT_SIZE   0x10000
 #define CONFIG_ENV_SIZE                0x2000

diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index 8bdbabee68c5d913860021819aa2a8a1219efd7f..bdbf119c32894d6511efb5d754e31b6f3e91cb7d 100644 (file)
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -503,10 +503,6 @@
  * Environment
  */
 #ifdef CONFIG_SPIFLASH
-#define CONFIG_ENV_SPI_BUS     0
-#define CONFIG_ENV_SPI_CS      0
-#define CONFIG_ENV_SPI_MAX_HZ  10000000
-#define CONFIG_ENV_SPI_MODE    0
 #define CONFIG_ENV_SIZE                0x2000  /* 8KB */
 #define CONFIG_ENV_OFFSET      0x100000        /* 1MB */
 #define CONFIG_ENV_SECT_SIZE   0x10000

diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index da43320d18cf5363a79a352ab3f129f7992920c0..b433308fff39651dd86ea31c26a5cb318818396c 100644 (file)
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -49,10 +49,6 @@
 #define CONFIG_ENV_OVERWRITE
 
 #if defined(CONFIG_SPIFLASH)
-       #define CONFIG_ENV_SPI_BUS              0
-       #define CONFIG_ENV_SPI_CS               0
-       #define CONFIG_ENV_SPI_MAX_HZ           10000000
-       #define CONFIG_ENV_SPI_MODE             0
        #define CONFIG_ENV_SIZE                 0x2000          /* 8KB */
        #define CONFIG_ENV_OFFSET               0x100000        /* 1MB */
        #define CONFIG_ENV_SECT_SIZE            0x10000

diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h
index d62fd35e810a79729c44dca0aefb360a5acd5c77..1539e8fabb5bdff1b7d22a3006592fb72f9e9e95 100644 (file)
--- a/include/configs/SBx81LIFKW.h
+++ b/include/configs/SBx81LIFKW.h
@@ -56,10 +56,6 @@
 /*
  *  Environment variables configurations
  */
-#define CONFIG_ENV_SPI_BUS             0
-#define CONFIG_ENV_SPI_CS              0
-#define CONFIG_ENV_SPI_MAX_HZ          20000000        /* 20Mhz */
-#define CONFIG_ENV_SPI_MODE            CONFIG_SF_DEFAULT_MODE
 #define CONFIG_ENV_SECT_SIZE           0x40000         /* 256K */
 #define CONFIG_ENV_SIZE                        0x02000
 #define CONFIG_ENV_OFFSET              0xc0000         /* env starts here - 768K */

diff --git a/include/configs/SBx81LIFXCAT.h b/include/configs/SBx81LIFXCAT.h
index 3c8c216d89685153c9695d4901d7f977e429b887..af19193052753b10c451066675233cdb72260042 100644 (file)
--- a/include/configs/SBx81LIFXCAT.h
+++ b/include/configs/SBx81LIFXCAT.h
@@ -56,10 +56,6 @@
 /*
  *  Environment variables configurations
  */
-#define CONFIG_ENV_SPI_BUS             0
-#define CONFIG_ENV_SPI_CS              0
-#define CONFIG_ENV_SPI_MAX_HZ          20000000        /* 20Mhz */
-#define CONFIG_ENV_SPI_MODE            CONFIG_SF_DEFAULT_MODE
 #define CONFIG_ENV_SECT_SIZE           0x40000         /* 256K */
 #define CONFIG_ENV_SIZE                        0x02000
 #define CONFIG_ENV_OFFSET              0xc0000         /* env starts here - 768K */

diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index 73b70fa68000263490866a1ec57c096ae95b94e8..ef94097e09924f3e7d7ac75474f398215876b5cd 100644 (file)
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -129,10 +129,6 @@
 #endif
 
 #if defined(CONFIG_SPIFLASH)
-#define CONFIG_ENV_SPI_BUS             0
-#define CONFIG_ENV_SPI_CS              0
-#define CONFIG_ENV_SPI_MAX_HZ          10000000
-#define CONFIG_ENV_SPI_MODE            0
 #define CONFIG_ENV_SIZE                        0x2000          /* 8KB */
 #define CONFIG_ENV_OFFSET              0x100000        /* 1MB */
 #define CONFIG_ENV_SECT_SIZE           0x10000

diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 2ba3a9f8e632cf9bbf4dcd16918ec6de659678b1..551ba6d9359486e4cf57ef1f57ce1d331e4823ea 100644 (file)
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -144,10 +144,6 @@
 #endif
 
 #if defined(CONFIG_SPIFLASH)
-#define CONFIG_ENV_SPI_BUS             0
-#define CONFIG_ENV_SPI_CS              0
-#define CONFIG_ENV_SPI_MAX_HZ          10000000
-#define CONFIG_ENV_SPI_MODE            0
 #define CONFIG_ENV_SIZE                        0x2000          /* 8KB */
 #define CONFIG_ENV_OFFSET              0x100000        /* 1MB */
 #if defined(CONFIG_TARGET_T1024RDB)

diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index 89ace7c1b0185834ef4b1e2335f3cbc949c980a6..417383c7f07824319c7bd3db67187122e608aa80 100644 (file)
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -59,10 +59,6 @@
 
 #ifdef CONFIG_MTD_NOR_FLASH
 #if defined(CONFIG_SPIFLASH)
-#define CONFIG_ENV_SPI_BUS              0
-#define CONFIG_ENV_SPI_CS               0
-#define CONFIG_ENV_SPI_MAX_HZ           10000000
-#define CONFIG_ENV_SPI_MODE             0
 #define CONFIG_ENV_SIZE                 0x2000          /* 8KB */
 #define CONFIG_ENV_OFFSET               0x100000        /* 1MB */
 #define CONFIG_ENV_SECT_SIZE            0x10000

diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 0d92f27aab69cc01f8b863cabae2368df4174d3e..a7e0f8f5089a37c6c0c53c2437baaf86ec34fcd5 100644 (file)
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -521,10 +521,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
 /*
  * eSPI - Enhanced SPI
  */
-#define CONFIG_ENV_SPI_BUS              0
-#define CONFIG_ENV_SPI_CS               0
-#define CONFIG_ENV_SPI_MAX_HZ           10000000
-#define CONFIG_ENV_SPI_MODE             0
 
 /*
  * General PCI

diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index 8db38943ead0046dc527629f523fa1b8cf95990c..0d53ad50df91a830a2973a4091823f611a2a07f3 100644 (file)
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -125,10 +125,6 @@
 #endif
 
 #if defined(CONFIG_SPIFLASH)
-#define CONFIG_ENV_SPI_BUS     0
-#define CONFIG_ENV_SPI_CS      0
-#define CONFIG_ENV_SPI_MAX_HZ  10000000
-#define CONFIG_ENV_SPI_MODE    0
 #define CONFIG_ENV_SIZE                0x2000     /* 8KB */
 #define CONFIG_ENV_OFFSET      0x100000   /* 1MB */
 #define CONFIG_ENV_SECT_SIZE   0x10000

diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 40a03165ca86c6c8c3c33d677d2f8dafa81089d0..a78dd810c62ae8a554cc6bbf736b3e130d62ed5a 100644 (file)
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -110,10 +110,6 @@
 #define CONFIG_SYS_MEMTEST_END         0x00400000
 
 #if defined(CONFIG_SPIFLASH)
-#define CONFIG_ENV_SPI_BUS     0
-#define CONFIG_ENV_SPI_CS      0
-#define CONFIG_ENV_SPI_MAX_HZ  10000000
-#define CONFIG_ENV_SPI_MODE    0
 #define CONFIG_ENV_SIZE                0x2000     /* 8KB */
 #define CONFIG_ENV_OFFSET      0x100000   /* 1MB */
 #define CONFIG_ENV_SECT_SIZE   0x10000

diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h
index 80a4b13fd886ba3e48822f59dc7d982fea1fccf9..9e704122981b64e2b7e1755a39a1ab8e60ee7ac0 100644 (file)
--- a/include/configs/T4240QDS.h
+++ b/include/configs/T4240QDS.h
@@ -74,10 +74,6 @@
 #include "t4qds.h"
 
 #if defined(CONFIG_SPIFLASH)
-#define CONFIG_ENV_SPI_BUS              0
-#define CONFIG_ENV_SPI_CS               0
-#define CONFIG_ENV_SPI_MAX_HZ           10000000
-#define CONFIG_ENV_SPI_MODE             0
 #define CONFIG_ENV_SIZE                 0x2000          /* 8KB */
 #define CONFIG_ENV_OFFSET               0x100000        /* 1MB */
 #define CONFIG_ENV_SECT_SIZE            0x10000

diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index f007b62a3d7b3dccbdfcb58e0d2eb3cd51495756..71258c805d377df5c95bba6bb7f85236d260ffdd 100644 (file)
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -280,10 +280,6 @@
        "bootm 0x01000000 - 0x00f00000"
 
 #if defined(CONFIG_SPIFLASH)
-#define CONFIG_ENV_SPI_BUS              0
-#define CONFIG_ENV_SPI_CS               0
-#define CONFIG_ENV_SPI_MAX_HZ           10000000
-#define CONFIG_ENV_SPI_MODE             0
 #define CONFIG_ENV_SIZE                 0x2000          /* 8KB */
 #define CONFIG_ENV_OFFSET               0x100000        /* 1MB */
 #define CONFIG_ENV_SECT_SIZE            0x10000

diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h
index 0a996e097c83d82ad98f77ee450beac9638bf662..b518c222d4365491be6413fb3ab03bcc8625eaab 100644 (file)
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -328,10 +328,6 @@
 
 #else
 
-#define CONFIG_ENV_SPI_BUS     0
-#define CONFIG_ENV_SPI_CS      0
-#define CONFIG_ENV_SPI_MAX_HZ  10000000
-#define CONFIG_ENV_SPI_MODE    0
 
 #ifdef CONFIG_RAMBOOT_SPIFLASH
 

diff --git a/include/configs/adp-ae3xx.h b/include/configs/adp-ae3xx.h
index f2268dcb00d4229955eea6be2304e55c2b3410e4..1fe33917d01ffe3a24c0be9f9c3b37187c8f829a 100644 (file)
--- a/include/configs/adp-ae3xx.h
+++ b/include/configs/adp-ae3xx.h
@@ -201,10 +201,6 @@
 #define CONFIG_SYS_MAX_FLASH_SECT      512
 
 /* environments */
-#define CONFIG_ENV_SPI_BUS             0
-#define CONFIG_ENV_SPI_CS              0
-#define CONFIG_ENV_SPI_MAX_HZ          50000000
-#define CONFIG_ENV_SPI_MODE            0
 #define CONFIG_ENV_SECT_SIZE           0x1000
 #define CONFIG_ENV_OFFSET              0x140000
 #define CONFIG_ENV_SIZE                        8192

diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h
index a08f62b060c4eabeda88a07433c6d05d82d09d54..e2c70605b21fb18d811e8dad6e4c8082d16c6154 100644 (file)
--- a/include/configs/advantech_dms-ba16.h
+++ b/include/configs/advantech_dms-ba16.h
@@ -212,10 +212,6 @@
 #define CONFIG_ENV_SIZE                 (8 * 1024)
 #define CONFIG_ENV_OFFSET               (768 * 1024)
 #define CONFIG_ENV_SECT_SIZE            (64 * 1024)
-#define CONFIG_ENV_SPI_BUS              CONFIG_SF_DEFAULT_BUS
-#define CONFIG_ENV_SPI_CS               CONFIG_SF_DEFAULT_CS
-#define CONFIG_ENV_SPI_MODE             CONFIG_SF_DEFAULT_MODE
-#define CONFIG_ENV_SPI_MAX_HZ           CONFIG_SF_DEFAULT_SPEED
 
 #define CONFIG_SYS_FSL_USDHC_NUM        3
 

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index d8f05835c249dd6418bcf83e43aecd3b7ac76e97..0834ff502193cf2e8dd26fe4b2abfc5e3cc8aa42 100644 (file)
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -284,7 +284,6 @@
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     0x20000
 
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
-#define CONFIG_ENV_SPI_MAX_HZ          CONFIG_SF_DEFAULT_SPEED
 #define CONFIG_ENV_SECT_SIZE           (4 << 10) /* 4 KB sectors */
 #define CONFIG_ENV_OFFSET              (768 << 10) /* 768 KiB in */
 #define CONFIG_ENV_OFFSET_REDUND       (896 << 10) /* 896 KiB in */

diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index 55faa7bc250260ca79e35f1fe2de9e7f00c3895d..5a6080645a85b0d6e9e5aca46e890f2f0aa01e6f 100644 (file)
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -115,7 +115,6 @@
 
 #ifdef CONFIG_QSPI_BOOT
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
-#define CONFIG_ENV_SPI_MAX_HZ           CONFIG_SF_DEFAULT_SPEED
 #define CONFIG_ENV_SECT_SIZE           (64 << 10) /* 64 KB sectors */
 #define CONFIG_ENV_OFFSET              0x110000
 #define CONFIG_ENV_OFFSET_REDUND       0x120000

diff --git a/include/configs/ap121.h b/include/configs/ap121.h
index 96850b5761cfabc12dbf647a0b2e9ad085cd3fa1..0e8c3f70d9594f9c373b790453d7e9bc60f99b37 100644 (file)
--- a/include/configs/ap121.h
+++ b/include/configs/ap121.h
@@ -30,7 +30,6 @@
                                        "mtdparts default;" \
                                        "bootm 0x9f650000"
 
-#define CONFIG_ENV_SPI_MAX_HZ           25000000
 #define CONFIG_ENV_OFFSET               0x40000
 #define CONFIG_ENV_SECT_SIZE            0x10000
 #define CONFIG_ENV_SIZE                 0x10000

diff --git a/include/configs/ap143.h b/include/configs/ap143.h
index 4dbca917e39cde81b0d5f601f40089e2d242eb88..fa6921022d058318b3d7cd64f66ddaf6d0999916 100644 (file)
--- a/include/configs/ap143.h
+++ b/include/configs/ap143.h
@@ -34,7 +34,6 @@
                                        "mtdparts default;" \
                                        "bootm 0x9f680000"
 
-#define CONFIG_ENV_SPI_MAX_HZ           25000000
 #define CONFIG_ENV_OFFSET               0x40000
 #define CONFIG_ENV_SECT_SIZE            0x10000
 #define CONFIG_ENV_SIZE                 0x10000

diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h
index eecc0213fdf2bf08aee9e3171b0d36704fdaac94..4f28f524020ebfb85f7bcbcb3671fde9470436ef 100644 (file)
--- a/include/configs/aristainetos-common.h
+++ b/include/configs/aristainetos-common.h
@@ -149,10 +149,6 @@
 /* Environment organization */
 #define CONFIG_ENV_SIZE                        (12 * 1024)
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
-#define CONFIG_ENV_SPI_BUS             CONFIG_SF_DEFAULT_BUS
-#define CONFIG_ENV_SPI_CS              CONFIG_SF_DEFAULT_CS
-#define CONFIG_ENV_SPI_MAX_HZ          CONFIG_SF_DEFAULT_SPEED
-#define CONFIG_ENV_SPI_MODE            CONFIG_SF_DEFAULT_MODE
 #define CONFIG_ENV_SECT_SIZE           (0x010000)
 #define CONFIG_ENV_OFFSET              (0x0d0000)
 #define CONFIG_ENV_OFFSET_REDUND       (0x0e0000)

diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index 2177512fe82fa9e66d399ba109b6592ecc97fd07..95710fb4c8a1209522b98b5ca368269a00fa0360 100644 (file)
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -118,7 +118,6 @@
 #define CONFIG_ENV_OFFSET      0x4200
 #define CONFIG_ENV_SIZE                0x4200
 #define CONFIG_ENV_SECT_SIZE   0x210
-#define CONFIG_ENV_SPI_MAX_HZ  15000000
 #define CONFIG_BOOTCOMMAND     "sf probe 0:0; " \
                                "sf read 0x22000000 0x84000 0x294000; " \
                                "bootm 0x22000000"
@@ -128,7 +127,6 @@
 #define CONFIG_ENV_OFFSET      0x4200
 #define CONFIG_ENV_SIZE                0x4200
 #define CONFIG_ENV_SECT_SIZE   0x210
-#define CONFIG_ENV_SPI_MAX_HZ  15000000
 #define CONFIG_BOOTCOMMAND     "sf probe 0:1; " \
                                "sf read 0x22000000 0x84000 0x294000; " \
                                "bootm 0x22000000"

diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index 1c7fbe111f7e3a4ebdca7bab3f83017716aefe5a..599e2627f6cc812dacb3915046e3b157d59b75fa 100644 (file)
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -104,7 +104,6 @@
 #define CONFIG_ENV_OFFSET      0x4200
 #define CONFIG_ENV_SIZE                0x4200
 #define CONFIG_ENV_SECT_SIZE   0x210
-#define CONFIG_ENV_SPI_MAX_HZ  15000000
 #define CONFIG_BOOTCOMMAND     "sf probe 0; " \
                                "sf read 0x22000000 0x84000 0x294000; " \
                                "bootm 0x22000000"
@@ -115,7 +114,6 @@
 #define CONFIG_ENV_OFFSET      0x4200
 #define CONFIG_ENV_SIZE                0x4200
 #define CONFIG_ENV_SECT_SIZE   0x210
-#define CONFIG_ENV_SPI_MAX_HZ  15000000
 #define CONFIG_BOOTCOMMAND     "sf probe 0:3; " \
                                "sf read 0x22000000 0x84000 0x294000; " \
                                "bootm 0x22000000"

diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index 856e0328e7dbe3e5ae8c52fc678fa1ef4e01b298..6b1db9ff1e9e071c156dd330870c3133107cd025 100644 (file)
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -222,7 +222,6 @@
 #define CONFIG_ENV_OFFSET      0x4200
 #define CONFIG_ENV_SIZE                0x4200
 #define CONFIG_ENV_SECT_SIZE   0x210
-#define CONFIG_ENV_SPI_MAX_HZ  15000000
 #define CONFIG_BOOTCOMMAND     "sf probe 0; " \
                                "sf read 0x22000000 0x84000 0x294000; " \
                                "bootm 0x22000000"

diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index b052071478ba5fee9eaa41586ea7abcbfcebf5e1..3e18716e20fd6e6089cca903c26bc8c428b9424a 100644 (file)
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -76,7 +76,6 @@
 #define CONFIG_ENV_OFFSET      0x4200
 #define CONFIG_ENV_SIZE                0x4200
 #define CONFIG_ENV_SECT_SIZE   0x210
-#define CONFIG_ENV_SPI_MAX_HZ  15000000
 #define CONFIG_BOOTCOMMAND     "sf probe 0; " \
                                "sf read 0x22000000 0x84000 0x294000; " \
                                "bootm 0x22000000"

diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index d43d40842672d906784d561626e8e41706bcb85b..1abca551127614cc06b7786c5c6d6307eeeb0220 100644 (file)
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -84,7 +84,6 @@
 #define CONFIG_ENV_OFFSET      0x5000
 #define CONFIG_ENV_SIZE                0x3000
 #define CONFIG_ENV_SECT_SIZE   0x1000
-#define CONFIG_ENV_SPI_MAX_HZ  30000000
 #define CONFIG_BOOTCOMMAND     "sf probe 0; " \
                                "sf read 0x22000000 0x100000 0x300000; " \
                                "bootm 0x22000000"
@@ -93,7 +92,6 @@
 #define CONFIG_ENV_OFFSET      0x4200
 #define CONFIG_ENV_SIZE                0x4200
 #define CONFIG_ENV_SECT_SIZE   0x210
-#define CONFIG_ENV_SPI_MAX_HZ  30000000
 #define CONFIG_BOOTCOMMAND     "sf probe 0; " \
                                "sf read 0x22000000 0x84000 0x294000; " \
                                "bootm 0x22000000"

diff --git a/include/configs/ax25-ae350.h b/include/configs/ax25-ae350.h
index cd0721248ac7b62ff21d05a97b65e4734957446d..395f3a442da6e27a82cd26a492531d408dd5c430 100644 (file)
--- a/include/configs/ax25-ae350.h
+++ b/include/configs/ax25-ae350.h
@@ -113,10 +113,6 @@
 #define CONFIG_SYS_MAX_FLASH_SECT      512
 
 /* environments */
-#define CONFIG_ENV_SPI_BUS             0
-#define CONFIG_ENV_SPI_CS              0
-#define CONFIG_ENV_SPI_MAX_HZ          50000000
-#define CONFIG_ENV_SPI_MODE            0
 #define CONFIG_ENV_SECT_SIZE           0x1000
 #define CONFIG_ENV_OVERWRITE
 

diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h
index 89362229f9fad9c5410af2c7cc22b3136e783a2a..fb9c2a6d04d0e143238eed355f4ffe0cec4f9b3d 100644 (file)
--- a/include/configs/bav335x.h
+++ b/include/configs/bav335x.h
@@ -453,7 +453,6 @@ DEFAULT_LINUX_BOOT_ENV \
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     0x20000
 
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
-#define CONFIG_ENV_SPI_MAX_HZ          CONFIG_SF_DEFAULT_SPEED
 #define CONFIG_ENV_SECT_SIZE           (4 << 10) /* 4 KB sectors */
 #define CONFIG_ENV_OFFSET              (768 << 10) /* 768 KiB in */
 #define CONFIG_ENV_OFFSET_REDUND       (896 << 10) /* 896 KiB in */

diff --git a/include/configs/bg0900.h b/include/configs/bg0900.h
index 0c3d54a0821605f538d3953a87c3b10ef814dad3..832dbbaafcd5fc4a42bb945abd0f5046a280fcfa 100644 (file)
--- a/include/configs/bg0900.h
+++ b/include/configs/bg0900.h
@@ -21,10 +21,6 @@
 
 /* SPI FLASH */
 #ifdef CONFIG_CMD_SF
-#define CONFIG_ENV_SPI_BUS             2
-#define CONFIG_ENV_SPI_CS              0
-#define CONFIG_ENV_SPI_MAX_HZ          40000000
-#define CONFIG_ENV_SPI_MODE            SPI_MODE_0
 #endif
 
 /* Boot Linux */

diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h
index 2219663f2e3f008d484f468b8622696f0a383bc1..ae9b75bb87ad0c65a101b1efe60f444d9bd14570 100644 (file)
--- a/include/configs/brppt1.h
+++ b/include/configs/brppt1.h
@@ -190,7 +190,6 @@ NANDTGTS \
 #define CONFIG_SYS_SPI_U_BOOT_OFFS             0x40000
 /* Environment */
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
-#define CONFIG_ENV_SPI_MAX_HZ                  CONFIG_SF_DEFAULT_SPEED
 #define CONFIG_ENV_SECT_SIZE                   CONFIG_ENV_SIZE
 #define CONFIG_ENV_OFFSET                      0x20000
 #define CONFIG_ENV_OFFSET_REDUND               (CONFIG_ENV_OFFSET + \

diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
index ab8d1c64c0e0bd4d1645d31d51eaa0164545faf3..ad0a64a93686fd6d650c88907e4355474349859b 100644 (file)
--- a/include/configs/cgtqmx6eval.h
+++ b/include/configs/cgtqmx6eval.h
@@ -217,10 +217,6 @@
 #if defined(CONFIG_ENV_IS_IN_SPI_FLASH)
 #define CONFIG_ENV_OFFSET              (768 * 1024)
 #define CONFIG_ENV_SECT_SIZE           (64 * 1024)
-#define CONFIG_ENV_SPI_BUS             CONFIG_SF_DEFAULT_BUS
-#define CONFIG_ENV_SPI_CS              CONFIG_SF_DEFAULT_CS
-#define CONFIG_ENV_SPI_MODE            CONFIG_SF_DEFAULT_MODE
-#define CONFIG_ENV_SPI_MAX_HZ          CONFIG_SF_DEFAULT_SPEED
 #endif
 
 #endif                        /* __CONFIG_CGTQMX6EVAL_H */

diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h
index 687a9e703ca4e9d3669298216d8bfaa4d91d48b0..bf2bb44d486eb9d56caa4a20df375f1ea513f90a 100644 (file)
--- a/include/configs/cl-som-am57x.h
+++ b/include/configs/cl-som-am57x.h
@@ -42,7 +42,6 @@
 
 #define CONFIG_ENV_SECT_SIZE           (64 * 1024)
 #define CONFIG_ENV_OFFSET              (768 * 1024)
-#define CONFIG_ENV_SPI_MAX_HZ          48000000
 
 /* EEPROM */
 #define CONFIG_SYS_I2C_EEPROM_ADDR      0x50

diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index d895f89c82320d7e8d7b3dd38f8b29209899007a..26d1a97891d806486f8d8f70d9e3c8757bb6dca1 100644 (file)
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -145,10 +145,6 @@
 #define CONFIG_ENV_SIZE                        SZ_8K
 #define CONFIG_ENV_OFFSET              (768 * 1024)
 #define CONFIG_ENV_SECT_SIZE           (64 * 1024)
-#define CONFIG_ENV_SPI_BUS             CONFIG_SF_DEFAULT_BUS
-#define CONFIG_ENV_SPI_CS              CONFIG_SF_DEFAULT_CS
-#define CONFIG_ENV_SPI_MODE            CONFIG_SF_DEFAULT_MODE
-#define CONFIG_ENV_SPI_MAX_HZ          CONFIG_SF_DEFAULT_SPEED
 
 /* MMC Config*/
 #define CONFIG_FSL_USDHC

diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 2ac888f9f8fe1a7aed31e7ee138eeb1ac1f0a597..dfd96ff8d59a60530f29e2c3e108baaf7bab99ef 100644 (file)
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -46,10 +46,6 @@
 #endif
 
 /* Environment */
-#define CONFIG_ENV_SPI_MAX_HZ          CONFIG_SF_DEFAULT_SPEED
-#define CONFIG_ENV_SPI_MODE            CONFIG_SF_DEFAULT_MODE
-#define CONFIG_ENV_SPI_BUS             CONFIG_SF_DEFAULT_BUS
-#define CONFIG_ENV_SPI_CS              CONFIG_SF_DEFAULT_CS
 #define CONFIG_ENV_SECT_SIZE           (64 * 1024)
 #define CONFIG_ENV_SIZE                        (8 * 1024)
 #define CONFIG_ENV_OFFSET              (768 * 1024)

diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h
index 6df8b8b2a7e1877badb91ccc1f14fb6622c5563c..ffe4a44c869adb77b35bdc36227b760dd17f8194 100644 (file)
--- a/include/configs/cm_t43.h
+++ b/include/configs/cm_t43.h
@@ -85,7 +85,6 @@
 
 #define CONFIG_ENV_SECT_SIZE           (64 * 1024)
 #define CONFIG_ENV_OFFSET              (768 * 1024)
-#define CONFIG_ENV_SPI_MAX_HZ           48000000
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "loadaddr=0x80200000\0" \

diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
index 69c65f19eda5c1fee4c51405d543ca1d1fe7f983..f1c3522c68cd19e39b0232bf7dedfc3496065496 100644 (file)
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -275,10 +275,6 @@
 #if defined(CONFIG_TRAILBLAZER)
 #define CONFIG_ENV_SIZE                0x2000          /* 8KB */
 #elif defined(CONFIG_RAMBOOT_SPIFLASH)
-#define CONFIG_ENV_SPI_BUS     0
-#define CONFIG_ENV_SPI_CS      0
-#define CONFIG_ENV_SPI_MAX_HZ  10000000
-#define CONFIG_ENV_SPI_MODE    0
 #define CONFIG_ENV_SIZE                0x2000          /* 8KB */
 #define CONFIG_ENV_OFFSET      0x100000        /* 1MB */
 #define CONFIG_ENV_SECT_SIZE   0x10000

diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h
index edd8749d74f7edd192217f8e5bd4f5e16301ef38..91308377c202086e19ebfafa475baa5e7c5dd6cd 100644 (file)
--- a/include/configs/controlcenterdc.h
+++ b/include/configs/controlcenterdc.h
@@ -43,7 +43,6 @@
 #define CONFIG_EHCI_IS_TDI
 
 /* Environment in SPI NOR flash */
-#define CONFIG_ENV_SPI_BUS             1
 #define CONFIG_ENV_OFFSET              (1 << 20) /* 1MiB in */
 #define CONFIG_ENV_SIZE                        (64 << 10) /* 64KiB */
 #define CONFIG_ENV_SECT_SIZE           (256 << 10) /* 256KiB sectors */

diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index a3963db6282fefb3f73eed7762e2064896b7b6a8..f974291eac1f51b70d868685d9bd67350518cac1 100644 (file)
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -60,10 +60,6 @@
 #define CONFIG_ENV_OVERWRITE
 
 #if defined(CONFIG_SPIFLASH)
-#define CONFIG_ENV_SPI_BUS              0
-#define CONFIG_ENV_SPI_CS               0
-#define CONFIG_ENV_SPI_MAX_HZ           10000000
-#define CONFIG_ENV_SPI_MODE             0
 #define CONFIG_ENV_SIZE                 0x2000          /* 8KB */
 #define CONFIG_ENV_OFFSET               0x100000        /* 1MB */
 #define CONFIG_ENV_SECT_SIZE            0x10000

diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index 7b1e53f7672b9fa7a3248a762f76c87ecb51772a..583f9948072830b81e49d1ae6cb08362c4a8664e 100644 (file)
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -124,8 +124,6 @@
 #ifdef CONFIG_SPL_BUILD
 #define CONFIG_SYS_SPI_BASE            DAVINCI_SPI1_BASE
 #endif
-#define CONFIG_ENV_SPI_MAX_HZ  0
-#define CONFIG_ENV_SPI_MODE    0
 
 #ifdef CONFIG_USE_SPIFLASH
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     0x8000

diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h
index 222bdf81f6b9a81ec7dee12e41a32286b8c1664a..f1bdc2d3e74ffb9a3cd783e4e39e7082f3ed6210 100644 (file)
--- a/include/configs/db-88f6820-amc.h
+++ b/include/configs/db-88f6820-amc.h
@@ -22,7 +22,6 @@
 #define CONFIG_EHCI_IS_TDI
 
 /* Environment in SPI NOR flash */
-#define CONFIG_ENV_SPI_BUS             1
 #define CONFIG_ENV_OFFSET              (1 << 20) /* 1MiB in */
 #define CONFIG_ENV_SIZE                        (64 << 10) /* 64KiB */
 #define CONFIG_ENV_SECT_SIZE           (256 << 10) /* 256KiB sectors */

diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h
index 967b1334368a9159b7766a9e9292e7743108c81d..d378052a8f7caf0925ead9aded12df677b2ff853 100644 (file)
--- a/include/configs/db-88f6820-gp.h
+++ b/include/configs/db-88f6820-gp.h
@@ -26,8 +26,6 @@
 /*
  * SPI Flash configuration for the environemnt access
  */
-#define CONFIG_ENV_SPI_BUS             0
-#define CONFIG_ENV_SPI_CS              0
 
 /* SPI NOR flash default params, used by sf commands */
 

diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index 1c1178c342975132043f4ecdf31f0073f1fbec2d..48514ff076b37ce4d18946b206afbc170ff3802b 100644 (file)
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -163,10 +163,6 @@
 #define CONFIG_ENV_OFFSET_REDUND       \
        (CONFIG_ENV_OFFSET + CONFIG_ENV_SECT_SIZE)
 #define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE
-#define CONFIG_ENV_SPI_BUS             CONFIG_SF_DEFAULT_BUS
-#define CONFIG_ENV_SPI_CS              CONFIG_SF_DEFAULT_CS
-#define CONFIG_ENV_SPI_MODE            CONFIG_SF_DEFAULT_MODE
-#define CONFIG_ENV_SPI_MAX_HZ          CONFIG_SF_DEFAULT_SPEED
 #endif
 
 #endif /* __DH_IMX6_CONFIG_H */

diff --git a/include/configs/display5.h b/include/configs/display5.h
index d729054eb81f00e0633c6d0c9173fc90c5a1365a..8ab47abfa85d0ffc36b19d24e76780618f321ff9 100644 (file)
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -374,11 +374,6 @@
 #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + \
                                                CONFIG_ENV_SECT_SIZE)
 #define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE
-
-#define CONFIG_ENV_SPI_BUS             CONFIG_SF_DEFAULT_BUS
-#define CONFIG_ENV_SPI_CS              CONFIG_SF_DEFAULT_CS
-#define CONFIG_ENV_SPI_MODE            CONFIG_SF_DEFAULT_MODE
-#define CONFIG_ENV_SPI_MAX_HZ          CONFIG_SF_DEFAULT_SPEED
 #endif
 
 #define CONFIG_MXC_USB_PORTSC           (PORT_PTS_UTMI | PORT_PTS_PTW)

diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index 36e15824a13750882a6edcfc2c2b128776cc9693..10eac20aa0c8fca754550a74c23f3853b2171451 100644 (file)
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -91,7 +91,6 @@
 #define CONFIG_SYS_SPI_ARGS_SIZE       0x80000
 #if defined(CONFIG_QSPI_BOOT)
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
-#define CONFIG_ENV_SPI_MAX_HZ           CONFIG_SF_DEFAULT_SPEED
 #define CONFIG_ENV_SIZE                        (64 << 10)
 #define CONFIG_ENV_SECT_SIZE           (64 << 10) /* 64 KB sectors */
 #define CONFIG_ENV_OFFSET              0x1C0000

diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h
index f4d717213ce172ecab751d88387864d99a81d86e..28bda14c3d9384f521a0e5137cbdf26e4b3091c2 100644 (file)
--- a/include/configs/dreamplug.h
+++ b/include/configs/dreamplug.h
@@ -35,9 +35,6 @@
 #endif
 
 #ifdef CONFIG_CMD_SF
-#define CONFIG_ENV_SPI_BUS             0
-#define CONFIG_ENV_SPI_CS              0
-#define CONFIG_ENV_SPI_MAX_HZ          50000000 /* 50 MHz */
 #endif
 
 /*

diff --git a/include/configs/ds109.h b/include/configs/ds109.h
index 2c7928e88c1c181b80f53921cc0588c5b6b1f7b3..07367cfef05a31f56024561d12e322eaaa0437ac 100644 (file)
--- a/include/configs/ds109.h
+++ b/include/configs/ds109.h
@@ -38,9 +38,6 @@
 #endif
 
 #ifdef CONFIG_CMD_SF
-#define CONFIG_ENV_SPI_BUS             0
-#define CONFIG_ENV_SPI_CS              0
-#define CONFIG_ENV_SPI_MAX_HZ          50000000 /* 50 MHz */
 #endif
 
 /*

diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index 800ce03931fb8374076cf4e1715b1ca8a9992127..88f2e17d40227751d5289a6ffc7a25caa2c56ffb 100644 (file)
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -52,7 +52,6 @@
 
 #define CONFIG_SYS_SPI_BASE            DAVINCI_SPI1_BASE
 #define CONFIG_SYS_SPI_CLK             clk_get(DAVINCI_SPI1_CLKID)
-#define CONFIG_ENV_SPI_MAX_HZ  CONFIG_SF_DEFAULT_SPEED
 
 /*
  * I2C Configuration

diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index f98454012da7e8b5d728138c9fef3078645f97b3..5142680e7d6f520d59240c295b36e28765b51414 100644 (file)
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -83,10 +83,6 @@
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 #define CONFIG_ENV_OFFSET              (768 * 1024)
 #define CONFIG_ENV_SECT_SIZE           (8 * 1024)
-#define CONFIG_ENV_SPI_BUS             CONFIG_SF_DEFAULT_BUS
-#define CONFIG_ENV_SPI_CS              CONFIG_SF_DEFAULT_CS
-#define CONFIG_ENV_SPI_MODE            CONFIG_SF_DEFAULT_MODE
-#define CONFIG_ENV_SPI_MAX_HZ          CONFIG_SF_DEFAULT_SPEED
 #endif
 
 /* Framebuffer */

diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index 0d84c97b9860c72901730261a1a29966cc058ebb..b86b54209cab29995e3b12382275698e62c82bc5 100644 (file)
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -54,7 +54,6 @@
 #define CONFIG_ENV_OFFSET      0x3DE000
 #define CONFIG_ENV_SIZE                (132 << 10)
 #define CONFIG_ENV_SECT_SIZE   CONFIG_ENV_SIZE
-#define CONFIG_ENV_SPI_MAX_HZ  15000000
 
 /* NAND flash */
 #ifdef CONFIG_CMD_NAND

diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h
index 5641f09a4a797ce956e97aa989061ea369ee7524..db1fc934bbba08568952b357b643d779408bf1a3 100644 (file)
--- a/include/configs/exynos5-common.h
+++ b/include/configs/exynos5-common.h
@@ -110,10 +110,7 @@
 /* SPI */
 
 #ifdef CONFIG_ENV_IS_IN_SPI_FLASH
-#define CONFIG_ENV_SPI_MODE    SPI_MODE_0
 #define CONFIG_ENV_SECT_SIZE   CONFIG_ENV_SIZE
-#define CONFIG_ENV_SPI_BUS     1
-#define CONFIG_ENV_SPI_MAX_HZ  50000000
 #endif
 
 /* Ethernet Controllor Driver */

diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index 9ca3ee3920cb3e8ceb790113a2ba3ecd4b80c0da..333657807177c97636506c9222d865df0839aa46 100644 (file)
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -172,10 +172,6 @@
 #define CONFIG_ENV_SIZE                (8 * 1024)
 #define CONFIG_ENV_OFFSET              (768 * 1024)
 #define CONFIG_ENV_SECT_SIZE           (64 * 1024)
-#define CONFIG_ENV_SPI_BUS             CONFIG_SF_DEFAULT_BUS
-#define CONFIG_ENV_SPI_CS              CONFIG_SF_DEFAULT_CS
-#define CONFIG_ENV_SPI_MODE            CONFIG_SF_DEFAULT_MODE
-#define CONFIG_ENV_SPI_MAX_HZ          CONFIG_SF_DEFAULT_SPEED
 
 #define CONFIG_SYS_FSL_USDHC_NUM       3
 

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index a4215c87cfeb338a1ca35531ddb361e39a5ae60a..84ee44e87205a48e302e35ab7208fe44b7c19dfd 100644 (file)
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -181,10 +181,6 @@
   #define CONFIG_ENV_OFFSET            (512 * SZ_1K)
   #define CONFIG_ENV_SECT_SIZE         (64 * SZ_1K)
   #define CONFIG_ENV_SIZE              (8 * SZ_1K)
-  #define CONFIG_ENV_SPI_BUS             CONFIG_SF_DEFAULT_BUS
-  #define CONFIG_ENV_SPI_CS              CONFIG_SF_DEFAULT_CS
-  #define CONFIG_ENV_SPI_MODE            CONFIG_SF_DEFAULT_MODE
-  #define CONFIG_ENV_SPI_MAX_HZ          CONFIG_SF_DEFAULT_SPEED
 #endif
 
 /* Environment */

diff --git a/include/configs/helios4.h b/include/configs/helios4.h
index 5a1164131508794ae30d2643bd4b2b8274f14a41..df4d8bcb3bbf869c830a8b0138e6d1b446c144a9 100644 (file)
--- a/include/configs/helios4.h
+++ b/include/configs/helios4.h
@@ -45,13 +45,6 @@
                                        CONFIG_SYS_SCSI_MAX_LUN)
 
 #ifdef CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI
-/*
- * SPI Flash configuration for the environment access
- */
-#define CONFIG_ENV_SPI_BUS             CONFIG_SF_DEFAULT_BUS
-#define CONFIG_ENV_SPI_CS              CONFIG_SF_DEFAULT_CS
-#define CONFIG_ENV_SPI_MAX_HZ          CONFIG_SF_DEFAULT_SPEED
-
 /* Environment in SPI NOR flash */
 #define CONFIG_ENV_SECT_SIZE           SZ_64K
 #define CONFIG_ENV_SIZE                        CONFIG_ENV_SECT_SIZE

diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index f93629ecc9a9ea889dc6a42c96eb5454ceeaeb31..a2e9cf1fa5bcec1dd5593ba3dd8163c971d32e11 100644 (file)
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -35,10 +35,6 @@
 /* SPI NOR Flash default params, used by sf commands */
 
 #if defined CONFIG_KM_ENV_IS_IN_SPI_NOR
-#define CONFIG_ENV_SPI_BUS             0
-#define CONFIG_ENV_SPI_CS              0
-#define CONFIG_ENV_SPI_MAX_HZ          8100000
-#define CONFIG_ENV_SPI_MODE            SPI_MODE_3
 #endif
 
 /* Reserve 4 MB for malloc */

diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h
index 37b9abc7b27671e3907ce98d8714f2e002e74f13..a52d1df120ccc55a165b61f5f1a3b82d77e2c1aa 100644 (file)
--- a/include/configs/km/kmp204x-common.h
+++ b/include/configs/km/kmp204x-common.h
@@ -39,10 +39,6 @@
 #define CONFIG_SYS_DPAA_RMAN           /* RMan */
 
 /* Environment in SPI Flash */
-#define CONFIG_ENV_SPI_BUS              0
-#define CONFIG_ENV_SPI_CS               0
-#define CONFIG_ENV_SPI_MAX_HZ           20000000
-#define CONFIG_ENV_SPI_MODE             0
 #define CONFIG_ENV_OFFSET               0x100000       /* 1MB for u-boot */
 #define CONFIG_ENV_SIZE                        0x004000        /* 16K env */
 #define CONFIG_ENV_SECT_SIZE            0x010000

diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
index 1f619a0d27dc027a37c45faafb4729aba2f28049..1ba28b501f58bd1ef1c83fe9e960f9efa12cbba1 100644 (file)
--- a/include/configs/lacie_kw.h
+++ b/include/configs/lacie_kw.h
@@ -65,10 +65,8 @@
 #include "mv-common.h"
 
 /* Remove or override few declarations from mv-common.h */
-#undef CONFIG_ENV_SPI_MAX_HZ
 #undef CONFIG_SYS_IDE_MAXBUS
 #undef CONFIG_SYS_IDE_MAXDEVICE
-#define CONFIG_ENV_SPI_MAX_HZ           20000000 /* 20Mhz */
 
 /*
  * Enable platform initialisation via misc_init_r() function

diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h
index ce806d162a0385dc8f865280c396d7dc96b8690e..1e239ecadd016f43474ea8db302a326de8a51a2e 100644 (file)
--- a/include/configs/legoev3.h
+++ b/include/configs/legoev3.h
@@ -47,7 +47,6 @@
 
 #define CONFIG_SYS_SPI_BASE            DAVINCI_SPI0_BASE
 #define CONFIG_SYS_SPI_CLK             clk_get(DAVINCI_SPI0_CLKID)
-#define CONFIG_ENV_SPI_MAX_HZ          CONFIG_SF_DEFAULT_SPEED
 
 /*
  * I2C Configuration

diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h
index 04639c175f5acab9dcafa44ec1e319f24a22f090..3a42210c6e59d2cd02d797e3facf8a5c4ab1bbd2 100644 (file)
--- a/include/configs/ls1012a_common.h
+++ b/include/configs/ls1012a_common.h
@@ -40,10 +40,6 @@
 #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_TFABOOT)
 #define CONFIG_SYS_QE_FW_IN_SPIFLASH
 #define CONFIG_SYS_FMAN_FW_ADDR                0x400d0000
-#define CONFIG_ENV_SPI_BUS             0
-#define CONFIG_ENV_SPI_CS              0
-#define CONFIG_ENV_SPI_MAX_HZ          1000000
-#define CONFIG_ENV_SPI_MODE            0x03
 #define CONFIG_SPI_FLASH_SPANSION
 #define CONFIG_FSL_SPI_INTERFACE
 #define CONFIG_SF_DATAFLASH

diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index bc804c531e2a227f90c6c0fec482ac6c90cf8604..2e9d47648323f14a85df079f282dc1223cdd2b3e 100644 (file)
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -186,10 +186,6 @@
 #define CONFIG_SYS_FMAN_FW_ADDR                0x900000
 #define CONFIG_SYS_QE_FW_ADDR          0x940000
 
-#define CONFIG_ENV_SPI_BUS             0
-#define CONFIG_ENV_SPI_CS              0
-#define CONFIG_ENV_SPI_MAX_HZ          1000000
-#define CONFIG_ENV_SPI_MODE            0x03
 
 #else
 #ifdef CONFIG_NAND_BOOT
@@ -208,10 +204,6 @@
 #elif defined(CONFIG_QSPI_BOOT)
 #define CONFIG_SYS_QE_FW_IN_SPIFLASH
 #define CONFIG_SYS_FMAN_FW_ADDR                0x40900000
-#define CONFIG_ENV_SPI_BUS             0
-#define CONFIG_ENV_SPI_CS              0
-#define CONFIG_ENV_SPI_MAX_HZ          1000000
-#define CONFIG_ENV_SPI_MODE            0x03
 #else
 #define CONFIG_SYS_QE_FMAN_FW_IN_NOR
 /* FMan fireware Pre-load address */

diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index d9fcd3af5efaf4766c433c59a9b871e4c1360826..24ff2d15470fd5650730ac366d1860fcdb60c482 100644 (file)
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -170,10 +170,6 @@
 
 #ifdef CONFIG_TFABOOT
 #define CONFIG_SYS_FMAN_FW_ADDR                0x900000
-#define CONFIG_ENV_SPI_BUS             0
-#define CONFIG_ENV_SPI_CS              0
-#define CONFIG_ENV_SPI_MAX_HZ          1000000
-#define CONFIG_ENV_SPI_MODE            0x03
 #else
 #ifdef CONFIG_SD_BOOT
 /*
@@ -186,10 +182,6 @@
 #elif defined(CONFIG_QSPI_BOOT)
 #define CONFIG_SYS_QE_FW_IN_SPIFLASH
 #define CONFIG_SYS_FMAN_FW_ADDR                0x40900000
-#define CONFIG_ENV_SPI_BUS             0
-#define CONFIG_ENV_SPI_CS              0
-#define CONFIG_ENV_SPI_MAX_HZ          1000000
-#define CONFIG_ENV_SPI_MODE            0x03
 #elif defined(CONFIG_NAND_BOOT)
 #define CONFIG_SYS_QE_FMAN_FW_IN_NAND
 #define CONFIG_SYS_FMAN_FW_ADDR                (36 * CONFIG_SYS_NAND_BLOCK_SIZE)

diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h
index bcad8a030de9bd0cf3256b143b6a2441af5f996f..72e62658d0ccc7a201e134111706a148b3160b23 100644 (file)
--- a/include/configs/lsxl.h
+++ b/include/configs/lsxl.h
@@ -45,10 +45,6 @@
 
 /* loading initramfs images without uimage header */
 
-/* ST M25P40 */
-#undef CONFIG_ENV_SPI_MAX_HZ
-#define CONFIG_ENV_SPI_MAX_HZ          25000000
-
 /*
  *  Environment variables configurations
  */

diff --git a/include/configs/meesc.h b/include/configs/meesc.h
index 0a03a2f5c7ab8d867792c590d504ccfbc11208da..a1fd5f61950b344ee4c2d72873d2e8b83d7108b7 100644 (file)
--- a/include/configs/meesc.h
+++ b/include/configs/meesc.h
@@ -99,7 +99,6 @@
 #define CONFIG_ENV_OFFSET      0x4200
 #define CONFIG_ENV_SIZE                0x4200
 #define CONFIG_ENV_SECT_SIZE   0x210
-#define CONFIG_ENV_SPI_MAX_HZ  15000000
 
 #elif CONFIG_SYS_USE_NANDFLASH
 

diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index d81194bb43cbc4cfbc371e5c7dcb242185570101..d1ab40ec13dd95ddddc2da5a96e5594ca6f4f5a7 100644 (file)
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -86,9 +86,6 @@
 #  define CONFIG_ENV_ADDR      (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SIZE)
 
 # else /* SPIFLASH && !RAMENV */
-#  define CONFIG_ENV_SPI_MODE          SPI_MODE_3
-#  define CONFIG_ENV_SPI_MAX_HZ                CONFIG_SF_DEFAULT_SPEED
-#  define CONFIG_ENV_SPI_CS            CONFIG_SF_DEFAULT_CS
 /* 128K(two sectors) for env */
 #  define CONFIG_ENV_SECT_SIZE 0x10000
 #  define CONFIG_ENV_SIZE      (2 * CONFIG_ENV_SECT_SIZE)

diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h
index e8981334aecc73258eae1380e8fc4a6996c67c00..10b94f438f1168df61534454fd837b52790da989 100644 (file)
--- a/include/configs/mvebu_armada-37xx.h
+++ b/include/configs/mvebu_armada-37xx.h
@@ -57,11 +57,7 @@
 /*
  * SPI Flash configuration
  */
-#define CONFIG_ENV_SPI_BUS             0
-#define CONFIG_ENV_SPI_CS              0
 
-/* SPI NOR flash default params, used by sf commands */
-#define CONFIG_ENV_SPI_MODE            CONFIG_SF_DEFAULT_MODE
 #define CONFIG_MTD_DEVICE              /* needed for mtdparts commands */
 #define CONFIG_MTD_PARTITIONS          /* required for UBI partition support */
 

diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h
index 51f484d2e7db91deff88264280c61dec4daad301..f4972b64dcb158cf6ff8463cb56197957c8a5801 100644 (file)
--- a/include/configs/mvebu_armada-8k.h
+++ b/include/configs/mvebu_armada-8k.h
@@ -52,11 +52,6 @@
 /*
  * SPI Flash configuration
  */
-#define CONFIG_ENV_SPI_BUS             0
-#define CONFIG_ENV_SPI_CS              0
-
-/* SPI NOR flash default params, used by sf commands */
-#define CONFIG_ENV_SPI_MODE            CONFIG_SF_DEFAULT_MODE
 
 #define CONFIG_ENV_OFFSET              0x180000 /* as Marvell U-Boot version */
 #define CONFIG_ENV_SIZE                        (64 << 10) /* 64KiB */

diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index a078e3a0b8004f2a07ccb0815773732496c2b386..dd045804ae1bbe587e0974737af0df5c370d39b6 100644 (file)
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -48,10 +48,6 @@
 #define CONFIG_ENV_OFFSET              0x40000         /* 256K */
 #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
 #define CONFIG_ENV_SECT_SIZE           0x1000
-#define CONFIG_ENV_SPI_CS              0
-#define CONFIG_ENV_SPI_BUS             2
-#define CONFIG_ENV_SPI_MAX_HZ          24000000
-#define CONFIG_ENV_SPI_MODE            SPI_MODE_0
 #endif
 
 /* UBI and NAND partitioning */

diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index 2cce3d5d9e03129f795e582682a020f82b969c68..5d649f6e2f08ab47421546abdc359d01c48509c7 100644 (file)
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -136,10 +136,6 @@
 #if defined CONFIG_SPI_BOOT
 #define CONFIG_ENV_OFFSET               (768 * 1024)
 #define CONFIG_ENV_SECT_SIZE            (64 * 1024)
-#define CONFIG_ENV_SPI_BUS              CONFIG_SF_DEFAULT_BUS
-#define CONFIG_ENV_SPI_CS               CONFIG_SF_DEFAULT_CS
-#define CONFIG_ENV_SPI_MODE             CONFIG_SF_DEFAULT_MODE
-#define CONFIG_ENV_SPI_MAX_HZ           CONFIG_SF_DEFAULT_SPEED
 #else
 #define CONFIG_ENV_OFFSET              (8 * SZ_64K)
 #endif

diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index c37a766368765e16b00425163ecafa640a8c90a9..d941caa905e78fe3e8eeb3cfb0275ff1860673a3 100644 (file)
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -158,10 +158,6 @@
 #elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
 #define CONFIG_ENV_OFFSET              (768 * 1024)
 #define CONFIG_ENV_SECT_SIZE           (8 * 1024)
-#define CONFIG_ENV_SPI_BUS             CONFIG_SF_DEFAULT_BUS
-#define CONFIG_ENV_SPI_CS              CONFIG_SF_DEFAULT_CS
-#define CONFIG_ENV_SPI_MODE            CONFIG_SF_DEFAULT_MODE
-#define CONFIG_ENV_SPI_MAX_HZ          CONFIG_SF_DEFAULT_SPEED
 #endif
 
 /*

diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index 5f5aa57a4b040a54b19973f27b5f6c23d4376a5c..1786e099ad4f7f7bff87b56ddd789f8ed85b3e5a 100644 (file)
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -119,7 +119,6 @@
 
 #define CONFIG_SYS_SPI_BASE            DAVINCI_SPI1_BASE
 #define CONFIG_SYS_SPI_CLK             clk_get(DAVINCI_SPI1_CLKID)
-#define CONFIG_ENV_SPI_MAX_HZ  CONFIG_SF_DEFAULT_SPEED
 
 #ifdef CONFIG_USE_SPIFLASH
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     0x8000

diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h
index 67541819cd63344991c94606cc31b092b51ff8f0..925e7ae3dbc5d6d6c9bc8228f45f72828d8aa4c6 100644 (file)
--- a/include/configs/ot1200.h
+++ b/include/configs/ot1200.h
@@ -99,10 +99,6 @@
 #define CONFIG_ENV_OFFSET               (1024 * 1024)
 /* M25P16 has an erase size of 64 KiB */
 #define CONFIG_ENV_SECT_SIZE            (64 * 1024)
-#define CONFIG_ENV_SPI_BUS              CONFIG_SF_DEFAULT_BUS
-#define CONFIG_ENV_SPI_CS               CONFIG_SF_DEFAULT_CS
-#define CONFIG_ENV_SPI_MODE             CONFIG_SF_DEFAULT_MODE
-#define CONFIG_ENV_SPI_MAX_HZ           CONFIG_SF_DEFAULT_SPEED
 
 #define CONFIG_BOOTP_SERVERIP
 #define CONFIG_BOOTP_BOOTFILE

diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 24003c2b1c3e11e27cc5dbbfcd1ca9a9ef3e2c0b..8fa91fb81d31159d5d5a56a3e4de3a9c4d2f8aaa 100644 (file)
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -700,10 +700,6 @@
  * Environment
  */
 #ifdef CONFIG_SPIFLASH
-#define CONFIG_ENV_SPI_BUS     0
-#define CONFIG_ENV_SPI_CS      0
-#define CONFIG_ENV_SPI_MAX_HZ  10000000
-#define CONFIG_ENV_SPI_MODE    0
 #define CONFIG_ENV_SIZE                0x2000  /* 8KB */
 #define CONFIG_ENV_OFFSET      0x100000        /* 1MB */
 #define CONFIG_ENV_SECT_SIZE   0x10000

diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h
index 15dc1b2dbeeeb71a30dbe77451b54f1fca8dabf6..b0415b28adeb12507787aa4cb18a61bc918091d8 100644 (file)
--- a/include/configs/pcm058.h
+++ b/include/configs/pcm058.h
@@ -78,10 +78,6 @@
 #define CONFIG_ENV_SIZE                (16 * 1024)
 #define CONFIG_ENV_OFFSET              (1024 * SZ_1K)
 #define CONFIG_ENV_SECT_SIZE           (64 * SZ_1K)
-#define CONFIG_ENV_SPI_BUS             CONFIG_SF_DEFAULT_BUS
-#define CONFIG_ENV_SPI_CS              CONFIG_SF_DEFAULT_CS
-#define CONFIG_ENV_SPI_MODE            CONFIG_SF_DEFAULT_MODE
-#define CONFIG_ENV_SPI_MAX_HZ          CONFIG_SF_DEFAULT_SPEED
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + \
                                                CONFIG_ENV_SECT_SIZE)

diff --git a/include/configs/pfla02.h b/include/configs/pfla02.h
index fe54e54595c8afda92389688e034d9501f0bd15b..3a9b85acd8d75484dab4ef02c68acba4c03460ec 100644 (file)
--- a/include/configs/pfla02.h
+++ b/include/configs/pfla02.h
@@ -79,10 +79,6 @@
 #define CONFIG_ENV_SIZE                (16 * 1024)
 #define CONFIG_ENV_OFFSET              (1024 * SZ_1K)
 #define CONFIG_ENV_SECT_SIZE           (64 * SZ_1K)
-#define CONFIG_ENV_SPI_BUS             CONFIG_SF_DEFAULT_BUS
-#define CONFIG_ENV_SPI_CS              CONFIG_SF_DEFAULT_CS
-#define CONFIG_ENV_SPI_MODE            CONFIG_SF_DEFAULT_MODE
-#define CONFIG_ENV_SPI_MAX_HZ          CONFIG_SF_DEFAULT_SPEED
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + \
                                                CONFIG_ENV_SECT_SIZE)

diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index e88948c7f5e036c6c10754a7f1ef74d9fb7cee41..c1ce12217aa7ad7e0632f12cd524b91f89ade430 100644 (file)
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -207,7 +207,6 @@
 #define CONFIG_ENV_OFFSET      0x4200
 #define CONFIG_ENV_SIZE                0x4200
 #define CONFIG_ENV_SECT_SIZE   0x210
-#define CONFIG_ENV_SPI_MAX_HZ  15000000
 #define CONFIG_BOOTCOMMAND     "sf probe 0; " \
                                "sf read 0x22000000 0x84000 0x210000; " \
                                "bootm 0x22000000"

diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index f11879b4e9c7b095629ed59ccf7372f8343c36a0..b09d8515d3c533d04109524fc6879cf4857f6499 100644 (file)
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -236,7 +236,6 @@
 #define CONFIG_ENV_OFFSET      0x4200
 #define CONFIG_ENV_SIZE                0x4200
 #define CONFIG_ENV_SECT_SIZE   0x210
-#define CONFIG_ENV_SPI_MAX_HZ  15000000
 #define CONFIG_BOOTCOMMAND     "sf probe 0; " \
                                "sf read 0x22000000 0x84000 0x294000; " \
                                "bootm 0x22000000"

diff --git a/include/configs/puma_rk3399.h b/include/configs/puma_rk3399.h
index 45a4ccc18f0a21c00ddcbe96c4cdbffd7fff6792..4d6085d2dd833affd08cd24f25aae9b91d125dad 100644 (file)
--- a/include/configs/puma_rk3399.h
+++ b/include/configs/puma_rk3399.h
@@ -12,10 +12,6 @@
 #define CONFIG_SYS_MMC_ENV_DEV 1
 #elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
 #define CONFIG_ENV_SECT_SIZE           (8 * 1024)
-#define CONFIG_ENV_SPI_BUS             CONFIG_SF_DEFAULT_BUS
-#define CONFIG_ENV_SPI_CS              CONFIG_SF_DEFAULT_CS
-#define CONFIG_ENV_SPI_MODE            CONFIG_SF_DEFAULT_MODE
-#define CONFIG_ENV_SPI_MAX_HZ  CONFIG_SF_DEFAULT_SPEED
 #endif
 
 #define SDRAM_BANK_SIZE                        (2UL << 30)

diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 8f2dd5f4d6784db1922eea309957c1f75f1fd3e3..f44a4280f435bb02e6831e118291fe1eb83c2108 100644 (file)
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -179,7 +179,6 @@
  * 0x442000 - 0x800000 : Userland
  */
 #if defined(CONFIG_SPI_BOOT)
-# define CONFIG_ENV_SPI_MAX_HZ         CONFIG_SF_DEFAULT_SPEED
 # define CONFIG_ENV_OFFSET             (892 << 10) /* 892 KiB in */
 # define CONFIG_ENV_SECT_SIZE          (4 << 10) /* 4 KB sectors */
 #endif /* SPI support */

diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h
index d9de07543dcd53018b0fa76d41685de908ab94ad..b6a98611c0e05a2f1ef2f67a1c139478a8bd1dac 100644 (file)
--- a/include/configs/socfpga_sr1500.h
+++ b/include/configs/socfpga_sr1500.h
@@ -35,10 +35,6 @@
 #define CONFIG_ENV_SIZE                (16 * 1024)
 #define CONFIG_ENV_OFFSET      0x000e0000
 #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SPI_BUS     0
-#define CONFIG_ENV_SPI_CS      0
-#define CONFIG_ENV_SPI_MODE    SPI_MODE_3
-#define CONFIG_ENV_SPI_MAX_HZ  100000000       /* Use max of 100MHz */
 
 /*
  * The QSPI NOR flash layout on SR1500:

diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h
index fa3d6b8a7bb990dcdded0f563aabca4066b6f771..17f92d89c96825a35afcbd24245cdd8fdf63cf07 100644 (file)
--- a/include/configs/stmark2.h
+++ b/include/configs/stmark2.h
@@ -65,8 +65,6 @@
 /* DSPI and Serial Flash */
 #define CONFIG_CF_DSPI
 #define CONFIG_SERIAL_FLASH
-#define CONFIG_ENV_SPI_BUS             0
-#define CONFIG_ENV_SPI_CS              1
 
 #define CONFIG_SYS_SBFHDR_SIZE         0x7
 
@@ -152,7 +150,6 @@
 
 #if defined(CONFIG_CF_SBF)
 #define CONFIG_ENV_IS_IN_SPI_FLASH     1
-#define CONFIG_ENV_SPI_CS              1
 #define CONFIG_ENV_OFFSET              0x40000
 #define CONFIG_ENV_SIZE                        0x2000
 #define CONFIG_ENV_SECT_SIZE           0x10000

diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index 767615a0852f3fcb27efcaa527ebc8d5ea6adeef..fb8c082c1dcdaf706d07d5af791ec628ac75c748 100644 (file)
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -71,7 +71,6 @@
 
 /* SPI Configuration */
 #define CONFIG_SYS_SPI_CLK             ks_clk_get_rate(KS2_CLK1_6)
-#define CONFIG_ENV_SPI_MAX_HZ          CONFIG_SF_DEFAULT_SPEED
 #define CONFIG_SYS_SPI0
 #define CONFIG_SYS_SPI_BASE            KS2_SPI0_BASE
 #define CONFIG_SYS_SPI0_NUM_CS         4

diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h
index c4f01aac59362e37f8732837079913e8a43f67f2..69aa79bafc88b9141682c169b4e7097b22325edf 100644 (file)
--- a/include/configs/topic_miami.h
+++ b/include/configs/topic_miami.h
@@ -48,7 +48,6 @@
 #define CONFIG_SYS_MEMTEST_END 0x18000000
 
 /* Faster flash, ours may run at 108 MHz */
-#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
 #undef CONFIG_SPI_FLASH_WINBOND
 
 /* Setup proper boot sequences for Miami boards */

diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index 6c0d4f2008bd3298f52e4e6540df4a441d50fff9..13e3d60bfe7bb0cab7f7f1a032245e5044c8dcee 100644 (file)
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -154,11 +154,6 @@
 #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + \
                                         CONFIG_ENV_SECT_SIZE)
 
-#define CONFIG_ENV_SPI_BUS             (CONFIG_SF_DEFAULT_BUS)
-#define CONFIG_ENV_SPI_CS              (CONFIG_SF_DEFAULT_CS)
-#define CONFIG_ENV_SPI_MAX_HZ          (CONFIG_SF_DEFAULT_SPEED)
-#define CONFIG_ENV_SPI_MODE            (CONFIG_SF_DEFAULT_MODE)
-
 #define TQMA6_FDT_OFFSET               (CONFIG_ENV_OFFSET_REDUND + \
                                         CONFIG_ENV_SECT_SIZE)
 #define TQMA6_FDT_SECT_SIZE            (TQMA6_SPI_FLASH_SECTOR_SIZE)

diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
index 417c562e62b04d622005dcf8cbe662df590e9c4d..93db175288c1264849ec24e211adac77eefe34a2 100644 (file)
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -23,8 +23,6 @@
 /* SPI */
 
 /* Environment in SPI */
-#define CONFIG_ENV_SPI_MAX_HZ          48000000
-#define CONFIG_ENV_SPI_MODE            SPI_MODE_0
 #define CONFIG_ENV_SECT_SIZE           CONFIG_ENV_SIZE
 /* 1MiB flash, environment located as high as possible */
 #define CONFIG_ENV_OFFSET              (SZ_1M - CONFIG_ENV_SIZE)

diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h
index 648c87dfa8f5f63b5174cb9c6d90b6aede0a57f3..5d5394e3e53b9fed10733a267ab05d1084b4a066 100644 (file)
--- a/include/configs/turris_mox.h
+++ b/include/configs/turris_mox.h
@@ -66,11 +66,6 @@
 /*
  * SPI Flash configuration
  */
-#define CONFIG_ENV_SPI_BUS             0
-#define CONFIG_ENV_SPI_CS              0
-
-/* SPI NOR flash default params, used by sf commands */
-#define CONFIG_ENV_SPI_MODE            CONFIG_SF_DEFAULT_MODE
 
 /* Environment in SPI NOR flash */
 #define CONFIG_ENV_OFFSET              0x180000 /* as Marvell U-Boot version */

diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h
index aa8738fe733fa4f212b12d92134660874b31d6f2..fa38274d56f1a0ca059eb6e81f8c7976a9d4bd96 100644 (file)
--- a/include/configs/usb_a9263.h
+++ b/include/configs/usb_a9263.h
@@ -82,7 +82,6 @@
 #define CONFIG_ENV_OFFSET      0x2000
 #define CONFIG_ENV_SIZE                0x2000
 #define CONFIG_ENV_SECT_SIZE   CONFIG_ENV_SIZE
-#define CONFIG_ENV_SPI_MAX_HZ  15000000
 #define CONFIG_BOOTCOMMAND     "nboot 21000000 0"
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \

diff --git a/include/configs/vcoreiii.h b/include/configs/vcoreiii.h
index 8c30c6f09a2ddde016b0fcb54108a4d8704c69dd..2840c7b815b53275afeea6392fca53fda683e7e4 100644 (file)
--- a/include/configs/vcoreiii.h
+++ b/include/configs/vcoreiii.h
@@ -34,8 +34,6 @@
 #define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE
 #define CONFIG_ENV_OFFSET_REDUND      (CONFIG_ENV_OFFSET + CONFIG_ENV_SECT_SIZE)
 
-#define CONFIG_ENV_SPI_MAX_HZ          0 /* This force to read from DT */
-#define CONFIG_ENV_SPI_MODE            0 /* This force to read from DT */
 #endif
 
 #define CONFIG_SYS_SDRAM_BASE          0x80000000

diff --git a/include/configs/vinco.h b/include/configs/vinco.h
index 715ef2a73952043af6f7921eff24378db7432425..ec22a30cda129b21cc1325cbf5f069c88c658704 100644 (file)
--- a/include/configs/vinco.h
+++ b/include/configs/vinco.h
@@ -38,8 +38,6 @@
 #ifdef CONFIG_CMD_SF
 #define CONFIG_ATMEL_SPI0
 #define CONFIG_SPI_FLASH_STMICRO
-#define CONFIG_ENV_SPI_MAX_HZ          50000000
-#define CONFIG_ENV_SPI_MODE            (SPI_MODE_0)
 #endif
 
 /* MMC */
@@ -65,8 +63,6 @@
 
 #ifdef CONFIG_SPI_BOOT
 /* bootstrap + u-boot + env + linux in serial flash */
-#define CONFIG_ENV_SPI_BUS     CONFIG_SF_DEFAULT_BUS
-#define CONFIG_ENV_SPI_CS      CONFIG_SF_DEFAULT_CS
 /* Use our own mapping for the VInCo platform */
 #undef CONFIG_ENV_OFFSET
 #undef CONFIG_ENV_SIZE

diff --git a/include/configs/x530.h b/include/configs/x530.h
index d9c1eff9e0f8c8ee4c4d1d45e73dad8ec320b1e2..80c898ef7ce9c63de9c47783f3803bbc8018007c 100644 (file)
--- a/include/configs/x530.h
+++ b/include/configs/x530.h
@@ -60,8 +60,6 @@
 #define CONFIG_EHCI_IS_TDI
 
 /* Environment in SPI NOR flash */
-#define CONFIG_ENV_SPI_BUS             CONFIG_SF_DEFAULT_BUS
-#define CONFIG_ENV_SPI_MODE            CONFIG_SF_DEFAULT_MODE
 #define CONFIG_ENV_OFFSET              (1 << 20) /* 1MiB in */
 #define CONFIG_ENV_SIZE                        (64 << 10) /* 64KiB */
 #define CONFIG_ENV_SECT_SIZE           (256 << 10) /* 256KiB sectors */

diff --git a/include/spi_flash.h b/include/spi_flash.h
index 97ec2b3e586186067209a8b74febe2cf17a22559..55b4721813a7a8531f36b273fa89323b874afc94 100644 (file)
--- a/include/spi_flash.h
+++ b/include/spi_flash.h
@@ -13,6 +13,20 @@
 #include <linux/types.h>
 #include <linux/mtd/spi-nor.h>
 
+/* by default ENV use the same parameters than SF command */
+#ifndef CONFIG_ENV_SPI_BUS
+# define CONFIG_ENV_SPI_BUS    CONFIG_SF_DEFAULT_BUS
+#endif
+#ifndef CONFIG_ENV_SPI_CS
+# define CONFIG_ENV_SPI_CS     CONFIG_SF_DEFAULT_CS
+#endif
+#ifndef CONFIG_ENV_SPI_MAX_HZ
+# define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
+#endif
+#ifndef CONFIG_ENV_SPI_MODE
+# define CONFIG_ENV_SPI_MODE   CONFIG_SF_DEFAULT_MODE
+#endif
+
 struct spi_slave;
 
 struct dm_spi_flash_ops {