Skip to contentSkip to conversation

Migrate SPI defines to Kconfig

PATCH New Patrick Delaunay 3 participants 19 messages Feb 27, 2019 – Mar 27, 2019

Subsystems (9)
lore
Share & tools
lore
#0 lore raw

cover Migrate SPI defines to Kconfig

This serie is a proposal to convert all SPI configuration settings in Kconfig :
+ parameters for SF command
- CONFIG_SF_DEFAULT_BUS
- CONFIG_SF_DEFAULT_CS
- CONFIG_SF_DEFAULT_MODE
- CONFIG_SF_DEFAULT_SPEED
+ parameters for SSPI command
- CONFIG_DEFAULT_SPI_BUS
- CONFIG_DEFAULT_SPI_MODE
+ parameters for ENV in SPI
- CONFIG_ENV_SPI_BUS
- CONFIG_ENV_SPI_CS
- CONFIG_ENV_SPI_MAX_HZ
- CONFIG_ENV_SPI_MODE

I make this work after the remarks of Jagan Teki.
on http://patchwork.ozlabs.org/patch/1031768/
[U-Boot,v3] dm: spi: Read default speed and mode values from DT

So it is a preliminary for v4 on this patch.

This commit includes a full migration using moveconfig.py to ensure that each commit compiles.

To allow compilation, I also move CMD in Kconfig for some board.

I introduce CONFIG_USE_ENV_SPI* to handle absent value (CONFIG_SF_DEFAULT_* is used) and use some post-processing to solve the remaining issue and remove the unnecessary configuration in defconfig (when default value can be used).
I make manual check at the end.

Compilation is OK on Travis:
https://travis-ci.org/patrickdelaunay/u-boot/builds/498044826

This v1 can be see as a starting point based on v2019.04-rc2. Any feedback or test is welcome.

Patrick Delaunay (7):
bcm7445: move some configuration in defconfig file
controlcenterdc: move some configuration in defconfig file
exynos: replace CONFIG_ENV_SPI_BASE by CONFIG_SYS_SPI_BASE
tqma6s_wru4_mmc: manage board_spi_cs_gpio correctly Convert CONFIG_SF_DEFAULT_* to Kconfig
Convert CONFIG_DEFAULT_SPI_* to Kconfig
Convert CONFIG_ENV_SPI_* to Kconfig

 README                                             | 15 ------
 arch/arm/mach-exynos/spl_boot.c                    |  2 +-
 arch/arm/mach-kirkwood/include/mach/config.h       | 15 ------
 arch/arm/mach-mvebu/include/mach/config.h          | 15 ------
 board/Arcturus/ucp1020/cmd_arc.c                   | 13 ------
 board/tqc/tqma6/tqma6.c                            |  2 +
 cmd/Kconfig                                        | 12 ++++-
 cmd/spi.c                                          |  7 ---
 configs/B4420QDS_NAND_defconfig                    |  2 +
 configs/B4420QDS_SPIFLASH_defconfig                |  2 +
 configs/B4420QDS_defconfig                         |  2 +
 configs/B4860QDS_NAND_defconfig                    |  2 +
 configs/B4860QDS_SECURE_BOOT_defconfig             |  2 +
 configs/B4860QDS_SPIFLASH_defconfig                |  2 +
 configs/B4860QDS_SRIO_PCIE_BOOT_defconfig          |  2 +
 configs/B4860QDS_defconfig                         |  2 +
 configs/BSC9131RDB_NAND_SYSCLK100_defconfig        |  2 +
 configs/BSC9131RDB_NAND_defconfig                  |  2 +
 configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig    |  2 +
 configs/BSC9131RDB_SPIFLASH_defconfig              |  2 +
 configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig |  2 +
 configs/BSC9132QDS_NAND_DDRCLK100_defconfig        |  2 +
 configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig |  2 +
 configs/BSC9132QDS_NAND_DDRCLK133_defconfig        |  2 +
 configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig  |  2 +
 configs/BSC9132QDS_NOR_DDRCLK100_defconfig         |  2 +
 configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig  |  2 +
 configs/BSC9132QDS_NOR_DDRCLK133_defconfig         |  2 +
 .../BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig   |  2 +
 configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig      |  2 +
 .../BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig   |  2 +
 configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig      |  2 +
 .../BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig |  2 +
 configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig    |  2 +
 .../BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig |  2 +
 configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig    |  2 +
 configs/C29XPCIE_NAND_defconfig                    |  2 +
 configs/C29XPCIE_NOR_SECBOOT_defconfig             |  2 +
 configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig        |  2 +
 configs/C29XPCIE_SPIFLASH_defconfig                |  2 +
 configs/C29XPCIE_defconfig                         |  2 +
 configs/M52277EVB_stmicro_defconfig                |  2 +
 configs/M54418TWR_defconfig                        |  2 +
 configs/M54418TWR_serial_mii_defconfig             |  2 +
 configs/M54418TWR_serial_rmii_defconfig            |  2 +
 configs/M54451EVB_stmicro_defconfig                |  2 +
 configs/M54455EVB_stm33_defconfig                  |  2 +
 configs/MPC8536DS_36BIT_defconfig                  |  2 +
 configs/MPC8536DS_SDCARD_defconfig                 |  2 +
 configs/MPC8536DS_SPIFLASH_defconfig               |  2 +
 configs/MPC8536DS_defconfig                        |  2 +
 configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig   |  2 +
 configs/P1010RDB-PA_36BIT_NAND_defconfig           |  2 +
 configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig    |  2 +
 configs/P1010RDB-PA_36BIT_NOR_defconfig            |  2 +
 configs/P1010RDB-PA_36BIT_SDCARD_defconfig         |  2 +
 .../P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig   |  2 +
 configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig       |  2 +
 configs/P1010RDB-PA_NAND_SECBOOT_defconfig         |  2 +
 configs/P1010RDB-PA_NAND_defconfig                 |  2 +
 configs/P1010RDB-PA_NOR_SECBOOT_defconfig          |  2 +
 configs/P1010RDB-PA_NOR_defconfig                  |  2 +
 configs/P1010RDB-PA_SDCARD_defconfig               |  2 +
 configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig     |  2 +
 configs/P1010RDB-PA_SPIFLASH_defconfig             |  2 +
 configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig   |  2 +
 configs/P1010RDB-PB_36BIT_NAND_defconfig           |  2 +
 configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig    |  2 +
 configs/P1010RDB-PB_36BIT_NOR_defconfig            |  2 +
 configs/P1010RDB-PB_36BIT_SDCARD_defconfig         |  2 +
 .../P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig   |  2 +
 configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig       |  2 +
 configs/P1010RDB-PB_NAND_SECBOOT_defconfig         |  2 +
 configs/P1010RDB-PB_NAND_defconfig                 |  2 +
 configs/P1010RDB-PB_NOR_SECBOOT_defconfig          |  2 +
 configs/P1010RDB-PB_NOR_defconfig                  |  2 +
 configs/P1010RDB-PB_SDCARD_defconfig               |  2 +
 configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig     |  2 +
 configs/P1010RDB-PB_SPIFLASH_defconfig             |  2 +
 configs/P1020RDB-PC_36BIT_NAND_defconfig           |  2 +
 configs/P1020RDB-PC_36BIT_SDCARD_defconfig         |  2 +
 configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig       |  2 +
 configs/P1020RDB-PC_36BIT_defconfig                |  2 +
 configs/P1020RDB-PC_NAND_defconfig                 |  2 +
 configs/P1020RDB-PC_SDCARD_defconfig               |  2 +
 configs/P1020RDB-PC_SPIFLASH_defconfig             |  2 +
 configs/P1020RDB-PC_defconfig                      |  2 +
 configs/P1020RDB-PD_NAND_defconfig                 |  2 +
 configs/P1020RDB-PD_SDCARD_defconfig               |  2 +
 configs/P1020RDB-PD_SPIFLASH_defconfig             |  2 +
 configs/P1020RDB-PD_defconfig                      |  2 +
 configs/P1021RDB-PC_36BIT_NAND_defconfig           |  2 +
 configs/P1021RDB-PC_36BIT_SDCARD_defconfig         |  2 +
 configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig       |  2 +
 configs/P1021RDB-PC_36BIT_defconfig                |  2 +
 configs/P1021RDB-PC_NAND_defconfig                 |  2 +
 configs/P1021RDB-PC_SDCARD_defconfig               |  2 +
 configs/P1021RDB-PC_SPIFLASH_defconfig             |  2 +
 configs/P1021RDB-PC_defconfig                      |  2 +
 configs/P1022DS_36BIT_NAND_defconfig               |  2 +
 configs/P1022DS_36BIT_SDCARD_defconfig             |  2 +
 configs/P1022DS_36BIT_SPIFLASH_defconfig           |  2 +
 configs/P1022DS_36BIT_defconfig                    |  2 +
 configs/P1022DS_NAND_defconfig                     |  2 +
 configs/P1022DS_SDCARD_defconfig                   |  2 +
 configs/P1022DS_SPIFLASH_defconfig                 |  2 +
 configs/P1022DS_defconfig                          |  2 +
 configs/P1024RDB_36BIT_defconfig                   |  2 +
 configs/P1024RDB_NAND_defconfig                    |  2 +
 configs/P1024RDB_SDCARD_defconfig                  |  2 +
 configs/P1024RDB_SPIFLASH_defconfig                |  2 +
 configs/P1024RDB_defconfig                         |  2 +
 configs/P1025RDB_36BIT_defconfig                   |  2 +
 configs/P1025RDB_NAND_defconfig                    |  2 +
 configs/P1025RDB_SDCARD_defconfig                  |  2 +
 configs/P1025RDB_SPIFLASH_defconfig                |  2 +
 configs/P1025RDB_defconfig                         |  2 +
 configs/P2020RDB-PC_36BIT_NAND_defconfig           |  2 +
 configs/P2020RDB-PC_36BIT_SDCARD_defconfig         |  2 +
 configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig       |  2 +
 configs/P2020RDB-PC_36BIT_defconfig                |  2 +
 configs/P2020RDB-PC_NAND_defconfig                 |  2 +
 configs/P2020RDB-PC_SDCARD_defconfig               |  2 +
 configs/P2020RDB-PC_SPIFLASH_defconfig             |  2 +
 configs/P2020RDB-PC_defconfig                      |  2 +
 configs/P2041RDB_NAND_defconfig                    |  2 +
 configs/P2041RDB_SDCARD_defconfig                  |  2 +
 configs/P2041RDB_SECURE_BOOT_defconfig             |  2 +
 configs/P2041RDB_SPIFLASH_defconfig                |  2 +
 configs/P2041RDB_SRIO_PCIE_BOOT_defconfig          |  2 +
 configs/P2041RDB_defconfig                         |  2 +
 configs/P3041DS_NAND_SECURE_BOOT_defconfig         |  2 +
 configs/P3041DS_NAND_defconfig                     |  2 +
 configs/P3041DS_SDCARD_defconfig                   |  2 +
 configs/P3041DS_SECURE_BOOT_defconfig              |  2 +
 configs/P3041DS_SPIFLASH_defconfig                 |  2 +
 configs/P3041DS_SRIO_PCIE_BOOT_defconfig           |  2 +
 configs/P3041DS_defconfig                          |  2 +
 configs/P4080DS_SDCARD_defconfig                   |  2 +
 configs/P4080DS_SECURE_BOOT_defconfig              |  2 +
 configs/P4080DS_SPIFLASH_defconfig                 |  2 +
 configs/P4080DS_SRIO_PCIE_BOOT_defconfig           |  2 +
 configs/P4080DS_defconfig                          |  2 +
 configs/P5020DS_NAND_SECURE_BOOT_defconfig         |  2 +
 configs/P5020DS_NAND_defconfig                     |  2 +
 configs/P5020DS_SDCARD_defconfig                   |  2 +
 configs/P5020DS_SECURE_BOOT_defconfig              |  2 +
 configs/P5020DS_SPIFLASH_defconfig                 |  2 +
 configs/P5020DS_SRIO_PCIE_BOOT_defconfig           |  2 +
 configs/P5020DS_defconfig                          |  2 +
 configs/P5040DS_NAND_SECURE_BOOT_defconfig         |  2 +
 configs/P5040DS_NAND_defconfig                     |  2 +
 configs/P5040DS_SDCARD_defconfig                   |  2 +
 configs/P5040DS_SECURE_BOOT_defconfig              |  2 +
 configs/P5040DS_SPIFLASH_defconfig                 |  2 +
 configs/P5040DS_defconfig                          |  2 +
 configs/SBx81LIFKW_defconfig                       |  2 +
 configs/SBx81LIFXCAT_defconfig                     |  2 +
 configs/T1023RDB_NAND_defconfig                    |  2 +
 configs/T1023RDB_SDCARD_defconfig                  |  2 +
 configs/T1023RDB_SECURE_BOOT_defconfig             |  2 +
 configs/T1023RDB_SPIFLASH_defconfig                |  2 +
 configs/T1023RDB_defconfig                         |  2 +
 configs/T1024QDS_DDR4_SECURE_BOOT_defconfig        |  2 +
 configs/T1024QDS_DDR4_defconfig                    |  2 +
 configs/T1024QDS_NAND_defconfig                    |  2 +
 configs/T1024QDS_SDCARD_defconfig                  |  2 +
 configs/T1024QDS_SECURE_BOOT_defconfig             |  2 +
 configs/T1024QDS_SPIFLASH_defconfig                |  2 +
 configs/T1024QDS_defconfig                         |  2 +
 configs/T1024RDB_NAND_defconfig                    |  2 +
 configs/T1024RDB_SDCARD_defconfig                  |  2 +
 configs/T1024RDB_SECURE_BOOT_defconfig             |  2 +
 configs/T1024RDB_SPIFLASH_defconfig                |  2 +
 configs/T1024RDB_defconfig                         |  2 +
 configs/T1040D4RDB_NAND_defconfig                  |  2 +
 configs/T1040D4RDB_SDCARD_defconfig                |  2 +
 configs/T1040D4RDB_SECURE_BOOT_defconfig           |  2 +
 configs/T1040D4RDB_SPIFLASH_defconfig              |  2 +
 configs/T1040D4RDB_defconfig                       |  2 +
 configs/T1040QDS_DDR4_defconfig                    |  2 +
 configs/T1040QDS_SECURE_BOOT_defconfig             |  2 +
 configs/T1040QDS_defconfig                         |  2 +
 configs/T1040RDB_NAND_defconfig                    |  2 +
 configs/T1040RDB_SDCARD_defconfig                  |  2 +
 configs/T1040RDB_SECURE_BOOT_defconfig             |  2 +
 configs/T1040RDB_SPIFLASH_defconfig                |  2 +
 configs/T1040RDB_defconfig                         |  2 +
 configs/T1042D4RDB_NAND_defconfig                  |  2 +
 configs/T1042D4RDB_SDCARD_defconfig                |  2 +
 configs/T1042D4RDB_SECURE_BOOT_defconfig           |  2 +
 configs/T1042D4RDB_SPIFLASH_defconfig              |  2 +
 configs/T1042D4RDB_defconfig                       |  2 +
 configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig     |  2 +
 configs/T1042RDB_PI_NAND_defconfig                 |  2 +
 configs/T1042RDB_PI_SDCARD_defconfig               |  2 +
 configs/T1042RDB_PI_SPIFLASH_defconfig             |  2 +
 configs/T1042RDB_PI_defconfig                      |  2 +
 configs/T1042RDB_SECURE_BOOT_defconfig             |  2 +
 configs/T1042RDB_defconfig                         |  2 +
 configs/T2080QDS_NAND_defconfig                    |  2 +
 configs/T2080QDS_SDCARD_defconfig                  |  2 +
 configs/T2080QDS_SECURE_BOOT_defconfig             |  2 +
 configs/T2080QDS_SPIFLASH_defconfig                |  2 +
 configs/T2080QDS_SRIO_PCIE_BOOT_defconfig          |  2 +
 configs/T2080QDS_defconfig                         |  2 +
 configs/T2080RDB_NAND_defconfig                    |  2 +
 configs/T2080RDB_SDCARD_defconfig                  |  2 +
 configs/T2080RDB_SECURE_BOOT_defconfig             |  2 +
 configs/T2080RDB_SPIFLASH_defconfig                |  2 +
 configs/T2080RDB_SRIO_PCIE_BOOT_defconfig          |  2 +
 configs/T2080RDB_defconfig                         |  2 +
 configs/T2081QDS_NAND_defconfig                    |  2 +
 configs/T2081QDS_SDCARD_defconfig                  |  2 +
 configs/T2081QDS_SPIFLASH_defconfig                |  2 +
 configs/T2081QDS_SRIO_PCIE_BOOT_defconfig          |  2 +
 configs/T2081QDS_defconfig                         |  2 +
 configs/T4160QDS_NAND_defconfig                    |  2 +
 configs/T4160QDS_SDCARD_defconfig                  |  2 +
 configs/T4160QDS_SECURE_BOOT_defconfig             |  2 +
 configs/T4160QDS_defconfig                         |  2 +
 configs/T4160RDB_defconfig                         |  2 +
 configs/T4240QDS_NAND_defconfig                    |  2 +
 configs/T4240QDS_SDCARD_defconfig                  |  2 +
 configs/T4240QDS_SECURE_BOOT_defconfig             |  2 +
 configs/T4240QDS_SRIO_PCIE_BOOT_defconfig          |  2 +
 configs/T4240QDS_defconfig                         |  2 +
 configs/T4240RDB_SDCARD_defconfig                  |  2 +
 configs/T4240RDB_defconfig                         |  2 +
 configs/UCP1020_SPIFLASH_defconfig                 |  2 +
 configs/UCP1020_defconfig                          |  2 +
 configs/ae350_rv32_defconfig                       |  1 +
 configs/ae350_rv64_defconfig                       |  1 +
 configs/am335x_boneblack_vboot_defconfig           |  1 +
 configs/am335x_evm_defconfig                       |  1 +
 configs/am335x_hs_evm_defconfig                    |  1 +
 configs/am335x_hs_evm_uart_defconfig               |  1 +
 configs/am43xx_evm_defconfig                       |  1 +
 configs/am43xx_evm_qspiboot_defconfig              |  1 +
 configs/am43xx_evm_rtconly_defconfig               |  1 +
 configs/am43xx_evm_usbhost_boot_defconfig          |  1 +
 configs/am43xx_hs_evm_defconfig                    |  1 +
 configs/am57xx_evm_defconfig                       |  2 +
 configs/am57xx_hs_evm_defconfig                    |  2 +
 configs/am57xx_hs_evm_usb_defconfig                |  2 +
 configs/ap121_defconfig                            |  2 +
 configs/ap143_defconfig                            |  2 +
 configs/aristainetos2_defconfig                    |  4 ++
 configs/aristainetos2b_defconfig                   |  2 +
 configs/aristainetos_defconfig                     |  3 ++
 configs/at91sam9260ek_dataflash_cs0_defconfig      |  2 +
 configs/at91sam9260ek_dataflash_cs1_defconfig      |  2 +
 configs/at91sam9261ek_dataflash_cs0_defconfig      |  2 +
 configs/at91sam9261ek_dataflash_cs3_defconfig      |  2 +
 configs/at91sam9263ek_dataflash_cs0_defconfig      |  2 +
 configs/at91sam9263ek_dataflash_defconfig          |  2 +
 configs/at91sam9g10ek_dataflash_cs0_defconfig      |  2 +
 configs/at91sam9g10ek_dataflash_cs3_defconfig      |  2 +
 configs/at91sam9g20ek_dataflash_cs0_defconfig      |  2 +
 configs/at91sam9g20ek_dataflash_cs1_defconfig      |  2 +
 configs/at91sam9n12ek_mmc_defconfig                |  1 +
 configs/at91sam9n12ek_nandflash_defconfig          |  1 +
 configs/at91sam9n12ek_spiflash_defconfig           |  1 +
 configs/at91sam9rlek_dataflash_defconfig           |  2 +
 configs/at91sam9x5ek_dataflash_defconfig           |  1 +
 configs/at91sam9x5ek_mmc_defconfig                 |  1 +
 configs/at91sam9x5ek_nandflash_defconfig           |  1 +
 configs/at91sam9x5ek_spiflash_defconfig            |  1 +
 configs/at91sam9xeek_dataflash_cs0_defconfig       |  2 +
 configs/at91sam9xeek_dataflash_cs1_defconfig       |  2 +
 configs/bcm7445_defconfig                          |  3 ++
 configs/beaver_defconfig                           |  2 +
 configs/bg0900_defconfig                           |  4 ++
 configs/birdland_bav335a_defconfig                 |  1 +
 configs/birdland_bav335b_defconfig                 |  1 +
 configs/brppt1_spi_defconfig                       |  1 +
 configs/cardhu_defconfig                           |  2 +
 configs/cei-tk1-som_defconfig                      |  2 +
 configs/cgtqmx6eval_defconfig                      |  2 +
 configs/chromebit_mickey_defconfig                 |  1 +
 configs/chromebook_bob_defconfig                   |  1 +
 configs/chromebook_jerry_defconfig                 |  1 +
 configs/chromebook_minnie_defconfig                |  1 +
 configs/chromebook_speedy_defconfig                |  1 +
 configs/cl-som-am57x_defconfig                     |  1 +
 configs/cl-som-imx7_defconfig                      |  2 +
 configs/clearfog_defconfig                         |  1 +
 configs/clearfog_gt_8k_defconfig                   |  1 +
 configs/cm_fx6_defconfig                           |  2 +
 configs/cm_t43_defconfig                           |  1 +
 .../controlcenterd_36BIT_SDCARD_DEVELOP_defconfig  |  2 +
 configs/controlcenterd_36BIT_SDCARD_defconfig      |  2 +
 configs/controlcenterdc_defconfig                  |  5 ++
 configs/d2net_v2_defconfig                         |  2 +
 configs/da850_am18xxevm_defconfig                  |  4 ++
 configs/da850evm_defconfig                         |  4 ++
 configs/dalmore_defconfig                          |  2 +
 configs/db-88f6720_defconfig                       |  2 +
 configs/db-88f6820-amc_defconfig                   |  3 ++
 configs/db-88f6820-gp_defconfig                    |  2 +
 configs/db-mv784mp-gp_defconfig                    |  2 +
 configs/dh_imx6_defconfig                          |  2 +
 configs/display5_defconfig                         |  3 ++
 configs/display5_factory_defconfig                 |  3 ++
 configs/dms-ba16-1g_defconfig                      |  2 +
 configs/dms-ba16_defconfig                         |  2 +
 configs/dra7xx_evm_defconfig                       |  2 +
 configs/dra7xx_hs_evm_defconfig                    |  2 +
 configs/dra7xx_hs_evm_usb_defconfig                |  2 +
 configs/dreamplug_defconfig                        |  2 +
 configs/ds109_defconfig                            |  2 +
 configs/ds414_defconfig                            |  2 +
 configs/e2220-1170_defconfig                       |  2 +
 configs/ea20_defconfig                             |  1 +
 configs/ethernut5_defconfig                        |  2 +
 configs/evb-rk3036_defconfig                       |  1 +
 configs/evb-rk3128_defconfig                       |  1 +
 configs/evb-rk3288_defconfig                       |  1 +
 configs/evb-rk3328_defconfig                       |  1 +
 configs/evb-rk3399_defconfig                       |  1 +
 configs/fennec-rk3288_defconfig                    |  1 +
 configs/ficus-rk3399_defconfig                     |  1 +
 configs/firefly-rk3288_defconfig                   |  1 +
 configs/firefly-rk3399_defconfig                   |  1 +
 configs/ge_bx50v3_defconfig                        |  2 +
 configs/helios4_defconfig                          |  2 +
 configs/inetspace_v2_defconfig                     |  2 +
 configs/jetson-tk1_defconfig                       |  2 +
 configs/k2e_evm_defconfig                          |  1 +
 configs/k2e_hs_evm_defconfig                       |  1 +
 configs/k2g_evm_defconfig                          |  2 +
 configs/k2g_hs_evm_defconfig                       |  2 +
 configs/k2hk_evm_defconfig                         |  1 +
 configs/k2hk_hs_evm_defconfig                      |  1 +
 configs/k2l_evm_defconfig                          |  1 +
 configs/k2l_hs_evm_defconfig                       |  1 +
 configs/km_kirkwood_128m16_defconfig               |  1 +
 configs/km_kirkwood_defconfig                      |  1 +
 configs/km_kirkwood_pci_defconfig                  |  1 +
 configs/kmcoge4_defconfig                          |  2 +
 configs/kmcoge5un_defconfig                        |  1 +
 configs/kmlion1_defconfig                          |  2 +
 configs/kmnusa_defconfig                           |  1 +
 configs/kmsugp1_defconfig                          |  1 +
 configs/kmsuv31_defconfig                          |  1 +
 configs/kylin-rk3036_defconfig                     |  1 +
 configs/legoev3_defconfig                          |  1 +
 configs/ls1012aqds_qspi_defconfig                  | 11 +++++
 configs/ls1012aqds_tfa_SECURE_BOOT_defconfig       |  5 ++
 configs/ls1012aqds_tfa_defconfig                   | 11 +++++
 configs/ls1043aqds_defconfig                       |  1 +
 configs/ls1043aqds_lpuart_defconfig                |  1 +
 configs/ls1043aqds_nand_defconfig                  |  1 +
 configs/ls1043aqds_nor_ddr3_defconfig              |  1 +
 configs/ls1043aqds_sdcard_ifc_defconfig            |  1 +
 configs/ls1043aqds_tfa_SECURE_BOOT_defconfig       |  1 +
 configs/ls1043aqds_tfa_defconfig                   |  3 ++
 configs/ls1043ardb_SECURE_BOOT_defconfig           |  1 +
 configs/ls1043ardb_defconfig                       |  1 +
 configs/ls1043ardb_nand_SECURE_BOOT_defconfig      |  1 +
 configs/ls1043ardb_nand_defconfig                  |  1 +
 configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig    |  1 +
 configs/ls1043ardb_sdcard_defconfig                |  1 +
 configs/ls1043ardb_tfa_SECURE_BOOT_defconfig       |  1 +
 configs/ls1043ardb_tfa_defconfig                   |  1 +
 configs/ls1046aqds_SECURE_BOOT_defconfig           |  1 +
 configs/ls1046aqds_defconfig                       |  1 +
 configs/ls1046aqds_lpuart_defconfig                |  1 +
 configs/ls1046aqds_nand_defconfig                  |  1 +
 configs/ls1046aqds_sdcard_ifc_defconfig            |  1 +
 configs/ls1046aqds_tfa_SECURE_BOOT_defconfig       |  1 +
 configs/ls1046aqds_tfa_defconfig                   |  3 ++
 configs/lschlv2_defconfig                          |  1 +
 configs/lsxhl_defconfig                            |  1 +
 configs/marsboard_defconfig                        |  2 +
 configs/maxbcm_defconfig                           |  2 +
 configs/mccmon6_nor_defconfig                      |  3 ++
 configs/mccmon6_sd_defconfig                       |  3 ++
 configs/meesc_dataflash_defconfig                  |  2 +
 configs/mgcoge3un_defconfig                        |  1 +
 configs/miqi-rk3288_defconfig                      |  1 +
 configs/mscc_jr2_defconfig                         |  4 ++
 configs/mscc_luton_defconfig                       |  4 ++
 configs/mscc_ocelot_defconfig                      |  4 ++
 configs/mscc_serval_defconfig                      |  4 ++
 configs/mscc_servalt_defconfig                     |  4 ++
 configs/mvebu_db-88f3720_defconfig                 |  1 +
 configs/mvebu_db_armada8k_defconfig                |  1 +
 configs/mvebu_espressobin-88f3720_defconfig        |  1 +
 configs/mvebu_mcbin-88f8040_defconfig              |  1 +
 configs/mx28evk_auart_console_defconfig            |  4 ++
 configs/mx28evk_defconfig                          |  4 ++
 configs/mx28evk_nand_defconfig                     |  4 ++
 configs/mx28evk_spi_defconfig                      |  4 ++
 configs/mx31pdk_defconfig                          |  2 +
 configs/mx6qsabrelite_defconfig                    |  2 +
 configs/mx6sabreauto_defconfig                     |  2 +
 configs/mx6sabresd_defconfig                       |  2 +
 configs/mx6slevk_defconfig                         |  2 +
 configs/mx6slevk_spinor_defconfig                  |  2 +
 configs/mx6slevk_spl_defconfig                     |  2 +
 configs/mx6sxsabreauto_defconfig                   |  2 +
 configs/mx6sxsabresd_defconfig                     |  3 ++
 configs/mx6ul_14x14_evk_defconfig                  |  2 +
 configs/mx6ul_9x9_evk_defconfig                    |  2 +
 configs/mx6ull_14x14_evk_defconfig                 |  2 +
 configs/mx6ull_14x14_evk_plugin_defconfig          |  2 +
 configs/mx7dsabresd_qspi_defconfig                 |  2 +
 configs/net2big_v2_defconfig                       |  2 +
 configs/netspace_lite_v2_defconfig                 |  2 +
 configs/netspace_max_v2_defconfig                  |  2 +
 configs/netspace_mini_v2_defconfig                 |  2 +
 configs/netspace_v2_defconfig                      |  2 +
 configs/nitrogen6dl2g_defconfig                    |  2 +
 configs/nitrogen6dl_defconfig                      |  2 +
 configs/nitrogen6q2g_defconfig                     |  2 +
 configs/nitrogen6q_defconfig                       |  2 +
 configs/nitrogen6s1g_defconfig                     |  2 +
 configs/nitrogen6s_defconfig                       |  2 +
 configs/nyan-big_defconfig                         |  2 +
 configs/omapl138_lcdk_defconfig                    |  1 +
 configs/ot1200_defconfig                           |  3 ++
 configs/ot1200_spl_defconfig                       |  3 ++
 configs/p2371-0000_defconfig                       |  2 +
 configs/p2371-2180_defconfig                       |  2 +
 configs/p2571_defconfig                            |  2 +
 configs/pcm051_rev1_defconfig                      |  1 +
 configs/pcm051_rev3_defconfig                      |  1 +
 configs/pcm058_defconfig                           |  2 +
 configs/peach-pi_defconfig                         |  4 ++
 configs/peach-pit_defconfig                        |  4 ++
 configs/pfla02_defconfig                           |  3 ++
 configs/phycore-rk3288_defconfig                   |  1 +
 configs/popmetal-rk3288_defconfig                  |  1 +
 configs/portl2_defconfig                           |  1 +
 configs/puma-rk3399_defconfig                      |  1 +
 configs/riotboard_defconfig                        |  2 +
 configs/riotboard_spl_defconfig                    |  2 +
 configs/rock2_defconfig                            |  1 +
 configs/rock960-rk3399_defconfig                   |  1 +
 configs/rock_defconfig                             |  1 +
 configs/sama5d27_som1_ek_mmc1_defconfig            |  1 +
 configs/sama5d27_som1_ek_mmc_defconfig             |  1 +
 configs/sama5d2_xplained_emmc_defconfig            |  1 +
 configs/sama5d2_xplained_mmc_defconfig             |  1 +
 configs/sama5d2_xplained_spiflash_defconfig        |  1 +
 configs/sama5d36ek_cmp_mmc_defconfig               |  1 +
 configs/sama5d36ek_cmp_nandflash_defconfig         |  1 +
 configs/sama5d36ek_cmp_spiflash_defconfig          |  1 +
 configs/sama5d3xek_mmc_defconfig                   |  1 +
 configs/sama5d3xek_nandflash_defconfig             |  1 +
 configs/sama5d3xek_spiflash_defconfig              |  1 +
 configs/sama5d4_xplained_mmc_defconfig             |  1 +
 configs/sama5d4_xplained_nandflash_defconfig       |  1 +
 configs/sama5d4_xplained_spiflash_defconfig        |  1 +
 configs/sama5d4ek_mmc_defconfig                    |  1 +
 configs/sama5d4ek_nandflash_defconfig              |  1 +
 configs/sama5d4ek_spiflash_defconfig               |  1 +
 configs/smdk5250_defconfig                         |  4 ++
 configs/smdk5420_defconfig                         |  4 ++
 configs/snow_defconfig                             |  4 ++
 configs/socfpga_sr1500_defconfig                   |  1 +
 configs/socfpga_stratix10_defconfig                |  1 +
 configs/spring_defconfig                           |  4 ++
 configs/stmark2_defconfig                          |  3 ++
 configs/tec-ng_defconfig                           |  2 +
 configs/theadorable_debug_defconfig                |  3 ++
 configs/tinker-rk3288_defconfig                    |  1 +
 configs/topic_miami_defconfig                      |  3 +-
 configs/topic_miamilite_defconfig                  |  3 +-
 configs/topic_miamiplus_defconfig                  |  2 +
 configs/tqma6dl_mba6_mmc_defconfig                 |  2 +
 configs/tqma6dl_mba6_spi_defconfig                 |  2 +
 configs/tqma6q_mba6_mmc_defconfig                  |  2 +
 configs/tqma6q_mba6_spi_defconfig                  |  2 +
 configs/tqma6s_mba6_mmc_defconfig                  |  2 +
 configs/tqma6s_mba6_spi_defconfig                  |  2 +
 configs/trimslice_defconfig                        |  3 ++
 configs/turris_mox_defconfig                       |  2 +
 configs/turris_omnia_defconfig                     |  2 +
 configs/uDPU_defconfig                             |  1 +
 configs/usb_a9263_dataflash_defconfig              |  2 +
 configs/venice2_defconfig                          |  2 +
 configs/vinco_defconfig                            |  2 +
 configs/vyasa-rk3288_defconfig                     |  1 +
 configs/x530_defconfig                             |  2 +
 configs/zc5202_defconfig                           |  3 ++
 configs/zc5601_defconfig                           |  3 ++
 configs/zynq_cc108_defconfig                       |  1 +
 configs/zynq_cse_qspi_defconfig                    |  1 +
 configs/zynq_dlc20_rev1_0_defconfig                |  1 +
 configs/zynq_microzed_defconfig                    |  1 +
 configs/zynq_minized_defconfig                     |  1 +
 configs/zynq_z_turn_defconfig                      |  1 +
 configs/zynq_zc702_defconfig                       |  1 +
 configs/zynq_zc706_defconfig                       |  1 +
 configs/zynq_zc770_xm010_defconfig                 |  1 +
 configs/zynq_zc770_xm013_defconfig                 |  1 +
 configs/zynq_zed_defconfig                         |  1 +
 configs/zynq_zybo_defconfig                        |  1 +
 configs/zynq_zybo_z7_defconfig                     |  1 +
 drivers/mtd/spi/Kconfig                            | 36 +++++++++++++++
 env/Kconfig                                        | 53 +++++++++++++++++++---
 env/sf.c                                           | 13 ------
 include/configs/B4860QDS.h                         |  6 ---
 include/configs/BSC9131RDB.h                       |  8 ----
 include/configs/BSC9132QDS.h                       |  8 ----
 include/configs/C29XPCIE.h                         |  6 ---
 include/configs/M52277EVB.h                        |  3 --
 include/configs/M54418TWR.h                        |  1 -
 include/configs/M54451EVB.h                        |  1 -
 include/configs/M54455EVB.h                        |  3 --
 include/configs/MPC8536DS.h                        |  9 ----
 include/configs/P1010RDB.h                         |  6 ---
 include/configs/P1022DS.h                          |  7 ---
 include/configs/P2041RDB.h                         |  6 ---
 include/configs/SBx81LIFKW.h                       |  4 --
 include/configs/SBx81LIFXCAT.h                     |  4 --
 include/configs/T102xQDS.h                         |  6 ---
 include/configs/T102xRDB.h                         |  6 ---
 include/configs/T1040QDS.h                         |  6 ---
 include/configs/T104xRDB.h                         |  6 ---
 include/configs/T208xQDS.h                         |  9 ----
 include/configs/T208xRDB.h                         |  8 ----
 include/configs/T4240QDS.h                         |  6 ---
 include/configs/T4240RDB.h                         |  6 ---
 include/configs/UCP1020.h                          |  7 ---
 include/configs/adp-ae3xx.h                        |  8 ----
 include/configs/advantech_dms-ba16.h               | 10 ----
 include/configs/am335x_evm.h                       |  2 -
 include/configs/am43xx_evm.h                       |  3 --
 include/configs/am57xx_evm.h                       |  2 -
 include/configs/ap121.h                            |  1 -
 include/configs/ap143.h                            |  1 -
 include/configs/aristainetos-common.h              |  6 ---
 include/configs/aristainetos.h                     |  3 --
 include/configs/aristainetos2.h                    |  3 --
 include/configs/aristainetos2b.h                   |  3 --
 include/configs/at91sam9260ek.h                    |  2 -
 include/configs/at91sam9261ek.h                    |  2 -
 include/configs/at91sam9263ek.h                    |  1 -
 include/configs/at91sam9n12ek.h                    |  3 --
 include/configs/at91sam9rlek.h                     |  1 -
 include/configs/at91sam9x5ek.h                     |  5 --
 include/configs/ax25-ae350.h                       |  8 ----
 include/configs/bav335x.h                          |  2 -
 include/configs/bcm7445.h                          |  4 --
 include/configs/beaver.h                           |  2 -
 include/configs/bg0900.h                           | 16 -------
 include/configs/brppt1.h                           |  2 -
 include/configs/cardhu.h                           |  2 -
 include/configs/cei-tk1-som.h                      |  2 -
 include/configs/cgtqmx6eval.h                      |  7 ---
 include/configs/cl-som-am57x.h                     |  3 --
 include/configs/cl-som-imx7.h                      |  8 ----
 include/configs/clearfog.h                         |  1 -
 include/configs/cm_fx6.h                           |  8 ----
 include/configs/cm_t43.h                           |  3 --
 include/configs/controlcenterd.h                   | 10 ----
 include/configs/controlcenterdc.h                  | 12 -----
 include/configs/corenet_ds.h                       |  6 ---
 include/configs/da850evm.h                         |  3 --
 include/configs/dalmore.h                          |  2 -
 include/configs/db-88f6720.h                       |  2 -
 include/configs/db-88f6820-amc.h                   |  4 --
 include/configs/db-88f6820-gp.h                    |  4 --
 include/configs/db-mv784mp-gp.h                    |  2 -
 include/configs/dh_imx6.h                          | 10 ----
 include/configs/display5.h                         | 11 -----
 include/configs/dra7xx_evm.h                       |  3 --
 include/configs/dreamplug.h                        |  3 --
 include/configs/ds109.h                            |  3 --
 include/configs/ds414.h                            |  2 -
 include/configs/e2220-1170.h                       |  2 -
 include/configs/ea20.h                             |  2 -
 include/configs/el6x_common.h                      |  4 --
 include/configs/embestmx6boards.h                  | 11 -----
 include/configs/ethernut5.h                        |  1 -
 include/configs/exynos5-common.h                   |  7 ---
 include/configs/exynos5-dt-common.h                |  2 +-
 include/configs/ge_bx50v3.h                        | 10 ----
 include/configs/gw_ventana.h                       |  8 ----
 include/configs/helios4.h                          | 11 -----
 include/configs/jetson-tk1.h                       |  2 -
 include/configs/k2g_evm.h                          |  3 --
 include/configs/km/km_arm.h                        |  6 ---
 include/configs/km/kmp204x-common.h                |  6 ---
 include/configs/lacie_kw.h                         |  2 -
 include/configs/legoev3.h                          |  2 -
 include/configs/ls1012a_common.h                   |  4 --
 include/configs/ls1012aqds.h                       |  7 ---
 include/configs/ls1043a_common.h                   | 12 -----
 include/configs/ls1046a_common.h                   |  8 ----
 include/configs/ls1046aqds.h                       |  4 --
 include/configs/ls1088aqds.h                       |  2 -
 include/configs/lsxl.h                             |  6 ---
 include/configs/maxbcm.h                           |  2 -
 include/configs/mccmon6.h                          |  5 --
 include/configs/meesc.h                            |  1 -
 include/configs/microblaze-generic.h               |  7 ---
 include/configs/mvebu_armada-37xx.h                |  6 ---
 include/configs/mvebu_armada-8k.h                  |  7 ---
 include/configs/mx28evk.h                          | 20 --------
 include/configs/mx31pdk.h                          |  3 --
 include/configs/mx6sabre_common.h                  |  7 ---
 include/configs/mx6slevk.h                         | 11 -----
 include/configs/mx6sxsabreauto.h                   |  4 --
 include/configs/mx6sxsabresd.h                     |  4 --
 include/configs/mx6ul_14x14_evk.h                  |  4 --
 include/configs/mx6ullevk.h                        |  4 --
 include/configs/mx7dsabresd.h                      |  4 --
 include/configs/nitrogen6x.h                       | 11 -----
 include/configs/nyan-big.h                         |  2 -
 include/configs/omapl138_lcdk.h                    |  2 -
 include/configs/ot1200.h                           |  8 ----
 include/configs/p1_p2_rdb_pc.h                     |  9 ----
 include/configs/p2371-0000.h                       |  2 -
 include/configs/p2371-2180.h                       |  2 -
 include/configs/p2571.h                            |  2 -
 include/configs/pcm051.h                           |  2 -
 include/configs/pcm058.h                           |  8 ----
 include/configs/pfla02.h                           |  8 ----
 include/configs/pm9261.h                           |  1 -
 include/configs/pm9263.h                           |  1 -
 include/configs/puma_rk3399.h                      |  4 --
 include/configs/rk3036_common.h                    |  1 -
 include/configs/rk3128_common.h                    |  1 -
 include/configs/rk3188_common.h                    |  2 -
 include/configs/rk3288_common.h                    |  2 -
 include/configs/rk3328_common.h                    |  2 -
 include/configs/rk3399_common.h                    |  2 -
 include/configs/sama5d27_som1_ek.h                 |  1 -
 include/configs/sama5d2_xplained.h                 |  5 --
 include/configs/sama5d3xek.h                       |  4 --
 include/configs/sama5d4_xplained.h                 |  4 --
 include/configs/sama5d4ek.h                        |  4 --
 include/configs/siemens-am33x-common.h             |  3 --
 include/configs/socfpga_common.h                   |  1 -
 include/configs/socfpga_sr1500.h                   |  5 --
 include/configs/socfpga_stratix10_socdk.h          |  4 --
 include/configs/stmark2.h                          |  4 --
 include/configs/taurus.h                           |  4 --
 include/configs/tec-ng.h                           |  2 -
 include/configs/theadorable.h                      |  2 -
 include/configs/ti_armv7_keystone2.h               |  2 -
 include/configs/topic_miami.h                      |  4 --
 include/configs/tqma6.h                            | 10 ----
 include/configs/trimslice.h                        |  3 --
 include/configs/turris_mox.h                       |  7 ---
 include/configs/turris_omnia.h                     |  2 -
 include/configs/usb_a9263.h                        |  1 -
 include/configs/vcoreiii.h                         |  2 -
 include/configs/venice2.h                          |  2 -
 include/configs/vinco.h                            |  8 ----
 include/configs/x530.h                             |  5 --
 include/configs/zynq-common.h                      |  3 --
 include/spi_flash.h                                | 17 +++----
 scripts/config_whitelist.txt                       |  7 ---
 658 files changed, 1044 insertions(+), 811 deletions(-)
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/7 bcm7445: move some configuration in defconfig file

