Convert CONFIG_ENV_SPI_BUS et al 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

As part of this, we use Kconfig to provide the defaults now that were
done in include/spi_flash.h.  We also in some cases change from using
CONFIG_ENV_SPI_FOO to CONFIG_SF_DEFAULT_FOO as those were the values in
use anyhow as ENV was not enabled.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c
index a7f3ff3c6fc0ec7b95c102df80051f6803d92606..1362c03bcee57842834d81f7a6173ab7e9371024 100644 (file)
--- a/cmd/mvebu/bubt.c
+++ b/cmd/mvebu/bubt.c
@@ -271,8 +271,8 @@ static int spi_burn_image(size_t image_size)
        u32 erase_bytes;
 
        /* Probe the SPI bus to get the flash device */
-       flash = spi_flash_probe(CONFIG_ENV_SPI_BUS,
-                               CONFIG_ENV_SPI_CS,
+       flash = spi_flash_probe(CONFIG_SF_DEFAULT_BUS,
+                               CONFIG_SF_DEFAULT_CS,
                                CONFIG_SF_DEFAULT_SPEED,
                                CONFIG_SF_DEFAULT_MODE);
        if (!flash) {

diff --git a/configs/SBx81LIFKW_defconfig b/configs/SBx81LIFKW_defconfig
index 8988ed9e96a1eb4e8a2fbf2d016c11fe7a0ee983..933dca9f65f6de4468228e5ff7766584431e1b8d 100644 (file)
--- a/configs/SBx81LIFKW_defconfig
+++ b/configs/SBx81LIFKW_defconfig
@@ -30,7 +30,6 @@ CONFIG_DOS_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NETCONSOLE=y

diff --git a/configs/SBx81LIFXCAT_defconfig b/configs/SBx81LIFXCAT_defconfig
index cd491c4fee7f0bdc5ee0e5a7756a6717368f6b1b..4c8e2aa34d3ef6f42fc93fe6e37489deb089cee7 100644 (file)
--- a/configs/SBx81LIFXCAT_defconfig
+++ b/configs/SBx81LIFXCAT_defconfig
@@ -32,7 +32,6 @@ CONFIG_DOS_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NETCONSOLE=y

diff --git a/configs/ae350_rv32_defconfig b/configs/ae350_rv32_defconfig
index f65f58cbefd7fade78c526959949ad4e310326c2..0324f1e7def150f1522976304100fee2cd22a6a7 100644 (file)
--- a/configs/ae350_rv32_defconfig
+++ b/configs/ae350_rv32_defconfig
@@ -30,7 +30,6 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_SF_DEFAULT_MODE=0x0
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_FTMAC100=y
 CONFIG_BAUDRATE=38400

diff --git a/configs/ae350_rv32_spl_defconfig b/configs/ae350_rv32_spl_defconfig
index 9324ed1f6cd76777421610d3d74ae7f5ff77cc5b..2484d194459efdd5a234b99098d0a6e42e196237 100644 (file)
--- a/configs/ae350_rv32_spl_defconfig
+++ b/configs/ae350_rv32_spl_defconfig
@@ -32,7 +32,6 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_SF_DEFAULT_MODE=0x0
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_FTMAC100=y
 CONFIG_BAUDRATE=38400

diff --git a/configs/ae350_rv32_spl_xip_defconfig b/configs/ae350_rv32_spl_xip_defconfig
index bd06c8ed8970de0f5058d96f5605e165965b4a57..9f21084a54133069150660d7a6f3a69d6fe29ac4 100644 (file)
--- a/configs/ae350_rv32_spl_xip_defconfig
+++ b/configs/ae350_rv32_spl_xip_defconfig
@@ -34,7 +34,6 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_SF_DEFAULT_MODE=0x0
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_FTMAC100=y
 CONFIG_BAUDRATE=38400

diff --git a/configs/ae350_rv32_xip_defconfig b/configs/ae350_rv32_xip_defconfig
index 524996c8709b532b0b3aa3a8d8a8c2584d2f0dce..d69a585b82dcc9e31b86f50172183eeb6a4deb32 100644 (file)
--- a/configs/ae350_rv32_xip_defconfig
+++ b/configs/ae350_rv32_xip_defconfig
@@ -31,7 +31,6 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_SF_DEFAULT_MODE=0x0
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_FTMAC100=y
 CONFIG_BAUDRATE=38400

diff --git a/configs/ae350_rv64_defconfig b/configs/ae350_rv64_defconfig
index 479c1ded58cbd6890bf987a64ff806d6b2d45e72..c30763ac1e8508cf1cf5ed01a9bc22384c46a285 100644 (file)
--- a/configs/ae350_rv64_defconfig
+++ b/configs/ae350_rv64_defconfig
@@ -31,7 +31,6 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_SF_DEFAULT_MODE=0x0
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_FTMAC100=y
 CONFIG_BAUDRATE=38400

diff --git a/configs/ae350_rv64_spl_defconfig b/configs/ae350_rv64_spl_defconfig
index 1ec993ccc5f5c9584ad78b3ad6e22262ad0d915d..8ef8e91a4f87f734e3e3fdc9943221fc8a4047b1 100644 (file)
--- a/configs/ae350_rv64_spl_defconfig
+++ b/configs/ae350_rv64_spl_defconfig
@@ -33,7 +33,6 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_SF_DEFAULT_MODE=0x0
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_FTMAC100=y
 CONFIG_BAUDRATE=38400

diff --git a/configs/ae350_rv64_spl_xip_defconfig b/configs/ae350_rv64_spl_xip_defconfig
index b6a97f27d1d5538c8d4afb638fa665d1dfae38ec..2bf3dd66ac210867fafc0e4e086d182c4d6c68e4 100644 (file)
--- a/configs/ae350_rv64_spl_xip_defconfig
+++ b/configs/ae350_rv64_spl_xip_defconfig
@@ -35,7 +35,6 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_SF_DEFAULT_MODE=0x0
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_FTMAC100=y
 CONFIG_BAUDRATE=38400

diff --git a/configs/ae350_rv64_xip_defconfig b/configs/ae350_rv64_xip_defconfig
index 190206fe444ac38e87e80ce6565acafd99a83005..e8dc44787457298f638e3ec6839337b862f6d1fa 100644 (file)
--- a/configs/ae350_rv64_xip_defconfig
+++ b/configs/ae350_rv64_xip_defconfig
@@ -32,7 +32,6 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_SF_DEFAULT_MODE=0x0
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_FTMAC100=y
 CONFIG_BAUDRATE=38400

diff --git a/configs/ap121_defconfig b/configs/ap121_defconfig
index 668e9c363a1ab806a79af15aea5d5b8d5b382116..3af41e8fed4a3e233adcbaa5152297f730e01a60 100644 (file)
--- a/configs/ap121_defconfig
+++ b/configs/ap121_defconfig
@@ -40,7 +40,6 @@ CONFIG_MTDIDS_DEFAULT="nor0=spi-flash.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=spi-flash.0:256k(u-boot),64k(u-boot-env),6144k(rootfs),1600k(uImage),64k(NVRAM),64k(ART)"
 # CONFIG_ISO_PARTITION is not set
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=25000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NET_RANDOM_ETHADDR=y

diff --git a/configs/ap143_defconfig b/configs/ap143_defconfig
index df2913531b3316c84b105917a14143e2bcdc0064..17aeda48e2c8c029fb94fb0d1edc2a20bc475b53 100644 (file)
--- a/configs/ap143_defconfig
+++ b/configs/ap143_defconfig
@@ -39,7 +39,6 @@ CONFIG_MTDIDS_DEFAULT="nor0=spi-flash.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=spi-flash.0:256k(u-boot),64k(u-boot-env),6336k(rootfs),1472k(uImage),64k(ART)"
 # CONFIG_ISO_PARTITION is not set
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=25000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 # CONFIG_NET is not set

diff --git a/configs/ap152_defconfig b/configs/ap152_defconfig
index e2f6f09376d3b3d0bbae6d010aa1febc12ad2e4c..3aa0ea5c56316a3b76465dbbea0d4c561652d18b 100644 (file)
--- a/configs/ap152_defconfig
+++ b/configs/ap152_defconfig
@@ -39,6 +39,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=spi-flash.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=spi-flash.0:256k(u-boot),64k(u-boot-env),6336k(rootfs),1472k(uImage),64k(ART)"
 # CONFIG_ISO_PARTITION is not set
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_ENV_SPI_MAX_HZ=25000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 # CONFIG_NET is not set
 CONFIG_MTD=y

diff --git a/configs/at91sam9260ek_dataflash_cs0_defconfig b/configs/at91sam9260ek_dataflash_cs0_defconfig
index 2bb6039e427bb2c72682d9dad82346efafde3c89..ebcf14daa31fb4e326ed5076d6da148d97889e46 100644 (file)
--- a/configs/at91sam9260ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9260ek_dataflash_cs0_defconfig
@@ -37,7 +37,6 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=15000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM=y

diff --git a/configs/at91sam9260ek_dataflash_cs1_defconfig b/configs/at91sam9260ek_dataflash_cs1_defconfig
index 904f0b28fb466b47fe2592773dce47f4134f38c1..7b9e0a4928ca127cc002ce9d6bbad5b9a647dff4 100644 (file)
--- a/configs/at91sam9260ek_dataflash_cs1_defconfig
+++ b/configs/at91sam9260ek_dataflash_cs1_defconfig
@@ -37,7 +37,6 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=15000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM=y

diff --git a/configs/at91sam9261ek_dataflash_cs0_defconfig b/configs/at91sam9261ek_dataflash_cs0_defconfig
index 5d07a9c49af9df9291c4c214ab67ac19b96633c0..5ec1e61ebdeba91916ed58be96b5a324332b00a9 100644 (file)
--- a/configs/at91sam9261ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9261ek_dataflash_cs0_defconfig
@@ -36,7 +36,6 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=15000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM=y

diff --git a/configs/at91sam9261ek_dataflash_cs3_defconfig b/configs/at91sam9261ek_dataflash_cs3_defconfig
index 1277d49b7e12aaaf74a24ea5d7bd1e35e46efb1b..94c283404b1728ea13abac4366b2a5de5335ccec 100644 (file)
--- a/configs/at91sam9261ek_dataflash_cs3_defconfig
+++ b/configs/at91sam9261ek_dataflash_cs3_defconfig
@@ -36,7 +36,6 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=15000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM=y

diff --git a/configs/at91sam9263ek_dataflash_cs0_defconfig b/configs/at91sam9263ek_dataflash_cs0_defconfig
index f4e540718582483608033614077075170639ecd6..29b392374f3beebb94f967f3cb6a1529d94d65ae 100644 (file)
--- a/configs/at91sam9263ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9263ek_dataflash_cs0_defconfig
@@ -40,7 +40,6 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=15000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM=y

diff --git a/configs/at91sam9263ek_dataflash_defconfig b/configs/at91sam9263ek_dataflash_defconfig
index f4e540718582483608033614077075170639ecd6..29b392374f3beebb94f967f3cb6a1529d94d65ae 100644 (file)
--- a/configs/at91sam9263ek_dataflash_defconfig
+++ b/configs/at91sam9263ek_dataflash_defconfig
@@ -40,7 +40,6 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=15000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM=y

diff --git a/configs/at91sam9g10ek_dataflash_cs0_defconfig b/configs/at91sam9g10ek_dataflash_cs0_defconfig
index 64b45c3ceccc83ae9e68c4926461ff35fe840de7..f4d5dba4a46856c38594bff4e4a246302b1a8c67 100644 (file)
--- a/configs/at91sam9g10ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9g10ek_dataflash_cs0_defconfig
@@ -36,7 +36,6 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=15000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM=y

diff --git a/configs/at91sam9g10ek_dataflash_cs3_defconfig b/configs/at91sam9g10ek_dataflash_cs3_defconfig
index d170b69daec54ebbf099d0894909abfac41ae33a..72228b559712d7794c09eecce6e145498e683c98 100644 (file)
--- a/configs/at91sam9g10ek_dataflash_cs3_defconfig
+++ b/configs/at91sam9g10ek_dataflash_cs3_defconfig
@@ -36,7 +36,6 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=15000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM=y

diff --git a/configs/at91sam9g20ek_dataflash_cs0_defconfig b/configs/at91sam9g20ek_dataflash_cs0_defconfig
index 9fb18c2cfa9f377cf987d541b8299791e52b2e06..cff3b1ae026e62a4516433594d8c9ae6540539bf 100644 (file)
--- a/configs/at91sam9g20ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9g20ek_dataflash_cs0_defconfig
@@ -37,7 +37,6 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=15000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM=y

diff --git a/configs/at91sam9g20ek_dataflash_cs1_defconfig b/configs/at91sam9g20ek_dataflash_cs1_defconfig
index 2c8098cf3655b49f8343defeae254d2d34a7aaa4..350faaf5f2836887976e280d23dcdb71ac7e0e88 100644 (file)
--- a/configs/at91sam9g20ek_dataflash_cs1_defconfig
+++ b/configs/at91sam9g20ek_dataflash_cs1_defconfig
@@ -37,7 +37,6 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=15000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM=y

diff --git a/configs/at91sam9rlek_dataflash_defconfig b/configs/at91sam9rlek_dataflash_defconfig
index 479efeb121b4bad24b576c0825d1641dc1534c91..9943b868c0da07ad662e44c389304cd89338d5bc 100644 (file)
--- a/configs/at91sam9rlek_dataflash_defconfig
+++ b/configs/at91sam9rlek_dataflash_defconfig
@@ -38,7 +38,6 @@ CONFIG_CMD_NAND=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=15000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 # CONFIG_NET is not set

diff --git a/configs/at91sam9xeek_dataflash_cs0_defconfig b/configs/at91sam9xeek_dataflash_cs0_defconfig
index 1e41ea4bd68a86ff9e91f7c821fb2342d0f3b07e..28479b92c7ca7c8908d7884d38cb16e8456deb35 100644 (file)
--- a/configs/at91sam9xeek_dataflash_cs0_defconfig
+++ b/configs/at91sam9xeek_dataflash_cs0_defconfig
@@ -37,7 +37,6 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=15000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM=y

diff --git a/configs/at91sam9xeek_dataflash_cs1_defconfig b/configs/at91sam9xeek_dataflash_cs1_defconfig
index 5797f16a1ed486b4799bece53fd6f0f8ea4341cf..5072a9bcd213a77ea022f6354e1b8ad4a3b31d6f 100644 (file)
--- a/configs/at91sam9xeek_dataflash_cs1_defconfig
+++ b/configs/at91sam9xeek_dataflash_cs1_defconfig
@@ -37,7 +37,6 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=15000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM=y

diff --git a/configs/controlcenterdc_defconfig b/configs/controlcenterdc_defconfig
index 44db3110916c3f2c2198c300be34c56c2acb9f5e..d6844a48ac1bd1b016e3db73a6688ec11c204d7e 100644 (file)
--- a/configs/controlcenterdc_defconfig
+++ b/configs/controlcenterdc_defconfig
@@ -54,7 +54,6 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_EFI_PARTITION=y
 CONFIG_ENV_OVERWRITE=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=50000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SPL_OF_TRANSLATE=y

diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig
index 4655a15616a6eaea180bce75a5278031770e673f..32fe1dcb4266b1228174fd40e3d923fc725699d6 100644 (file)
--- a/configs/d2net_v2_defconfig
+++ b/configs/d2net_v2_defconfig
@@ -42,7 +42,6 @@ CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_ENV_ADDR=0x70000
 CONFIG_NETCONSOLE=y

diff --git a/configs/db-88f6720_defconfig b/configs/db-88f6720_defconfig
index dfc27ba48b8de16a1c22e644696305be4c346808..32a7349993cab9ef155851c54705b43f2dfaf01c 100644 (file)
--- a/configs/db-88f6720_defconfig
+++ b/configs/db-88f6720_defconfig
@@ -41,7 +41,6 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 # CONFIG_DOS_PARTITION is not set
 CONFIG_ENV_OVERWRITE=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=50000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NET_RANDOM_ETHADDR=y

diff --git a/configs/db-88f6820-amc_defconfig b/configs/db-88f6820-amc_defconfig
index 54edfff4bdd149b73e4c6f1d10ef2aa4670092e4..9c54e7fe8048d1a2147dd2e45b495872318bca6c 100644 (file)
--- a/configs/db-88f6820-amc_defconfig
+++ b/configs/db-88f6820-amc_defconfig
@@ -45,7 +45,6 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_SPL_PARTITION_UUIDS is not set
 CONFIG_ENV_OVERWRITE=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=50000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SPL_OF_TRANSLATE=y

diff --git a/configs/db-88f6820-gp_defconfig b/configs/db-88f6820-gp_defconfig
index 8435f155fd651d39401b9e8b7cf0185b3330d25a..90fd8e82988eb7434f11386fe6fc423812117227 100644 (file)
--- a/configs/db-88f6820-gp_defconfig
+++ b/configs/db-88f6820-gp_defconfig
@@ -44,7 +44,6 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_SPL_PARTITION_UUIDS is not set
 CONFIG_ENV_OVERWRITE=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=50000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SPL_OF_TRANSLATE=y

diff --git a/configs/db-mv784mp-gp_defconfig b/configs/db-mv784mp-gp_defconfig
index 6a11aa0ecb8c51209e9654c775d1025512ea824e..3d0b06fbc61bc7df542be5bf3a2186161c859e47 100644 (file)
--- a/configs/db-mv784mp-gp_defconfig
+++ b/configs/db-mv784mp-gp_defconfig
@@ -45,7 +45,6 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_SPL_PARTITION_UUIDS is not set
 CONFIG_ENV_OVERWRITE=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=50000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SPL_OF_TRANSLATE=y

diff --git a/configs/dreamplug_defconfig b/configs/dreamplug_defconfig
index 72864d2608150b6152ba9418a7bc3a778e82a9ea..3b4df5c0dbdbf36db8c81624a9df1f7316b6d0f5 100644 (file)
--- a/configs/dreamplug_defconfig
+++ b/configs/dreamplug_defconfig
@@ -34,7 +34,6 @@ CONFIG_ISO_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=50000000
 CONFIG_ENV_ADDR=0x100000
 CONFIG_NET_RANDOM_ETHADDR=y

diff --git a/configs/ds109_defconfig b/configs/ds109_defconfig
index c5a707c3b7f94afe864466474e18d2c5745224a4..ba74ece738ded294b5378e3713b30eb5bd188228 100644 (file)
--- a/configs/ds109_defconfig
+++ b/configs/ds109_defconfig
@@ -34,7 +34,6 @@ CONFIG_ISO_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=50000000
 CONFIG_ENV_ADDR=0x3D0000
 CONFIG_NETCONSOLE=y

diff --git a/configs/ds414_defconfig b/configs/ds414_defconfig
index 5a7c95825c58bf1bbb058bea4b0bbd5fd0c46084..d33246786cc5d1e5edce4745e424481137a1301f 100644 (file)
--- a/configs/ds414_defconfig
+++ b/configs/ds414_defconfig
@@ -51,7 +51,6 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_UBI=y
 CONFIG_ISO_PARTITION=y
 CONFIG_ENV_OVERWRITE=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=50000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SPL_OF_TRANSLATE=y

diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig
index 8c76a53e691a493d0f2140d05259044f965b0c11..16c4a9469aaacaead34e6cc3670c9727ae54a8e5 100644 (file)
--- a/configs/ethernut5_defconfig
+++ b/configs/ethernut5_defconfig
@@ -54,7 +54,6 @@ CONFIG_CMD_REISER=y
 CONFIG_CMD_UBI=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=15000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM=y

diff --git a/configs/grpeach_defconfig b/configs/grpeach_defconfig
index 72707511f0838ff53f27ed3f1e4d605c41f848bd..4b2f6999f963283b8557d92238a0b7fb5392a597 100644 (file)
--- a/configs/grpeach_defconfig
+++ b/configs/grpeach_defconfig
@@ -31,14 +31,7 @@ CONFIG_MAC_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_BUS=y
-CONFIG_ENV_SPI_BUS=0
-CONFIG_USE_ENV_SPI_CS=y
-CONFIG_ENV_SPI_CS=0
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=50000000
-CONFIG_USE_ENV_SPI_MODE=y
-CONFIG_ENV_SPI_MODE=0x0
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_RZA1_GPIO=y

diff --git a/configs/imx28_xea_defconfig b/configs/imx28_xea_defconfig
index 249bdd6d83eeb6edd06ac6a680e668d0e19e0cda..eb8bdc4970d0daf35d9f2f1b78e6034ef144c165 100644 (file)
--- a/configs/imx28_xea_defconfig
+++ b/configs/imx28_xea_defconfig
@@ -72,14 +72,6 @@ CONFIG_SPL_OF_PLATDATA=y
 # CONFIG_SPL_OF_PLATDATA_PARENT is not set
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_BUS=y
-CONFIG_ENV_SPI_BUS=3
-CONFIG_USE_ENV_SPI_CS=y
-CONFIG_ENV_SPI_CS=0
-CONFIG_USE_ENV_SPI_MAX_HZ=y
-CONFIG_ENV_SPI_MAX_HZ=40000000
-CONFIG_USE_ENV_SPI_MODE=y
-CONFIG_ENV_SPI_MODE=0x0
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
@@ -91,7 +83,6 @@ CONFIG_MMC_MXS=y
 CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SF_DEFAULT_BUS=3
-CONFIG_SF_DEFAULT_MODE=0x0
 CONFIG_SF_DEFAULT_SPEED=40000000
 CONFIG_SPI_FLASH_SFDP_SUPPORT=y
 CONFIG_SPI_FLASH_ISSI=y

diff --git a/configs/imx8mm_beacon_defconfig b/configs/imx8mm_beacon_defconfig
index 647901cfa0e55883d06df38f47ee337b89f059a2..86085427088177cbdad5985d239f3b3220493634 100644 (file)
--- a/configs/imx8mm_beacon_defconfig
+++ b/configs/imx8mm_beacon_defconfig
@@ -81,7 +81,6 @@ CONFIG_FSL_USDHC=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_DM_SPI_FLASH=y
-CONFIG_SF_DEFAULT_MODE=0x0
 CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_STMICRO=y

diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig
index 27c8713b9eb54570e5a20916b80f85023cefefaf..b6ebab0d183d0280da253357b92ce99b7659efd0 100644 (file)
--- a/configs/inetspace_v2_defconfig
+++ b/configs/inetspace_v2_defconfig
@@ -42,7 +42,6 @@ CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_ENV_ADDR=0x70000
 CONFIG_NETCONSOLE=y

diff --git a/configs/kontron-sl-mx6ul_defconfig b/configs/kontron-sl-mx6ul_defconfig
index 47faca8a268dbba0cd9bfa4a93c19cda62ee03cd..b663391f130e660ce09865d02de4a000c4b7772d 100644 (file)
--- a/configs/kontron-sl-mx6ul_defconfig
+++ b/configs/kontron-sl-mx6ul_defconfig
@@ -55,7 +55,6 @@ CONFIG_OF_LIST="imx6ul-kontron-n631x-s imx6ull-kontron-n641x-s"
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_BUS=y
 CONFIG_ENV_SPI_BUS=2
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_ENV=y

diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig
index d8567031a44f787c77bf07d361688d6ff22d46ef..35d12fca325a4de184bf294f4525d99078900b68 100644 (file)
--- a/configs/kontron-sl-mx8mm_defconfig
+++ b/configs/kontron-sl-mx8mm_defconfig
@@ -57,10 +57,6 @@ CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_LIST="imx8mm-kontron-n801x-s imx8mm-kontron-n801x-s-lvds"
 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=80000000
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y

diff --git a/configs/libretech-ac_defconfig b/configs/libretech-ac_defconfig
index fa4427a815a93fdfc5084055ea15031b50f99629..7cddd329f6a3e0a205555b302965bf93b5e64255 100644 (file)
--- a/configs/libretech-ac_defconfig
+++ b/configs/libretech-ac_defconfig
@@ -40,7 +40,6 @@ CONFIG_MMC_MESON_GX=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_DM_SPI_FLASH=y
-CONFIG_SF_DEFAULT_MODE=0x0
 CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MESON_GXL=y

diff --git a/configs/libretech-cc_v2_defconfig b/configs/libretech-cc_v2_defconfig
index 9f8a914bb7412b0c44b88dfcebb9436a7053d3f2..6e08f993fd69021e99988cbb273320a10cdbfd92 100644 (file)
--- a/configs/libretech-cc_v2_defconfig
+++ b/configs/libretech-cc_v2_defconfig
@@ -36,7 +36,6 @@ CONFIG_MMC_MESON_GX=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_DM_SPI_FLASH=y
-CONFIG_SF_DEFAULT_MODE=0x0
 CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_PHY_MESON_GXL=y
 CONFIG_DM_ETH=y

diff --git a/configs/libretech-s905d-pc_defconfig b/configs/libretech-s905d-pc_defconfig
index bde2bb877ca628db104b2c09916f865a65b43985..052b1732ed363637d206ff86f0cb42f67f07a318 100644 (file)
--- a/configs/libretech-s905d-pc_defconfig
+++ b/configs/libretech-s905d-pc_defconfig
@@ -37,7 +37,6 @@ CONFIG_SARADC_MESON=y
 CONFIG_MMC_MESON_GX=y
 CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
-CONFIG_SF_DEFAULT_MODE=0x0
 CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_PHY_REALTEK=y
 CONFIG_DM_ETH=y

diff --git a/configs/libretech-s912-pc_defconfig b/configs/libretech-s912-pc_defconfig
index 536f9e8d121f3edf638226741afe79a952c039db..ee86ec9b4067c42b768f141d450c4cd8f6be80a4 100644 (file)
--- a/configs/libretech-s912-pc_defconfig
+++ b/configs/libretech-s912-pc_defconfig
@@ -36,7 +36,6 @@ CONFIG_SARADC_MESON=y
 CONFIG_MMC_MESON_GX=y
 CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
-CONFIG_SF_DEFAULT_MODE=0x0
 CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_PHY_REALTEK=y
 CONFIG_DM_ETH=y

diff --git a/configs/ls1012aqds_qspi_defconfig b/configs/ls1012aqds_qspi_defconfig
index 9a0162d5a7583f6484d5dcc29c6614ea02c5feae..051cab55ef85b583e26d66858bb2a46f6f8ab0de 100644 (file)
--- a/configs/ls1012aqds_qspi_defconfig
+++ b/configs/ls1012aqds_qspi_defconfig
@@ -45,11 +45,8 @@ CONFIG_CMD_CACHE=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 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_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NET_RANDOM_ETHADDR=y

diff --git a/configs/ls1012aqds_tfa_defconfig b/configs/ls1012aqds_tfa_defconfig
index 10f6ddfab3915be1bf9842225396e8714065c9c9..2789aeee529355c98eacf1911ff8debadd907b00 100644 (file)
--- a/configs/ls1012aqds_tfa_defconfig
+++ b/configs/ls1012aqds_tfa_defconfig
@@ -46,11 +46,8 @@ CONFIG_CMD_CACHE=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 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_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NET_RANDOM_ETHADDR=y

diff --git a/configs/ls1043aqds_tfa_defconfig b/configs/ls1043aqds_tfa_defconfig
index cce59cdb5a58a6db9375709f140e39cf51d8ccdb..5bb0926ee1fa0a4acb4fa367df1464e824e610a7 100644 (file)
--- a/configs/ls1043aqds_tfa_defconfig
+++ b/configs/ls1043aqds_tfa_defconfig
@@ -48,7 +48,6 @@ 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_ENV_ADDR=0x60500000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y

diff --git a/configs/ls1046aqds_tfa_defconfig b/configs/ls1046aqds_tfa_defconfig
index 4bf413c0eb58d1433a7af1136fc29b2263c4bed0..d5ea1e8cc367a5e154eadacc024d8c27f8e04651 100644 (file)
--- a/configs/ls1046aqds_tfa_defconfig
+++ b/configs/ls1046aqds_tfa_defconfig
@@ -49,7 +49,6 @@ 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_ENV_ADDR=0x60500000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y

diff --git a/configs/maxbcm_defconfig b/configs/maxbcm_defconfig
index 9fa2f5134b2b85ae4705c999dff2f68a4189174b..a69c0351b10954faaf76be5dd93c88aad7084309 100644 (file)
--- a/configs/maxbcm_defconfig
+++ b/configs/maxbcm_defconfig
@@ -33,7 +33,6 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_TIME=y
 CONFIG_ENV_OVERWRITE=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=50000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SPL_OF_TRANSLATE=y

diff --git a/configs/meesc_dataflash_defconfig b/configs/meesc_dataflash_defconfig
index 6fda013ab12fb5ef0d1f43db8f1f89b35173d8af..5d9f783c95f2081dc525827e380f491fb61554a2 100644 (file)
--- a/configs/meesc_dataflash_defconfig
+++ b/configs/meesc_dataflash_defconfig
@@ -28,7 +28,6 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=15000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM=y

diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig
index 04a7af27857d2f45b6636d13be9f59ab75df5c08..cc1d81c7a1dd38ead78673af70cb796c6cdd1108 100644 (file)
--- a/configs/net2big_v2_defconfig
+++ b/configs/net2big_v2_defconfig
@@ -42,7 +42,6 @@ CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_ENV_ADDR=0x70000
 CONFIG_NETCONSOLE=y

diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig
index ff2ee6723258800863208030a0d670d7d0cb9511..249ffc6dad0995645f9a8e145ef1c882b21b8a9d 100644 (file)
--- a/configs/netspace_lite_v2_defconfig
+++ b/configs/netspace_lite_v2_defconfig
@@ -42,7 +42,6 @@ CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_ENV_ADDR=0x70000
 CONFIG_NETCONSOLE=y

diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig
index 2e30ca54840d187d673b6c6b5077bd74e8c56dd1..e11a6b7cd46b59c275d58e89144db5dc18b0a13a 100644 (file)
--- a/configs/netspace_max_v2_defconfig
+++ b/configs/netspace_max_v2_defconfig
@@ -42,7 +42,6 @@ CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_ENV_ADDR=0x70000
 CONFIG_NETCONSOLE=y

diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig
index 98b1c4e53c95e13233ea30dd63c93e5110aab749..7b9c29b9db9834e267f9f25e12d23401cbd12e8d 100644 (file)
--- a/configs/netspace_mini_v2_defconfig
+++ b/configs/netspace_mini_v2_defconfig
@@ -40,7 +40,6 @@ CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_ENV_ADDR=0x70000
 CONFIG_NETCONSOLE=y

diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig
index 92ff66550c7691b67b7b4da4f0c6b769cf9af565..ba0d0ffbab6586bd96d14fa8a4152035db7c66af 100644 (file)
--- a/configs/netspace_v2_defconfig
+++ b/configs/netspace_v2_defconfig
@@ -42,7 +42,6 @@ CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_ENV_ADDR=0x70000
 CONFIG_NETCONSOLE=y

diff --git a/configs/octeontx2_95xx_defconfig b/configs/octeontx2_95xx_defconfig
index 0dbb954273f0f2e9092b3f06546e3a7a62899dde..6b8aed5303fb3e5e2b195812908fac921d11c0e4 100644 (file)
--- a/configs/octeontx2_95xx_defconfig
+++ b/configs/octeontx2_95xx_defconfig
@@ -66,14 +66,6 @@ CONFIG_EFI_PARTITION=y
 CONFIG_PARTITION_TYPE_GUID=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_BUS=y
-CONFIG_ENV_SPI_BUS=0
-CONFIG_USE_ENV_SPI_CS=y
-CONFIG_ENV_SPI_CS=0
-CONFIG_USE_ENV_SPI_MAX_HZ=y
-CONFIG_ENV_SPI_MAX_HZ=125000000
-CONFIG_USE_ENV_SPI_MODE=y
-CONFIG_ENV_SPI_MODE=0x0
 CONFIG_VERSION_VARIABLE=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_TFTP_TSIZE=y
@@ -84,7 +76,6 @@ CONFIG_MMC_HS400_SUPPORT=y
 CONFIG_MMC_OCTEONTX=y
 CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
-CONFIG_SF_DEFAULT_MODE=0x0
 CONFIG_SF_DEFAULT_SPEED=125000000
 CONFIG_SPI_FLASH_SFDP_SUPPORT=y
 CONFIG_SPI_FLASH_MACRONIX=y

diff --git a/configs/octeontx2_96xx_defconfig b/configs/octeontx2_96xx_defconfig
index 65fb8474e10f294fab3bc4fe1a8998f9a6681a20..f168248da96086dc4c2529ac063701d2abe2e3b0 100644 (file)
--- a/configs/octeontx2_96xx_defconfig
+++ b/configs/octeontx2_96xx_defconfig
@@ -67,14 +67,6 @@ CONFIG_EFI_PARTITION=y
 CONFIG_PARTITION_TYPE_GUID=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_BUS=y
-CONFIG_ENV_SPI_BUS=0
-CONFIG_USE_ENV_SPI_CS=y
-CONFIG_ENV_SPI_CS=0
-CONFIG_USE_ENV_SPI_MAX_HZ=y
-CONFIG_ENV_SPI_MAX_HZ=125000000
-CONFIG_USE_ENV_SPI_MODE=y
-CONFIG_ENV_SPI_MODE=0x0
 CONFIG_VERSION_VARIABLE=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_TFTP_TSIZE=y
@@ -90,7 +82,6 @@ CONFIG_MMC_HS400_SUPPORT=y
 CONFIG_MMC_OCTEONTX=y
 CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
-CONFIG_SF_DEFAULT_MODE=0x0
 CONFIG_SF_DEFAULT_SPEED=125000000
 CONFIG_SPI_FLASH_SFDP_SUPPORT=y
 CONFIG_SPI_FLASH_MACRONIX=y

diff --git a/configs/octeontx_81xx_defconfig b/configs/octeontx_81xx_defconfig
index ea62be30631549c4bb5d4ffe1e76496cb3af594d..0238f2f2b788346c0595d382152a71a8db8ecc80 100644 (file)
--- a/configs/octeontx_81xx_defconfig
+++ b/configs/octeontx_81xx_defconfig
@@ -68,14 +68,6 @@ CONFIG_EFI_PARTITION=y
 CONFIG_PARTITION_TYPE_GUID=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_BUS=y
-CONFIG_ENV_SPI_BUS=0
-CONFIG_USE_ENV_SPI_CS=y
-CONFIG_ENV_SPI_CS=0
-CONFIG_USE_ENV_SPI_MAX_HZ=y
-CONFIG_ENV_SPI_MAX_HZ=16000000
-CONFIG_USE_ENV_SPI_MODE=y
-CONFIG_ENV_SPI_MODE=0x0
 CONFIG_VERSION_VARIABLE=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_TFTP_TSIZE=y
@@ -87,7 +79,6 @@ CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_OCTEONTX=y
 CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
-CONFIG_SF_DEFAULT_MODE=0x0
 CONFIG_SF_DEFAULT_SPEED=16000000
 CONFIG_SPI_FLASH_SFDP_SUPPORT=y
 CONFIG_SPI_FLASH_MACRONIX=y

diff --git a/configs/octeontx_83xx_defconfig b/configs/octeontx_83xx_defconfig
index 47ddc50e7b7684031941fb5b834f10669d842879..4cfd4eae614ed9fe10580aa495d0f67d3200989f 100644 (file)
--- a/configs/octeontx_83xx_defconfig
+++ b/configs/octeontx_83xx_defconfig
@@ -65,14 +65,6 @@ CONFIG_EFI_PARTITION=y
 CONFIG_PARTITION_TYPE_GUID=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_BUS=y
-CONFIG_ENV_SPI_BUS=0
-CONFIG_USE_ENV_SPI_CS=y
-CONFIG_ENV_SPI_CS=0
-CONFIG_USE_ENV_SPI_MAX_HZ=y
-CONFIG_ENV_SPI_MAX_HZ=16000000
-CONFIG_USE_ENV_SPI_MODE=y
-CONFIG_ENV_SPI_MODE=0x0
 CONFIG_VERSION_VARIABLE=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_TFTP_TSIZE=y
@@ -84,7 +76,6 @@ CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_OCTEONTX=y
 CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
-CONFIG_SF_DEFAULT_MODE=0x0
 CONFIG_SF_DEFAULT_SPEED=16000000
 CONFIG_SPI_FLASH_SFDP_SUPPORT=y
 CONFIG_SPI_FLASH_MACRONIX=y

diff --git a/configs/p3450-0000_defconfig b/configs/p3450-0000_defconfig
index 85402e9b8297b44aaad8ac0abc60bec026fca4b9..c1ce890fb6b8fc6fe09093096171c3f802e1d8e2 100644 (file)
--- a/configs/p3450-0000_defconfig
+++ b/configs/p3450-0000_defconfig
@@ -32,6 +32,7 @@ CONFIG_OF_LIVE=y
 CONFIG_ENV_OVERWRITE=y
 # CONFIG_ENV_IS_IN_MMC is not set
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_ENV_SPI_MAX_HZ=48000000
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y

diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig
index dcd9a6b8896d392015f11e719a7ddb327228c0df..930191d7619090f511a245a1e5ffb1f5fff12e02 100644 (file)
--- a/configs/peach-pi_defconfig
+++ b/configs/peach-pi_defconfig
@@ -38,7 +38,6 @@ CONFIG_CMD_TPM_TEST=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_BUS=y
 CONFIG_ENV_SPI_BUS=1
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_I2C_CROS_EC_TUNNEL=y

diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig
index 4259f1416e6602bef3c4f1145531ae4a24973968..16fde6d49ed12021eb9d6f3e68b302ae611b588b 100644 (file)
--- a/configs/peach-pit_defconfig
+++ b/configs/peach-pit_defconfig
@@ -37,7 +37,6 @@ CONFIG_CMD_TPM_TEST=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_BUS=y
 CONFIG_ENV_SPI_BUS=1
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_I2C_CROS_EC_TUNNEL=y

diff --git a/configs/phycore-imx8mm_defconfig b/configs/phycore-imx8mm_defconfig
index ff28488ca2f6d0d3a3225fd47dd49259fc085435..a7d3e3495b85156096d1190971a0e1302008ad9f 100644 (file)
--- a/configs/phycore-imx8mm_defconfig
+++ b/configs/phycore-imx8mm_defconfig
@@ -86,7 +86,6 @@ CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SF_DEFAULT_BUS=3
-CONFIG_SF_DEFAULT_MODE=0x0
 CONFIG_SF_DEFAULT_SPEED=80000000
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_MACRONIX=y

diff --git a/configs/sam9x60ek_qspiflash_defconfig b/configs/sam9x60ek_qspiflash_defconfig
index 7a5d4d0600cefa9ea1ae43f4f1461c11d8ef3e69..d386030179dac212822bffc723c13f1541e4205b 100644 (file)
--- a/configs/sam9x60ek_qspiflash_defconfig
+++ b/configs/sam9x60ek_qspiflash_defconfig
@@ -46,14 +46,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_UBI=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_BUS=y
-CONFIG_ENV_SPI_BUS=0
-CONFIG_USE_ENV_SPI_CS=y
-CONFIG_ENV_SPI_CS=0
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=50000000
-CONFIG_USE_ENV_SPI_MODE=y
-CONFIG_ENV_SPI_MODE=0x0
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM=y
 CONFIG_CLK=y

diff --git a/configs/sama5d27_som1_ek_qspiflash_defconfig b/configs/sama5d27_som1_ek_qspiflash_defconfig
index 7bff5726fc7a4eeaeb010197927a7a467ddbc8b1..9d6d146f2f72aa49e62251cf7633ab1300559946 100644 (file)
--- a/configs/sama5d27_som1_ek_qspiflash_defconfig
+++ b/configs/sama5d27_som1_ek_qspiflash_defconfig
@@ -52,14 +52,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-parent dmas dma-names"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_BUS=y
-CONFIG_ENV_SPI_BUS=0
-CONFIG_USE_ENV_SPI_CS=y
-CONFIG_ENV_SPI_CS=0
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=50000000
-CONFIG_USE_ENV_SPI_MODE=y
-CONFIG_ENV_SPI_MODE=0x0
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM=y
 CONFIG_SPL_DM=y

diff --git a/configs/sama5d27_wlsom1_ek_qspiflash_defconfig b/configs/sama5d27_wlsom1_ek_qspiflash_defconfig
index b68d6cde3d34d7fc205ef30d69eb7127afc1d481..3b8fd5592d5f23c942f216cf8def7483cc74ca7c 100644 (file)
--- a/configs/sama5d27_wlsom1_ek_qspiflash_defconfig
+++ b/configs/sama5d27_wlsom1_ek_qspiflash_defconfig
@@ -60,14 +60,6 @@ CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-parent dmas dma-names"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_BUS=y
-CONFIG_ENV_SPI_BUS=2
-CONFIG_USE_ENV_SPI_CS=y
-CONFIG_ENV_SPI_CS=0
-CONFIG_USE_ENV_SPI_MAX_HZ=y
-CONFIG_ENV_SPI_MAX_HZ=50000000
-CONFIG_USE_ENV_SPI_MODE=y
-CONFIG_ENV_SPI_MODE=0x0
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM=y
 CONFIG_SPL_DM=y

diff --git a/configs/sama5d2_icp_qspiflash_defconfig b/configs/sama5d2_icp_qspiflash_defconfig
index c1c2298d642ba9f0e99141d125c3efb4b9cd7a29..88bbbb4d3fa0a0032938f349a7d815036f2d0d06 100644 (file)
--- a/configs/sama5d2_icp_qspiflash_defconfig
+++ b/configs/sama5d2_icp_qspiflash_defconfig
@@ -53,14 +53,6 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_BUS=y
-CONFIG_ENV_SPI_BUS=2
-CONFIG_USE_ENV_SPI_CS=y
-CONFIG_ENV_SPI_CS=0
-CONFIG_USE_ENV_SPI_MAX_HZ=y
-CONFIG_ENV_SPI_MAX_HZ=66000000
-CONFIG_USE_ENV_SPI_MODE=y
-CONFIG_ENV_SPI_MODE=0x0
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM=y
 CONFIG_CLK=y

diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig
index f8350bfffc462a6fb8720b085667e86e2fb78138..26a20602364cfdfee32ce800302f985c7d0313e8 100644 (file)
--- a/configs/smdk5250_defconfig
+++ b/configs/smdk5250_defconfig
@@ -39,7 +39,6 @@ CONFIG_CMD_REGULATOR=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_BUS=y
 CONFIG_ENV_SPI_BUS=1
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SYS_I2C_S3C24X0=y

diff --git a/configs/smdk5420_defconfig b/configs/smdk5420_defconfig
index a9924a46c3fb76dba07cdabf51dbcaba14f096d6..34aacc663f8ef02bc74d8a795ed0c0e3fa9d9fe8 100644 (file)
--- a/configs/smdk5420_defconfig
+++ b/configs/smdk5420_defconfig
@@ -34,7 +34,6 @@ CONFIG_CMD_TIME=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_BUS=y
 CONFIG_ENV_SPI_BUS=1
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SYS_I2C_S3C24X0=y

diff --git a/configs/snow_defconfig b/configs/snow_defconfig
index 00181124eca66e690c72e3d96ae94264e0490426..3b8373273d352dbe5e5c63e938fff98222be4df2 100644 (file)
--- a/configs/snow_defconfig
+++ b/configs/snow_defconfig
@@ -44,7 +44,6 @@ CONFIG_CMD_TPM_TEST=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_BUS=y
 CONFIG_ENV_SPI_BUS=1
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_I2C_CROS_EC_LDO=y

diff --git a/configs/socfpga_vining_fpga_defconfig b/configs/socfpga_vining_fpga_defconfig
index 258aaf2171ead41ef8099fc61a00fe5f755b9244..e647314ad9935dcfdfc7bbd5a3f67874d64047cf 100644 (file)
--- a/configs/socfpga_vining_fpga_defconfig
+++ b/configs/socfpga_vining_fpga_defconfig
@@ -76,7 +76,6 @@ CONFIG_I2C_EEPROM=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x50
 CONFIG_MMC_DW=y
 CONFIG_MTD=y
-CONFIG_SF_DEFAULT_MODE=0x0
 CONFIG_SF_DEFAULT_SPEED=40000000
 CONFIG_SPI_FLASH_SFDP_SUPPORT=y
 CONFIG_SPI_FLASH_SPANSION=y

diff --git a/configs/spring_defconfig b/configs/spring_defconfig
index 8838b556b91eefa5362e8017babfd91689aefb82..ef5688f861c0bcaa373efcfe08abe58d0ec9b32c 100644 (file)
--- a/configs/spring_defconfig
+++ b/configs/spring_defconfig
@@ -43,7 +43,6 @@ CONFIG_CMD_TPM_TEST=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_BUS=y
 CONFIG_ENV_SPI_BUS=1
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_I2C_CROS_EC_LDO=y

diff --git a/configs/stm32mp15_dhcom_basic_defconfig b/configs/stm32mp15_dhcom_basic_defconfig
index 8fbcef26997ace0105a60a9c2660d30dacf7f0c6..c422c47775ea3a353ef2c8f6ad6cf10870ef5df8 100644 (file)
--- a/configs/stm32mp15_dhcom_basic_defconfig
+++ b/configs/stm32mp15_dhcom_basic_defconfig
@@ -69,14 +69,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=nor0:256k(fsbl1),256k(fsbl2),1408k(uboot),64k(
 CONFIG_OF_LIST="stm32mp15xx-dhcom-pdk2 stm32mp15xx-dhcom-drc02 stm32mp15xx-dhcom-picoitx"
 CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-names interrupts-extended interrupt-controller \\\#interrupt-cells interrupt-parent dmas dma-names assigned-clocks assigned-clock-rates assigned-clock-parents hwlocks"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_BUS=y
-CONFIG_ENV_SPI_BUS=0
-CONFIG_USE_ENV_SPI_CS=y
-CONFIG_ENV_SPI_CS=0
-CONFIG_USE_ENV_SPI_MAX_HZ=y
-CONFIG_ENV_SPI_MAX_HZ=50000000
-CONFIG_USE_ENV_SPI_MODE=y
-CONFIG_ENV_SPI_MODE=0x0
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NET_RANDOM_ETHADDR=y

diff --git a/configs/stm32mp15_dhcor_basic_defconfig b/configs/stm32mp15_dhcor_basic_defconfig
index 078d0dee740b4d801bcfff4e601e8064fe8a7fa0..38b050f667a986860e59efe4109e128b6439e1a7 100644 (file)
--- a/configs/stm32mp15_dhcor_basic_defconfig
+++ b/configs/stm32mp15_dhcor_basic_defconfig
@@ -66,14 +66,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=nor0:256k(fsbl1),256k(fsbl2),1408k(uboot),64k(
 # CONFIG_SPL_PARTITION_UUIDS is not set
 CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-names interrupts-extended interrupt-controller \\\#interrupt-cells interrupt-parent dmas dma-names assigned-clocks assigned-clock-rates assigned-clock-parents hwlocks"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_BUS=y
-CONFIG_ENV_SPI_BUS=0
-CONFIG_USE_ENV_SPI_CS=y
-CONFIG_ENV_SPI_CS=0
-CONFIG_USE_ENV_SPI_MAX_HZ=y
-CONFIG_ENV_SPI_MAX_HZ=50000000
-CONFIG_USE_ENV_SPI_MODE=y
-CONFIG_ENV_SPI_MODE=0x0
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NET_RANDOM_ETHADDR=y

diff --git a/configs/stmark2_defconfig b/configs/stmark2_defconfig
index 39efda6145a9b8c527226fca5638909a9d0442f3..53510eaadf555c23ab026280f68e56583557c46c 100644 (file)
--- a/configs/stmark2_defconfig
+++ b/configs/stmark2_defconfig
@@ -29,7 +29,6 @@ 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_SYS_RELOC_GD_ENV_ADDR=y
 # CONFIG_NET is not set

diff --git a/configs/synquacer_developerbox_defconfig b/configs/synquacer_developerbox_defconfig
index 4fb0fba4416daae90e8fd8cd09d91e2f328bd6af..da57dc288fd2731072e542b82f5f20bdac997b8d 100644 (file)
--- a/configs/synquacer_developerbox_defconfig
+++ b/configs/synquacer_developerbox_defconfig
@@ -40,10 +40,6 @@ CONFIG_CMD_LOG=y
 CONFIG_PARTITION_TYPE_GUID=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_BUS=y
-CONFIG_ENV_SPI_BUS=0
-CONFIG_USE_ENV_SPI_CS=y
-CONFIG_ENV_SPI_CS=0
 CONFIG_PROT_UDP=y
 CONFIG_SCSI_AHCI=y
 CONFIG_AHCI_PCI=y

diff --git a/configs/theadorable_debug_defconfig b/configs/theadorable_debug_defconfig
index cfa1bac707c90b6f44ca082b1c272dfc25b06456..a781f150e483e0108e62a085827a69ebee04dbe6 100644 (file)
--- a/configs/theadorable_debug_defconfig
+++ b/configs/theadorable_debug_defconfig
@@ -49,7 +49,6 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_SPL_PARTITION_UUIDS is not set
 CONFIG_ENV_OVERWRITE=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=50000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NET_RANDOM_ETHADDR=y

diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig
index 50b08cb8f801a6c4ece59071415fcddd58db130a..e0e7f8a4d563d31121bafc315218afaf1812dc03 100644 (file)
--- a/configs/trimslice_defconfig
+++ b/configs/trimslice_defconfig
@@ -28,7 +28,6 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=48000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SPL_DM=y

diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig
index e6f901ea7797e2145cd7509ec7905cb6e6d44a27..9d121b79826d38e41a0d12c69870914f0413696d 100644 (file)
--- a/configs/turris_omnia_defconfig
+++ b/configs/turris_omnia_defconfig
@@ -59,8 +59,6 @@ CONFIG_CMD_BTRFS=y
 CONFIG_CMD_FS_UUID=y
 # CONFIG_SPL_PARTITION_UUIDS is not set
 CONFIG_ENV_OVERWRITE=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
-CONFIG_ENV_SPI_MAX_HZ=40000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SPL_OF_TRANSLATE=y
 CONFIG_AHCI_PCI=y
@@ -71,7 +69,6 @@ CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_MV=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
-CONFIG_SF_DEFAULT_MODE=0x0
 CONFIG_SF_DEFAULT_SPEED=40000000
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_SPANSION=y

diff --git a/configs/usb_a9263_dataflash_defconfig b/configs/usb_a9263_dataflash_defconfig
index 2a6c67d637904697bef577eb4d0bb80fd756dcc3..5792d78995052d19caae4e57b24112d691926407 100644 (file)
--- a/configs/usb_a9263_dataflash_defconfig
+++ b/configs/usb_a9263_dataflash_defconfig
@@ -34,7 +34,6 @@ CONFIG_CMD_PING=y
 CONFIG_MTDPARTS_DEFAULT="mtdparts=atmel_nand:16m(kernel)ro,120m(root1),-(root2)"
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=15000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM=y

diff --git a/drivers/mtd/spi/Kconfig b/drivers/mtd/spi/Kconfig
index 408a53f86178cf98837dcf204c85e460227a1b53..0969c038e5776ec81aff1ef9a541a4a1d46a498e 100644 (file)
--- a/drivers/mtd/spi/Kconfig
+++ b/drivers/mtd/spi/Kconfig
@@ -57,7 +57,7 @@ config SF_DEFAULT_CS
 config SF_DEFAULT_MODE
        hex "SPI Flash default mode (see include/spi.h)"
        depends on SPI_FLASH || DM_SPI_FLASH
-       default 0
+       default 0x0
        help
          The default mode may be provided by the platform
          to handle the common case when only a single serial

diff --git a/drivers/net/fm/fm.c b/drivers/net/fm/fm.c
index 7d51be1f723e9a89494b0be30a8e85a5c5f145f8..f8256126405a56a7571a6bff00eaa85011b5b0f3 100644 (file)
--- a/drivers/net/fm/fm.c
+++ b/drivers/net/fm/fm.c
@@ -387,8 +387,8 @@ int fm_init_common(int index, struct ccsr_fman *reg)
                struct udevice *new;
 
                /* speed and mode will be read from DT */
-               ret = spi_flash_probe_bus_cs(CONFIG_ENV_SPI_BUS,
-                                            CONFIG_ENV_SPI_CS, 0, 0, &new);
+               ret = spi_flash_probe_bus_cs(CONFIG_SF_DEFAULT_BUS,
+                                            CONFIG_SF_DEFAULT_CS, 0, 0, &new);
 
                ucode_flash = dev_get_uclass_priv(new);
 #else
@@ -474,7 +474,7 @@ int fm_init_common(int index, struct ccsr_fman *reg)
        struct udevice *new;
 
        /* speed and mode will be read from DT */
-       ret = spi_flash_probe_bus_cs(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS,
+       ret = spi_flash_probe_bus_cs(CONFIG_SF_DEFAULT_BUS, CONFIG_SF_DEFAULT_CS,
                                     0, 0, &new);
 
        ucode_flash = dev_get_uclass_priv(new);

diff --git a/drivers/net/pfe_eth/Kconfig b/drivers/net/pfe_eth/Kconfig
index a13b331a508c28012e2fafe6c2f664f21cd367d8..b2724ee3e84600bf693cb315231f5bd0c1409a42 100644 (file)
--- a/drivers/net/pfe_eth/Kconfig
+++ b/drivers/net/pfe_eth/Kconfig
@@ -9,4 +9,20 @@ config SYS_FSL_PFE_ADDR
        hex "PFE base address"
        default 0x04000000
 
+config SYS_FSL_PFE_SPI_BUS
+       int "Value of SPI flash bus for PFE firmware"
+       default SF_DEFAULT_BUS
+
+config SYS_FSL_PFE_SPI_CS
+       int "Value of SPI flash chip select for PFE firmware"
+       default SF_DEFAULT_CS
+
+config SYS_FSL_PFE_SPI_MAX_HZ
+       int "Value of SPI flash max frequency for PFE firmware"
+       default SF_DEFAULT_SPEED
+
+config SYS_FSL_PFE_SPI_MODE
+       hex "Value of SPI flash work mode for PFE firmware"
+       default SF_DEFAULT_MODE
+
 endif

diff --git a/drivers/net/pfe_eth/pfe_firmware.c b/drivers/net/pfe_eth/pfe_firmware.c
index ad5bc3c8624e5f02ea613ae05e8463e000a08eea..93e5ea55c783825048607da3320e0a61938db8f2 100644 (file)
--- a/drivers/net/pfe_eth/pfe_firmware.c
+++ b/drivers/net/pfe_eth/pfe_firmware.c
@@ -179,10 +179,10 @@ int pfe_spi_flash_init(void)
        if (!addr)
                return -ENOMEM;
 
-       ret = spi_flash_probe_bus_cs(CONFIG_ENV_SPI_BUS,
-                                    CONFIG_ENV_SPI_CS,
-                                    CONFIG_ENV_SPI_MAX_HZ,
-                                    CONFIG_ENV_SPI_MODE,
+       ret = spi_flash_probe_bus_cs(CONFIG_SYS_FSL_PFE_SPI_BUS,
+                                    CONFIG_SYS_FSL_PFE_SPI_CS,
+                                    CONFIG_SYS_FSL_PFE_SPI_MAX_HZ,
+                                    CONFIG_SYS_FSL_PFE_SPI_MODE,
                                     &new);
        if (ret) {
                printf("SF: failed to probe spi\n");

diff --git a/drivers/net/phy/cortina.c b/drivers/net/phy/cortina.c
index 2ac02952450da5658653bbe0cc0059243322d514..778d93e609cd482ee63a536b765a48bae6ba10ca 100644 (file)
--- a/drivers/net/phy/cortina.c
+++ b/drivers/net/phy/cortina.c
@@ -159,8 +159,8 @@ void cs4340_upload_firmware(struct phy_device *phydev)
                struct spi_flash *ucode_flash;
 
                addr = malloc(CONFIG_CORTINA_FW_LENGTH);
-               ucode_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS,
-                                                                        CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE);
+               ucode_flash = spi_flash_probe(CONFIG_SF_DEFAULT_BUS, CONFIG_SF_DEFAULT_CS,
+                                                                        CONFIG_SF_DEFAULT_SPEED, CONFIG_SF_DEFAULT_MODE);
                if (!ucode_flash) {
                        puts("SF: probe for Cortina ucode failed\n");
                } else {
@@ -212,8 +212,8 @@ void cs4340_upload_firmware(struct phy_device *phydev)
        struct spi_flash *ucode_flash;
 
        addr = malloc(CONFIG_CORTINA_FW_LENGTH);
-       ucode_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS,
-                               CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE);
+       ucode_flash = spi_flash_probe(CONFIG_SF_DEFAULT_BUS, CONFIG_SF_DEFAULT_CS,
+                               CONFIG_SF_DEFAULT_SPEED, CONFIG_SF_DEFAULT_MODE);
        if (!ucode_flash) {
                puts("SF: probe for Cortina ucode failed\n");
        } else {

diff --git a/env/Kconfig b/env/Kconfig
index 24966f8c37380f713c34db3fa2bd3c5b241b657a..6dc8d8d860ebe8d6d597240ab7b7055db1857221 100644 (file)
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -357,54 +357,31 @@ config ENV_SECT_SIZE_AUTO
          different sector sizes, and CONFIG_ENV_SECT_SIZE should be
          set to that value.
 
-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
+       default SF_DEFAULT_BUS
        help
-         Force the SPI chip select for environment.
-         If not defined, use CONFIG_SF_DEFAULT_CS.
+         Value the SPI bus and chip select for environment.
 
 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 USE_ENV_SPI_MAX_HZ
-       bool "SPI flash max frequency for environment"
        depends on ENV_IS_IN_SPI_FLASH
+       default SF_DEFAULT_CS
        help
-         Force the SPI max work clock for environment.
-         If not defined, use CONFIG_SF_DEFAULT_SPEED.
+         Value of the SPI chip select for environment.
 
 config ENV_SPI_MAX_HZ
        int "Value of SPI flash max frequency for environment"
-       depends on USE_ENV_SPI_MAX_HZ
-       help
-         Value of the SPI max work clock for environment.
-
-config USE_ENV_SPI_MODE
-       bool "SPI flash mode for environment"
        depends on ENV_IS_IN_SPI_FLASH
+       default SF_DEFAULT_SPEED
        help
-         Force the SPI work mode for environment.
+         Value of the SPI max work clock for environment.
 
 config ENV_SPI_MODE
        hex "Value of SPI flash work mode for environment"
-       depends on USE_ENV_SPI_MODE
+       depends on ENV_IS_IN_SPI_FLASH
+       default SF_DEFAULT_MODE
        help
          Value of the SPI work mode for environment.
          See include/spi.h for value.

diff --git a/include/configs/ap152.h b/include/configs/ap152.h
index c3ed137475cd1ec1dc4e231953c04e412f71b665..5bfca42156b69b38eb5f3a5937d70fe91f55cb7c 100644 (file)
--- a/include/configs/ap152.h
+++ b/include/configs/ap152.h
@@ -25,8 +25,6 @@
  */
 #define CONFIG_SYS_NS16550_CLK          25000000
 
-#define CONFIG_ENV_SPI_MAX_HZ           25000000
-
 /* Miscellaneous configurable options */
 
 /*

diff --git a/include/configs/imx8qm_rom7720.h b/include/configs/imx8qm_rom7720.h
index 3dea00ca280c9c20fcfab78c459ca01c5561a650..bd2387ab80c30bc0aa42e51549c40250eaa345a6 100644 (file)
--- a/include/configs/imx8qm_rom7720.h
+++ b/include/configs/imx8qm_rom7720.h
@@ -109,15 +109,6 @@
 
 #define CONFIG_SYS_INIT_SP_ADDR                0x80200000
 
-/* Default environment is in SD */
-
-#ifdef CONFIG_QSPI_BOOT
-#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_SYS_MMC_IMG_LOAD_PART   1
 
 /* On LPDDR4 board, USDHC1 is for eMMC, USDHC2 is for SD on CPU board,

diff --git a/include/configs/p3450-0000.h b/include/configs/p3450-0000.h
index 7f05bebbcd7acf91860ab8ca61a3a78b8a322c23..bc3dc81cb73e8aa7d4e48d753d40df6bf6e1c9d3 100644 (file)
--- a/include/configs/p3450-0000.h
+++ b/include/configs/p3450-0000.h
@@ -24,8 +24,6 @@
        func(DHCP, dhcp, na)
 
 /* Environment at end of QSPI, in the VER partition */
-#define CONFIG_ENV_SPI_MAX_HZ          48000000
-#define CONFIG_ENV_SPI_MODE            SPI_MODE_0
 #define CONFIG_SPI_FLASH_SIZE          (4 << 20)
 
 #define CONFIG_PREBOOT

diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h
index 34fd272467afad7ccf1f948511a21a9ef0e86f75..11c13c65d8debb03b9295c987c9177da0e897039 100644 (file)
--- a/include/configs/sama5d2_xplained.h
+++ b/include/configs/sama5d2_xplained.h
@@ -30,12 +30,6 @@
 
 #endif
 
-#ifdef CONFIG_QSPI_BOOT
-#undef CONFIG_ENV_SPI_BUS
-#define CONFIG_ENV_SPI_BUS     1
-
-#endif
-
 /* SPL */
 #define CONFIG_SPL_MAX_SIZE            0x10000
 #define CONFIG_SPL_BSS_START_ADDR      0x20000000

diff --git a/include/spi_flash.h b/include/spi_flash.h
index 4d4ae89c192111914045444990ae9e81f2f8a509..4566feab6313be80204a183fbf1a702479c4b976 100644 (file)
--- a/include/spi_flash.h
+++ b/include/spi_flash.h
@@ -14,20 +14,6 @@
 
 struct udevice;
 
-/* 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 {