Move some configurations in defconfig file
- CONFIG_DM_SPI (removed by syncing defconfigs )
- CONFIG_CMD_SF
- CONFIG_CMD_SPI
- CONFIG_CMD_SF_TEST

This allow correct dependency handling in Kconfig.

---

 configs/bcm7445_defconfig | 3 +++
 include/configs/bcm7445.h | 4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)
configs/bcm7445_defconfig +3 -0
index a09ac5c..97098bf 100644
@@ -8,6 +8,9 @@ CONFIG_FIT_SIGNATURE=y
 CONFIG_BOOTDELAY=1
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot>"
+CONFIG_CMD_SF=y
+CONFIG_CMD_SF_TEST=y
+CONFIG_CMD_SPI=y
 CONFIG_OF_PRIOR_STAGE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MMC_SDHCI=y
include/configs/bcm7445.h +0 -4
index 8c675f7..6984edd 100644
@@ -34,10 +34,6 @@
 #define CONFIG_ENV_OFFSET	0x1e0000
 #define CONFIG_ENV_SECT_SIZE	CONFIG_ENV_SIZE
 
-#define CONFIG_DM_SPI			1
 #define CONFIG_SYS_MAX_FLASH_BANKS	1
-#define CONFIG_CMD_SF
-#define CONFIG_CMD_SPI
-#define CONFIG_CMD_SF_TEST
 
 #endif	/* __CONFIG_H */
Signature · 1 line
2.7.4
#2 lore raw

PATCH 1/7 bcm7445: move some configuration in defconfig file

Quoted 9 lines · Patrick Delaunay

Move some configurations in defconfig file
- CONFIG_DM_SPI (removed by syncing defconfigs )
- CONFIG_CMD_SF
- CONFIG_CMD_SPI
- CONFIG_CMD_SF_TEST

This allow correct dependency handling in Kconfig.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190326/62297de1/attachment.sig>
#3 lore raw

PATCH 2/7 controlcenterdc: move some configuration in defconfig file

In reply to Patrick Delaunay

Move some configurations in defconfig file
- CONFIG_CMD_I2C
- CONFIG_CMD_SPI

This allow correct dependency handling in Kconfig.

---

 configs/controlcenterdc_defconfig | 2 ++
 include/configs/controlcenterdc.h | 6 ------
 2 files changed, 2 insertions(+), 6 deletions(-)
configs/controlcenterdc_defconfig +2 -0
index f22a3ab..b4b5732 100644
@@ -26,9 +26,11 @@ CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_GO is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPIO=y
+CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_SF=y
+CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
include/configs/controlcenterdc.h +0 -6
index 06c93c3..2433815 100644
@@ -25,12 +25,6 @@
 
 #define CONFIG_LOADADDR 		1000000
 
-/*
- * Commands configuration
- */
-#define CONFIG_CMD_I2C
-#define CONFIG_CMD_SPI
-
 /* SPI NOR flash default params, used by sf commands */
 #define CONFIG_SF_DEFAULT_BUS		1
 #define CONFIG_SF_DEFAULT_SPEED		1000000
Signature · 1 line
2.7.4
#4 lore raw

PATCH 2/7 controlcenterdc: move some configuration in defconfig file

Quoted 7 lines · Patrick Delaunay

Move some configurations in defconfig file
- CONFIG_CMD_I2C
- CONFIG_CMD_SPI

This allow correct dependency handling in Kconfig.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190326/974c8aaa/attachment.sig>
#5 lore raw

PATCH 3/7 exynos: replace CONFIG_ENV_SPI_BASE by CONFIG_SYS_SPI_BASE

In reply to Patrick Delaunay

Replace CONFIG_ENV_SPI_BASE by the better CONFIG_SYS_SPI_BASE (it is not the location for environment but the location for U-Boot) and, as it is the only platform with use this define, remove it from whitelist.

---

 arch/arm/mach-exynos/spl_boot.c     | 2 +-
 include/configs/exynos5-dt-common.h | 2 +-
 scripts/config_whitelist.txt        | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)
arch/arm/mach-exynos/spl_boot.c +1 -1
index b4945bd..103bb38 100644
@@ -107,7 +107,7 @@ static void exynos_spi_copy(unsigned int uboot_size, unsigned int uboot_addr)
 {
 	int upto, todo;
 	int i, timeout = 100;
-	struct exynos_spi *regs = (struct exynos_spi *)CONFIG_ENV_SPI_BASE;
+	struct exynos_spi *regs = (struct exynos_spi *)CONFIG_SYS_SPI_BASE;
 
 	set_spi_clk(PERIPH_ID_SPI1, 50000000); /* set spi clock to 50Mhz */
 	/* set the spi1 GPIO */
include/configs/exynos5-dt-common.h +1 -1
index 696f009..a87182a 100644
@@ -17,7 +17,7 @@
 
 #define CONFIG_EXYNOS5_DT
 
-#define CONFIG_ENV_SPI_BASE	0x12D30000
+#define CONFIG_SYS_SPI_BASE	0x12D30000
 #define FLASH_SIZE		(4 << 20)
 #define CONFIG_ENV_OFFSET	(FLASH_SIZE - CONFIG_ENV_SECT_SIZE)
 #define CONFIG_SPI_BOOTING
scripts/config_whitelist.txt +0 -1
index 2b35725..3e01f84 100644
@@ -498,7 +498,6 @@ CONFIG_ENV_SETTINGS_V1
 CONFIG_ENV_SETTINGS_V2
 CONFIG_ENV_SIZE_FLEX
 CONFIG_ENV_SIZE_REDUND
-CONFIG_ENV_SPI_BASE
 CONFIG_ENV_SPI_BUS
 CONFIG_ENV_SPI_CS
 CONFIG_ENV_SPI_MAX_HZ
Signature · 1 line
2.7.4
#6 lore raw

PATCH 3/7 exynos: replace CONFIG_ENV_SPI_BASE by CONFIG_SYS_SPI_BASE

Quoted 6 lines · Patrick Delaunay

Replace CONFIG_ENV_SPI_BASE by the better CONFIG_SYS_SPI_BASE (it is not the location for environment but the location for U-Boot) and, as it is the only platform with use this define, remove it from whitelist.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190326/fe60ed07/attachment.sig>
#7 lore raw

PATCH 4/7 tqma6s_wru4_mmc: manage board_spi_cs_gpio correctly

In reply to Patrick Delaunay

Define the function board_spi_cs_gpio only when needed, only called in drivers/spi/mxc_spi.c.
That avoid compilation issue for tqma6s_wru4_mmc_defconfig when CONFIG_SF_DEFAULT_BUS and CONFIG_SF_DEFAULT_CS are not defined (CMD_SF not defined) after migration in KConfig.

---

 board/tqc/tqma6/tqma6.c | 2 ++
 1 file changed, 2 insertions(+)
board/tqc/tqma6/tqma6.c +2 -0
index 816672e..372a17c 100644
@@ -155,11 +155,13 @@ __weak void tqma6_iomuxc_spi(void)
 					 ARRAY_SIZE(tqma6_ecspi1_pads));
 }
 
+#if defined(CONFIG_SF_DEFAULT_BUS) && defined(CONFIG_SF_DEFAULT_CS)
 int board_spi_cs_gpio(unsigned bus, unsigned cs)
 {
 	return ((bus == CONFIG_SF_DEFAULT_BUS) &&
 		(cs == CONFIG_SF_DEFAULT_CS)) ? TQMA6_SF_CS_GPIO : -1;
 }
+#endif
 
 static struct i2c_pads_info tqma6_i2c3_pads = {
 	/* I2C3: on board LM75, M24C64,  */
Signature · 1 line
2.7.4
#8 lore raw

PATCH 4/7 tqma6s_wru4_mmc: manage board_spi_cs_gpio correctly

Quoted 7 lines · Patrick Delaunay

Define the function board_spi_cs_gpio only when needed, only called in drivers/spi/mxc_spi.c.
That avoid compilation issue for tqma6s_wru4_mmc_defconfig when CONFIG_SF_DEFAULT_BUS and CONFIG_SF_DEFAULT_CS are not defined (CMD_SF not defined) after migration in KConfig.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190326/7b65c9e1/attachment.sig>
#9 lore raw

PATCH 5/7 Convert CONFIG_SF_DEFAULT_* to Kconfig

In reply to Patrick Delaunay

This converts the following to Kconfig:
CONFIG_SF_DEFAULT_BUS
CONFIG_SF_DEFAULT_CS
CONFIG_SF_DEFAULT_MODE
CONFIG_SF_DEFAULT_SPEED

I use moveconfig script and then manual check on generated u-boot.cfg to solve the remaining issue.

---

 README                                             | 15 ---------
 board/Arcturus/ucp1020/cmd_arc.c                   | 13 --------
 configs/B4420QDS_NAND_defconfig                    |  2 ++
 configs/B4420QDS_SPIFLASH_defconfig                |  2 ++
 configs/B4420QDS_defconfig                         |  2 ++
 configs/B4860QDS_NAND_defconfig                    |  2 ++
 configs/B4860QDS_SECURE_BOOT_defconfig             |  2 ++
 configs/B4860QDS_SPIFLASH_defconfig                |  2 ++
 configs/B4860QDS_SRIO_PCIE_BOOT_defconfig          |  2 ++
 configs/B4860QDS_defconfig                         |  2 ++
 configs/BSC9131RDB_NAND_SYSCLK100_defconfig        |  2 ++
 configs/BSC9131RDB_NAND_defconfig                  |  2 ++
 configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig    |  2 ++
 configs/BSC9131RDB_SPIFLASH_defconfig              |  2 ++
 configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig |  2 ++
 configs/BSC9132QDS_NAND_DDRCLK100_defconfig        |  2 ++
 configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig |  2 ++
 configs/BSC9132QDS_NAND_DDRCLK133_defconfig        |  2 ++
 configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig  |  2 ++
 configs/BSC9132QDS_NOR_DDRCLK100_defconfig         |  2 ++
 configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig  |  2 ++
 configs/BSC9132QDS_NOR_DDRCLK133_defconfig         |  2 ++
 .../BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig   |  2 ++
 configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig      |  2 ++
 .../BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig   |  2 ++
 configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig      |  2 ++
 .../BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig |  2 ++
 configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig    |  2 ++
 .../BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig |  2 ++
 configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig    |  2 ++
 configs/C29XPCIE_NAND_defconfig                    |  2 ++
 configs/C29XPCIE_NOR_SECBOOT_defconfig             |  2 ++
 configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig        |  2 ++
 configs/C29XPCIE_SPIFLASH_defconfig                |  2 ++
 configs/C29XPCIE_defconfig                         |  2 ++
 configs/MPC8536DS_36BIT_defconfig                  |  2 ++
 configs/MPC8536DS_SDCARD_defconfig                 |  2 ++
 configs/MPC8536DS_SPIFLASH_defconfig               |  2 ++
 configs/MPC8536DS_defconfig                        |  2 ++
 configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig   |  2 ++
 configs/P1010RDB-PA_36BIT_NAND_defconfig           |  2 ++
 configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig    |  2 ++
 configs/P1010RDB-PA_36BIT_NOR_defconfig            |  2 ++
 configs/P1010RDB-PA_36BIT_SDCARD_defconfig         |  2 ++
 .../P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig   |  2 ++
 configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig       |  2 ++
 configs/P1010RDB-PA_NAND_SECBOOT_defconfig         |  2 ++
 configs/P1010RDB-PA_NAND_defconfig                 |  2 ++
 configs/P1010RDB-PA_NOR_SECBOOT_defconfig          |  2 ++
 configs/P1010RDB-PA_NOR_defconfig                  |  2 ++
 configs/P1010RDB-PA_SDCARD_defconfig               |  2 ++
 configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig     |  2 ++
 configs/P1010RDB-PA_SPIFLASH_defconfig             |  2 ++
 configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig   |  2 ++
 configs/P1010RDB-PB_36BIT_NAND_defconfig           |  2 ++
 configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig    |  2 ++
 configs/P1010RDB-PB_36BIT_NOR_defconfig            |  2 ++
 configs/P1010RDB-PB_36BIT_SDCARD_defconfig         |  2 ++
 .../P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig   |  2 ++
 configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig       |  2 ++
 configs/P1010RDB-PB_NAND_SECBOOT_defconfig         |  2 ++
 configs/P1010RDB-PB_NAND_defconfig                 |  2 ++
 configs/P1010RDB-PB_NOR_SECBOOT_defconfig          |  2 ++
 configs/P1010RDB-PB_NOR_defconfig                  |  2 ++
 configs/P1010RDB-PB_SDCARD_defconfig               |  2 ++
 configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig     |  2 ++
 configs/P1010RDB-PB_SPIFLASH_defconfig             |  2 ++
 configs/P1020RDB-PC_36BIT_NAND_defconfig           |  2 ++
 configs/P1020RDB-PC_36BIT_SDCARD_defconfig         |  2 ++
 configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig       |  2 ++
 configs/P1020RDB-PC_36BIT_defconfig                |  2 ++
 configs/P1020RDB-PC_NAND_defconfig                 |  2 ++
 configs/P1020RDB-PC_SDCARD_defconfig               |  2 ++
 configs/P1020RDB-PC_SPIFLASH_defconfig             |  2 ++
 configs/P1020RDB-PC_defconfig                      |  2 ++
 configs/P1020RDB-PD_NAND_defconfig                 |  2 ++
 configs/P1020RDB-PD_SDCARD_defconfig               |  2 ++
 configs/P1020RDB-PD_SPIFLASH_defconfig             |  2 ++
 configs/P1020RDB-PD_defconfig                      |  2 ++
 configs/P1021RDB-PC_36BIT_NAND_defconfig           |  2 ++
 configs/P1021RDB-PC_36BIT_SDCARD_defconfig         |  2 ++
 configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig       |  2 ++
 configs/P1021RDB-PC_36BIT_defconfig                |  2 ++
 configs/P1021RDB-PC_NAND_defconfig                 |  2 ++
 configs/P1021RDB-PC_SDCARD_defconfig               |  2 ++
 configs/P1021RDB-PC_SPIFLASH_defconfig             |  2 ++
 configs/P1021RDB-PC_defconfig                      |  2 ++
 configs/P1022DS_36BIT_NAND_defconfig               |  2 ++
 configs/P1022DS_36BIT_SDCARD_defconfig             |  2 ++
 configs/P1022DS_36BIT_SPIFLASH_defconfig           |  2 ++
 configs/P1022DS_36BIT_defconfig                    |  2 ++
 configs/P1022DS_NAND_defconfig                     |  2 ++
 configs/P1022DS_SDCARD_defconfig                   |  2 ++
 configs/P1022DS_SPIFLASH_defconfig                 |  2 ++
 configs/P1022DS_defconfig                          |  2 ++
 configs/P1024RDB_36BIT_defconfig                   |  2 ++
 configs/P1024RDB_NAND_defconfig                    |  2 ++
 configs/P1024RDB_SDCARD_defconfig                  |  2 ++
 configs/P1024RDB_SPIFLASH_defconfig                |  2 ++
 configs/P1024RDB_defconfig                         |  2 ++
 configs/P1025RDB_36BIT_defconfig                   |  2 ++
 configs/P1025RDB_NAND_defconfig                    |  2 ++
 configs/P1025RDB_SDCARD_defconfig                  |  2 ++
 configs/P1025RDB_SPIFLASH_defconfig                |  2 ++
 configs/P1025RDB_defconfig                         |  2 ++
 configs/P2020RDB-PC_36BIT_NAND_defconfig           |  2 ++
 configs/P2020RDB-PC_36BIT_SDCARD_defconfig         |  2 ++
 configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig       |  2 ++
 configs/P2020RDB-PC_36BIT_defconfig                |  2 ++
 configs/P2020RDB-PC_NAND_defconfig                 |  2 ++
 configs/P2020RDB-PC_SDCARD_defconfig               |  2 ++
 configs/P2020RDB-PC_SPIFLASH_defconfig             |  2 ++
 configs/P2020RDB-PC_defconfig                      |  2 ++
 configs/P2041RDB_NAND_defconfig                    |  2 ++
 configs/P2041RDB_SDCARD_defconfig                  |  2 ++
 configs/P2041RDB_SECURE_BOOT_defconfig             |  2 ++
 configs/P2041RDB_SPIFLASH_defconfig                |  2 ++
 configs/P2041RDB_SRIO_PCIE_BOOT_defconfig          |  2 ++
 configs/P2041RDB_defconfig                         |  2 ++
 configs/P3041DS_NAND_SECURE_BOOT_defconfig         |  2 ++
 configs/P3041DS_NAND_defconfig                     |  2 ++
 configs/P3041DS_SDCARD_defconfig                   |  2 ++
 configs/P3041DS_SECURE_BOOT_defconfig              |  2 ++
 configs/P3041DS_SPIFLASH_defconfig                 |  2 ++
 configs/P3041DS_SRIO_PCIE_BOOT_defconfig           |  2 ++
 configs/P3041DS_defconfig                          |  2 ++
 configs/P4080DS_SDCARD_defconfig                   |  2 ++
 configs/P4080DS_SECURE_BOOT_defconfig              |  2 ++
 configs/P4080DS_SPIFLASH_defconfig                 |  2 ++
 configs/P4080DS_SRIO_PCIE_BOOT_defconfig           |  2 ++
 configs/P4080DS_defconfig                          |  2 ++
 configs/P5020DS_NAND_SECURE_BOOT_defconfig         |  2 ++
 configs/P5020DS_NAND_defconfig                     |  2 ++
 configs/P5020DS_SDCARD_defconfig                   |  2 ++
 configs/P5020DS_SECURE_BOOT_defconfig              |  2 ++
 configs/P5020DS_SPIFLASH_defconfig                 |  2 ++
 configs/P5020DS_SRIO_PCIE_BOOT_defconfig           |  2 ++
 configs/P5020DS_defconfig                          |  2 ++
 configs/P5040DS_NAND_SECURE_BOOT_defconfig         |  2 ++
 configs/P5040DS_NAND_defconfig                     |  2 ++
 configs/P5040DS_SDCARD_defconfig                   |  2 ++
 configs/P5040DS_SECURE_BOOT_defconfig              |  2 ++
 configs/P5040DS_SPIFLASH_defconfig                 |  2 ++
 configs/P5040DS_defconfig                          |  2 ++
 configs/T1023RDB_NAND_defconfig                    |  2 ++
 configs/T1023RDB_SDCARD_defconfig                  |  2 ++
 configs/T1023RDB_SECURE_BOOT_defconfig             |  2 ++
 configs/T1023RDB_SPIFLASH_defconfig                |  2 ++
 configs/T1023RDB_defconfig                         |  2 ++
 configs/T1024QDS_DDR4_SECURE_BOOT_defconfig        |  2 ++
 configs/T1024QDS_DDR4_defconfig                    |  2 ++
 configs/T1024QDS_NAND_defconfig                    |  2 ++
 configs/T1024QDS_SDCARD_defconfig                  |  2 ++
 configs/T1024QDS_SECURE_BOOT_defconfig             |  2 ++
 configs/T1024QDS_SPIFLASH_defconfig                |  2 ++
 configs/T1024QDS_defconfig                         |  2 ++
 configs/T1024RDB_NAND_defconfig                    |  2 ++
 configs/T1024RDB_SDCARD_defconfig                  |  2 ++
 configs/T1024RDB_SECURE_BOOT_defconfig             |  2 ++
 configs/T1024RDB_SPIFLASH_defconfig                |  2 ++
 configs/T1024RDB_defconfig                         |  2 ++
 configs/T1040D4RDB_NAND_defconfig                  |  2 ++
 configs/T1040D4RDB_SDCARD_defconfig                |  2 ++
 configs/T1040D4RDB_SECURE_BOOT_defconfig           |  2 ++
 configs/T1040D4RDB_SPIFLASH_defconfig              |  2 ++
 configs/T1040D4RDB_defconfig                       |  2 ++
 configs/T1040QDS_DDR4_defconfig                    |  2 ++
 configs/T1040QDS_SECURE_BOOT_defconfig             |  2 ++
 configs/T1040QDS_defconfig                         |  2 ++
 configs/T1040RDB_NAND_defconfig                    |  2 ++
 configs/T1040RDB_SDCARD_defconfig                  |  2 ++
 configs/T1040RDB_SECURE_BOOT_defconfig             |  2 ++
 configs/T1040RDB_SPIFLASH_defconfig                |  2 ++
 configs/T1040RDB_defconfig                         |  2 ++
 configs/T1042D4RDB_NAND_defconfig                  |  2 ++
 configs/T1042D4RDB_SDCARD_defconfig                |  2 ++
 configs/T1042D4RDB_SECURE_BOOT_defconfig           |  2 ++
 configs/T1042D4RDB_SPIFLASH_defconfig              |  2 ++
 configs/T1042D4RDB_defconfig                       |  2 ++
 configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig     |  2 ++
 configs/T1042RDB_PI_NAND_defconfig                 |  2 ++
 configs/T1042RDB_PI_SDCARD_defconfig               |  2 ++
 configs/T1042RDB_PI_SPIFLASH_defconfig             |  2 ++
 configs/T1042RDB_PI_defconfig                      |  2 ++
 configs/T1042RDB_SECURE_BOOT_defconfig             |  2 ++
 configs/T1042RDB_defconfig                         |  2 ++
 configs/T2080QDS_NAND_defconfig                    |  2 ++
 configs/T2080QDS_SDCARD_defconfig                  |  2 ++
 configs/T2080QDS_SECURE_BOOT_defconfig             |  2 ++
 configs/T2080QDS_SPIFLASH_defconfig                |  2 ++
 configs/T2080QDS_SRIO_PCIE_BOOT_defconfig          |  2 ++
 configs/T2080QDS_defconfig                         |  2 ++
 configs/T2080RDB_NAND_defconfig                    |  2 ++
 configs/T2080RDB_SDCARD_defconfig                  |  2 ++
 configs/T2080RDB_SECURE_BOOT_defconfig             |  2 ++
 configs/T2080RDB_SPIFLASH_defconfig                |  2 ++
 configs/T2080RDB_SRIO_PCIE_BOOT_defconfig          |  2 ++
 configs/T2080RDB_defconfig                         |  2 ++
 configs/T2081QDS_NAND_defconfig                    |  2 ++
 configs/T2081QDS_SDCARD_defconfig                  |  2 ++
 configs/T2081QDS_SPIFLASH_defconfig                |  2 ++
 configs/T2081QDS_SRIO_PCIE_BOOT_defconfig          |  2 ++
 configs/T2081QDS_defconfig                         |  2 ++
 configs/T4160QDS_NAND_defconfig                    |  2 ++
 configs/T4160QDS_SDCARD_defconfig                  |  2 ++
 configs/T4160QDS_SECURE_BOOT_defconfig             |  2 ++
 configs/T4160QDS_defconfig                         |  2 ++
 configs/T4160RDB_defconfig                         |  2 ++
 configs/T4240QDS_NAND_defconfig                    |  2 ++
 configs/T4240QDS_SDCARD_defconfig                  |  2 ++
 configs/T4240QDS_SECURE_BOOT_defconfig             |  2 ++
 configs/T4240QDS_SRIO_PCIE_BOOT_defconfig          |  2 ++
 configs/T4240QDS_defconfig                         |  2 ++
 configs/T4240RDB_SDCARD_defconfig                  |  2 ++
 configs/T4240RDB_defconfig                         |  2 ++
 configs/UCP1020_SPIFLASH_defconfig                 |  2 ++
 configs/UCP1020_defconfig                          |  2 ++
 configs/ae350_rv32_defconfig                       |  1 +
 configs/ae350_rv64_defconfig                       |  1 +
 configs/am335x_boneblack_vboot_defconfig           |  1 +
 configs/am335x_evm_defconfig                       |  1 +
 configs/am335x_hs_evm_defconfig                    |  1 +
 configs/am335x_hs_evm_uart_defconfig               |  1 +
 configs/am43xx_evm_defconfig                       |  1 +
 configs/am43xx_evm_qspiboot_defconfig              |  1 +
 configs/am43xx_evm_rtconly_defconfig               |  1 +
 configs/am43xx_evm_usbhost_boot_defconfig          |  1 +
 configs/am43xx_hs_evm_defconfig                    |  1 +
 configs/am57xx_evm_defconfig                       |  2 ++
 configs/am57xx_hs_evm_defconfig                    |  2 ++
 configs/am57xx_hs_evm_usb_defconfig                |  2 ++
 configs/aristainetos2_defconfig                    |  4 +++
 configs/aristainetos2b_defconfig                   |  2 ++
 configs/aristainetos_defconfig                     |  3 ++
 configs/at91sam9n12ek_mmc_defconfig                |  1 +
 configs/at91sam9n12ek_nandflash_defconfig          |  1 +
 configs/at91sam9n12ek_spiflash_defconfig           |  1 +
 configs/at91sam9x5ek_dataflash_defconfig           |  1 +
 configs/at91sam9x5ek_mmc_defconfig                 |  1 +
 configs/at91sam9x5ek_nandflash_defconfig           |  1 +
 configs/at91sam9x5ek_spiflash_defconfig            |  1 +
 configs/beaver_defconfig                           |  2 ++
 configs/bg0900_defconfig                           |  3 ++
 configs/birdland_bav335a_defconfig                 |  1 +
 configs/birdland_bav335b_defconfig                 |  1 +
 configs/brppt1_spi_defconfig                       |  1 +
 configs/cardhu_defconfig                           |  2 ++
 configs/cei-tk1-som_defconfig                      |  2 ++
 configs/cgtqmx6eval_defconfig                      |  2 ++
 configs/chromebit_mickey_defconfig                 |  1 +
 configs/chromebook_bob_defconfig                   |  1 +
 configs/chromebook_jerry_defconfig                 |  1 +
 configs/chromebook_minnie_defconfig                |  1 +
 configs/chromebook_speedy_defconfig                |  1 +
 configs/cl-som-am57x_defconfig                     |  1 +
 configs/cl-som-imx7_defconfig                      |  2 ++
 configs/clearfog_defconfig                         |  1 +
 configs/clearfog_gt_8k_defconfig                   |  1 +
 configs/cm_fx6_defconfig                           |  2 ++
 configs/cm_t43_defconfig                           |  1 +
 .../controlcenterd_36BIT_SDCARD_DEVELOP_defconfig  |  2 ++
 configs/controlcenterd_36BIT_SDCARD_defconfig      |  2 ++
 configs/controlcenterdc_defconfig                  |  1 +
 configs/dalmore_defconfig                          |  2 ++
 configs/db-88f6820-amc_defconfig                   |  1 +
 configs/dh_imx6_defconfig                          |  2 ++
 configs/display5_defconfig                         |  3 ++
 configs/display5_factory_defconfig                 |  3 ++
 configs/dms-ba16-1g_defconfig                      |  2 ++
 configs/dms-ba16_defconfig                         |  2 ++
 configs/dra7xx_evm_defconfig                       |  2 ++
 configs/dra7xx_hs_evm_defconfig                    |  2 ++
 configs/dra7xx_hs_evm_usb_defconfig                |  2 ++
 configs/e2220-1170_defconfig                       |  2 ++
 configs/ea20_defconfig                             |  1 +
 configs/evb-rk3036_defconfig                       |  1 +
 configs/evb-rk3128_defconfig                       |  1 +
 configs/evb-rk3288_defconfig                       |  1 +
 configs/evb-rk3328_defconfig                       |  1 +
 configs/evb-rk3399_defconfig                       |  1 +
 configs/fennec-rk3288_defconfig                    |  1 +
 configs/ficus-rk3399_defconfig                     |  1 +
 configs/firefly-rk3288_defconfig                   |  1 +
 configs/firefly-rk3399_defconfig                   |  1 +
 configs/ge_bx50v3_defconfig                        |  2 ++
 configs/helios4_defconfig                          |  2 ++
 configs/jetson-tk1_defconfig                       |  2 ++
 configs/k2e_evm_defconfig                          |  1 +
 configs/k2e_hs_evm_defconfig                       |  1 +
 configs/k2g_evm_defconfig                          |  2 ++
 configs/k2g_hs_evm_defconfig                       |  2 ++
 configs/k2hk_evm_defconfig                         |  1 +
 configs/k2hk_hs_evm_defconfig                      |  1 +
 configs/k2l_evm_defconfig                          |  1 +
 configs/k2l_hs_evm_defconfig                       |  1 +
 configs/km_kirkwood_128m16_defconfig               |  1 +
 configs/km_kirkwood_defconfig                      |  1 +
 configs/km_kirkwood_pci_defconfig                  |  1 +
 configs/kmcoge4_defconfig                          |  2 ++
 configs/kmcoge5un_defconfig                        |  1 +
 configs/kmlion1_defconfig                          |  2 ++
 configs/kmnusa_defconfig                           |  1 +
 configs/kmsugp1_defconfig                          |  1 +
 configs/kmsuv31_defconfig                          |  1 +
 configs/kylin-rk3036_defconfig                     |  1 +
 configs/legoev3_defconfig                          |  1 +
 configs/ls1012aqds_qspi_defconfig                  |  3 ++
 configs/ls1012aqds_tfa_SECURE_BOOT_defconfig       |  3 ++
 configs/ls1012aqds_tfa_defconfig                   |  3 ++
 configs/ls1043aqds_defconfig                       |  1 +
 configs/ls1043aqds_lpuart_defconfig                |  1 +
 configs/ls1043aqds_nand_defconfig                  |  1 +
 configs/ls1043aqds_nor_ddr3_defconfig              |  1 +
 configs/ls1043aqds_sdcard_ifc_defconfig            |  1 +
 configs/ls1043aqds_tfa_SECURE_BOOT_defconfig       |  1 +
 configs/ls1043aqds_tfa_defconfig                   |  1 +
 configs/ls1043ardb_SECURE_BOOT_defconfig           |  1 +
 configs/ls1043ardb_defconfig                       |  1 +
 configs/ls1043ardb_nand_SECURE_BOOT_defconfig      |  1 +
 configs/ls1043ardb_nand_defconfig                  |  1 +
 configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig    |  1 +
 configs/ls1043ardb_sdcard_defconfig                |  1 +
 configs/ls1043ardb_tfa_SECURE_BOOT_defconfig       |  1 +
 configs/ls1043ardb_tfa_defconfig                   |  1 +
 configs/ls1046aqds_SECURE_BOOT_defconfig           |  1 +
 configs/ls1046aqds_defconfig                       |  1 +
 configs/ls1046aqds_lpuart_defconfig                |  1 +
 configs/ls1046aqds_nand_defconfig                  |  1 +
 configs/ls1046aqds_sdcard_ifc_defconfig            |  1 +
 configs/ls1046aqds_tfa_SECURE_BOOT_defconfig       |  1 +
 configs/ls1046aqds_tfa_defconfig                   |  1 +
 configs/lschlv2_defconfig                          |  1 +
 configs/lsxhl_defconfig                            |  1 +
 configs/marsboard_defconfig                        |  2 ++
 configs/mccmon6_nor_defconfig                      |  3 ++
 configs/mccmon6_sd_defconfig                       |  3 ++
 configs/mgcoge3un_defconfig                        |  1 +
 configs/miqi-rk3288_defconfig                      |  1 +
 configs/mvebu_db-88f3720_defconfig                 |  1 +
 configs/mvebu_db_armada8k_defconfig                |  1 +
 configs/mvebu_espressobin-88f3720_defconfig        |  1 +
 configs/mvebu_mcbin-88f8040_defconfig              |  1 +
 configs/mx28evk_auart_console_defconfig            |  3 ++
 configs/mx28evk_defconfig                          |  3 ++
 configs/mx28evk_nand_defconfig                     |  3 ++
 configs/mx28evk_spi_defconfig                      |  3 ++
 configs/mx6qsabrelite_defconfig                    |  2 ++
 configs/mx6sabreauto_defconfig                     |  2 ++
 configs/mx6sabresd_defconfig                       |  2 ++
 configs/mx6slevk_defconfig                         |  2 ++
 configs/mx6slevk_spinor_defconfig                  |  2 ++
 configs/mx6slevk_spl_defconfig                     |  2 ++
 configs/mx6sxsabreauto_defconfig                   |  2 ++
 configs/mx6sxsabresd_defconfig                     |  3 ++
 configs/mx6ul_14x14_evk_defconfig                  |  2 ++
 configs/mx6ul_9x9_evk_defconfig                    |  2 ++
 configs/mx6ull_14x14_evk_defconfig                 |  2 ++
 configs/mx6ull_14x14_evk_plugin_defconfig          |  2 ++
 configs/mx7dsabresd_qspi_defconfig                 |  2 ++
 configs/nitrogen6dl2g_defconfig                    |  2 ++
 configs/nitrogen6dl_defconfig                      |  2 ++
 configs/nitrogen6q2g_defconfig                     |  2 ++
 configs/nitrogen6q_defconfig                       |  2 ++
 configs/nitrogen6s1g_defconfig                     |  2 ++
 configs/nitrogen6s_defconfig                       |  2 ++
 configs/nyan-big_defconfig                         |  2 ++
 configs/omapl138_lcdk_defconfig                    |  1 +
 configs/ot1200_defconfig                           |  3 ++
 configs/ot1200_spl_defconfig                       |  3 ++
 configs/p2371-0000_defconfig                       |  2 ++
 configs/p2371-2180_defconfig                       |  2 ++
 configs/p2571_defconfig                            |  2 ++
 configs/pcm051_rev1_defconfig                      |  1 +
 configs/pcm051_rev3_defconfig                      |  1 +
 configs/pcm058_defconfig                           |  2 ++
 configs/peach-pi_defconfig                         |  2 ++
 configs/peach-pit_defconfig                        |  2 ++
 configs/pfla02_defconfig                           |  3 ++
 configs/phycore-rk3288_defconfig                   |  1 +
 configs/popmetal-rk3288_defconfig                  |  1 +
 configs/portl2_defconfig                           |  1 +
 configs/puma-rk3399_defconfig                      |  1 +
 configs/riotboard_defconfig                        |  2 ++
 configs/riotboard_spl_defconfig                    |  2 ++
 configs/rock2_defconfig                            |  1 +
 configs/rock960-rk3399_defconfig                   |  1 +
 configs/rock_defconfig                             |  1 +
 configs/sama5d27_som1_ek_mmc1_defconfig            |  1 +
 configs/sama5d27_som1_ek_mmc_defconfig             |  1 +
 configs/sama5d2_xplained_emmc_defconfig            |  1 +
 configs/sama5d2_xplained_mmc_defconfig             |  1 +
 configs/sama5d2_xplained_spiflash_defconfig        |  1 +
 configs/sama5d36ek_cmp_mmc_defconfig               |  1 +
 configs/sama5d36ek_cmp_nandflash_defconfig         |  1 +
 configs/sama5d36ek_cmp_spiflash_defconfig          |  1 +
 configs/sama5d3xek_mmc_defconfig                   |  1 +
 configs/sama5d3xek_nandflash_defconfig             |  1 +
 configs/sama5d3xek_spiflash_defconfig              |  1 +
 configs/sama5d4_xplained_mmc_defconfig             |  1 +
 configs/sama5d4_xplained_nandflash_defconfig       |  1 +
 configs/sama5d4_xplained_spiflash_defconfig        |  1 +
 configs/sama5d4ek_mmc_defconfig                    |  1 +
 configs/sama5d4ek_nandflash_defconfig              |  1 +
 configs/sama5d4ek_spiflash_defconfig               |  1 +
 configs/smdk5250_defconfig                         |  2 ++
 configs/smdk5420_defconfig                         |  2 ++
 configs/snow_defconfig                             |  2 ++
 configs/socfpga_sr1500_defconfig                   |  1 +
 configs/socfpga_stratix10_defconfig                |  1 +
 configs/spring_defconfig                           |  2 ++
 configs/stmark2_defconfig                          |  1 +
 configs/tec-ng_defconfig                           |  2 ++
 configs/theadorable_debug_defconfig                |  1 +
 configs/tinker-rk3288_defconfig                    |  1 +
 configs/topic_miami_defconfig                      |  3 +-
 configs/topic_miamilite_defconfig                  |  3 +-
 configs/topic_miamiplus_defconfig                  |  2 ++
 configs/tqma6dl_mba6_mmc_defconfig                 |  2 ++
 configs/tqma6dl_mba6_spi_defconfig                 |  2 ++
 configs/tqma6q_mba6_mmc_defconfig                  |  2 ++
 configs/tqma6q_mba6_spi_defconfig                  |  2 ++
 configs/tqma6s_mba6_mmc_defconfig                  |  2 ++
 configs/tqma6s_mba6_spi_defconfig                  |  2 ++
 configs/trimslice_defconfig                        |  1 +
 configs/turris_mox_defconfig                       |  2 ++
 configs/uDPU_defconfig                             |  1 +
 configs/venice2_defconfig                          |  2 ++
 configs/vinco_defconfig                            |  2 ++
 configs/vyasa-rk3288_defconfig                     |  1 +
 configs/x530_defconfig                             |  2 ++
 configs/zc5202_defconfig                           |  3 ++
 configs/zc5601_defconfig                           |  3 ++
 configs/zynq_cc108_defconfig                       |  1 +
 configs/zynq_cse_qspi_defconfig                    |  1 +
 configs/zynq_dlc20_rev1_0_defconfig                |  1 +
 configs/zynq_microzed_defconfig                    |  1 +
 configs/zynq_minized_defconfig                     |  1 +
 configs/zynq_z_turn_defconfig                      |  1 +
 configs/zynq_zc702_defconfig                       |  1 +
 configs/zynq_zc706_defconfig                       |  1 +
 configs/zynq_zc770_xm010_defconfig                 |  1 +
 configs/zynq_zc770_xm013_defconfig                 |  1 +
 configs/zynq_zed_defconfig                         |  1 +
 configs/zynq_zybo_defconfig                        |  1 +
 configs/zynq_zybo_z7_defconfig                     |  1 +
 drivers/mtd/spi/Kconfig                            | 36 ++++++++++++++++++++++
 include/configs/B4860QDS.h                         |  2 --
 include/configs/BSC9131RDB.h                       |  4 ---
 include/configs/BSC9132QDS.h                       |  4 ---
 include/configs/C29XPCIE.h                         |  2 --
 include/configs/MPC8536DS.h                        |  5 ---
 include/configs/P1010RDB.h                         |  2 --
 include/configs/P1022DS.h                          |  3 --
 include/configs/P2041RDB.h                         |  2 --
 include/configs/T102xQDS.h                         |  2 --
 include/configs/T102xRDB.h                         |  2 --
 include/configs/T1040QDS.h                         |  2 --
 include/configs/T104xRDB.h                         |  2 --
 include/configs/T208xQDS.h                         |  5 ---
 include/configs/T208xRDB.h                         |  4 ---
 include/configs/T4240QDS.h                         |  2 --
 include/configs/T4240RDB.h                         |  2 --
 include/configs/UCP1020.h                          |  3 --
 include/configs/adp-ae3xx.h                        |  4 ---
 include/configs/advantech_dms-ba16.h               |  6 ----
 include/configs/am335x_evm.h                       |  1 -
 include/configs/am43xx_evm.h                       |  2 --
 include/configs/am57xx_evm.h                       |  2 --
 include/configs/aristainetos-common.h              |  2 --
 include/configs/aristainetos.h                     |  3 --
 include/configs/aristainetos2.h                    |  3 --
 include/configs/aristainetos2b.h                   |  3 --
 include/configs/at91sam9n12ek.h                    |  3 --
 include/configs/at91sam9x5ek.h                     |  3 --
 include/configs/ax25-ae350.h                       |  4 ---
 include/configs/bav335x.h                          |  1 -
 include/configs/beaver.h                           |  2 --
 include/configs/bg0900.h                           |  5 ---
 include/configs/brppt1.h                           |  1 -
 include/configs/cardhu.h                           |  2 --
 include/configs/cei-tk1-som.h                      |  2 --
 include/configs/cgtqmx6eval.h                      |  3 --
 include/configs/cl-som-am57x.h                     |  1 -
 include/configs/cl-som-imx7.h                      |  4 ---
 include/configs/clearfog.h                         |  1 -
 include/configs/cm_fx6.h                           |  4 ---
 include/configs/cm_t43.h                           |  2 --
 include/configs/controlcenterd.h                   |  6 ----
 include/configs/controlcenterdc.h                  |  5 ---
 include/configs/corenet_ds.h                       |  2 --
 include/configs/da850evm.h                         |  1 -
 include/configs/dalmore.h                          |  2 --
 include/configs/db-88f6720.h                       |  2 --
 include/configs/db-88f6820-amc.h                   |  3 --
 include/configs/db-88f6820-gp.h                    |  2 --
 include/configs/db-mv784mp-gp.h                    |  2 --
 include/configs/dh_imx6.h                          |  6 ----
 include/configs/display5.h                         |  6 ----
 include/configs/dra7xx_evm.h                       |  2 --
 include/configs/ds414.h                            |  2 --
 include/configs/e2220-1170.h                       |  2 --
 include/configs/ea20.h                             |  1 -
 include/configs/el6x_common.h                      |  4 ---
 include/configs/embestmx6boards.h                  |  7 -----
 include/configs/exynos5-common.h                   |  4 ---
 include/configs/ge_bx50v3.h                        |  6 ----
 include/configs/gw_ventana.h                       |  4 ---
 include/configs/helios4.h                          |  4 ---
 include/configs/jetson-tk1.h                       |  2 --
 include/configs/k2g_evm.h                          |  3 --
 include/configs/km/km_arm.h                        |  2 --
 include/configs/km/kmp204x-common.h                |  2 --
 include/configs/legoev3.h                          |  1 -
 include/configs/ls1012aqds.h                       |  5 ---
 include/configs/ls1043a_common.h                   |  4 ---
 include/configs/ls1046aqds.h                       |  4 ---
 include/configs/ls1088aqds.h                       |  2 --
 include/configs/lsxl.h                             |  2 --
 include/configs/maxbcm.h                           |  2 --
 include/configs/mccmon6.h                          |  5 ---
 include/configs/microblaze-generic.h               |  4 ---
 include/configs/mvebu_armada-37xx.h                |  2 --
 include/configs/mvebu_armada-8k.h                  |  2 --
 include/configs/mx28evk.h                          | 10 ------
 include/configs/mx6sabre_common.h                  |  7 -----
 include/configs/mx6slevk.h                         |  7 -----
 include/configs/mx6sxsabreauto.h                   |  4 ---
 include/configs/mx6sxsabresd.h                     |  4 ---
 include/configs/mx6ul_14x14_evk.h                  |  4 ---
 include/configs/mx6ullevk.h                        |  4 ---
 include/configs/mx7dsabresd.h                      |  4 ---
 include/configs/nitrogen6x.h                       |  7 -----
 include/configs/nyan-big.h                         |  2 --
 include/configs/omapl138_lcdk.h                    |  1 -
 include/configs/ot1200.h                           |  4 ---
 include/configs/p1_p2_rdb_pc.h                     |  5 ---
 include/configs/p2371-0000.h                       |  2 --
 include/configs/p2371-2180.h                       |  2 --
 include/configs/p2571.h                            |  2 --
 include/configs/pcm051.h                           |  2 --
 include/configs/pcm058.h                           |  4 ---
 include/configs/pfla02.h                           |  4 ---
 include/configs/rk3036_common.h                    |  1 -
 include/configs/rk3128_common.h                    |  1 -
 include/configs/rk3188_common.h                    |  2 --
 include/configs/rk3288_common.h                    |  2 --
 include/configs/rk3328_common.h                    |  2 --
 include/configs/rk3399_common.h                    |  2 --
 include/configs/sama5d27_som1_ek.h                 |  1 -
 include/configs/sama5d2_xplained.h                 |  5 ---
 include/configs/sama5d3xek.h                       |  4 ---
 include/configs/sama5d4_xplained.h                 |  4 ---
 include/configs/sama5d4ek.h                        |  4 ---
 include/configs/siemens-am33x-common.h             |  2 --
 include/configs/socfpga_common.h                   |  1 -
 include/configs/socfpga_sr1500.h                   |  1 -
 include/configs/socfpga_stratix10_socdk.h          |  4 ---
 include/configs/stmark2.h                          |  1 -
 include/configs/taurus.h                           |  4 ---
 include/configs/tec-ng.h                           |  2 --
 include/configs/theadorable.h                      |  2 --
 include/configs/ti_armv7_keystone2.h               |  1 -
 include/configs/topic_miami.h                      |  3 --
 include/configs/tqma6.h                            |  5 ---
 include/configs/trimslice.h                        |  1 -
 include/configs/turris_mox.h                       |  2 --
 include/configs/turris_omnia.h                     |  2 --
 include/configs/venice2.h                          |  2 --
 include/configs/vinco.h                            |  4 ---
 include/configs/x530.h                             |  3 --
 include/configs/zynq-common.h                      |  3 --
 include/spi_flash.h                                | 13 --------
 scripts/config_whitelist.txt                       |  4 ---
 573 files changed, 808 insertions(+), 424 deletions(-)
README +0 -15
index 1287341..319bf9f 100644
@@ -2146,21 +2146,6 @@ The following options need to be configured:
 		this is instead controlled by the value of
 		/config/load-environment.
 
-- Serial Flash support
-		Usage requires an initial 'sf probe' to define the serial
-		flash parameters, followed by read/write/erase/update
-		commands.
-
-		The following defaults may be provided by the platform
-		to handle the common case when only a single serial
-		flash is present on the system.
-
-		CONFIG_SF_DEFAULT_BUS		Bus identifier
-		CONFIG_SF_DEFAULT_CS		Chip-select
-		CONFIG_SF_DEFAULT_MODE 		(see include/spi.h)
-		CONFIG_SF_DEFAULT_SPEED		in Hz
-
-
 - TFTP Fixed UDP Port:
 		CONFIG_TFTP_PORT
 
board/Arcturus/ucp1020/cmd_arc.c +0 -13
index 1c42fee..9579d52 100644
@@ -15,19 +15,6 @@
 
 #include <asm/io.h>
 
-#ifndef CONFIG_SF_DEFAULT_SPEED
-#   define CONFIG_SF_DEFAULT_SPEED	1000000
-#endif
-#ifndef CONFIG_SF_DEFAULT_MODE
-#   define CONFIG_SF_DEFAULT_MODE	SPI_MODE0
-#endif
-#ifndef CONFIG_SF_DEFAULT_CS
-#   define CONFIG_SF_DEFAULT_CS		0
-#endif
-#ifndef CONFIG_SF_DEFAULT_BUS
-#   define CONFIG_SF_DEFAULT_BUS	0
-#endif
-
 #define MAX_SERIAL_SIZE 15
 #define MAX_HWADDR_SIZE 17
 
configs/B4420QDS_NAND_defconfig +2 -0
index fd74888..d48bc77 100644
@@ -41,6 +41,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/B4420QDS_SPIFLASH_defconfig +2 -0
index 8e3b0a7..e576a87 100644
@@ -30,6 +30,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/B4420QDS_defconfig +2 -0
index 29b351a..896df53 100644
@@ -29,6 +29,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/B4860QDS_NAND_defconfig +2 -0
index bfd1bcf..5b15b9c 100644
@@ -41,6 +41,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/B4860QDS_SECURE_BOOT_defconfig +2 -0
index 26ad411..e376a19 100644
@@ -30,6 +30,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/B4860QDS_SPIFLASH_defconfig +2 -0
index 612cb7e..90e19bd 100644
@@ -30,6 +30,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/B4860QDS_SRIO_PCIE_BOOT_defconfig +2 -0
index 9bfed3c..c35c752 100644
@@ -26,6 +26,8 @@ CONFIG_ENV_IS_IN_REMOTE=y
 CONFIG_FSL_CAAM=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/B4860QDS_defconfig +2 -0
index 3232530..03b925f 100644
@@ -29,6 +29,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/BSC9131RDB_NAND_SYSCLK100_defconfig +2 -0
index 3f271cc..55906fa 100644
@@ -32,6 +32,8 @@ CONFIG_FSL_CAAM=y
 # CONFIG_MMC is not set
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_MII=y
configs/BSC9131RDB_NAND_defconfig +2 -0
index 51dc152..e26ad53 100644
@@ -31,6 +31,8 @@ CONFIG_FSL_CAAM=y
 # CONFIG_MMC is not set
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_MII=y
configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig +2 -0
index 2d3c3d6..2324158 100644
@@ -27,6 +27,8 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_MII=y
configs/BSC9131RDB_SPIFLASH_defconfig +2 -0
index 5a9f10d..0e5a2da 100644
@@ -27,6 +27,8 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_MII=y
configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig +2 -0
index 1e26861..af1bc88 100644
@@ -35,6 +35,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/BSC9132QDS_NAND_DDRCLK100_defconfig +2 -0
index 0db36b0..a0c697a 100644
@@ -39,6 +39,8 @@ CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig +2 -0
index 005087e..abc0886 100644
@@ -35,6 +35,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/BSC9132QDS_NAND_DDRCLK133_defconfig +2 -0
index a37a8a2..d688029 100644
@@ -39,6 +39,8 @@ CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig +2 -0
index d88b6d4..81c3b3b 100644
@@ -35,6 +35,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/BSC9132QDS_NOR_DDRCLK100_defconfig +2 -0
index 09751ed..a16838c 100644
@@ -34,6 +34,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig +2 -0
index 94d099b..dca1260 100644
@@ -35,6 +35,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/BSC9132QDS_NOR_DDRCLK133_defconfig +2 -0
index 7b4ecee..e56be3f 100644
@@ -34,6 +34,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig +2 -0
index 4a53c72..1e5c762 100644
@@ -35,6 +35,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig +2 -0
index ea2e040..f55cb61 100644
@@ -34,6 +34,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig +2 -0
index fc41568..1203bdb 100644
@@ -35,6 +35,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig +2 -0
index 622f5ca..407c2e6 100644
@@ -34,6 +34,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig +2 -0
index 5eca1f1..a0e9cd8 100644
@@ -35,6 +35,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig +2 -0
index b6f2e69..309159e 100644
@@ -34,6 +34,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig +2 -0
index fc89a74..f086438 100644
@@ -35,6 +35,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig +2 -0
index 18f40bb..1af0223 100644
@@ -34,6 +34,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/C29XPCIE_NAND_defconfig +2 -0
index aef42ac..94f04d7 100644
@@ -40,6 +40,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
configs/C29XPCIE_NOR_SECBOOT_defconfig +2 -0
index efc8dd9..a256315 100644
@@ -27,6 +27,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig +2 -0
index dcf793b..8629f8a 100644
@@ -28,6 +28,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
configs/C29XPCIE_SPIFLASH_defconfig +2 -0
index aaecadb..031ab2c 100644
@@ -27,6 +27,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
configs/C29XPCIE_defconfig +2 -0
index a487dca..ac525e8 100644
@@ -26,6 +26,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
configs/MPC8536DS_36BIT_defconfig +2 -0
index 654a517..428586a 100644
@@ -31,6 +31,8 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/MPC8536DS_SDCARD_defconfig +2 -0
index eebc003..1a02f26 100644
@@ -30,6 +30,8 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/MPC8536DS_SPIFLASH_defconfig +2 -0
index c376abe..155f227 100644
@@ -30,6 +30,8 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/MPC8536DS_defconfig +2 -0
index 7501488..01863a4 100644
@@ -30,6 +30,8 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig +2 -0
index 568d886..51b6488 100644
@@ -34,6 +34,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1010RDB-PA_36BIT_NAND_defconfig +2 -0
index 2399330..9e938b2 100644
@@ -47,6 +47,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig +2 -0
index e565b41..b14e7de 100644
@@ -33,6 +33,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1010RDB-PA_36BIT_NOR_defconfig +2 -0
index 1723d8d..10a2eff 100644
@@ -32,6 +32,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1010RDB-PA_36BIT_SDCARD_defconfig +2 -0
index 798a0dc..2e38575 100644
@@ -43,6 +43,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig +2 -0
index d8482a3..b24f704 100644
@@ -34,6 +34,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig +2 -0
index 3b4992f..9bdbac0 100644
@@ -44,6 +44,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1010RDB-PA_NAND_SECBOOT_defconfig +2 -0
index b2f000a..036f8e8 100644
@@ -33,6 +33,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1010RDB-PA_NAND_defconfig +2 -0
index 0dd4d4a..aea4529 100644
@@ -46,6 +46,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1010RDB-PA_NOR_SECBOOT_defconfig +2 -0
index 806bf88..349fc95 100644
@@ -32,6 +32,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1010RDB-PA_NOR_defconfig +2 -0
index f1429ab..47c5cca 100644
@@ -31,6 +31,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1010RDB-PA_SDCARD_defconfig +2 -0
index eb3151c..1455291 100644
@@ -42,6 +42,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig +2 -0
index 9c759db..0fa105c 100644
@@ -33,6 +33,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1010RDB-PA_SPIFLASH_defconfig +2 -0
index 5513446..bb38e71 100644
@@ -43,6 +43,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig +2 -0
index aee9edf..dcc7d11 100644
@@ -34,6 +34,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1010RDB-PB_36BIT_NAND_defconfig +2 -0
index 0f7e989..ce80bad 100644
@@ -47,6 +47,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig +2 -0
index f41e050..6ed4467 100644
@@ -33,6 +33,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1010RDB-PB_36BIT_NOR_defconfig +2 -0
index a7e7ecf..9ea5d83 100644
@@ -32,6 +32,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1010RDB-PB_36BIT_SDCARD_defconfig +2 -0
index aca0441..69a933c 100644
@@ -43,6 +43,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig +2 -0
index 9a0332d..6f43d69 100644
@@ -34,6 +34,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig +2 -0
index 7041356..4ec77b8 100644
@@ -44,6 +44,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1010RDB-PB_NAND_SECBOOT_defconfig +2 -0
index 39b62bb..8e76629 100644
@@ -33,6 +33,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1010RDB-PB_NAND_defconfig +2 -0
index cdf51c8..1873c131 100644
@@ -46,6 +46,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1010RDB-PB_NOR_SECBOOT_defconfig +2 -0
index 45c7d3c..cc2a04f 100644
@@ -32,6 +32,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1010RDB-PB_NOR_defconfig +2 -0
index f1753a3..4178800 100644
@@ -31,6 +31,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1010RDB-PB_SDCARD_defconfig +2 -0
index 56200bb..be6ca00 100644
@@ -42,6 +42,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig +2 -0
index 60e2e1b..78aef83 100644
@@ -33,6 +33,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1010RDB-PB_SPIFLASH_defconfig +2 -0
index f44d36c..6efe1aa 100644
@@ -43,6 +43,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1020RDB-PC_36BIT_NAND_defconfig +2 -0
index 09fc7d9..13a47f8 100644
@@ -46,6 +46,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1020RDB-PC_36BIT_SDCARD_defconfig +2 -0
index 778a258..96c9f3c 100644
@@ -43,6 +43,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig +2 -0
index 3157256..a28913e 100644
@@ -44,6 +44,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1020RDB-PC_36BIT_defconfig +2 -0
index 3dbefd3..8ada9bb 100644
@@ -33,6 +33,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1020RDB-PC_NAND_defconfig +2 -0
index 2cc48c6..6b5c7a5 100644
@@ -45,6 +45,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1020RDB-PC_SDCARD_defconfig +2 -0
index 983fbc7..6ab5929 100644
@@ -42,6 +42,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1020RDB-PC_SPIFLASH_defconfig +2 -0
index 0f49a81..afc789b 100644
@@ -43,6 +43,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1020RDB-PC_defconfig +2 -0
index 2dadfa9..dec97c4 100644
@@ -32,6 +32,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1020RDB-PD_NAND_defconfig +2 -0
index 58f2571..324881d 100644
@@ -49,6 +49,8 @@ CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1020RDB-PD_SDCARD_defconfig +2 -0
index c6cb7a5..4c72120 100644
@@ -46,6 +46,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1020RDB-PD_SPIFLASH_defconfig +2 -0
index 848ca27..243456c 100644
@@ -47,6 +47,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1020RDB-PD_defconfig +2 -0
index 5377df3..0f25faf 100644
@@ -36,6 +36,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1021RDB-PC_36BIT_NAND_defconfig +2 -0
index d03cfc0..c0524e7 100644
@@ -51,6 +51,8 @@ CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1021RDB-PC_36BIT_SDCARD_defconfig +2 -0
index a086c52..a5bcf76 100644
@@ -48,6 +48,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig +2 -0
index 2ff094c..c4160b4 100644
@@ -49,6 +49,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1021RDB-PC_36BIT_defconfig +2 -0
index 72c79d7..ae7752b 100644
@@ -38,6 +38,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1021RDB-PC_NAND_defconfig +2 -0
index 0ee7a35..4221812 100644
@@ -50,6 +50,8 @@ CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1021RDB-PC_SDCARD_defconfig +2 -0
index 4c49da3..ebd6b4c 100644
@@ -47,6 +47,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1021RDB-PC_SPIFLASH_defconfig +2 -0
index ac8c9b2..5ce4384 100644
@@ -48,6 +48,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1021RDB-PC_defconfig +2 -0
index c831333..093c0ae 100644
@@ -37,6 +37,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1022DS_36BIT_NAND_defconfig +2 -0
index a28d506..e73c54a 100644
@@ -48,6 +48,8 @@ CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1022DS_36BIT_SDCARD_defconfig +2 -0
index 5e49b03..6a03645 100644
@@ -45,6 +45,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1022DS_36BIT_SPIFLASH_defconfig +2 -0
index cf1b6a0..aa6640c 100644
@@ -46,6 +46,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1022DS_36BIT_defconfig +2 -0
index e1fb283..44c950e 100644
@@ -35,6 +35,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1022DS_NAND_defconfig +2 -0
index c69ae01..7d25d55 100644
@@ -47,6 +47,8 @@ CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1022DS_SDCARD_defconfig +2 -0
index dbf1872..cf90121 100644
@@ -44,6 +44,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1022DS_SPIFLASH_defconfig +2 -0
index 2c05461..81421c9 100644
@@ -45,6 +45,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1022DS_defconfig +2 -0
index 3449838..42c47f7 100644
@@ -34,6 +34,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1024RDB_36BIT_defconfig +2 -0
index b34dc74..577d9e8 100644
@@ -33,6 +33,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1024RDB_NAND_defconfig +2 -0
index ed1b5e5..4eabadf 100644
@@ -45,6 +45,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1024RDB_SDCARD_defconfig +2 -0
index 0925c2c..3e35df0 100644
@@ -42,6 +42,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1024RDB_SPIFLASH_defconfig +2 -0
index 398112f..5e92ce1 100644
@@ -43,6 +43,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1024RDB_defconfig +2 -0
index 2f21e2a..694a2e9 100644
@@ -32,6 +32,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1025RDB_36BIT_defconfig +2 -0
index 30cef8e..703b8d7 100644
@@ -35,6 +35,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1025RDB_NAND_defconfig +2 -0
index 9e5bf25..2670cf1 100644
@@ -47,6 +47,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1025RDB_SDCARD_defconfig +2 -0
index 5ca059c..fec3ac8 100644
@@ -44,6 +44,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1025RDB_SPIFLASH_defconfig +2 -0
index ebb0475..f8c6486 100644
@@ -45,6 +45,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P1025RDB_defconfig +2 -0
index 2feb9cca..19ac763 100644
@@ -34,6 +34,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P2020RDB-PC_36BIT_NAND_defconfig +2 -0
index e16c385..ea80231 100644
@@ -51,6 +51,8 @@ CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P2020RDB-PC_36BIT_SDCARD_defconfig +2 -0
index fb78b20..7f0d3f8 100644
@@ -48,6 +48,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig +2 -0
index e453814..ad0c7cc 100644
@@ -49,6 +49,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P2020RDB-PC_36BIT_defconfig +2 -0
index 2d7b823..a9c21fb 100644
@@ -38,6 +38,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P2020RDB-PC_NAND_defconfig +2 -0
index 964f21d..aeb14c8 100644
@@ -50,6 +50,8 @@ CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P2020RDB-PC_SDCARD_defconfig +2 -0
index 784262e..a2bdcc2 100644
@@ -47,6 +47,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P2020RDB-PC_SPIFLASH_defconfig +2 -0
index 6470097..df72a7d 100644
@@ -48,6 +48,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P2020RDB-PC_defconfig +2 -0
index 7e905dc..706a27d 100644
@@ -37,6 +37,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/P2041RDB_NAND_defconfig +2 -0
index 96c388b..44966d8 100644
@@ -32,6 +32,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/P2041RDB_SDCARD_defconfig +2 -0
index 3d5d96e..3d558c5 100644
@@ -31,6 +31,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/P2041RDB_SECURE_BOOT_defconfig +2 -0
index 098f40f..f42c141 100644
@@ -31,6 +31,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/P2041RDB_SPIFLASH_defconfig +2 -0
index e8698e8..4fb3794 100644
@@ -31,6 +31,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/P2041RDB_SRIO_PCIE_BOOT_defconfig +2 -0
index 75dedf3..ac74a25 100644
@@ -27,6 +27,8 @@ CONFIG_ENV_IS_IN_REMOTE=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/P2041RDB_defconfig +2 -0
index 07c212b..2a70296 100644
@@ -30,6 +30,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/P3041DS_NAND_SECURE_BOOT_defconfig +2 -0
index 0f38a46..b1bc659 100644
@@ -33,6 +33,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/P3041DS_NAND_defconfig +2 -0
index a8dea7d..81ce703 100644
@@ -32,6 +32,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/P3041DS_SDCARD_defconfig +2 -0
index 40b40fc..7392948 100644
@@ -31,6 +31,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/P3041DS_SECURE_BOOT_defconfig +2 -0
index 06555e8..f7ed963 100644
@@ -31,6 +31,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/P3041DS_SPIFLASH_defconfig +2 -0
index 84b5d76..c89ee84 100644
@@ -31,6 +31,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/P3041DS_SRIO_PCIE_BOOT_defconfig +2 -0
index 8e39410..2bc3f81 100644
@@ -27,6 +27,8 @@ CONFIG_ENV_IS_IN_REMOTE=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/P3041DS_defconfig +2 -0
index 2d72e76..6bae5a5 100644
@@ -30,6 +30,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/P4080DS_SDCARD_defconfig +2 -0
index 1a617b2..b67e12a 100644
@@ -31,6 +31,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/P4080DS_SECURE_BOOT_defconfig +2 -0
index 517a3af..0e47d70 100644
@@ -31,6 +31,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/P4080DS_SPIFLASH_defconfig +2 -0
index b90d65e..b108367 100644
@@ -31,6 +31,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/P4080DS_SRIO_PCIE_BOOT_defconfig +2 -0
index 9b3ba81..a011c8c 100644
@@ -27,6 +27,8 @@ CONFIG_ENV_IS_IN_REMOTE=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/P4080DS_defconfig +2 -0
index 83a925b..ee4f51d 100644
@@ -30,6 +30,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/P5020DS_NAND_SECURE_BOOT_defconfig +2 -0
index 7d420a3..078d70b 100644
@@ -34,6 +34,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/P5020DS_NAND_defconfig +2 -0
index 8c89cca..7cbd790 100644
@@ -33,6 +33,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/P5020DS_SDCARD_defconfig +2 -0
index 0116c2d..c5438e2 100644
@@ -32,6 +32,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/P5020DS_SECURE_BOOT_defconfig +2 -0
index ce172a9..16607ae 100644
@@ -32,6 +32,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/P5020DS_SPIFLASH_defconfig +2 -0
index 28ac033..0ac8813 100644
@@ -32,6 +32,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/P5020DS_SRIO_PCIE_BOOT_defconfig +2 -0
index e81af0e..487ad27 100644
@@ -28,6 +28,8 @@ CONFIG_ENV_IS_IN_REMOTE=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/P5020DS_defconfig +2 -0
index 7177716..6ef6de9 100644
@@ -31,6 +31,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/P5040DS_NAND_SECURE_BOOT_defconfig +2 -0
index 19c41ea..fd277ce 100644
@@ -34,6 +34,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/P5040DS_NAND_defconfig +2 -0
index 3e7c1f7..b2c61d7 100644
@@ -33,6 +33,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/P5040DS_SDCARD_defconfig +2 -0
index b12bb8f..dbff8f7 100644
@@ -32,6 +32,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/P5040DS_SECURE_BOOT_defconfig +2 -0
index 66c116f..2469443 100644
@@ -32,6 +32,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/P5040DS_SPIFLASH_defconfig +2 -0
index 1c34959..1552f84 100644
@@ -32,6 +32,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/P5040DS_defconfig +2 -0
index 314d05b..e8ff36e 100644
@@ -31,6 +31,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/T1023RDB_NAND_defconfig +2 -0
index 22feb6f..767458e 100644
@@ -49,6 +49,8 @@ CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
configs/T1023RDB_SDCARD_defconfig +2 -0
index de99d16..f3b09d0 100644
@@ -48,6 +48,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
configs/T1023RDB_SECURE_BOOT_defconfig +2 -0
index 60c8a47..ebb5ce3 100644
@@ -38,6 +38,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
configs/T1023RDB_SPIFLASH_defconfig +2 -0
index b0434ea..dfbc755 100644
@@ -49,6 +49,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
configs/T1023RDB_defconfig +2 -0
index 7a57a75..b334490 100644
@@ -37,6 +37,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
configs/T1024QDS_DDR4_SECURE_BOOT_defconfig +2 -0
index c38fee0..dd5c006 100644
@@ -39,6 +39,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
configs/T1024QDS_DDR4_defconfig +2 -0
index 9a9a25b..9d887f1 100644
@@ -38,6 +38,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
configs/T1024QDS_NAND_defconfig +2 -0
index fa031a9..612c63f 100644
@@ -51,6 +51,8 @@ CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
configs/T1024QDS_SDCARD_defconfig +2 -0
index be461fc..392a180 100644
@@ -50,6 +50,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
configs/T1024QDS_SECURE_BOOT_defconfig +2 -0
index ecebd48..5d8a919 100644
@@ -40,6 +40,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
configs/T1024QDS_SPIFLASH_defconfig +2 -0
index 8ad4d35..7769acf 100644
@@ -51,6 +51,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
configs/T1024QDS_defconfig +2 -0
index 23ed39e..fbba22c 100644
@@ -39,6 +39,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
configs/T1024RDB_NAND_defconfig +2 -0
index 294d126..88eb858 100644
@@ -51,6 +51,8 @@ CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
configs/T1024RDB_SDCARD_defconfig +2 -0
index e31578c..7078b3d 100644
@@ -50,6 +50,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
configs/T1024RDB_SECURE_BOOT_defconfig +2 -0
index 4269133..76e959f 100644
@@ -40,6 +40,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
configs/T1024RDB_SPIFLASH_defconfig +2 -0
index 148eef0..de60091 100644
@@ -51,6 +51,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
configs/T1024RDB_defconfig +2 -0
index cb1f264..683a619 100644
@@ -39,6 +39,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
configs/T1040D4RDB_NAND_defconfig +2 -0
index 637fa07..61ab715 100644
@@ -48,6 +48,8 @@ CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/T1040D4RDB_SDCARD_defconfig +2 -0
index 88f3c28..e07c1e6 100644
@@ -47,6 +47,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/T1040D4RDB_SECURE_BOOT_defconfig +2 -0
index 030f72a..d1b3c1a 100644
@@ -37,6 +37,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/T1040D4RDB_SPIFLASH_defconfig +2 -0
index 7adf65c..76b3792 100644
@@ -48,6 +48,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/T1040D4RDB_defconfig +2 -0
index c9032c2..17c47de 100644
@@ -36,6 +36,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/T1040QDS_DDR4_defconfig +2 -0
index fd2c74f..fad61d4 100644
@@ -39,6 +39,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
configs/T1040QDS_SECURE_BOOT_defconfig +2 -0
index 719a1e4..a86936a 100644
@@ -41,6 +41,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
configs/T1040QDS_defconfig +2 -0
index 81454ab..e3ae3d7 100644
@@ -40,6 +40,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
configs/T1040RDB_NAND_defconfig +2 -0
index 3287d1b..353feba 100644
@@ -49,6 +49,8 @@ CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/T1040RDB_SDCARD_defconfig +2 -0
index 57d214d..93fd667 100644
@@ -48,6 +48,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/T1040RDB_SECURE_BOOT_defconfig +2 -0
index 62d1c30..ea400b2 100644
@@ -38,6 +38,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/T1040RDB_SPIFLASH_defconfig +2 -0
index c086a9f..beb8b8c 100644
@@ -49,6 +49,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/T1040RDB_defconfig +2 -0
index 0209fb8..3e7b3e8 100644
@@ -37,6 +37,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/T1042D4RDB_NAND_defconfig +2 -0
index 0bb15cc..73fc6ae 100644
@@ -49,6 +49,8 @@ CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/T1042D4RDB_SDCARD_defconfig +2 -0
index 1f7cf60..248136d 100644
@@ -48,6 +48,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/T1042D4RDB_SECURE_BOOT_defconfig +2 -0
index ef9b243..9d40088 100644
@@ -38,6 +38,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/T1042D4RDB_SPIFLASH_defconfig +2 -0
index a2a7d67..abf29ef 100644
@@ -49,6 +49,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/T1042D4RDB_defconfig +2 -0
index 5d60022..466aea2 100644
@@ -37,6 +37,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig +2 -0
index 245abd2..e1ad125 100644
@@ -54,6 +54,8 @@ CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/T1042RDB_PI_NAND_defconfig +2 -0
index 0d72714..1c5f6b5 100644
@@ -51,6 +51,8 @@ CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/T1042RDB_PI_SDCARD_defconfig +2 -0
index 4b2d182..d8688aa 100644
@@ -50,6 +50,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/T1042RDB_PI_SPIFLASH_defconfig +2 -0
index 8c36654..6ab4091 100644
@@ -51,6 +51,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/T1042RDB_PI_defconfig +2 -0
index ec816e7..d968324 100644
@@ -39,6 +39,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/T1042RDB_SECURE_BOOT_defconfig +2 -0
index 2e40362..5072f2a 100644
@@ -37,6 +37,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/T1042RDB_defconfig +2 -0
index 515dec4..2bf2647 100644
@@ -36,6 +36,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/T2080QDS_NAND_defconfig +2 -0
index 948a05a..f5609ed 100644
@@ -47,6 +47,8 @@ CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
configs/T2080QDS_SDCARD_defconfig +2 -0
index 30e87df..8af628b 100644
@@ -46,6 +46,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
configs/T2080QDS_SECURE_BOOT_defconfig +2 -0
index 9e155ee..dd71811 100644
@@ -34,6 +34,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
configs/T2080QDS_SPIFLASH_defconfig +2 -0
index 0cccb3a..d0b7d38 100644
@@ -47,6 +47,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
configs/T2080QDS_SRIO_PCIE_BOOT_defconfig +2 -0
index 9c9a436..133dc7d 100644
@@ -26,6 +26,8 @@ CONFIG_ENV_IS_IN_REMOTE=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
configs/T2080QDS_defconfig +2 -0
index 79cf442..7f5a26f 100644
@@ -36,6 +36,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
configs/T2080RDB_NAND_defconfig +2 -0
index 4a5a56e..5731a1f 100644
@@ -47,6 +47,8 @@ CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
configs/T2080RDB_SDCARD_defconfig +2 -0
index dfe5e8b..66a1a11 100644
@@ -46,6 +46,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
configs/T2080RDB_SECURE_BOOT_defconfig +2 -0
index 5ec495a..0166821 100644
@@ -36,6 +36,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
configs/T2080RDB_SPIFLASH_defconfig +2 -0
index 6d6d640..58abfbd 100644
@@ -47,6 +47,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
configs/T2080RDB_SRIO_PCIE_BOOT_defconfig +2 -0
index 297c31f..a5d83bc 100644
@@ -28,6 +28,8 @@ CONFIG_ENV_IS_IN_REMOTE=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
configs/T2080RDB_defconfig +2 -0
index 4f155de..e782ba0 100644
@@ -35,6 +35,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
configs/T2081QDS_NAND_defconfig +2 -0
index d38a1e3..a2c4953 100644
@@ -45,6 +45,8 @@ CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
configs/T2081QDS_SDCARD_defconfig +2 -0
index 4dd0e90..1e9686a 100644
@@ -44,6 +44,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
configs/T2081QDS_SPIFLASH_defconfig +2 -0
index 6dc7d6d..9b55633 100644
@@ -45,6 +45,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
configs/T2081QDS_SRIO_PCIE_BOOT_defconfig +2 -0
index 43fe470..83d5e50 100644
@@ -26,6 +26,8 @@ CONFIG_ENV_IS_IN_REMOTE=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
configs/T2081QDS_defconfig +2 -0
index 24b616b..e785b58 100644
@@ -33,6 +33,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
configs/T4160QDS_NAND_defconfig +2 -0
index af529b2..3bc51e5 100644
@@ -41,6 +41,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/T4160QDS_SDCARD_defconfig +2 -0
index b29c0691..8afa322 100644
@@ -40,6 +40,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/T4160QDS_SECURE_BOOT_defconfig +2 -0
index 4463386..bf7b701 100644
@@ -30,6 +30,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/T4160QDS_defconfig +2 -0
index 4f45229..7834ebf 100644
@@ -29,6 +29,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/T4160RDB_defconfig +2 -0
index 06c8038..c5a8bb0 100644
@@ -29,6 +29,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/T4240QDS_NAND_defconfig +2 -0
index caeeacb..8efb924 100644
@@ -41,6 +41,8 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/T4240QDS_SDCARD_defconfig +2 -0
index b461e08..07bda33 100644
@@ -40,6 +40,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/T4240QDS_SECURE_BOOT_defconfig +2 -0
index 416b415..2535ea3 100644
@@ -30,6 +30,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/T4240QDS_SRIO_PCIE_BOOT_defconfig +2 -0
index 1169b66..d360f3b 100644
@@ -26,6 +26,8 @@ CONFIG_ENV_IS_IN_REMOTE=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/T4240QDS_defconfig +2 -0
index d1f33d7..89cd173 100644
@@ -29,6 +29,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/T4240RDB_SDCARD_defconfig +2 -0
index 8bde983..ae9d663 100644
@@ -40,6 +40,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/T4240RDB_defconfig +2 -0
index d9f5845..ef26e7c 100644
@@ -29,6 +29,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/UCP1020_SPIFLASH_defconfig +2 -0
index d75c1f3..a2d7e66 100644
@@ -41,6 +41,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_SPI_FLASH_WINBOND=y
configs/UCP1020_defconfig +2 -0
index 7fc6acc..0a676d4 100644
@@ -41,6 +41,8 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_SPI_FLASH_WINBOND=y
configs/ae350_rv32_defconfig +1 -0
index 5837b48..6e0be88 100644
@@ -27,6 +27,7 @@ CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0x0
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_FTMAC100=y
 CONFIG_BAUDRATE=38400
configs/ae350_rv64_defconfig +1 -0
index b250d3f..b472a76 100644
@@ -28,6 +28,7 @@ CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0x0
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_FTMAC100=y
 CONFIG_BAUDRATE=38400
configs/am335x_boneblack_vboot_defconfig +1 -0
index f455b01..6afda72 100644
@@ -39,6 +39,7 @@ CONFIG_MISC=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=24000000
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_ETH=y
 CONFIG_PHY_GIGE=y
configs/am335x_evm_defconfig +1 -0
index 9241168..4fddb78 100644
@@ -44,6 +44,7 @@ CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=24000000
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_ETH=y
 CONFIG_PHY_GIGE=y
configs/am335x_hs_evm_defconfig +1 -0
index faa6c2b..92cfdd6 100644
@@ -45,6 +45,7 @@ CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=24000000
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_ETH=y
 CONFIG_PHY_GIGE=y
configs/am335x_hs_evm_uart_defconfig +1 -0
index 02332db..c12179d 100644
@@ -47,6 +47,7 @@ CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=24000000
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_ETH=y
 CONFIG_PHY_GIGE=y
configs/am43xx_evm_defconfig +1 -0
index e346414..526dda2 100644
@@ -46,6 +46,7 @@ CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=48000000
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_PHY_GIGE=y
 CONFIG_MII=y
configs/am43xx_evm_qspiboot_defconfig +1 -0
index 0d7bd72..b644273 100644
@@ -39,6 +39,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=48000000
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_MII=y
 CONFIG_DRIVER_TI_CPSW=y
configs/am43xx_evm_rtconly_defconfig +1 -0
index 7d56db4..c855705 100644
@@ -37,6 +37,7 @@ CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=48000000
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_PHY_GIGE=y
 CONFIG_MII=y
configs/am43xx_evm_usbhost_boot_defconfig +1 -0
index 5bd919b..e0580b9 100644
@@ -49,6 +49,7 @@ CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=48000000
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_PHY_GIGE=y
 CONFIG_MII=y
configs/am43xx_hs_evm_defconfig +1 -0
index c01fda9..76224c6 100644
@@ -47,6 +47,7 @@ CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=48000000
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_PHY_GIGE=y
 CONFIG_MII=y
configs/am57xx_evm_defconfig +2 -0
index 7486820..e96cd4c 100644
@@ -57,6 +57,8 @@ CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=76800000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
configs/am57xx_hs_evm_defconfig +2 -0
index 9124ada..4c9b4a0 100644
@@ -60,6 +60,8 @@ CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=76800000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
configs/am57xx_hs_evm_usb_defconfig +2 -0
index 6e4580a..c49140e 100644
@@ -65,6 +65,8 @@ CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=76800000
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MICREL=y
configs/aristainetos2_defconfig +4 -0
index f7de4e3..b852b4d 100644
@@ -39,6 +39,10 @@ CONFIG_FSL_ESDHC=y
 CONFIG_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=3
+CONFIG_SF_DEFAULT_CS=1
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_MTD_UBI_FASTMAP=y
 CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT=1
configs/aristainetos2b_defconfig +2 -0
index ff21f1f..7806d0a 100644
@@ -39,6 +39,8 @@ CONFIG_FSL_ESDHC=y
 CONFIG_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_MTD_UBI_FASTMAP=y
 CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT=1
configs/aristainetos_defconfig +3 -0
index 950f9f6..bad6aeb 100644
@@ -39,6 +39,9 @@ CONFIG_FSL_ESDHC=y
 CONFIG_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=3
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_MTD_UBI_FASTMAP=y
 CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT=1
configs/at91sam9n12ek_mmc_defconfig +1 -0
index 853a264..04e251b 100644
@@ -44,6 +44,7 @@ CONFIG_NAND_ATMEL=y
 CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=30000000
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_AT91=y
configs/at91sam9n12ek_nandflash_defconfig +1 -0
index fd83ba0..b04d95b 100644
@@ -43,6 +43,7 @@ CONFIG_NAND_ATMEL=y
 CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=30000000
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_AT91=y
configs/at91sam9n12ek_spiflash_defconfig +1 -0
index 273f91c..7260e0c 100644
@@ -44,6 +44,7 @@ CONFIG_NAND_ATMEL=y
 CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=30000000
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_AT91=y
configs/at91sam9x5ek_dataflash_defconfig +1 -0
index 010d731..1330207 100644
@@ -46,6 +46,7 @@ CONFIG_NAND_ATMEL=y
 CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=30000000
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_DM_ETH=y
 CONFIG_MACB=y
configs/at91sam9x5ek_mmc_defconfig +1 -0
index 5deabaf..39e3eee 100644
@@ -46,6 +46,7 @@ CONFIG_NAND_ATMEL=y
 CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=30000000
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_DM_ETH=y
 CONFIG_MACB=y
configs/at91sam9x5ek_nandflash_defconfig +1 -0
index bdb2b9a..842047f 100644
@@ -45,6 +45,7 @@ CONFIG_NAND_ATMEL=y
 CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=30000000
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_DM_ETH=y
 CONFIG_MACB=y
configs/at91sam9x5ek_spiflash_defconfig +1 -0
index 5f06231..85ad78a 100644
@@ -46,6 +46,7 @@ CONFIG_NAND_ATMEL=y
 CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=30000000
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_DM_ETH=y
 CONFIG_MACB=y
configs/beaver_defconfig +2 -0
index 77d1ad5..36abe26 100644
@@ -31,6 +31,8 @@ CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=24000000
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_RTL8169=y
 CONFIG_PCI=y
configs/bg0900_defconfig +3 -0
index 2bafc79..a8b5f86 100644
@@ -32,6 +32,9 @@ CONFIG_DOS_PARTITION=y
 CONFIG_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=2
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=40000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_MII=y
 CONFIG_CONS_INDEX=0
configs/birdland_bav335a_defconfig +1 -0
index 17015b9..eea1223 100644
@@ -48,6 +48,7 @@ CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x82000000
 CONFIG_MMC_OMAP_HS=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=24000000
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_MII=y
 CONFIG_DRIVER_TI_CPSW=y
configs/birdland_bav335b_defconfig +1 -0
index af3dbcf..7358fe5 100644
@@ -48,6 +48,7 @@ CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x82000000
 CONFIG_MMC_OMAP_HS=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=24000000
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_MII=y
 CONFIG_DRIVER_TI_CPSW=y
configs/brppt1_spi_defconfig +1 -0
index 12bb8cd..739b078 100644
@@ -83,6 +83,7 @@ CONFIG_MMC_OMAP_HS=y
 CONFIG_MTD_DEVICE=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=24000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
configs/cardhu_defconfig +2 -0
index be55728..666ce5f 100644
@@ -25,6 +25,8 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-cardhu"
 CONFIG_SPL_DM=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=24000000
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_RTL8169=y
 CONFIG_PCI=y
configs/cei-tk1-som_defconfig +2 -0
index 74b17ef..f0b8eb8 100644
@@ -30,6 +30,8 @@ CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=24000000
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_RTL8169=y
 CONFIG_PCI=y
configs/cgtqmx6eval_defconfig +2 -0
index 99c581b..2311c4f 100644
@@ -56,6 +56,8 @@ CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x12000000
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_PHYLIB=y
 CONFIG_MII=y
 CONFIG_SPI=y
configs/chromebit_mickey_defconfig +1 -0
index ea19c69..d7c343b 100644
@@ -60,6 +60,7 @@ CONFIG_PWRSEQ=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_PINCTRL=y
 CONFIG_SPL_PINCTRL=y
 CONFIG_DM_PMIC=y
configs/chromebook_bob_defconfig +1 -0
index 92c65b1..ce3decc 100644
@@ -66,6 +66,7 @@ CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ROCKCHIP=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
configs/chromebook_jerry_defconfig +1 -0
index 617c706..5943db0 100644
@@ -64,6 +64,7 @@ CONFIG_PWRSEQ=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_PINCTRL=y
 CONFIG_SPL_PINCTRL=y
 CONFIG_DM_PMIC=y
configs/chromebook_minnie_defconfig +1 -0
index 297d0e4..2a1f1c1 100644
@@ -61,6 +61,7 @@ CONFIG_PWRSEQ=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_PINCTRL=y
 CONFIG_SPL_PINCTRL=y
 CONFIG_DM_PMIC=y
configs/chromebook_speedy_defconfig +1 -0
index 624b8f8..aeaee38 100644
@@ -62,6 +62,7 @@ CONFIG_CROS_EC_SPI=y
 CONFIG_PWRSEQ=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_PINCTRL=y
 CONFIG_SPL_PINCTRL=y
 # CONFIG_SPL_PINCTRL_FULL is not set
configs/cl-som-am57x_defconfig +1 -0
index cd780cd..fd8353e 100644
@@ -37,6 +37,7 @@ CONFIG_LED_STATUS_BIT=37
 CONFIG_LED_STATUS_STATE=2
 CONFIG_MMC_OMAP_HS=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=48000000
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
configs/cl-som-imx7_defconfig +2 -0
index 3501e2b..2b26e66 100644
@@ -51,6 +51,8 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
configs/clearfog_defconfig +1 -0
index c90600e..0429071 100644
@@ -48,6 +48,7 @@ CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_MMC_SDHCI_MV=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=1
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SPI_FLASH_MTD=y
 CONFIG_PHY_MARVELL=y
configs/clearfog_gt_8k_defconfig +1 -0
index ee84877..f8e0850 100644
@@ -44,6 +44,7 @@ CONFIG_DM_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_XENON=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/cm_fx6_defconfig +2 -0
index c8d1e83..6156ac2 100644
@@ -57,6 +57,8 @@ CONFIG_FSL_ESDHC=y
 CONFIG_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=25000000
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
configs/cm_t43_defconfig +1 -0
index ea0cafa..4338629 100644
@@ -49,6 +49,7 @@ CONFIG_DM_GPIO=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=48000000
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig +2 -0
index 966d321..c4d7488 100644
@@ -39,6 +39,8 @@ CONFIG_DM=y
 CONFIG_FSL_SATA=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHY_MARVELL=y
 CONFIG_MII=y
configs/controlcenterd_36BIT_SDCARD_defconfig +2 -0
index 752015c..113dc33 100644
@@ -39,6 +39,8 @@ CONFIG_DM=y
 CONFIG_FSL_SATA=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHY_MARVELL=y
 CONFIG_MII=y
configs/controlcenterdc_defconfig +1 -0
index b4b5732..b2b61b2 100644
@@ -55,6 +55,7 @@ CONFIG_LED_GPIO=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_MV=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=1
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
configs/dalmore_defconfig +2 -0
index c2ee3d8..e6cdaff 100644
@@ -30,6 +30,8 @@ CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=24000000
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA114_SPI=y
configs/db-88f6820-amc_defconfig +1 -0
index 3e1b404..7fd1d50 100644
@@ -52,6 +52,7 @@ CONFIG_SYS_I2C_MVTWSI=y
 CONFIG_NAND=y
 CONFIG_NAND_PXA3XX=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=1
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHY_MARVELL=y
configs/dh_imx6_defconfig +2 -0
index a14c5f2..b2faf1c 100644
@@ -41,6 +41,8 @@ CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_SYS_BOOTCOUNT_ADDR=0x00900000
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=25000000
 CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/display5_defconfig +3 -0
index cdf3642..077a451 100644
@@ -65,6 +65,9 @@ CONFIG_SYS_BOOTCOUNT_ADDR=0x020CC068
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD_DEVICE=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=1
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=50000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
configs/display5_factory_defconfig +3 -0
index 6b9febf..983ea72 100644
@@ -66,6 +66,9 @@ CONFIG_DFU_SF=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD_DEVICE=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=1
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=50000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
configs/dms-ba16-1g_defconfig +2 -0
index a2f4395..6ca5d2b 100644
@@ -34,6 +34,8 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DWC_AHSATA=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHYLIB=y
configs/dms-ba16_defconfig +2 -0
index 2784c12..4ad3df6 100644
@@ -33,6 +33,8 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DWC_AHSATA=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHYLIB=y
configs/dra7xx_evm_defconfig +2 -0
index ef06150..0bc8012 100644
@@ -67,6 +67,8 @@ CONFIG_SPL_MMC_HS200_SUPPORT=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=76800000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_DM_ETH=y
 CONFIG_PHY_GIGE=y
configs/dra7xx_hs_evm_defconfig +2 -0
index 3cf7659..fb25818 100644
@@ -71,6 +71,8 @@ CONFIG_SPL_MMC_HS200_SUPPORT=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=76800000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_DM_ETH=y
 CONFIG_PHY_GIGE=y
configs/dra7xx_hs_evm_usb_defconfig +2 -0
index 378b3d7..aa4b826 100644
@@ -76,6 +76,8 @@ CONFIG_SPL_MMC_HS200_SUPPORT=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=76800000
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_DM_ETH=y
configs/e2220-1170_defconfig +2 -0
index afa08a0..4c847bd 100644
@@ -25,6 +25,8 @@ CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=24000000
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA114_SPI=y
configs/ea20_defconfig +1 -0
index fae7ff9..ceab73d 100644
@@ -37,6 +37,7 @@ CONFIG_SYS_I2C_DAVINCI=y
 CONFIG_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=30000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_MII=y
 CONFIG_DRIVER_TI_EMAC=y
configs/evb-rk3036_defconfig +1 -0
index eb7b3a4..a0ca4e1 100644
@@ -43,6 +43,7 @@ CONFIG_LED=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_PINCTRL=y
 # CONFIG_SPL_DM_SERIAL is not set
 CONFIG_DEBUG_UART_SHIFT=2
configs/evb-rk3128_defconfig +1 -0
index d2c0fb0..de85f5a 100644
@@ -30,6 +30,7 @@ CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_PHY=y
 CONFIG_PINCTRL=y
 CONFIG_REGULATOR_PWM=y
configs/evb-rk3288_defconfig +1 -0
index d0eba8a..8635fd9 100644
@@ -53,6 +53,7 @@ CONFIG_LED_GPIO=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
configs/evb-rk3328_defconfig +1 -0
index 6783d5a..fffd293 100644
@@ -33,6 +33,7 @@ CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
configs/evb-rk3399_defconfig +1 -0
index 3a0ed18..d985353 100644
@@ -44,6 +44,7 @@ CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ROCKCHIP=y
+CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
configs/fennec-rk3288_defconfig +1 -0
index 4e0898d..668323f 100644
@@ -52,6 +52,7 @@ CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
configs/ficus-rk3399_defconfig +1 -0
index 4e4e7dd..94c565e 100644
@@ -44,6 +44,7 @@ CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ROCKCHIP=y
+CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y
configs/firefly-rk3288_defconfig +1 -0
index b8eae0f..ba5b3ba 100644
@@ -55,6 +55,7 @@ CONFIG_LED_GPIO=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
configs/firefly-rk3399_defconfig +1 -0
index 3b3be22..6725b48 100644
@@ -44,6 +44,7 @@ CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ROCKCHIP=y
+CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
configs/ge_bx50v3_defconfig +2 -0
index a250719..7319919 100644
@@ -38,6 +38,8 @@ CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="1:5"
 CONFIG_SYS_BOOTCOUNT_ADDR=0x7000A000
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_E1000=y
configs/helios4_defconfig +2 -0
index 6ef40b0..699ce06 100644
@@ -47,6 +47,8 @@ CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_MMC_SDHCI_MV=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=1
+CONFIG_SF_DEFAULT_SPEED=104000000
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHY_GIGE=y
 CONFIG_MVNETA=y
configs/jetson-tk1_defconfig +2 -0
index c39c424..cee01a3 100644
@@ -31,6 +31,8 @@ CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=24000000
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_RTL8169=y
 CONFIG_PCI=y
configs/k2e_evm_defconfig +1 -0
index a108f88..6123dad 100644
@@ -43,6 +43,7 @@ CONFIG_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=30000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MARVELL=y
configs/k2e_hs_evm_defconfig +1 -0
index 67f6fb1..11c9fda 100644
@@ -36,6 +36,7 @@ CONFIG_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=30000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MARVELL=y
configs/k2g_evm_defconfig +2 -0
index 838b6f1..4ff9c13 100644
@@ -43,6 +43,8 @@ CONFIG_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=1
+CONFIG_SF_DEFAULT_SPEED=30000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
configs/k2g_hs_evm_defconfig +2 -0
index 93fa236..990c7f6 100644
@@ -37,6 +37,8 @@ CONFIG_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=1
+CONFIG_SF_DEFAULT_SPEED=30000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
configs/k2hk_evm_defconfig +1 -0
index ce139d1..6835874 100644
@@ -43,6 +43,7 @@ CONFIG_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=30000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MARVELL=y
configs/k2hk_hs_evm_defconfig +1 -0
index db61557..e14f901 100644
@@ -36,6 +36,7 @@ CONFIG_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=30000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MARVELL=y
configs/k2l_evm_defconfig +1 -0
index 368171d..0e2f73a 100644
@@ -43,6 +43,7 @@ CONFIG_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=30000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MARVELL=y
configs/k2l_hs_evm_defconfig +1 -0
index 7bb672f..1f7a93e 100644
@@ -35,6 +35,7 @@ CONFIG_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=30000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MARVELL=y
configs/km_kirkwood_128m16_defconfig +1 -0
index b55b8b0..92fb248 100644
@@ -35,6 +35,7 @@ CONFIG_BOOTCOUNT_RAM=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=8100000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
configs/km_kirkwood_defconfig +1 -0
index b47b9e3..b1a95cb 100644
@@ -35,6 +35,7 @@ CONFIG_BOOTCOUNT_RAM=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=8100000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
configs/km_kirkwood_pci_defconfig +1 -0
index fb18630..443399d 100644
@@ -35,6 +35,7 @@ CONFIG_BOOTCOUNT_RAM=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=8100000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
configs/kmcoge4_defconfig +2 -0
index a3cc06b..4243933 100644
@@ -40,6 +40,8 @@ CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_SYS_BOOTCOUNT_ADDR=0xFB000020
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
configs/kmcoge5un_defconfig +1 -0
index 598af88..7ec7281 100644
@@ -35,6 +35,7 @@ CONFIG_BOOTCOUNT_RAM=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=8100000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
configs/kmlion1_defconfig +2 -0
index 75e5204..8f02b85 100644
@@ -40,6 +40,8 @@ CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_SYS_BOOTCOUNT_ADDR=0xFB000020
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
configs/kmnusa_defconfig +1 -0
index 8b3fa7e..34ece18 100644
@@ -35,6 +35,7 @@ CONFIG_BOOTCOUNT_RAM=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=8100000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
configs/kmsugp1_defconfig +1 -0
index d2206b4..63c5925 100644
@@ -35,6 +35,7 @@ CONFIG_BOOTCOUNT_RAM=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=8100000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
configs/kmsuv31_defconfig +1 -0
index 62d3a0a..b2d6232 100644
@@ -35,6 +35,7 @@ CONFIG_BOOTCOUNT_RAM=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=8100000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
configs/kylin-rk3036_defconfig +1 -0
index d6d5abb..29113f9 100644
@@ -41,6 +41,7 @@ CONFIG_LED=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_PINCTRL=y
 CONFIG_DM_REGULATOR_FIXED=y
 # CONFIG_SPL_DM_SERIAL is not set
configs/legoev3_defconfig +1 -0
index 7b8f169..32cd52c 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_DIAG=y
 CONFIG_SYS_I2C_DAVINCI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=50000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
configs/ls1012aqds_qspi_defconfig +3 -0
index 3a1121c..1bf9343 100644
@@ -42,6 +42,9 @@ CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=1
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_FSL_PFE=y
 CONFIG_DM_ETH=y
configs/ls1012aqds_tfa_SECURE_BOOT_defconfig +3 -0
index 7d0d690..747fa3d 100644
@@ -40,6 +40,9 @@ CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=1
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_FSL_PFE=y
 CONFIG_DM_ETH=y
configs/ls1012aqds_tfa_defconfig +3 -0
index 30f2343..a41757d 100644
@@ -42,6 +42,9 @@ CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=1
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=10000000
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_FSL_PFE=y
 CONFIG_DM_ETH=y
configs/ls1043aqds_defconfig +1 -0
index 8bde83d..349600e 100644
@@ -39,6 +39,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=1
 CONFIG_PHYLIB=y
 CONFIG_E1000=y
 CONFIG_PCI=y
configs/ls1043aqds_lpuart_defconfig +1 -0
index 7944812..f67f584 100644
@@ -38,6 +38,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=1
 CONFIG_PHYLIB=y
 CONFIG_E1000=y
 CONFIG_PCI=y
configs/ls1043aqds_nand_defconfig +1 -0
index ada225c..326f07d 100644
@@ -52,6 +52,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=1
 CONFIG_PHYLIB=y
 CONFIG_E1000=y
 CONFIG_PCI=y
configs/ls1043aqds_nor_ddr3_defconfig +1 -0
index e86d419..b47a21f 100644
@@ -38,6 +38,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=1
 CONFIG_PHYLIB=y
 CONFIG_E1000=y
 CONFIG_PCI=y
configs/ls1043aqds_sdcard_ifc_defconfig +1 -0
index afa91e8..fed4fda 100644
@@ -52,6 +52,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=1
 CONFIG_PHYLIB=y
 CONFIG_E1000=y
 CONFIG_PCI=y
configs/ls1043aqds_tfa_SECURE_BOOT_defconfig +1 -0
index ce6f1ef..92dde7c 100644
@@ -38,6 +38,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=1
 CONFIG_PHYLIB=y
 CONFIG_E1000=y
 CONFIG_PCI=y
configs/ls1043aqds_tfa_defconfig +1 -0
index dfd70b5..f17820d 100644
@@ -42,6 +42,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=1
 CONFIG_PHYLIB=y
 CONFIG_E1000=y
 CONFIG_PCI=y
configs/ls1043ardb_SECURE_BOOT_defconfig +1 -0
index 0a51540..b9ce10c 100644
@@ -31,6 +31,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=1
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
configs/ls1043ardb_defconfig +1 -0
index 1462a44..063f8c2 100644
@@ -32,6 +32,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=1
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
configs/ls1043ardb_nand_SECURE_BOOT_defconfig +1 -0
index 8a45f7c..6db8d55 100644
@@ -49,6 +49,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=1
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
configs/ls1043ardb_nand_defconfig +1 -0
index 509f2f1..1abd4be 100644
@@ -49,6 +49,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=1
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig +1 -0
index 33ce8ac..3008690 100644
@@ -47,6 +47,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=1
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
configs/ls1043ardb_sdcard_defconfig +1 -0
index 91dac81..3ca4046 100644
@@ -47,6 +47,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=1
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
configs/ls1043ardb_tfa_SECURE_BOOT_defconfig +1 -0
index 0af2594..8e5ade3 100644
@@ -33,6 +33,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=1
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
configs/ls1043ardb_tfa_defconfig +1 -0
index 93cd545..623a4b4 100644
@@ -36,6 +36,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=1
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
configs/ls1046aqds_SECURE_BOOT_defconfig +1 -0
index ae05dd1..7959144 100644
@@ -37,6 +37,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=1
 CONFIG_PHYLIB=y
 CONFIG_E1000=y
 CONFIG_PCI=y
configs/ls1046aqds_defconfig +1 -0
index f7a35df..fc6e838 100644
@@ -40,6 +40,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=1
 CONFIG_PHYLIB=y
 CONFIG_E1000=y
 CONFIG_PCI=y
configs/ls1046aqds_lpuart_defconfig +1 -0
index 0a8d51e..5ba6f5a 100644
@@ -39,6 +39,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=1
 CONFIG_PHYLIB=y
 CONFIG_E1000=y
 CONFIG_PCI=y
configs/ls1046aqds_nand_defconfig +1 -0
index 9e11db7..c0d330e 100644
@@ -45,6 +45,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=1
 CONFIG_PHYLIB=y
 CONFIG_E1000=y
 CONFIG_PCI=y
configs/ls1046aqds_sdcard_ifc_defconfig +1 -0
index edf915f..3989339 100644
@@ -54,6 +54,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=1
 CONFIG_PHYLIB=y
 CONFIG_E1000=y
 CONFIG_PCI=y
configs/ls1046aqds_tfa_SECURE_BOOT_defconfig +1 -0
index f57dda5..0e1be75 100644
@@ -41,6 +41,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=1
 CONFIG_PHYLIB=y
 CONFIG_E1000=y
 CONFIG_PCI=y
configs/ls1046aqds_tfa_defconfig +1 -0
index f77aa23..f73d5fe 100644
@@ -45,6 +45,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=1
 CONFIG_PHYLIB=y
 CONFIG_E1000=y
 CONFIG_PCI=y
configs/lschlv2_defconfig +1 -0
index 8563abc..16d9c92 100644
@@ -30,6 +30,7 @@ CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=25000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
configs/lsxhl_defconfig +1 -0
index c363606..b6eba4a 100644
@@ -30,6 +30,7 @@ CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=25000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
configs/marsboard_defconfig +2 -0
index 48bec11..320e14e 100644
@@ -23,6 +23,8 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
configs/mccmon6_nor_defconfig +3 -0
index 1ab29c1..245dc15 100644
@@ -38,6 +38,9 @@ CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=2
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=25000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/mccmon6_sd_defconfig +3 -0
index 6d47db5..9bb5e26 100644
@@ -39,6 +39,9 @@ CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=2
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=25000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/mgcoge3un_defconfig +1 -0
index 0c2785c..d85a216 100644
@@ -35,6 +35,7 @@ CONFIG_BOOTCOUNT_RAM=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=8100000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
configs/miqi-rk3288_defconfig +1 -0
index b26bd1e..abc46d0 100644
@@ -52,6 +52,7 @@ CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
configs/mvebu_db-88f3720_defconfig +1 -0
index da51868..ecbcf95 100644
@@ -45,6 +45,7 @@ CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_MMC_SDHCI_XENON=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/mvebu_db_armada8k_defconfig +1 -0
index 271875f..e1514b3 100644
@@ -41,6 +41,7 @@ CONFIG_DM_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_XENON=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/mvebu_espressobin-88f3720_defconfig +1 -0
index 8701d1f..0d7fafe 100644
@@ -44,6 +44,7 @@ CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_MMC_SDHCI_XENON=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/mvebu_mcbin-88f8040_defconfig +1 -0
index eb019c9..8c38722 100644
@@ -44,6 +44,7 @@ CONFIG_DM_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_XENON=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/mx28evk_auart_console_defconfig +3 -0
index d057221..beb10c4 100644
@@ -43,6 +43,9 @@ CONFIG_MMC_MXS=y
 CONFIG_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=2
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=24000000
 CONFIG_SPI_FLASH_SST=y
 CONFIG_MII=y
 CONFIG_CONS_INDEX=0
configs/mx28evk_defconfig +3 -0
index ab59d75..be1feb3 100644
@@ -43,6 +43,9 @@ CONFIG_MMC_MXS=y
 CONFIG_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=2
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=24000000
 CONFIG_SPI_FLASH_SST=y
 CONFIG_MII=y
 CONFIG_CONS_INDEX=0
configs/mx28evk_nand_defconfig +3 -0
index 6b774cf..61e3586 100644
@@ -42,6 +42,9 @@ CONFIG_MMC_MXS=y
 CONFIG_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=2
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=24000000
 CONFIG_SPI_FLASH_SST=y
 CONFIG_MII=y
 CONFIG_CONS_INDEX=0
configs/mx28evk_spi_defconfig +3 -0
index 0a77e6e..3198baf 100644
@@ -42,6 +42,9 @@ CONFIG_MMC_MXS=y
 CONFIG_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=2
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=24000000
 CONFIG_SPI_FLASH_SST=y
 CONFIG_MII=y
 CONFIG_CONS_INDEX=0
configs/mx6qsabrelite_defconfig +2 -0
index 2666340..3989352 100644
@@ -36,6 +36,8 @@ CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x12000000
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=25000000
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/mx6sabreauto_defconfig +2 -0
index f51b5af..d0f950b 100644
@@ -64,6 +64,8 @@ CONFIG_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
configs/mx6sabresd_defconfig +2 -0
index bd2d4ee..d5475bc 100644
@@ -75,6 +75,8 @@ CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
configs/mx6slevk_defconfig +2 -0
index 44cd50b..d93a4df 100644
@@ -36,6 +36,8 @@ CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
configs/mx6slevk_spinor_defconfig +2 -0
index 72212fb..76f6101 100644
@@ -36,6 +36,8 @@ CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
configs/mx6slevk_spl_defconfig +2 -0
index bcfeb30..936c152 100644
@@ -44,6 +44,8 @@ CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
configs/mx6sxsabreauto_defconfig +2 -0
index b60e9b6..b2247c4 100644
@@ -39,6 +39,8 @@ CONFIG_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=40000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
configs/mx6sxsabresd_defconfig +3 -0
index 5c0aa63..3982115 100644
@@ -41,6 +41,9 @@ CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=1
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=40000000
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
configs/mx6ul_14x14_evk_defconfig +2 -0
index 4a3c56f..3ef781e 100644
@@ -46,6 +46,8 @@ CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=40000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/mx6ul_9x9_evk_defconfig +2 -0
index 185f543..69160f7 100644
@@ -46,6 +46,8 @@ CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=40000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/mx6ull_14x14_evk_defconfig +2 -0
index a5a1cb5..7902465 100644
@@ -33,6 +33,8 @@ CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=40000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
configs/mx6ull_14x14_evk_plugin_defconfig +2 -0
index 831b8cc..990ea71 100644
@@ -34,6 +34,8 @@ CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=40000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
configs/mx7dsabresd_qspi_defconfig +2 -0
index 81f4538..3d74967 100644
@@ -50,6 +50,8 @@ CONFIG_MMC_HS200_SUPPORT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=40000000
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_PHYLIB=y
configs/nitrogen6dl2g_defconfig +2 -0
index af59a71..debe60b 100644
@@ -38,6 +38,8 @@ CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x12000000
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=25000000
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/nitrogen6dl_defconfig +2 -0
index 9072c04..96d9c02 100644
@@ -38,6 +38,8 @@ CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x12000000
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=25000000
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/nitrogen6q2g_defconfig +2 -0
index b92d27a..5bc4219 100644
@@ -40,6 +40,8 @@ CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x12000000
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=25000000
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/nitrogen6q_defconfig +2 -0
index 3b8cc6a..37fa405 100644
@@ -40,6 +40,8 @@ CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x12000000
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=25000000
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/nitrogen6s1g_defconfig +2 -0
index 36cfe21..1d3f015 100644
@@ -38,6 +38,8 @@ CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x12000000
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=25000000
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/nitrogen6s_defconfig +2 -0
index 40c09d7..5bf2b3a 100644
@@ -38,6 +38,8 @@ CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x12000000
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=25000000
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/nyan-big_defconfig +2 -0
index 13d8f99..4102ae7 100644
@@ -49,6 +49,8 @@ CONFIG_CROS_EC_KEYB=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_SPI=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=24000000
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_PMIC=y
 CONFIG_PMIC_AS3722=y
configs/omapl138_lcdk_defconfig +1 -0
index d66af98..e282099 100644
@@ -46,6 +46,7 @@ CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
 CONFIG_SYS_NAND_U_BOOT_OFFS=0x28000
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=30000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_MII=y
configs/ot1200_defconfig +3 -0
index 2825e44..f0fe375 100644
@@ -33,6 +33,9 @@ CONFIG_DWC_AHSATA=y
 CONFIG_CMD_PCA953X=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=2
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=25000000
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
configs/ot1200_spl_defconfig +3 -0
index c8c53e8..d3960e4 100644
@@ -42,6 +42,9 @@ CONFIG_DWC_AHSATA=y
 CONFIG_CMD_PCA953X=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=2
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=25000000
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
configs/p2371-0000_defconfig +2 -0
index 015ac05..9a6578a 100644
@@ -26,6 +26,8 @@ CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=24000000
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA114_SPI=y
configs/p2371-2180_defconfig +2 -0
index 81ce9a2..03c23dd 100644
@@ -28,6 +28,8 @@ CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=24000000
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_RTL8169=y
 CONFIG_PCI=y
configs/p2571_defconfig +2 -0
index 5482ac2..caeac30 100644
@@ -26,6 +26,8 @@ CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=24000000
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA114_SPI=y
configs/pcm051_rev1_defconfig +1 -0
index 1780307..718c33f 100644
@@ -42,6 +42,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=24000000
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_MII=y
 CONFIG_DRIVER_TI_CPSW=y
configs/pcm051_rev3_defconfig +1 -0
index 27431ee..05ebe66 100644
@@ -42,6 +42,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=24000000
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_MII=y
 CONFIG_DRIVER_TI_CPSW=y
configs/pcm058_defconfig +2 -0
index af4768f..9bb6dd6 100644
@@ -47,6 +47,8 @@ CONFIG_MTD=y
 CONFIG_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/peach-pi_defconfig +2 -0
index 96ec8fd..cb818c5 100644
@@ -39,6 +39,8 @@ CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_S5P=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=50000000
 CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SMC911X=y
configs/peach-pit_defconfig +2 -0
index 792f22f..bb1558b 100644
@@ -38,6 +38,8 @@ CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_S5P=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=50000000
 CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SMC911X=y
configs/pfla02_defconfig +3 -0
index 2eb59e4..799d54d 100644
@@ -46,6 +46,9 @@ CONFIG_MTD=y
 CONFIG_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_BUS=2
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/phycore-rk3288_defconfig +1 -0
index 1e54035..7503417 100644
@@ -56,6 +56,7 @@ CONFIG_I2C_EEPROM=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
configs/popmetal-rk3288_defconfig +1 -0
index ca194fd..ac50729 100644
@@ -52,6 +52,7 @@ CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
configs/portl2_defconfig +1 -0
index 7d2e97a..7e0abaa 100644
@@ -33,6 +33,7 @@ CONFIG_BOOTCOUNT_RAM=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=8100000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
configs/puma-rk3399_defconfig +1 -0
index 3fcff25..3547ec6 100644
@@ -67,6 +67,7 @@ CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_MMC_SDHCI_ROCKCHIP=y
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

configs/riotboard_defconfig +2 -0
index a9191ad..e3d16df 100644

Lines of this file are not shown. View the raw message.

configs/riotboard_spl_defconfig +2 -0
index 2298d5b..51fa98d 100644

Lines of this file are not shown. View the raw message.

configs/rock2_defconfig +1 -0
index 746c0bf..24ad3e9 100644

Lines of this file are not shown. View the raw message.

configs/rock960-rk3399_defconfig +1 -0
index 17311e6..cb5a35f 100644

Lines of this file are not shown. View the raw message.

configs/rock_defconfig +1 -0
index 2de51e8..19c3858 100644

Lines of this file are not shown. View the raw message.

configs/sama5d27_som1_ek_mmc1_defconfig +1 -0
index 5f4abe8..c523384 100644

Lines of this file are not shown. View the raw message.

configs/sama5d27_som1_ek_mmc_defconfig +1 -0
index 5dcd80c..447dd23 100644

Lines of this file are not shown. View the raw message.

configs/sama5d2_xplained_emmc_defconfig +1 -0
index d6c30e2..5259dff 100644

Lines of this file are not shown. View the raw message.

configs/sama5d2_xplained_mmc_defconfig +1 -0
index 49e2a73..e291127 100644

Lines of this file are not shown. View the raw message.

configs/sama5d2_xplained_spiflash_defconfig +1 -0
index 9bb4a07..b1e010c 100644

Lines of this file are not shown. View the raw message.

configs/sama5d36ek_cmp_mmc_defconfig +1 -0
index ced445f..bb4578a 100644

Lines of this file are not shown. View the raw message.

configs/sama5d36ek_cmp_nandflash_defconfig +1 -0
index 2967036..ed9d65c 100644

Lines of this file are not shown. View the raw message.

configs/sama5d36ek_cmp_spiflash_defconfig +1 -0
index 1f1fc8e..0514138 100644

Lines of this file are not shown. View the raw message.

configs/sama5d3xek_mmc_defconfig +1 -0
index 404af1f..98e0539 100644

Lines of this file are not shown. View the raw message.

configs/sama5d3xek_nandflash_defconfig +1 -0
index 0e36665..ddae1c8 100644

Lines of this file are not shown. View the raw message.

configs/sama5d3xek_spiflash_defconfig +1 -0
index 43db387..6724bea 100644

Lines of this file are not shown. View the raw message.

configs/sama5d4_xplained_mmc_defconfig +1 -0
index cbfb645..e3f69dd 100644

Lines of this file are not shown. View the raw message.

configs/sama5d4_xplained_nandflash_defconfig +1 -0
index 38a8b1c..14a1b14 100644

Lines of this file are not shown. View the raw message.

configs/sama5d4_xplained_spiflash_defconfig +1 -0
index ef08339..829c530 100644

Lines of this file are not shown. View the raw message.

configs/sama5d4ek_mmc_defconfig +1 -0
index a121af4..09cda6d 100644

Lines of this file are not shown. View the raw message.

configs/sama5d4ek_nandflash_defconfig +1 -0
index b830b8f..6ea0078 100644

Lines of this file are not shown. View the raw message.

configs/sama5d4ek_spiflash_defconfig +1 -0
index 87052d5..1d7de20 100644

Lines of this file are not shown. View the raw message.

configs/smdk5250_defconfig +2 -0
index c86fde7..d24e9e2 100644

Lines of this file are not shown. View the raw message.

configs/smdk5420_defconfig +2 -0
index e92472e..704786a 100644

Lines of this file are not shown. View the raw message.

configs/snow_defconfig +2 -0
index 86a668f..6179a64 100644

Lines of this file are not shown. View the raw message.

configs/socfpga_sr1500_defconfig +1 -0
index d984047..b8de47a 100644

Lines of this file are not shown. View the raw message.

configs/socfpga_stratix10_defconfig +1 -0
index 9e6d582..f0671dd 100644

Lines of this file are not shown. View the raw message.

configs/spring_defconfig +2 -0
index c008428..2bbfa6d 100644

Lines of this file are not shown. View the raw message.

configs/stmark2_defconfig +1 -0
index 48e851d..d74ba67 100644

Lines of this file are not shown. View the raw message.

configs/tec-ng_defconfig +2 -0
index 250d7f0..8839c7d 100644

Lines of this file are not shown. View the raw message.

configs/theadorable_debug_defconfig +1 -0
index a7d02e9..cd52220 100644

Lines of this file are not shown. View the raw message.

configs/tinker-rk3288_defconfig +1 -0
index 68adf76..85ef9da 100644

Lines of this file are not shown. View the raw message.

configs/topic_miami_defconfig +2 -1
index 352976b..5cfbbf8 100644

Lines of this file are not shown. View the raw message.

configs/topic_miamilite_defconfig +2 -1
index 9b004ac..91d8499 100644

Lines of this file are not shown. View the raw message.

configs/topic_miamiplus_defconfig +2 -0
index e450557..bcfca5d 100644

Lines of this file are not shown. View the raw message.

configs/tqma6dl_mba6_mmc_defconfig +2 -0
index af72877..bc54005 100644

Lines of this file are not shown. View the raw message.

configs/tqma6dl_mba6_spi_defconfig +2 -0
index f69189b..58d08bf 100644

Lines of this file are not shown. View the raw message.

configs/tqma6q_mba6_mmc_defconfig +2 -0
index 744547b..b57cb81 100644

Lines of this file are not shown. View the raw message.

configs/tqma6q_mba6_spi_defconfig +2 -0
index c99301e..c713fac 100644

Lines of this file are not shown. View the raw message.

configs/tqma6s_mba6_mmc_defconfig +2 -0
index 8d5f54c..d9d3ce9 100644

Lines of this file are not shown. View the raw message.

configs/tqma6s_mba6_spi_defconfig +2 -0
index 3470a78..f793658 100644

Lines of this file are not shown. View the raw message.

configs/trimslice_defconfig +1 -0
index 71bfbfc..be6be27 100644

Lines of this file are not shown. View the raw message.

configs/turris_mox_defconfig +2 -0
index 165f0ca..5b168df 100644

Lines of this file are not shown. View the raw message.

configs/uDPU_defconfig +1 -0
index 53f2b6e..2209330 100644

Lines of this file are not shown. View the raw message.

configs/venice2_defconfig +2 -0
index 856398b..1b6118a 100644

Lines of this file are not shown. View the raw message.

configs/vinco_defconfig +2 -0
index 0130ad4..5abc87e 100644

Lines of this file are not shown. View the raw message.

configs/vyasa-rk3288_defconfig +1 -0
index c4779c0..ab9bda0 100644

Lines of this file are not shown. View the raw message.

configs/x530_defconfig +2 -0
index 25b9e88..cd18e9e 100644

Lines of this file are not shown. View the raw message.

configs/zc5202_defconfig +3 -0
index cca1f2d..c9b1255 100644

Lines of this file are not shown. View the raw message.

configs/zc5601_defconfig +3 -0
index cfe80b3..4b764bc 100644

Lines of this file are not shown. View the raw message.

configs/zynq_cc108_defconfig +1 -0
index 5f15d42..637fae5 100644

Lines of this file are not shown. View the raw message.

configs/zynq_cse_qspi_defconfig +1 -0
index 1f8aa6e..c58d649 100644

Lines of this file are not shown. View the raw message.

configs/zynq_dlc20_rev1_0_defconfig +1 -0
index c61010f..37c5f35 100644

Lines of this file are not shown. View the raw message.

configs/zynq_microzed_defconfig +1 -0
index bbf9fc0..0af0f23 100644

Lines of this file are not shown. View the raw message.

configs/zynq_minized_defconfig +1 -0
index b64f91f..d61659f 100644

Lines of this file are not shown. View the raw message.

configs/zynq_z_turn_defconfig +1 -0
index 9704b81..c896880 100644

Lines of this file are not shown. View the raw message.

configs/zynq_zc702_defconfig +1 -0
index c9eb4d3..7b1b92d 100644

Lines of this file are not shown. View the raw message.

configs/zynq_zc706_defconfig +1 -0
index 9da1d54..f2ecdac 100644

Lines of this file are not shown. View the raw message.

configs/zynq_zc770_xm010_defconfig +1 -0
index bfff8af..8f74105 100644

Lines of this file are not shown. View the raw message.

configs/zynq_zc770_xm013_defconfig +1 -0
index 996f46b..d43869c 100644

Lines of this file are not shown. View the raw message.

configs/zynq_zed_defconfig +1 -0
index fdaa5bb..cc21557 100644

Lines of this file are not shown. View the raw message.

configs/zynq_zybo_defconfig +1 -0
index 9a4ac2d..496da8f 100644

Lines of this file are not shown. View the raw message.

configs/zynq_zybo_z7_defconfig +1 -0
index 8cabaf1..e8437b4 100644

Lines of this file are not shown. View the raw message.

drivers/mtd/spi/Kconfig +36 -0
index e3b40fc..5671bca 100644

Lines of this file are not shown. View the raw message.

include/configs/B4860QDS.h +0 -2
index 252e127..3239696 100644

Lines of this file are not shown. View the raw message.

include/configs/BSC9131RDB.h +0 -4
index 71e840a..49bea98 100644

Lines of this file are not shown. View the raw message.

include/configs/BSC9132QDS.h +0 -4
index 49bb382..45264c4 100644

Lines of this file are not shown. View the raw message.

include/configs/C29XPCIE.h +0 -2
index ebf44b5..a18d041 100644

Lines of this file are not shown. View the raw message.

include/configs/MPC8536DS.h +0 -5
index 86a1233..fedd151 100644

Lines of this file are not shown. View the raw message.

include/configs/P1010RDB.h +0 -2
index 134ffe5..cefa598 100644

Lines of this file are not shown. View the raw message.

include/configs/P1022DS.h +0 -3
index 3ccfeca..8bdbabe 100644

Lines of this file are not shown. View the raw message.

include/configs/P2041RDB.h +0 -2
index bd2913e..da43320 100644

Lines of this file are not shown. View the raw message.

include/configs/T102xQDS.h +0 -2
index c63dfd3..73b70fa 100644

Lines of this file are not shown. View the raw message.

include/configs/T102xRDB.h +0 -2
index c72be9f..078df7f 100644

Lines of this file are not shown. View the raw message.

include/configs/T1040QDS.h +0 -2
index 2d5c96f..c886fe2 100644

Lines of this file are not shown. View the raw message.

include/configs/T104xRDB.h +0 -2
index 4cecab3..0d92f27 100644

Lines of this file are not shown. View the raw message.

include/configs/T208xQDS.h +0 -5
index 69ec109..9864064 100644

Lines of this file are not shown. View the raw message.

include/configs/T208xRDB.h +0 -4
index 1d6a390..95e9ed3 100644

Lines of this file are not shown. View the raw message.

include/configs/T4240QDS.h +0 -2
index 0693901..80a4b13 100644

Lines of this file are not shown. View the raw message.

include/configs/T4240RDB.h +0 -2
index 42252c7..066e8dd 100644

Lines of this file are not shown. View the raw message.

include/configs/UCP1020.h +0 -3
index 1bbe9d9..69d43c4 100644

Lines of this file are not shown. View the raw message.

include/configs/adp-ae3xx.h +0 -4
index 915f416..f2268dc 100644

Lines of this file are not shown. View the raw message.

include/configs/advantech_dms-ba16.h +0 -6
index 0c9de61..a08f62b 100644

Lines of this file are not shown. View the raw message.

include/configs/am335x_evm.h +0 -1
index 3bd96b9..d8f0583 100644

Lines of this file are not shown. View the raw message.

include/configs/am43xx_evm.h +0 -2
index ed71f4c..55faa7b 100644

Lines of this file are not shown. View the raw message.

include/configs/am57xx_evm.h +0 -2
index d61fdf9..24e2d7e 100644

Lines of this file are not shown. View the raw message.

include/configs/aristainetos-common.h +0 -2
index ca974c0..eecc021 100644

Lines of this file are not shown. View the raw message.

include/configs/aristainetos.h +0 -3
index c53ba89..03e2a2b 100644

Lines of this file are not shown. View the raw message.

include/configs/aristainetos2.h +0 -3
index 67b2e58..00e5667 100644

Lines of this file are not shown. View the raw message.

include/configs/aristainetos2b.h +0 -3
index 91069a2..cfe0e05 100644

Lines of this file are not shown. View the raw message.

include/configs/at91sam9n12ek.h +0 -3
index 777a99b..d83546d 100644

Lines of this file are not shown. View the raw message.

include/configs/at91sam9x5ek.h +0 -3
index 6adb965..d43d408 100644

Lines of this file are not shown. View the raw message.

include/configs/ax25-ae350.h +0 -4
index e3eb928..cd07212 100644

Lines of this file are not shown. View the raw message.

include/configs/bav335x.h +0 -1
index df5d5bd..8936222 100644

Lines of this file are not shown. View the raw message.

include/configs/beaver.h +0 -2
index 73629dd..6c6f11b 100644

Lines of this file are not shown. View the raw message.

include/configs/bg0900.h +0 -5
index ec6b01f..32b975f 100644

Lines of this file are not shown. View the raw message.

include/configs/brppt1.h +0 -1
index 5badd2d..2219663 100644

Lines of this file are not shown. View the raw message.

include/configs/cardhu.h +0 -2
index dcb66a6..93fa2c2 100644

Lines of this file are not shown. View the raw message.

include/configs/cei-tk1-som.h +0 -2
index 1400844..edd4df8 100644

Lines of this file are not shown. View the raw message.

include/configs/cgtqmx6eval.h +0 -3
index e01bf5b..ab8d1c6 100644

Lines of this file are not shown. View the raw message.

include/configs/cl-som-am57x.h +0 -1
index 80f0b4f..c9e80c2 100644

Lines of this file are not shown. View the raw message.

include/configs/cl-som-imx7.h +0 -4
index f84a112..d895f89 100644

Lines of this file are not shown. View the raw message.

include/configs/clearfog.h +0 -1
index f951082..c51cf28 100644

Lines of this file are not shown. View the raw message.

include/configs/cm_fx6.h +0 -4
index f7e82df..2ac888f 100644

Lines of this file are not shown. View the raw message.

include/configs/cm_t43.h +0 -2
index 79eb865..6df8b8b 100644

Lines of this file are not shown. View the raw message.

include/configs/controlcenterd.h +0 -6
index 1908d35..69c65f1 100644

Lines of this file are not shown. View the raw message.

include/configs/controlcenterdc.h +0 -5
index 2433815..edd8749 100644

Lines of this file are not shown. View the raw message.

include/configs/corenet_ds.h +0 -2
index cd79150..a3963db 100644

Lines of this file are not shown. View the raw message.

include/configs/da850evm.h +0 -1
index 14a3046..7b1e53f 100644

Lines of this file are not shown. View the raw message.

include/configs/dalmore.h +0 -2
index 9a8b5a7..bd68d52 100644

Lines of this file are not shown. View the raw message.

include/configs/db-88f6720.h +0 -2
index 4c30077..55968c2 100644

Lines of this file are not shown. View the raw message.

include/configs/db-88f6820-amc.h +0 -3
index 626a406..222bdf8 100644

Lines of this file are not shown. View the raw message.

include/configs/db-88f6820-gp.h +0 -2
index 1f328e9..967b133 100644

Lines of this file are not shown. View the raw message.

include/configs/db-mv784mp-gp.h +0 -2
index 6cba326..b78dbcb 100644

Lines of this file are not shown. View the raw message.

include/configs/dh_imx6.h +0 -6
index 9231bd8..1c1178c3 100644

Lines of this file are not shown. View the raw message.

include/configs/display5.h +0 -6
index 1fb7469..d729054 100644

Lines of this file are not shown. View the raw message.

include/configs/dra7xx_evm.h +0 -2
index f36a9c3..36e1582 100644

Lines of this file are not shown. View the raw message.

include/configs/ds414.h +0 -2
index 4ba0505..275a2b4 100644

Lines of this file are not shown. View the raw message.

include/configs/e2220-1170.h +0 -2
index dd7a012..097199d 100644

Lines of this file are not shown. View the raw message.

include/configs/ea20.h +0 -1
index a644e67..800ce03 100644

Lines of this file are not shown. View the raw message.

include/configs/el6x_common.h +0 -4
index b472a6c..bf70ea0 100644

Lines of this file are not shown. View the raw message.

include/configs/embestmx6boards.h +0 -7
index 7e7de4d..f984540 100644

Lines of this file are not shown. View the raw message.

include/configs/exynos5-common.h +0 -4
index cd2a904..5641f09 100644

Lines of this file are not shown. View the raw message.

include/configs/ge_bx50v3.h +0 -6
index e0e1f71..9ca3ee3 100644

Lines of this file are not shown. View the raw message.

include/configs/gw_ventana.h +0 -4
index 6e23fa2..a4215c8 100644

Lines of this file are not shown. View the raw message.

include/configs/helios4.h +0 -4
index 4e98f19..5a11641 100644

Lines of this file are not shown. View the raw message.

include/configs/jetson-tk1.h +0 -2
index 93fcdd6..69f519e 100644

Lines of this file are not shown. View the raw message.

include/configs/k2g_evm.h +0 -3
index 90f9a99..b1aec98 100644

Lines of this file are not shown. View the raw message.

include/configs/km/km_arm.h +0 -2
index 0de83f6..f93629e 100644

Lines of this file are not shown. View the raw message.

include/configs/km/kmp204x-common.h +0 -2
index c762c93..810d66a 100644

Lines of this file are not shown. View the raw message.

include/configs/legoev3.h +0 -1
index c631e26..ce806d1 100644

Lines of this file are not shown. View the raw message.

include/configs/ls1012aqds.h +0 -5
index c76bfdc..aac782d 100644

Lines of this file are not shown. View the raw message.

include/configs/ls1043a_common.h +0 -4
index 49b0141..b34c765 100644

Lines of this file are not shown. View the raw message.

include/configs/ls1046aqds.h +0 -4
index 886fe72..92159fe 100644

Lines of this file are not shown. View the raw message.

include/configs/ls1088aqds.h +0 -2
index 17d543d..4387862 100644

Lines of this file are not shown. View the raw message.

include/configs/lsxl.h +0 -2
index 9d4be18..bcad8a0 100644

Lines of this file are not shown. View the raw message.

include/configs/maxbcm.h +0 -2
index d378333..fada0ca 100644

Lines of this file are not shown. View the raw message.

include/configs/mccmon6.h +0 -5
index 644f339..a1774c0 100644

Lines of this file are not shown. View the raw message.

include/configs/microblaze-generic.h +0 -4
index ba0952c..d81194b 100644

Lines of this file are not shown. View the raw message.

include/configs/mvebu_armada-37xx.h +0 -2
index cf9440f..e898133 100644

Lines of this file are not shown. View the raw message.

include/configs/mvebu_armada-8k.h +0 -2
index a6636e1..51f484d 100644

Lines of this file are not shown. View the raw message.

include/configs/mx28evk.h +0 -10
index 1117139..82ac6cc 100644

Lines of this file are not shown. View the raw message.

include/configs/mx6sabre_common.h +0 -7
index 711aa82..6fe0467 100644

Lines of this file are not shown. View the raw message.

include/configs/mx6slevk.h +0 -7
index a80a656..2cce3d5 100644

Lines of this file are not shown. View the raw message.

include/configs/mx6sxsabreauto.h +0 -4
index 058856a..c4d8a89 100644

Lines of this file are not shown. View the raw message.

include/configs/mx6sxsabresd.h +0 -4
index 2a7eb22..dc4181d 100644

Lines of this file are not shown. View the raw message.

include/configs/mx6ul_14x14_evk.h +0 -4
index c8c088e..42e5115 100644

Lines of this file are not shown. View the raw message.

include/configs/mx6ullevk.h +0 -4
index c64d092..1fc5c24 100644

Lines of this file are not shown. View the raw message.

include/configs/mx7dsabresd.h +0 -4
index ad919a6..39d29de 100644

Lines of this file are not shown. View the raw message.

include/configs/nitrogen6x.h +0 -7
index c364442..c37a766 100644

Lines of this file are not shown. View the raw message.

include/configs/nyan-big.h +0 -2
index dd76829..dd5a62f 100644

Lines of this file are not shown. View the raw message.

include/configs/omapl138_lcdk.h +0 -1
index 2002444..5f5aa57 100644

Lines of this file are not shown. View the raw message.

include/configs/ot1200.h +0 -4
index 776835a..6754181 100644

Lines of this file are not shown. View the raw message.

include/configs/p1_p2_rdb_pc.h +0 -5
index 0e1f983..e20125c 100644

Lines of this file are not shown. View the raw message.

include/configs/p2371-0000.h +0 -2
index 6654a1b..c74dd74 100644

Lines of this file are not shown. View the raw message.

include/configs/p2371-2180.h +0 -2
index 0e37511..9fa37ae 100644

Lines of this file are not shown. View the raw message.

include/configs/p2571.h +0 -2
index 1daf49a..83f29f8 100644

Lines of this file are not shown. View the raw message.

include/configs/pcm051.h +0 -2
index 5381ed1..8cde12e 100644

Lines of this file are not shown. View the raw message.

include/configs/pcm058.h +0 -4
index b9bc08b..15dc1b2 100644

Lines of this file are not shown. View the raw message.

include/configs/pfla02.h +0 -4
index e2aae19..fe54e54 100644

Lines of this file are not shown. View the raw message.

include/configs/rk3036_common.h +0 -1
index 4fc9226..50c6b56 100644

Lines of this file are not shown. View the raw message.

include/configs/rk3128_common.h +0 -1
index 9451715..0c08d7a 100644

Lines of this file are not shown. View the raw message.

include/configs/rk3188_common.h +0 -2
index 36e494e..208ca5a 100644

Lines of this file are not shown. View the raw message.

include/configs/rk3288_common.h +0 -2
index c59f5ef..72a54bc 100644

Lines of this file are not shown. View the raw message.

include/configs/rk3328_common.h +0 -2
index 02233d6..71aad70 100644

Lines of this file are not shown. View the raw message.

include/configs/rk3399_common.h +0 -2
index b977b1f..b412012 100644

Lines of this file are not shown. View the raw message.

include/configs/sama5d27_som1_ek.h +0 -1
index 7c7479b..ae51aea 100644

Lines of this file are not shown. View the raw message.

include/configs/sama5d2_xplained.h +0 -5
index 2cec1c7..a3df404 100644

Lines of this file are not shown. View the raw message.

include/configs/sama5d3xek.h +0 -4
index ca1c2b0..3870671 100644

Lines of this file are not shown. View the raw message.

include/configs/sama5d4_xplained.h +0 -4
index bbb1699..d8b61a6 100644

Lines of this file are not shown. View the raw message.

include/configs/sama5d4ek.h +0 -4
index d580416..8bfda3f 100644

Lines of this file are not shown. View the raw message.

include/configs/siemens-am33x-common.h +0 -2
index d8ed02b..8f2dd5f 100644

Lines of this file are not shown. View the raw message.

include/configs/socfpga_common.h +0 -1
index c9cbf8f..394e107 100644

Lines of this file are not shown. View the raw message.

include/configs/socfpga_sr1500.h +0 -1
index 984f118..d9de075 100644

Lines of this file are not shown. View the raw message.

include/configs/socfpga_stratix10_socdk.h +0 -4
index 0e73239..31c267f 100644

Lines of this file are not shown. View the raw message.

include/configs/stmark2.h +0 -1
index 33ddc67..fa3d6b8 100644

Lines of this file are not shown. View the raw message.

include/configs/taurus.h +0 -4
index f283ab7..1d24577 100644

Lines of this file are not shown. View the raw message.

include/configs/tec-ng.h +0 -2
index dd3e026..b5f0481 100644

Lines of this file are not shown. View the raw message.

include/configs/theadorable.h +0 -2
index 886456e..59b2546 100644

Lines of this file are not shown. View the raw message.

include/configs/ti_armv7_keystone2.h +0 -1
index 0c7d664..767615a 100644

Lines of this file are not shown. View the raw message.

include/configs/topic_miami.h +0 -3
index f14c4ee..c4f01aa 100644

Lines of this file are not shown. View the raw message.

include/configs/tqma6.h +0 -5
index 65cc12f..6c0d4f2 100644

Lines of this file are not shown. View the raw message.

include/configs/trimslice.h +0 -1
index 427da1c..f543521 100644

Lines of this file are not shown. View the raw message.

include/configs/turris_mox.h +0 -2
index 82cdcce..648c87d 100644

Lines of this file are not shown. View the raw message.

include/configs/turris_omnia.h +0 -2
index b90be65..038f639 100644

Lines of this file are not shown. View the raw message.

include/configs/venice2.h +0 -2
index e542187..7c567cf 100644

Lines of this file are not shown. View the raw message.

include/configs/vinco.h +0 -4
index 9d6001f..715ef2a 100644

Lines of this file are not shown. View the raw message.

include/configs/x530.h +0 -3
index a83d49b..d9c1eff 100644

Lines of this file are not shown. View the raw message.

include/configs/zynq-common.h +0 -3
index a285fcd..94177c6 100644

Lines of this file are not shown. View the raw message.

include/spi_flash.h +0 -13
index 7f691e8..97ec2b3 100644

Lines of this file are not shown. View the raw message.

scripts/config_whitelist.txt +0 -4
index 3e01f84..c2cc6fc 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.7.4

Part of the diff is not shown here. View the raw message.

#10 lore raw

PATCH 5/7 Convert CONFIG_SF_DEFAULT_* to Kconfig

[reducing the CC list as gmail won't let me send otherwise]

Quoted 10 lines · Patrick Delaunay

This converts the following to Kconfig:
CONFIG_SF_DEFAULT_BUS
CONFIG_SF_DEFAULT_CS
CONFIG_SF_DEFAULT_MODE
CONFIG_SF_DEFAULT_SPEED

I use moveconfig script and then manual check on generated u-boot.cfg to solve the remaining issue.

I admit I haven't followed the patches regarding these defines completely, but isn't moving these to Kconfig the opposite of what we want?

I always thought the goal would be to move U-Boot to DM and devicetree completely sooner or later (where these defines aren't used). Adding them to Kconfig does not make them optional but makes them *always* present (but probably with default values if not used).

Regards,
Simon

#11 lore raw

PATCH 5/7 Convert CONFIG_SF_DEFAULT_* to Kconfig

Hi Simon,

Quoted 12 lines

From: Simon Goldschmidt <[email protected]>
Sent: mercredi 27 février 2019 15:50

[reducing the CC list as gmail won't let me send otherwise]

Quoted 6 lines · Patrick Delaunay

This converts the following to Kconfig:
CONFIG_SF_DEFAULT_BUS
CONFIG_SF_DEFAULT_CS
CONFIG_SF_DEFAULT_MODE
CONFIG_SF_DEFAULT_SPEED

Quoted 7 lines
Quoted 4 lines

I use moveconfig script and then manual check on generated u-boot.cfg to solve the remaining issue.

I admit I haven't followed the patches regarding these defines completely, but isn't moving these to Kconfig the opposite of what we want?

Yes it was my first plan in the series:

http://patchwork.ozlabs.org/project/uboot/list/?series=76834&state=*
http://patchwork.ozlabs.org/project/uboot/list/?series=80769&state=*

But it is not possible too many dependency with board using platdata for SPI initialization and regression after my v3.

Quoted 4 lines

I always thought the goal would be to move U-Boot to DM and devicetree completely sooner or later (where these defines aren't used). Adding them to Kconfig does not make them optional but makes them *always* present (but probably with default values if not used).

Migration to Kconfig was requested by Jagan in
http://patchwork.ozlabs.org/patch/1031768/

The define need to be always define, as they are used in cmd/sf.c
They could dependent on CONFIG_CMD_SF when they are no more used is other part of code (for other purpose).

./board/Arcturus/ucp1020/cmd_arc.c
./board/aristainetos/aristainetos-v1.c
./board/aristainetos/aristainetos-v2.c
./board/davinci/da8xxevm/da850evm.c
./board/davinci/da8xxevm/omapl138_lcdk.c
./board/el/el6x/el6x.c
./board/siemens/taurus/taurus.c
./board/Synology/ds414/cmd_syno.c
./board/tqc/tqma6/tqma6.c
./cmd/mvebu/bubt.c
./common/splash_source.c
./common/spl/spl_spi.c
./drivers/dfu/dfu_sf.c

And yes, 0 is the "default" value, so defines are present in .config.

Why it is disturbing if these defines are requested by command sf ?

Quoted 2 lines

Regards,
Simon

Jagan: can you tell me what is the right direction.for you...

Regards

Patrick

#12 lore raw

PATCH 5/7 Convert CONFIG_SF_DEFAULT_* to Kconfig

Quoted 23 lines · Patrick DELAUNAY

Hi Simon,

Quoted 12 lines

From: Simon Goldschmidt <[email protected]>
Sent: mercredi 27 février 2019 15:50

[reducing the CC list as gmail won't let me send otherwise]

Quoted 6 lines · Patrick Delaunay

This converts the following to Kconfig:
CONFIG_SF_DEFAULT_BUS
CONFIG_SF_DEFAULT_CS
CONFIG_SF_DEFAULT_MODE
CONFIG_SF_DEFAULT_SPEED

Quoted 7 lines
Quoted 4 lines

I use moveconfig script and then manual check on generated u-boot.cfg to solve the remaining issue.

I admit I haven't followed the patches regarding these defines completely, but isn't moving these to Kconfig the opposite of what we want?

Quoted 6 lines

Yes it was my first plan in the series:

http://patchwork.ozlabs.org/project/uboot/list/?series=76834&state=*
http://patchwork.ozlabs.org/project/uboot/list/?series=80769&state=*

But it is not possible too many dependency with board using platdata for SPI initialization and regression after my v3.

Oh, ok. That's sad. But I wouldn't have time to work on this, either...

Quoted 11 lines
Quoted 5 lines

I always thought the goal would be to move U-Boot to DM and devicetree completely sooner or later (where these defines aren't used). Adding them to Kconfig does not make them optional but makes them *always* present (but probably with default values if not used).

Migration to Kconfig was requested by Jagan in
http://patchwork.ozlabs.org/patch/1031768/

The define need to be always define, as they are used in cmd/sf.c
They could dependent on CONFIG_CMD_SF when they are no more used is other part of code (for other purpose).

Well, defaults for that command are not necessarily defaults for use at driver level?

Quoted 15 lines

./board/Arcturus/ucp1020/cmd_arc.c
./board/aristainetos/aristainetos-v1.c
./board/aristainetos/aristainetos-v2.c
./board/davinci/da8xxevm/da850evm.c
./board/davinci/da8xxevm/omapl138_lcdk.c
./board/el/el6x/el6x.c
./board/siemens/taurus/taurus.c
./board/Synology/ds414/cmd_syno.c
./board/tqc/tqma6/tqma6.c
./cmd/mvebu/bubt.c
./common/splash_source.c
./common/spl/spl_spi.c
./drivers/dfu/dfu_sf.c

Quoted 3 lines

And yes, 0 is the "default" value, so defines are present in .config.

Why it is disturbing if these defines are requested by command sf ?

Because I would have thought with DM, defaults would come from dts, not from some defines.

Anyway, I guess I now understand why you have done it like that. I'm not the SPI maintainer, so I won't interfere. I was only a little bit surprised that
this took a different direction as the first things we discussed in that area...

And as long as this define doesn't interfere with my SPL + U-Boot using the settings from dts, this looks good, I guess.

Regards,
Simon

Quoted 9 lines
Quoted 3 lines

Regards,
Simon

Jagan: can you tell me what is the right direction.for you...

Regards

Patrick

#13 lore raw

PATCH 5/7 Convert CONFIG_SF_DEFAULT_* to Kconfig

Hi Simon,

Quoted 47 lines

From: Simon Goldschmidt <[email protected]>
Sent: lundi 4 mars 2019 11:51

Quoted 23 lines · Patrick DELAUNAY

Hi Simon,

Quoted 12 lines

From: Simon Goldschmidt <[email protected]>
Sent: mercredi 27 février 2019 15:50

[reducing the CC list as gmail won't let me send otherwise]

Quoted 6 lines · Patrick Delaunay

This converts the following to Kconfig:
CONFIG_SF_DEFAULT_BUS
CONFIG_SF_DEFAULT_CS
CONFIG_SF_DEFAULT_MODE
CONFIG_SF_DEFAULT_SPEED

Quoted 7 lines
Quoted 4 lines

I use moveconfig script and then manual check on generated u-boot.cfg to solve the remaining issue.

I admit I haven't followed the patches regarding these defines completely, but isn't moving these to Kconfig the opposite of what we want?

Quoted 6 lines

Yes it was my first plan in the series:

http://patchwork.ozlabs.org/project/uboot/list/?series=76834&state=*
http://patchwork.ozlabs.org/project/uboot/list/?series=80769&state=*

But it is not possible too many dependency with board using platdata for SPI

initialization and regression after my v3.

Oh, ok. That's sad. But I wouldn't have time to work on this, either...

Quoted 9 lines
Quoted 5 lines

I always thought the goal would be to move U-Boot to DM and devicetree completely sooner or later (where these defines aren't used). Adding them to Kconfig does not make them optional but makes them *always* present (but probably with default values if not used).

Migration to Kconfig was requested by Jagan in
http://patchwork.ozlabs.org/patch/1031768/

Quoted 6 lines
Quoted 2 lines

The define need to be always define, as they are used in cmd/sf.c They could dependent on CONFIG_CMD_SF when they are no more used is other

part of code (for other purpose).

Well, defaults for that command are not necessarily defaults for use at driver level?

Yes, but today it is the case for some fallback when DT information is not available (dfu_sf / spl_spi). And I don't know solve this issue.

This serie is only a step, I hope in the good direction.

Quoted 17 lines
Quoted 17 lines

./board/Arcturus/ucp1020/cmd_arc.c
./board/aristainetos/aristainetos-v1.c
./board/aristainetos/aristainetos-v2.c
./board/davinci/da8xxevm/da850evm.c
./board/davinci/da8xxevm/omapl138_lcdk.c
./board/el/el6x/el6x.c
./board/siemens/taurus/taurus.c
./board/Synology/ds414/cmd_syno.c
./board/tqc/tqma6/tqma6.c
./cmd/mvebu/bubt.c
./common/splash_source.c
./common/spl/spl_spi.c
./drivers/dfu/dfu_sf.c

And yes, 0 is the "default" value, so defines are present in .config.

Quoted 8 lines
Quoted 1 line

Why it is disturbing if these defines are requested by command sf ?

Because I would have thought with DM, defaults would come from dts, not from some defines.

Anyway, I guess I now understand why you have done it like that.
I'm not the SPI maintainer, so I won't interfere. I was only a little bit surprised that this took a different direction as the first things we discussed in that area...

In fact, I am also waiting feedback to be sure that is the good direction.

Quoted 2 lines

And as long as this define doesn't interfere with my SPL + U-Boot using the settings from dts, this looks good, I guess.

Yes, no interference: they are used only when DT is not available (tested on my board stm32mp1 ev1 which use only device tree, and it is OK).

Quoted 13 lines

Regards,
Simon

Quoted 9 lines
Quoted 3 lines

Regards,
Simon

Jagan: can you tell me what is the right direction.for you...

Regards

Patrick

Patrick

#14 lore raw

PATCH 5/7 Convert CONFIG_SF_DEFAULT_* to Kconfig

In reply to Patrick Delaunay
Quoted 10 lines · Patrick Delaunay

This converts the following to Kconfig:
CONFIG_SF_DEFAULT_BUS
CONFIG_SF_DEFAULT_CS
CONFIG_SF_DEFAULT_MODE
CONFIG_SF_DEFAULT_SPEED

I use moveconfig script and then manual check on generated u-boot.cfg to solve the remaining issue.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190326/e2aec19d/attachment.sig>
#15 lore raw

PATCH 6/7 Convert CONFIG_DEFAULT_SPI_* to Kconfig

In reply to Patrick Delaunay

This converts the following to Kconfig:
CONFIG_DEFAULT_SPI_BUS
CONFIG_DEFAULT_SPI_MODE

---

 cmd/Kconfig                                  | 12 +++++++++++-
 cmd/spi.c                                    |  7 -------
 configs/bg0900_defconfig                     |  1 +
 configs/ls1012aqds_qspi_defconfig            |  3 +++
 configs/ls1012aqds_tfa_SECURE_BOOT_defconfig |  2 ++
 configs/ls1012aqds_tfa_defconfig             |  2 ++
 configs/mx28evk_auart_console_defconfig      |  1 +
 configs/mx28evk_defconfig                    |  1 +
 configs/mx28evk_nand_defconfig               |  1 +
 configs/mx28evk_spi_defconfig                |  1 +
 configs/mx31pdk_defconfig                    |  2 ++
 include/configs/bg0900.h                     |  7 -------
 include/configs/cl-som-am57x.h               |  1 -
 include/configs/ls1012aqds.h                 |  2 --
 include/configs/mx28evk.h                    |  6 ------
 include/configs/mx31pdk.h                    |  3 ---
 scripts/config_whitelist.txt                 |  2 --
 17 files changed, 25 insertions(+), 29 deletions(-)
cmd/Kconfig +11 -1
index 3ea42e4..fbc1b6f 100644
@@ -1030,10 +1030,20 @@ config CMD_SF_TEST
 	  everything is working properly.
 
 config CMD_SPI
-	bool "sspi"
+	bool "sspi - Command to access spi device"
 	help
 	  SPI utility command.
 
+config DEFAULT_SPI_BUS
+	int "default spi bus used by sspi command"
+	depends on CMD_SPI
+	default 0
+
+config DEFAULT_SPI_MODE
+	hex "default spi mode used by sspi command (see include/spi.h)"
+	depends on CMD_SPI
+	default 0
+
 config CMD_TSI148
 	bool "tsi148 - Command to access tsi148 device"
 	help
cmd/spi.c +0 -7
index 9a2edcf..75226fd 100644
@@ -22,13 +22,6 @@
 #   define MAX_SPI_BYTES 32	/* Maximum number of bytes we can handle */
 #endif
 
-#ifndef CONFIG_DEFAULT_SPI_BUS
-#   define CONFIG_DEFAULT_SPI_BUS	0
-#endif
-#ifndef CONFIG_DEFAULT_SPI_MODE
-#   define CONFIG_DEFAULT_SPI_MODE	SPI_MODE_0
-#endif
-
 /*
  * Values from last command.
  */
configs/bg0900_defconfig +1 -0
index a8b5f86..2c4d3e3 100644
@@ -23,6 +23,7 @@ CONFIG_CMD_GPIO=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_SPI=y
+CONFIG_DEFAULT_SPI_BUS=2
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
configs/ls1012aqds_qspi_defconfig +3 -0
index 1bf9343..d2c3eea 100644
@@ -27,7 +27,10 @@ CONFIG_CMD_I2C=y
 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
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_DATE=y
configs/ls1012aqds_tfa_SECURE_BOOT_defconfig +2 -0
index 747fa3d..9a6139e 100644
@@ -27,6 +27,8 @@ CONFIG_CMD_I2C=y
 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_CMD_SETEXPR is not set
 CONFIG_CMD_CACHE=y
configs/ls1012aqds_tfa_defconfig +2 -0
index a41757d..d18d40a 100644
@@ -27,6 +27,8 @@ CONFIG_CMD_I2C=y
 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_CMD_SETEXPR is not set
 CONFIG_CMD_CACHE=y
configs/mx28evk_auart_console_defconfig +1 -0
index beb10c4..c54b933 100644
@@ -23,6 +23,7 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_SPI=y
+CONFIG_DEFAULT_SPI_BUS=2
 CONFIG_CMD_USB=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
configs/mx28evk_defconfig +1 -0
index be1feb3..187467d 100644
@@ -23,6 +23,7 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_SPI=y
+CONFIG_DEFAULT_SPI_BUS=2
 CONFIG_CMD_USB=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
configs/mx28evk_nand_defconfig +1 -0
index 61e3586..7d891e7 100644
@@ -22,6 +22,7 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_SPI=y
+CONFIG_DEFAULT_SPI_BUS=2
 CONFIG_CMD_USB=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
configs/mx28evk_spi_defconfig +1 -0
index 3198baf..cb5b1b3 100644
@@ -22,6 +22,7 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_SPI=y
+CONFIG_DEFAULT_SPI_BUS=2
 CONFIG_CMD_USB=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
configs/mx31pdk_defconfig +2 -0
index c6dcb45..2267818 100644
@@ -13,6 +13,8 @@ CONFIG_SPL_NAND_SUPPORT=y
 # CONFIG_AUTO_COMPLETE is not set
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_SPI=y
+CONFIG_DEFAULT_SPI_BUS=1
+CONFIG_DEFAULT_SPI_MODE=4
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
include/configs/bg0900.h +0 -7
index 32b975f..0c3d54a 100644
@@ -19,11 +19,6 @@
 #define CONFIG_FEC_MXC
 #endif
 
-/* SPI */
-#ifdef CONFIG_CMD_SPI
-#define CONFIG_DEFAULT_SPI_BUS		2
-#define CONFIG_DEFAULT_SPI_MODE		SPI_MODE_0
-
 /* SPI FLASH */
 #ifdef CONFIG_CMD_SF
 #define CONFIG_ENV_SPI_BUS		2
@@ -32,8 +27,6 @@
 #define CONFIG_ENV_SPI_MODE		SPI_MODE_0
 #endif
 
-#endif
-
 /* Boot Linux */
 #define CONFIG_BOOTFILE		"uImage"
 #define CONFIG_BOOTCOMMAND	"bootm"
include/configs/cl-som-am57x.h +0 -1
index c9e80c2..687a9e7 100644
@@ -27,7 +27,6 @@
 
 /* SPI Flash support */
 #define CONFIG_TI_SPI_MMAP
-#define CONFIG_DEFAULT_SPI_MODE		SPI_MODE_3
 
 /* SPI SPL defines */
 /* Offsets: 0K - SPL1, 64K - SPL2, 128K - SPL3, 192K - SPL4, 256K - U-Boot */
include/configs/ls1012aqds.h +0 -2
index aac782d..fb0d1ba 100644
@@ -74,9 +74,7 @@
 
 /* DSPI */
 #define CONFIG_FSL_DSPI1
-#define CONFIG_DEFAULT_SPI_BUS 1
 
-#define CONFIG_CMD_SPI
 #define MMAP_DSPI          DSPI1_BASE_ADDR
 
 #define CONFIG_SYS_DSPI_CTAR0   1
include/configs/mx28evk.h +0 -6
index 82ac6cc..a078e3a 100644
@@ -74,12 +74,6 @@
 #define CONFIG_USB_MAX_CONTROLLER_COUNT	1
 #endif
 
-/* SPI */
-#ifdef CONFIG_CMD_SPI
-#define CONFIG_DEFAULT_SPI_BUS		2
-#define CONFIG_DEFAULT_SPI_MODE		SPI_MODE_0
-#endif
-
 /* Framebuffer support */
 #ifdef CONFIG_VIDEO
 #define CONFIG_VIDEO_LOGO
include/configs/mx31pdk.h +0 -3
index 4765764..993d131 100644
@@ -43,9 +43,6 @@
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE	UART1_BASE
 
-#define CONFIG_DEFAULT_SPI_BUS	1
-#define CONFIG_DEFAULT_SPI_MODE	(SPI_MODE_0 | SPI_CS_HIGH)
-
 /* PMIC Controller */
 #define CONFIG_POWER
 #define CONFIG_POWER_SPI
scripts/config_whitelist.txt +0 -2
index c2cc6fc..080bdf5 100644
@@ -340,8 +340,6 @@ CONFIG_DEEP_SLEEP
 CONFIG_DEFAULT
 CONFIG_DEFAULT_CONSOLE
 CONFIG_DEFAULT_IMMR
-CONFIG_DEFAULT_SPI_BUS
-CONFIG_DEFAULT_SPI_MODE
 CONFIG_DEF_HWCONFIG
 CONFIG_DELAY_ENVIRONMENT
 CONFIG_DESIGNWARE_ETH
Signature · 1 line
2.7.4
#16 lore raw

PATCH 6/7 Convert CONFIG_DEFAULT_SPI_* to Kconfig

Quoted 5 lines · Patrick Delaunay

This converts the following to Kconfig:
CONFIG_DEFAULT_SPI_BUS
CONFIG_DEFAULT_SPI_MODE

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190326/d3143f8e/attachment.sig>
#17 lore raw

PATCH 7/7 Convert CONFIG_ENV_SPI_* to Kconfig

In reply to Patrick Delaunay

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.

---

 arch/arm/mach-kirkwood/include/mach/config.h  | 15 --------
 arch/arm/mach-mvebu/include/mach/config.h     | 15 --------
 configs/M52277EVB_stmicro_defconfig           |  2 +
 configs/M54418TWR_defconfig                   |  2 +
 configs/M54418TWR_serial_mii_defconfig        |  2 +
 configs/M54418TWR_serial_rmii_defconfig       |  2 +
 configs/M54451EVB_stmicro_defconfig           |  2 +
 configs/M54455EVB_stm33_defconfig             |  2 +
 configs/SBx81LIFKW_defconfig                  |  2 +
 configs/SBx81LIFXCAT_defconfig                |  2 +
 configs/ap121_defconfig                       |  2 +
 configs/ap143_defconfig                       |  2 +
 configs/at91sam9260ek_dataflash_cs0_defconfig |  2 +
 configs/at91sam9260ek_dataflash_cs1_defconfig |  2 +
 configs/at91sam9261ek_dataflash_cs0_defconfig |  2 +
 configs/at91sam9261ek_dataflash_cs3_defconfig |  2 +
 configs/at91sam9263ek_dataflash_cs0_defconfig |  2 +
 configs/at91sam9263ek_dataflash_defconfig     |  2 +
 configs/at91sam9g10ek_dataflash_cs0_defconfig |  2 +
 configs/at91sam9g10ek_dataflash_cs3_defconfig |  2 +
 configs/at91sam9g20ek_dataflash_cs0_defconfig |  2 +
 configs/at91sam9g20ek_dataflash_cs1_defconfig |  2 +
 configs/at91sam9rlek_dataflash_defconfig      |  2 +
 configs/at91sam9xeek_dataflash_cs0_defconfig  |  2 +
 configs/at91sam9xeek_dataflash_cs1_defconfig  |  2 +
 configs/controlcenterdc_defconfig             |  2 +
 configs/d2net_v2_defconfig                    |  2 +
 configs/da850_am18xxevm_defconfig             |  4 ++
 configs/da850evm_defconfig                    |  4 ++
 configs/db-88f6720_defconfig                  |  2 +
 configs/db-88f6820-amc_defconfig              |  2 +
 configs/db-88f6820-gp_defconfig               |  2 +
 configs/db-mv784mp-gp_defconfig               |  2 +
 configs/dreamplug_defconfig                   |  2 +
 configs/ds109_defconfig                       |  2 +
 configs/ds414_defconfig                       |  2 +
 configs/ethernut5_defconfig                   |  2 +
 configs/inetspace_v2_defconfig                |  2 +
 configs/ls1012aqds_qspi_defconfig             |  7 +++-
 configs/ls1012aqds_tfa_defconfig              |  6 +++
 configs/ls1043aqds_tfa_defconfig              |  2 +
 configs/ls1046aqds_tfa_defconfig              |  2 +
 configs/maxbcm_defconfig                      |  2 +
 configs/meesc_dataflash_defconfig             |  2 +
 configs/mscc_jr2_defconfig                    |  4 ++
 configs/mscc_luton_defconfig                  |  4 ++
 configs/mscc_ocelot_defconfig                 |  4 ++
 configs/mscc_serval_defconfig                 |  4 ++
 configs/mscc_servalt_defconfig                |  4 ++
 configs/net2big_v2_defconfig                  |  2 +
 configs/netspace_lite_v2_defconfig            |  2 +
 configs/netspace_max_v2_defconfig             |  2 +
 configs/netspace_mini_v2_defconfig            |  2 +
 configs/netspace_v2_defconfig                 |  2 +
 configs/peach-pi_defconfig                    |  2 +
 configs/peach-pit_defconfig                   |  2 +
 configs/smdk5250_defconfig                    |  2 +
 configs/smdk5420_defconfig                    |  2 +
 configs/snow_defconfig                        |  2 +
 configs/spring_defconfig                      |  2 +
 configs/stmark2_defconfig                     |  2 +
 configs/theadorable_debug_defconfig           |  2 +
 configs/trimslice_defconfig                   |  2 +
 configs/turris_omnia_defconfig                |  2 +
 configs/usb_a9263_dataflash_defconfig         |  2 +
 env/Kconfig                                   | 53 +++++++++++++++++++++++----
 env/sf.c                                      | 13 -------
 include/configs/B4860QDS.h                    |  4 --
 include/configs/BSC9131RDB.h                  |  4 --
 include/configs/BSC9132QDS.h                  |  4 --
 include/configs/C29XPCIE.h                    |  4 --
 include/configs/M52277EVB.h                   |  3 --
 include/configs/M54418TWR.h                   |  1 -
 include/configs/M54451EVB.h                   |  1 -
 include/configs/M54455EVB.h                   |  3 --
 include/configs/MPC8536DS.h                   |  4 --
 include/configs/P1010RDB.h                    |  4 --
 include/configs/P1022DS.h                     |  4 --
 include/configs/P2041RDB.h                    |  4 --
 include/configs/SBx81LIFKW.h                  |  4 --
 include/configs/SBx81LIFXCAT.h                |  4 --
 include/configs/T102xQDS.h                    |  4 --
 include/configs/T102xRDB.h                    |  4 --
 include/configs/T1040QDS.h                    |  4 --
 include/configs/T104xRDB.h                    |  4 --
 include/configs/T208xQDS.h                    |  4 --
 include/configs/T208xRDB.h                    |  4 --
 include/configs/T4240QDS.h                    |  4 --
 include/configs/T4240RDB.h                    |  4 --
 include/configs/UCP1020.h                     |  4 --
 include/configs/adp-ae3xx.h                   |  4 --
 include/configs/advantech_dms-ba16.h          |  4 --
 include/configs/am335x_evm.h                  |  1 -
 include/configs/am43xx_evm.h                  |  1 -
 include/configs/ap121.h                       |  1 -
 include/configs/ap143.h                       |  1 -
 include/configs/aristainetos-common.h         |  4 --
 include/configs/at91sam9260ek.h               |  2 -
 include/configs/at91sam9261ek.h               |  2 -
 include/configs/at91sam9263ek.h               |  1 -
 include/configs/at91sam9rlek.h                |  1 -
 include/configs/at91sam9x5ek.h                |  2 -
 include/configs/ax25-ae350.h                  |  4 --
 include/configs/bav335x.h                     |  1 -
 include/configs/bg0900.h                      |  4 --
 include/configs/brppt1.h                      |  1 -
 include/configs/cgtqmx6eval.h                 |  4 --
 include/configs/cl-som-am57x.h                |  1 -
 include/configs/cl-som-imx7.h                 |  4 --
 include/configs/cm_fx6.h                      |  4 --
 include/configs/cm_t43.h                      |  1 -
 include/configs/controlcenterd.h              |  4 --
 include/configs/controlcenterdc.h             |  1 -
 include/configs/corenet_ds.h                  |  4 --
 include/configs/da850evm.h                    |  2 -
 include/configs/db-88f6820-amc.h              |  1 -
 include/configs/db-88f6820-gp.h               |  2 -
 include/configs/dh_imx6.h                     |  4 --
 include/configs/display5.h                    |  5 ---
 include/configs/dra7xx_evm.h                  |  1 -
 include/configs/dreamplug.h                   |  3 --
 include/configs/ds109.h                       |  3 --
 include/configs/ea20.h                        |  1 -
 include/configs/embestmx6boards.h             |  4 --
 include/configs/ethernut5.h                   |  1 -
 include/configs/exynos5-common.h              |  3 --
 include/configs/ge_bx50v3.h                   |  4 --
 include/configs/gw_ventana.h                  |  4 --
 include/configs/helios4.h                     |  7 ----
 include/configs/km/km_arm.h                   |  4 --
 include/configs/km/kmp204x-common.h           |  4 --
 include/configs/lacie_kw.h                    |  2 -
 include/configs/legoev3.h                     |  1 -
 include/configs/ls1012a_common.h              |  4 --
 include/configs/ls1043a_common.h              |  8 ----
 include/configs/ls1046a_common.h              |  8 ----
 include/configs/lsxl.h                        |  4 --
 include/configs/meesc.h                       |  1 -
 include/configs/microblaze-generic.h          |  3 --
 include/configs/mvebu_armada-37xx.h           |  4 --
 include/configs/mvebu_armada-8k.h             |  5 ---
 include/configs/mx28evk.h                     |  4 --
 include/configs/mx6slevk.h                    |  4 --
 include/configs/nitrogen6x.h                  |  4 --
 include/configs/omapl138_lcdk.h               |  1 -
 include/configs/ot1200.h                      |  4 --
 include/configs/p1_p2_rdb_pc.h                |  4 --
 include/configs/pcm058.h                      |  4 --
 include/configs/pfla02.h                      |  4 --
 include/configs/pm9261.h                      |  1 -
 include/configs/pm9263.h                      |  1 -
 include/configs/puma_rk3399.h                 |  4 --
 include/configs/siemens-am33x-common.h        |  1 -
 include/configs/socfpga_sr1500.h              |  4 --
 include/configs/stmark2.h                     |  3 --
 include/configs/ti_armv7_keystone2.h          |  1 -
 include/configs/topic_miami.h                 |  1 -
 include/configs/tqma6.h                       |  5 ---
 include/configs/trimslice.h                   |  2 -
 include/configs/turris_mox.h                  |  5 ---
 include/configs/usb_a9263.h                   |  1 -
 include/configs/vcoreiii.h                    |  2 -
 include/configs/vinco.h                       |  4 --
 include/configs/x530.h                        |  2 -
 include/spi_flash.h                           | 14 +++++++
 165 files changed, 208 insertions(+), 351 deletions(-)
arch/arm/mach-kirkwood/include/mach/config.h +0 -15
index fcd9038..b6cf629 100644
@@ -55,21 +55,6 @@
 #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
  */
 #ifdef CONFIG_CMD_NET
arch/arm/mach-mvebu/include/mach/config.h +0 -15
index e3235fc..71c4f70 100644
@@ -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
 
configs/M52277EVB_stmicro_defconfig +2 -0
index 3628729..cafc861 100644
@@ -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
configs/M54418TWR_defconfig +2 -0
index f69f405..a239f4a 100644
@@ -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
configs/M54418TWR_serial_mii_defconfig +2 -0
index b2266a0..8b72bd3 100644
@@ -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
configs/M54418TWR_serial_rmii_defconfig +2 -0
index f69f405..a239f4a 100644
@@ -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
configs/M54451EVB_stmicro_defconfig +2 -0
index ce5f656..b614ca7 100644
@@ -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
configs/M54455EVB_stm33_defconfig +2 -0
index fc19de5..467bfae 100644
@@ -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
configs/SBx81LIFKW_defconfig +2 -0
index e0ce159..afda7ed 100644
@@ -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
configs/SBx81LIFXCAT_defconfig +2 -0
index 4a6e058..4cb4797 100644
@@ -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
configs/ap121_defconfig +2 -0
index c9dbe4d..eca24e9 100644
@@ -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
configs/ap143_defconfig +2 -0
index 7c1a296..9a5a9f8 100644
@@ -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
configs/at91sam9260ek_dataflash_cs0_defconfig +2 -0
index 7fd844c..9b0aa07 100644
@@ -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
configs/at91sam9260ek_dataflash_cs1_defconfig +2 -0
index c2fc77d..1e5d540 100644
@@ -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
configs/at91sam9261ek_dataflash_cs0_defconfig +2 -0
index 431cf28..e036ebc 100644
@@ -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
configs/at91sam9261ek_dataflash_cs3_defconfig +2 -0
index e5efad8..b67aa90 100644
@@ -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
configs/at91sam9263ek_dataflash_cs0_defconfig +2 -0
index a19f309..4f8694f 100644
@@ -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
configs/at91sam9263ek_dataflash_defconfig +2 -0
index a19f309..4f8694f 100644
@@ -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
configs/at91sam9g10ek_dataflash_cs0_defconfig +2 -0
index 7bf0b79..6f71d34 100644
@@ -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
configs/at91sam9g10ek_dataflash_cs3_defconfig +2 -0
index b4e8892..644d59d 100644
@@ -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
configs/at91sam9g20ek_dataflash_cs0_defconfig +2 -0
index 688c182..c064d01 100644
@@ -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
configs/at91sam9g20ek_dataflash_cs1_defconfig +2 -0
index 1eb4379..1e409ea 100644
@@ -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
configs/at91sam9rlek_dataflash_defconfig +2 -0
index 800a92c..88c0a43 100644
@@ -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
configs/at91sam9xeek_dataflash_cs0_defconfig +2 -0
index ac6d9de..b125182 100644
@@ -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
configs/at91sam9xeek_dataflash_cs1_defconfig +2 -0
index 56c6f12..c07008a 100644
@@ -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
configs/controlcenterdc_defconfig +2 -0
index b2b61b2..08fdc55 100644
@@ -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
configs/d2net_v2_defconfig +2 -0
index 0b27bd7..28c5c83 100644
@@ -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
configs/da850_am18xxevm_defconfig +4 -0
index 58745fe..b1cf9bd 100644
@@ -38,6 +38,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
configs/da850evm_defconfig +4 -0
index 5100ee7..e6031b4 100644
@@ -40,6 +40,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
configs/db-88f6720_defconfig +2 -0
index 2c9254b..3de9766 100644
@@ -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
configs/db-88f6820-amc_defconfig +2 -0
index 7fd1d50..2f8e31d 100644
@@ -42,6 +42,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
configs/db-88f6820-gp_defconfig +2 -0
index b36b7c3..a4c00e9 100644
@@ -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
configs/db-mv784mp-gp_defconfig +2 -0
index b6c61c3..98e47ee 100644
@@ -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
configs/dreamplug_defconfig +2 -0
index d3263cf..8202848 100644
@@ -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
configs/ds109_defconfig +2 -0
index 3e4e71b..29d5f98 100644
@@ -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
configs/ds414_defconfig +2 -0
index ce42f23..62cad53 100644
@@ -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
configs/ethernut5_defconfig +2 -0
index b14cf6c..2ec3aae 100644
@@ -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
configs/inetspace_v2_defconfig +2 -0
index cebe4a5..ca85973 100644
@@ -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
configs/ls1012aqds_qspi_defconfig +6 -1
index d2c3eea..3212f37 100644
@@ -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
configs/ls1012aqds_tfa_defconfig +6 -0
index d18d40a..99188d3 100644
@@ -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
configs/ls1043aqds_tfa_defconfig +2 -0
index f17820d..ff5fcd6 100644
@@ -33,6 +33,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_FSL_CAAM=y
 CONFIG_DM_MMC=y
configs/ls1046aqds_tfa_defconfig +2 -0
index f73d5fe..bfef66f 100644
@@ -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
configs/maxbcm_defconfig +2 -0
index 5c716cd..1521392 100644
@@ -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
configs/meesc_dataflash_defconfig +2 -0
index 54adab9..476700c 100644
@@ -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
configs/mscc_jr2_defconfig +4 -0
index 9276df2..95562b7 100644
@@ -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
configs/mscc_luton_defconfig +4 -0
index 0fdd9b8..162a514 100644
@@ -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
configs/mscc_ocelot_defconfig +4 -0
index edc476d..b0dcfaf 100644
@@ -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
configs/mscc_serval_defconfig +4 -0
index 146188b..f2c9563 100644
@@ -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
configs/mscc_servalt_defconfig +4 -0
index a450f48..027aaa4 100644
@@ -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
configs/net2big_v2_defconfig +2 -0
index 8996d52..44c8d5b 100644
@@ -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
configs/netspace_lite_v2_defconfig +2 -0
index e6d7724..ac103c3 100644
@@ -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
configs/netspace_max_v2_defconfig +2 -0
index 89df1f3..9eded36 100644
@@ -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
configs/netspace_mini_v2_defconfig +2 -0
index 9a5cf19..4b0fff4 100644
@@ -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
configs/netspace_v2_defconfig +2 -0
index bd879ab..24749f8 100644
@@ -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
configs/peach-pi_defconfig +2 -0
index cb818c5..6fc89cd 100644
@@ -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
configs/peach-pit_defconfig +2 -0
index bb1558b..f091d24 100644
@@ -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
configs/smdk5250_defconfig +2 -0
index d24e9e2..6741387 100644
@@ -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
configs/smdk5420_defconfig +2 -0
index 704786a..6a91962 100644
@@ -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
configs/snow_defconfig +2 -0
index 6179a64..54bf740 100644
@@ -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
configs/spring_defconfig +2 -0
index 2bbfa6d..c24aa2e 100644
@@ -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
configs/stmark2_defconfig +2 -0
index d74ba67..630b01c 100644
@@ -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
configs/theadorable_debug_defconfig +2 -0
index cd52220..fb9307a 100644
@@ -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
configs/trimslice_defconfig +2 -0
index be6be27..1c4f81a 100644
@@ -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_SPI_FLASH=y
 CONFIG_SF_DEFAULT_MODE=0
configs/turris_omnia_defconfig +2 -0
index 7e5943b..c406b25 100644
@@ -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
configs/usb_a9263_dataflash_defconfig +2 -0
index 9f7506f..3b9e4a5 100644
@@ -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
env/Kconfig +46 -7

64 lines not on this page · raw message

env/sf.c +0 -13
index b3dec82..6300b16 100644
@@ -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
include/configs/B4860QDS.h +0 -4
index 3239696..19d2ee1 100644
@@ -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
include/configs/BSC9131RDB.h +0 -4
index 49bea98..c01071e 100644
@@ -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
include/configs/BSC9132QDS.h +0 -4
index 45264c4..3be4fbe 100644
@@ -455,10 +455,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
include/configs/C29XPCIE.h +0 -4
index a18d041..9b83a50 100644
@@ -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
include/configs/M52277EVB.h +0 -3
index 83d7745..514733e 100644
@@ -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
 
 /*-----------------------------------------------------------------------
include/configs/M54418TWR.h +0 -1
index 4b8ef38..f7b0669 100644
@@ -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
include/configs/M54451EVB.h +0 -1
index 87cdbae..57c8572 100644
@@ -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
include/configs/M54455EVB.h +0 -3
index d41b7c4..448dfc9 100644
@@ -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
 
 /*-----------------------------------------------------------------------
include/configs/MPC8536DS.h +0 -4
index fedd151..0ad970b 100644
@@ -525,10 +525,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
include/configs/P1010RDB.h +0 -4
index cefa598..4be40d0 100644
@@ -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
include/configs/P1022DS.h +0 -4
index 8bdbabe..bdbf119 100644
@@ -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
include/configs/P2041RDB.h +0 -4
index da43320..b433308 100644
@@ -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
include/configs/SBx81LIFKW.h +0 -4
index d62fd35..1539e8f 100644
@@ -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 */
include/configs/SBx81LIFXCAT.h +0 -4
index 3c8c216..af19193 100644
@@ -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 */
include/configs/T102xQDS.h +0 -4
index 73b70fa..ef94097 100644
@@ -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
include/configs/T102xRDB.h +0 -4
index 078df7f..1c205a0 100644
@@ -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)
include/configs/T1040QDS.h +0 -4
index c886fe2..d2eb43f 100644
@@ -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
include/configs/T104xRDB.h +0 -4
index 0d92f27..a7e0f8f 100644
@@ -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
include/configs/T208xQDS.h +0 -4
index 9864064..0c8e6b4 100644
@@ -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
include/configs/T208xRDB.h +0 -4
index 95e9ed3..1a94535 100644
@@ -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
include/configs/T4240QDS.h +0 -4
index 80a4b13..9e70412 100644
@@ -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
include/configs/T4240RDB.h +0 -4
index 066e8dd..0554c58 100644
@@ -281,10 +281,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
include/configs/UCP1020.h +0 -4
index 69d43c4..1c888f0 100644
@@ -329,10 +329,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
 
include/configs/adp-ae3xx.h +0 -4
index f2268dc..1fe3391 100644
@@ -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
include/configs/advantech_dms-ba16.h +0 -4
index a08f62b..e2c7060 100644
@@ -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
 
include/configs/am335x_evm.h +0 -1
index d8f0583..0834ff5 100644
@@ -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 */
include/configs/am43xx_evm.h +0 -1
index 55faa7b..5a60806 100644
@@ -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
include/configs/ap121.h +0 -1
index 96850b5..0e8c3f7 100644
@@ -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
include/configs/ap143.h +0 -1
index 4dbca91..fa69210 100644
@@ -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
include/configs/aristainetos-common.h +0 -4
index eecc021..4f28f52 100644
@@ -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)
include/configs/at91sam9260ek.h +0 -2
index 2177512..95710fb 100644
@@ -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"
include/configs/at91sam9261ek.h +0 -2
index 1c7fbe1..599e262 100644
@@ -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"
include/configs/at91sam9263ek.h +0 -1
index 856e032..6b1db9f 100644
@@ -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"
include/configs/at91sam9rlek.h +0 -1
index b052071..3e18716 100644
@@ -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"
include/configs/at91sam9x5ek.h +0 -2
index d43d408..1abca55 100644
@@ -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"
include/configs/ax25-ae350.h +0 -4
index cd07212..395f3a4 100644
@@ -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
 
include/configs/bav335x.h +0 -1
index 8936222..fb9c2a6 100644
@@ -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 */
include/configs/bg0900.h +0 -4
index 0c3d54a..832dbba 100644
@@ -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 */
include/configs/brppt1.h +0 -1
index 2219663..ae9b75b 100644
@@ -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 + \
include/configs/cgtqmx6eval.h +0 -4
index ab8d1c6..ad0a64a 100644
@@ -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 */
include/configs/cl-som-am57x.h +0 -1
index 687a9e7..bf2bb44 100644
@@ -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
include/configs/cl-som-imx7.h +0 -4
index d895f89..26d1a97 100644
@@ -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
include/configs/cm_fx6.h +0 -4
index 2ac888f..dfd96ff 100644
@@ -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)
include/configs/cm_t43.h +0 -1
index 6df8b8b..ffe4a44 100644
@@ -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" \
include/configs/controlcenterd.h +0 -4
index 69c65f1..f1c3522 100644
@@ -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
include/configs/controlcenterdc.h +0 -1
index edd8749..9130837 100644
@@ -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 */
include/configs/corenet_ds.h +0 -4
index a3963db..f974291 100644
@@ -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
include/configs/da850evm.h +0 -2
index 7b1e53f..583f994 100644
@@ -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
include/configs/db-88f6820-amc.h +0 -1
index 222bdf8..f1bdc2d 100644
@@ -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 */
include/configs/db-88f6820-gp.h +0 -2
index 967b133..d378052 100644
@@ -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 */
 
include/configs/dh_imx6.h +0 -4
index 1c1178c3..48514ff 100644
@@ -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 */
include/configs/display5.h +0 -5
index d729054..8ab47ab 100644
@@ -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)
include/configs/dra7xx_evm.h +0 -1
index 36e1582..10eac20 100644
@@ -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
include/configs/dreamplug.h +0 -3
index f4d7172..28bda14 100644
@@ -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
 
 /*
include/configs/ds109.h +0 -3
index 2c7928e..07367cf 100644
@@ -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
 
 /*
include/configs/ea20.h +0 -1
index 800ce03..88f2e17 100644
@@ -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
include/configs/embestmx6boards.h +0 -4
index f984540..5142680 100644
@@ -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 */
include/configs/ethernut5.h +0 -1
index 0d84c97..b86b542 100644
@@ -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
include/configs/exynos5-common.h +0 -3
index 5641f09..db1fc93 100644
@@ -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 */
include/configs/ge_bx50v3.h +0 -4
index 9ca3ee3..3336578 100644
@@ -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
 
include/configs/gw_ventana.h +0 -4
index a4215c8..84ee44e 100644
@@ -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 */
include/configs/helios4.h +0 -7
index 5a11641..df4d8bc 100644
@@ -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
include/configs/km/km_arm.h +0 -4
index f93629e..a2e9cf1 100644
@@ -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 */
include/configs/km/kmp204x-common.h +0 -4
index 810d66a..7343f95 100644
@@ -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
include/configs/lacie_kw.h +0 -2
index 1f619a0..1ba28b5 100644
@@ -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
include/configs/legoev3.h +0 -1
index ce806d1..1e239ec 100644
@@ -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
include/configs/ls1012a_common.h +0 -4
index 324dba2..9189773 100644
@@ -41,10 +41,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
include/configs/ls1043a_common.h +0 -8
index b34c765..6fee15f 100644
@@ -187,10 +187,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
@@ -209,10 +205,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 */
include/configs/ls1046a_common.h +0 -8
index 6e36c93..7d913be 100644
@@ -171,10 +171,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
 /*
@@ -187,10 +183,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)
include/configs/lsxl.h +0 -4
index bcad8a0..72e6265 100644
@@ -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
  */
include/configs/meesc.h +0 -1
index 0a03a2f..a1fd5f6 100644
@@ -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
 
include/configs/microblaze-generic.h +0 -3
index d81194b..d1ab40e 100644
@@ -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)
include/configs/mvebu_armada-37xx.h +0 -4
index e898133..10b94f4 100644
@@ -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 */
 
include/configs/mvebu_armada-8k.h +0 -5
index 51f484d..f4972b6 100644
@@ -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 */
include/configs/mx28evk.h +0 -4
index a078e3a..dd04580 100644
@@ -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 */
include/configs/mx6slevk.h +0 -4
index 2cce3d5..5d649f6 100644
@@ -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
include/configs/nitrogen6x.h +0 -4
index c37a766..d941caa 100644
@@ -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
 
 /*
include/configs/omapl138_lcdk.h +0 -1
index 5f5aa57..1786e09 100644
@@ -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
include/configs/ot1200.h +0 -4
index 6754181..925e7ae 100644
@@ -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
include/configs/p1_p2_rdb_pc.h +0 -4
index e20125c..1b8305e 100644
@@ -701,10 +701,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
include/configs/pcm058.h +0 -4
index 15dc1b2..b0415b2 100644
@@ -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)
include/configs/pfla02.h +0 -4
index fe54e54..3a9b85a 100644
@@ -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)
include/configs/pm9261.h +0 -1
index e88948c..c1ce122 100644
@@ -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"
include/configs/pm9263.h +0 -1
index f11879b..b09d851 100644
@@ -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"
include/configs/puma_rk3399.h +0 -4
index 45a4ccc..4d6085d 100644
@@ -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)
include/configs/siemens-am33x-common.h +0 -1
index 8f2dd5f..f44a428 100644
@@ -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 */
include/configs/socfpga_sr1500.h +0 -4
index d9de075..b6a9861 100644
@@ -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:
include/configs/stmark2.h +0 -3
index fa3d6b8..17f92d8 100644
@@ -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
include/configs/ti_armv7_keystone2.h +0 -1
index 767615a..fb8c082 100644
@@ -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
include/configs/topic_miami.h +0 -1
index c4f01aa..69aa79b 100644
@@ -48,7 +48,6 @@
 #define CONFIG_SYS_MEMTEST_END	0x18000000
 
 /* Faster flash, ours may run@108 MHz */
-#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
 #undef CONFIG_SPI_FLASH_WINBOND
 
 /* Setup proper boot sequences for Miami boards */
include/configs/tqma6.h +0 -5
index 6c0d4f2..13e3d60 100644
@@ -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)
include/configs/trimslice.h +0 -2
index f543521..0378e8b 100644
@@ -26,8 +26,6 @@
 #define CONFIG_SYS_I2C_TEGRA
 
 /* 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)
include/configs/turris_mox.h +0 -5
index 648c87d..5d5394e 100644
@@ -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 */
include/configs/usb_a9263.h +0 -1
index aa8738f..fa38274 100644
@@ -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" \
include/configs/vcoreiii.h +0 -2
index 8c30c6f..2840c7b 100644
@@ -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
include/configs/vinco.h +0 -4
index 715ef2a..ec22a30 100644
@@ -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
include/configs/x530.h +0 -2
index d9c1eff..80c898e 100644
@@ -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 */
include/spi_flash.h +14 -0
index 97ec2b3..55b4721 100644
@@ -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 {
Signature · 1 line
2.7.4
#18 lore raw

PATCH 7/7 Convert CONFIG_ENV_SPI_* to Kconfig

Quoted 11 lines · Patrick Delaunay

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.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190326/d68e6e80/attachment.sig>