From 14453fbfadc2f98ca35d6033140466c7a4b4947a Mon Sep 17 00:00:00 2001 From: Patrick Delaunay Date: Wed, 27 Feb 2019 15:20:36 +0100 Subject: Convert CONFIG_SF_DEFAULT_* to Kconfig 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. Signed-off-by: Patrick Delaunay --- 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 ------------- 126 files changed, 390 deletions(-) (limited to 'include') diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 42b3337..25705cc 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -506,8 +506,6 @@ unsigned long get_board_ddr_clk(void); /* * eSPI - Enhanced SPI */ -#define CONFIG_SF_DEFAULT_SPEED 10000000 -#define CONFIG_SF_DEFAULT_MODE 0 /* * MAPLE diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index 71e840a..49bea98 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -226,10 +226,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 /* eSPI - Enhanced SPI */ -#ifdef CONFIG_FSL_ESPI -#define CONFIG_SF_DEFAULT_SPEED 10000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 -#endif #if defined(CONFIG_TSEC_ENET) diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index f385509..73cc353 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -406,10 +406,6 @@ combinations. this should be removed later * used for SLIC */ /* eSPI - Enhanced SPI */ -#ifdef CONFIG_FSL_ESPI -#define CONFIG_SF_DEFAULT_SPEED 10000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 -#endif #if defined(CONFIG_TSEC_ENET) diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index ebf44b5..a18d041 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -357,8 +357,6 @@ #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 /* eSPI - Enhanced SPI */ -#define CONFIG_SF_DEFAULT_SPEED 10000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #ifdef CONFIG_TSEC_ENET #define CONFIG_MII_DEFAULT_TSEC 1 /* Allow unregistered phys */ diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 1413b3d..11dcf23 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -369,11 +369,6 @@ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_EEPROM_BUS_NUM 1 -#if defined(CONFIG_SPI_FLASH) -#define CONFIG_SF_DEFAULT_SPEED 10000000 -#define CONFIG_SF_DEFAULT_MODE 0 -#endif - /* * General PCI * Memory space is mapped 1-1, but I/O space must start from 0. diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 134ffe5..cefa598 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -573,8 +573,6 @@ extern unsigned long get_sdram_size(void); */ #if !defined(CONFIG_NAND) || !defined(CONFIG_NAND_SECBOOT) /* eSPI - Enhanced SPI */ -#define CONFIG_SF_DEFAULT_SPEED 10000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #endif #if defined(CONFIG_TSEC_ENET) diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 3ccfeca..8bdbabe 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -388,9 +388,6 @@ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_EEPROM_BUS_NUM 1 -#define CONFIG_SF_DEFAULT_SPEED 10000000 -#define CONFIG_SF_DEFAULT_MODE 0 - /* * General PCI * Memory space is mapped 1-1, but I/O space must start from 0. diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index bd2913e..da43320 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -350,8 +350,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); /* * eSPI - Enhanced SPI */ -#define CONFIG_SF_DEFAULT_SPEED 10000000 -#define CONFIG_SF_DEFAULT_MODE 0 /* * General PCI diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index c63dfd3..73b70fa 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -501,8 +501,6 @@ unsigned long get_board_ddr_clk(void); /* * eSPI - Enhanced SPI */ -#define CONFIG_SF_DEFAULT_SPEED 10000000 -#define CONFIG_SF_DEFAULT_MODE 0 /* * General PCIe diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index b0f93ab..2ba3a9f 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -497,8 +497,6 @@ unsigned long get_board_ddr_clk(void); /* * eSPI - Enhanced SPI */ -#define CONFIG_SF_DEFAULT_SPEED 10000000 -#define CONFIG_SF_DEFAULT_MODE 0 /* * General PCIe diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 147ef71..89ace7c 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -415,8 +415,6 @@ unsigned long get_board_ddr_clk(void); /* * eSPI - Enhanced SPI */ -#define CONFIG_SF_DEFAULT_SPEED 10000000 -#define CONFIG_SF_DEFAULT_MODE 0 /* * General PCI diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 4cecab3..0d92f27 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -521,8 +521,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg /* * eSPI - Enhanced SPI */ -#define CONFIG_SF_DEFAULT_SPEED 10000000 -#define CONFIG_SF_DEFAULT_MODE 0 #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 10000000 diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 9ca384c..8db3894 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -493,11 +493,6 @@ unsigned long get_board_ddr_clk(void); /* * eSPI - Enhanced SPI */ -#ifdef CONFIG_SPI_FLASH - -#define CONFIG_SF_DEFAULT_SPEED 10000000 -#define CONFIG_SF_DEFAULT_MODE 0 -#endif /* * General PCI diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 446e426..40a0316 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -435,10 +435,6 @@ unsigned long get_board_ddr_clk(void); /* * eSPI - Enhanced SPI */ -#ifdef CONFIG_SPI_FLASH -#define CONFIG_SF_DEFAULT_SPEED 10000000 -#define CONFIG_SF_DEFAULT_MODE 0 -#endif /* * General PCI diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index 0693901..80a4b13 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -362,8 +362,6 @@ unsigned long get_board_ddr_clk(void); /* * eSPI - Enhanced SPI */ -#define CONFIG_SF_DEFAULT_SPEED 10000000 -#define CONFIG_SF_DEFAULT_MODE 0 /* Qman/Bman */ #ifndef CONFIG_NOBQFMAN diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index f42a4f4..f007b62 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -507,8 +507,6 @@ unsigned long get_board_ddr_clk(void); /* * eSPI - Enhanced SPI */ -#define CONFIG_SF_DEFAULT_SPEED 10000000 -#define CONFIG_SF_DEFAULT_MODE 0 /* Qman/Bman */ #ifndef CONFIG_NOBQFMAN diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 6a0254a..0a996e0 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -286,9 +286,6 @@ #define CONFIG_SYS_I2C_NCT72_ADDR 0x4C #define CONFIG_SYS_I2C_IDT6V49205B 0x69 -#define CONFIG_SF_DEFAULT_SPEED 10000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 - #if defined(CONFIG_PCI) /* * General PCI diff --git a/include/configs/adp-ae3xx.h b/include/configs/adp-ae3xx.h index 915f416..f2268dc 100644 --- a/include/configs/adp-ae3xx.h +++ b/include/configs/adp-ae3xx.h @@ -212,10 +212,6 @@ /* SPI FLASH */ -#define CONFIG_SF_DEFAULT_BUS 0 -#define CONFIG_SF_DEFAULT_CS 0 -#define CONFIG_SF_DEFAULT_SPEED 1000000 -#define CONFIG_SF_DEFAULT_MODE 0 /* * For booting Linux, the board info and command line data diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h index 0c9de61..a08f62b 100644 --- a/include/configs/advantech_dms-ba16.h +++ b/include/configs/advantech_dms-ba16.h @@ -63,12 +63,6 @@ #define CONFIG_PHY_ATHEROS /* Serial Flash */ -#ifdef CONFIG_CMD_SF -#define CONFIG_SF_DEFAULT_BUS 0 -#define CONFIG_SF_DEFAULT_CS 0 -#define CONFIG_SF_DEFAULT_SPEED 20000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 -#endif /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 3bd96b9..d8f0583 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -306,7 +306,6 @@ #endif /* SPI flash. */ -#define CONFIG_SF_DEFAULT_SPEED 24000000 /* Network. */ #define CONFIG_PHY_SMSC diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index ed71f4c..55faa7b 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -124,8 +124,6 @@ /* SPI */ #define CONFIG_TI_SPI_MMAP #define CONFIG_QSPI_SEL_GPIO 48 -#define CONFIG_SF_DEFAULT_SPEED 48000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 #define CONFIG_QSPI_QUAD_SUPPORT #define CONFIG_TI_EDMA3 diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index 70aa425..4899984 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -97,8 +97,6 @@ /* SPI */ #define CONFIG_TI_SPI_MMAP -#define CONFIG_SF_DEFAULT_SPEED 76800000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_QSPI_QUAD_SUPPORT #endif /* __CONFIG_AM57XX_EVM_H */ diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h index ca974c0..eecc021 100644 --- a/include/configs/aristainetos-common.h +++ b/include/configs/aristainetos-common.h @@ -31,8 +31,6 @@ #define CONFIG_FEC_MXC_PHYADDR 0 #define CONFIG_SPI_FLASH_MTD -#define CONFIG_SF_DEFAULT_SPEED 20000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SYS_SPI_ST_ENABLE_WP_PIN #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h index c53ba89..03e2a2b 100644 --- a/include/configs/aristainetos.h +++ b/include/configs/aristainetos.h @@ -21,9 +21,6 @@ #define CONFIG_FEC_XCV_TYPE RMII -#define CONFIG_SF_DEFAULT_BUS 3 -#define CONFIG_SF_DEFAULT_CS 0 - #define CONFIG_EXTRA_ENV_BOARD_SETTINGS \ "board_type=aristainetos7@1\0" \ "mtdids=nand0=gpmi-nand,nor0=spi3.0\0" \ diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h index 67b2e58..00e5667 100644 --- a/include/configs/aristainetos2.h +++ b/include/configs/aristainetos2.h @@ -20,9 +20,6 @@ #define CONFIG_FEC_XCV_TYPE RGMII -#define CONFIG_SF_DEFAULT_BUS 3 -#define CONFIG_SF_DEFAULT_CS 1 - #define CONFIG_EXTRA_ENV_BOARD_SETTINGS \ "board_type=aristainetos2_7@1\0" \ "nor_bootdelay=-2\0" \ diff --git a/include/configs/aristainetos2b.h b/include/configs/aristainetos2b.h index 91069a2..cfe0e05 100644 --- a/include/configs/aristainetos2b.h +++ b/include/configs/aristainetos2b.h @@ -20,9 +20,6 @@ #define CONFIG_FEC_XCV_TYPE RGMII -#define CONFIG_SF_DEFAULT_BUS 0 -#define CONFIG_SF_DEFAULT_CS 0 - #define CONFIG_EXTRA_ENV_BOARD_SETTINGS \ "board_type=aristainetos2_7@1\0" \ "nor_bootdelay=-2\0" \ diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index 777a99b..d83546d 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -45,9 +45,6 @@ (0x00300000 + 16 * 1024 - GENERATED_GBL_DATA_SIZE) /* DataFlash */ -#ifdef CONFIG_CMD_SF -#define CONFIG_SF_DEFAULT_SPEED 30000000 -#endif /* NAND flash */ #ifdef CONFIG_CMD_NAND diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 6adb965..d43d408 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -38,9 +38,6 @@ (CONFIG_SYS_SDRAM_BASE + 16 * 1024 - GENERATED_GBL_DATA_SIZE) /* DataFlash */ -#ifdef CONFIG_CMD_SF -#define CONFIG_SF_DEFAULT_SPEED 30000000 -#endif /* NAND flash */ #ifdef CONFIG_CMD_NAND diff --git a/include/configs/ax25-ae350.h b/include/configs/ax25-ae350.h index e3eb928..cd07212 100644 --- a/include/configs/ax25-ae350.h +++ b/include/configs/ax25-ae350.h @@ -121,10 +121,6 @@ #define CONFIG_ENV_OVERWRITE /* SPI FLASH */ -#define CONFIG_SF_DEFAULT_BUS 0 -#define CONFIG_SF_DEFAULT_CS 0 -#define CONFIG_SF_DEFAULT_SPEED 1000000 -#define CONFIG_SF_DEFAULT_MODE 0 /* * For booting Linux, the board info and command line data diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index df5d5bd..8936222 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -466,7 +466,6 @@ DEFAULT_LINUX_BOOT_ENV \ #endif /* SPI flash. */ -#define CONFIG_SF_DEFAULT_SPEED 24000000 /* Network. */ #define CONFIG_PHY_SMSC diff --git a/include/configs/beaver.h b/include/configs/beaver.h index a11a800a..4c5826c 100644 --- a/include/configs/beaver.h +++ b/include/configs/beaver.h @@ -29,8 +29,6 @@ /* SPI */ #define CONFIG_TEGRA_SLINK_CTRLS 6 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 -#define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20) #include "tegra-common-usb-gadget.h" diff --git a/include/configs/bg0900.h b/include/configs/bg0900.h index ec6b01f..32b975f 100644 --- a/include/configs/bg0900.h +++ b/include/configs/bg0900.h @@ -26,11 +26,6 @@ /* SPI FLASH */ #ifdef CONFIG_CMD_SF -#define CONFIG_SF_DEFAULT_BUS 2 -#define CONFIG_SF_DEFAULT_CS 0 -#define CONFIG_SF_DEFAULT_SPEED 40000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 - #define CONFIG_ENV_SPI_BUS 2 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 40000000 diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index 5badd2d..2219663 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -187,7 +187,6 @@ NANDTGTS \ #if defined(CONFIG_SPI) /* SPI Flash */ -#define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x40000 /* Environment */ #define CONFIG_SYS_REDUNDAND_ENVIRONMENT diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h index 6b2553c..8d541a1 100644 --- a/include/configs/cardhu.h +++ b/include/configs/cardhu.h @@ -33,8 +33,6 @@ /* SPI */ #define CONFIG_TEGRA_SLINK_CTRLS 6 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 -#define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20) #include "tegra-common-post.h" diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h index 74305f1..e6abfe2 100644 --- a/include/configs/cei-tk1-som.h +++ b/include/configs/cei-tk1-som.h @@ -28,8 +28,6 @@ #define CONFIG_SYS_MMC_ENV_PART 2 /* SPI */ -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 -#define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20) #include "tegra-common-usb-gadget.h" diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index e01bf5b..ab8d1c6 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -33,9 +33,6 @@ /* SPI NOR */ #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SPI_FLASH_SST -#define CONFIG_SF_DEFAULT_BUS 0 -#define CONFIG_SF_DEFAULT_SPEED 20000000 -#define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0) /* Thermal support */ #define CONFIG_IMX_THERMAL diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h index 80f0b4f..c9e80c2 100644 --- a/include/configs/cl-som-am57x.h +++ b/include/configs/cl-som-am57x.h @@ -27,7 +27,6 @@ /* SPI Flash support */ #define CONFIG_TI_SPI_MMAP -#define CONFIG_SF_DEFAULT_SPEED 48000000 #define CONFIG_DEFAULT_SPI_MODE SPI_MODE_3 /* SPI SPL defines */ diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h index f84a112..d895f89 100644 --- a/include/configs/cl-som-imx7.h +++ b/include/configs/cl-som-imx7.h @@ -140,10 +140,6 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) /* SPI Flash support */ -#define CONFIG_SF_DEFAULT_BUS 0 -#define CONFIG_SF_DEFAULT_CS 0 -#define CONFIG_SF_DEFAULT_SPEED 20000000 -#define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0) /* FLASH and environment organization */ #define CONFIG_ENV_SIZE SZ_8K diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index f951082..c51cf28 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -22,7 +22,6 @@ */ /* SPI NOR flash default params, used by sf commands */ -#define CONFIG_SF_DEFAULT_BUS 1 /* * SDIO/MMC Card Configuration diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index f7e82df..2ac888f 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -39,10 +39,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE {9600, 19200, 38400, 57600, 115200} /* SPI flash */ -#define CONFIG_SF_DEFAULT_BUS 0 -#define CONFIG_SF_DEFAULT_CS 0 -#define CONFIG_SF_DEFAULT_SPEED 25000000 -#define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0) /* MTD support */ #ifndef CONFIG_SPL_BUILD diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index 79eb865..6df8b8b 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -55,8 +55,6 @@ /* SPI Flash support */ #define CONFIG_TI_SPI_MMAP -#define CONFIG_SF_DEFAULT_SPEED 48000000 -#define CONFIG_DEFAULT_SPI_MODE SPI_MODE_3 /* Power */ #define CONFIG_POWER diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 1908d35..69c65f1 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -181,12 +181,6 @@ #define CONFIG_SYS_I2C_EEPROM_ADDR 0x52 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 -#ifndef CONFIG_TRAILBLAZER - -#define CONFIG_SF_DEFAULT_SPEED 10000000 -#define CONFIG_SF_DEFAULT_MODE 0 -#endif - /* * MMC */ diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index 2433815..edd8749 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -25,11 +25,6 @@ #define CONFIG_LOADADDR 1000000 -/* SPI NOR flash default params, used by sf commands */ -#define CONFIG_SF_DEFAULT_BUS 1 -#define CONFIG_SF_DEFAULT_SPEED 1000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 - /* * SDIO/MMC Card Configuration */ diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index cd79150..a3963db 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -358,8 +358,6 @@ /* * eSPI - Enhanced SPI */ -#define CONFIG_SF_DEFAULT_SPEED 10000000 -#define CONFIG_SF_DEFAULT_MODE 0 /* * General PCI diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 14a3046..7b1e53f 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -123,7 +123,6 @@ #define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI1_CLKID) #ifdef CONFIG_SPL_BUILD #define CONFIG_SYS_SPI_BASE DAVINCI_SPI1_BASE -#define CONFIG_SF_DEFAULT_SPEED 30000000 #endif #define CONFIG_ENV_SPI_MAX_HZ 0 #define CONFIG_ENV_SPI_MODE 0 diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h index 9b25a9d..e8a4e3c 100644 --- a/include/configs/dalmore.h +++ b/include/configs/dalmore.h @@ -25,8 +25,6 @@ #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) /* SPI */ -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 -#define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20) #include "tegra-common-usb-gadget.h" diff --git a/include/configs/db-88f6720.h b/include/configs/db-88f6720.h index 4c30077..55968c2 100644 --- a/include/configs/db-88f6720.h +++ b/include/configs/db-88f6720.h @@ -33,8 +33,6 @@ #define CONFIG_USB_MAX_CONTROLLER_COUNT 3 /* SPI NOR flash default params, used by sf commands */ -#define CONFIG_SF_DEFAULT_SPEED 1000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 /* Environment in SPI NOR flash */ #define CONFIG_ENV_OFFSET (1 << 20) /* 1MiB in */ diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h index 626a406..222bdf8 100644 --- a/include/configs/db-88f6820-amc.h +++ b/include/configs/db-88f6820-amc.h @@ -17,9 +17,6 @@ */ /* SPI NOR flash default params, used by sf commands */ -#define CONFIG_SF_DEFAULT_BUS 1 -#define CONFIG_SF_DEFAULT_SPEED 1000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 /* USB/EHCI configuration */ #define CONFIG_EHCI_IS_TDI diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index 1f328e9..967b133 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -30,8 +30,6 @@ #define CONFIG_ENV_SPI_CS 0 /* SPI NOR flash default params, used by sf commands */ -#define CONFIG_SF_DEFAULT_SPEED 1000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 /* * SDIO/MMC Card Configuration diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index 6cba326..b78dbcb 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -30,8 +30,6 @@ #define CONFIG_USB_MAX_CONTROLLER_COUNT 3 /* SPI NOR flash default params, used by sf commands */ -#define CONFIG_SF_DEFAULT_SPEED 1000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 /* Environment in SPI NOR flash */ #define CONFIG_ENV_OFFSET (1 << 20) /* 1MiB in */ diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index 9231bd8..1c1178c3 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -76,12 +76,6 @@ #endif /* SPI Flash Configs */ -#ifdef CONFIG_CMD_SF -#define CONFIG_SF_DEFAULT_BUS 0 -#define CONFIG_SF_DEFAULT_CS 0 -#define CONFIG_SF_DEFAULT_SPEED 25000000 -#define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0) -#endif /* UART */ #define CONFIG_MXC_UART diff --git a/include/configs/display5.h b/include/configs/display5.h index 1fb7469..d729054 100644 --- a/include/configs/display5.h +++ b/include/configs/display5.h @@ -59,12 +59,6 @@ #define CONFIG_MXC_UART_BASE UART5_BASE /* SPI NOR Flash */ -#ifdef CONFIG_CMD_SF -#define CONFIG_SF_DEFAULT_BUS 1 -#define CONFIG_SF_DEFAULT_CS (0 | (IMX_GPIO_NR(5, 29) << 8)) -#define CONFIG_SF_DEFAULT_SPEED 50000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 -#endif /* I2C Configs */ #define CONFIG_SYS_I2C diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index f36a9c3..36e1582 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -74,8 +74,6 @@ /* SPI */ #define CONFIG_TI_SPI_MMAP -#define CONFIG_SF_DEFAULT_SPEED 76800000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_QSPI_QUAD_SUPPORT /* diff --git a/include/configs/ds414.h b/include/configs/ds414.h index 4ba0505..275a2b4 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -29,8 +29,6 @@ #define CONFIG_SYS_I2C_SPEED 100000 /* SPI NOR flash default params, used by sf commands */ -#define CONFIG_SF_DEFAULT_SPEED 1000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 /* Environment in SPI NOR flash */ #define CONFIG_ENV_OFFSET 0x7E0000 /* RedBoot config partition in DTS */ diff --git a/include/configs/e2220-1170.h b/include/configs/e2220-1170.h index 30c0c7f..c636bf9 100644 --- a/include/configs/e2220-1170.h +++ b/include/configs/e2220-1170.h @@ -23,8 +23,6 @@ #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) /* SPI */ -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 -#define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20) #include "tegra-common-usb-gadget.h" diff --git a/include/configs/ea20.h b/include/configs/ea20.h index a644e67..800ce03 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -52,7 +52,6 @@ #define CONFIG_SYS_SPI_BASE DAVINCI_SPI1_BASE #define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI1_CLKID) -#define CONFIG_SF_DEFAULT_SPEED 30000000 #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED /* diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h index b472a6c..bf70ea0 100644 --- a/include/configs/el6x_common.h +++ b/include/configs/el6x_common.h @@ -43,10 +43,6 @@ #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 /* Commands */ -#define CONFIG_SF_DEFAULT_BUS 3 -#define CONFIG_SF_DEFAULT_CS 0 -#define CONFIG_SF_DEFAULT_SPEED 20000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index 7e7de4d..f984540 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -49,13 +49,6 @@ #define CONFIG_PHY_ATHEROS -#ifdef CONFIG_CMD_SF -#define CONFIG_SF_DEFAULT_BUS 0 -#define CONFIG_SF_DEFAULT_CS 0 -#define CONFIG_SF_DEFAULT_SPEED 20000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 -#endif - #define CONFIG_ARP_TIMEOUT 200UL #define CONFIG_SYS_MEMTEST_START 0x10000000 diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h index cd2a904..5641f09 100644 --- a/include/configs/exynos5-common.h +++ b/include/configs/exynos5-common.h @@ -108,10 +108,6 @@ #define CONFIG_SYS_I2C_S3C24X0_SLAVE 0x0 /* SPI */ -#ifdef CONFIG_SPI_FLASH -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 -#define CONFIG_SF_DEFAULT_SPEED 50000000 -#endif #ifdef CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SPI_MODE SPI_MODE_0 diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index e0e1f71..9ca3ee3 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -71,12 +71,6 @@ #endif /* Serial Flash */ -#ifdef CONFIG_CMD_SF -#define CONFIG_SF_DEFAULT_BUS 0 -#define CONFIG_SF_DEFAULT_CS 0 -#define CONFIG_SF_DEFAULT_SPEED 20000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 -#endif /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 6e23fa2..a4215c8 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -52,11 +52,7 @@ /* SPI */ #ifdef CONFIG_CMD_SF #define CONFIG_SPI_FLASH_MTD - #define CONFIG_SF_DEFAULT_BUS 0 - #define CONFIG_SF_DEFAULT_CS 0 /* GPIO 3-19 (21248) */ - #define CONFIG_SF_DEFAULT_SPEED 30000000 - #define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0) #endif #elif defined(CONFIG_SPL_NAND_SUPPORT) diff --git a/include/configs/helios4.h b/include/configs/helios4.h index 4e98f19..5a11641 100644 --- a/include/configs/helios4.h +++ b/include/configs/helios4.h @@ -24,10 +24,6 @@ */ /* SPI NOR flash default params, used by sf commands */ -#define CONFIG_SF_DEFAULT_BUS 1 -#define CONFIG_SF_DEFAULT_CS 0 -#define CONFIG_SF_DEFAULT_SPEED 104000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 /* * SDIO/MMC Card Configuration diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h index 7b2c794..6504469 100644 --- a/include/configs/jetson-tk1.h +++ b/include/configs/jetson-tk1.h @@ -24,8 +24,6 @@ #define CONFIG_SYS_MMC_ENV_PART 2 /* SPI */ -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 -#define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20) #include "tegra-common-usb-gadget.h" diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h index 90f9a99..b1aec98 100644 --- a/include/configs/k2g_evm.h +++ b/include/configs/k2g_evm.h @@ -86,9 +86,6 @@ #define CONFIG_ENV_SIZE (256 << 10) /* 256 KiB */ -#define CONFIG_SF_DEFAULT_BUS 1 -#define CONFIG_SF_DEFAULT_CS 0 - #ifndef CONFIG_SPL_BUILD #define CONFIG_CADENCE_QSPI #define CONFIG_CQSPI_REF_CLK 384000000 diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index 0de83f6..f93629e 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -33,8 +33,6 @@ #include "keymile-common.h" /* SPI NOR Flash default params, used by sf commands */ -#define CONFIG_SF_DEFAULT_SPEED 8100000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 #if defined CONFIG_KM_ENV_IS_IN_SPI_NOR #define CONFIG_ENV_SPI_BUS 0 diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h index d4da9dd..37b9abc 100644 --- a/include/configs/km/kmp204x-common.h +++ b/include/configs/km/kmp204x-common.h @@ -252,8 +252,6 @@ int get_scl(void); /* * eSPI - Enhanced SPI */ -#define CONFIG_SF_DEFAULT_SPEED 20000000 -#define CONFIG_SF_DEFAULT_MODE 0 /* * General PCI diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h index c631e26..ce806d1 100644 --- a/include/configs/legoev3.h +++ b/include/configs/legoev3.h @@ -47,7 +47,6 @@ #define CONFIG_SYS_SPI_BASE DAVINCI_SPI0_BASE #define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI0_CLKID) -#define CONFIG_SF_DEFAULT_SPEED 50000000 #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED /* diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h index c76bfdc..aac782d 100644 --- a/include/configs/ls1012aqds.h +++ b/include/configs/ls1012aqds.h @@ -99,11 +99,6 @@ DSPI_CTAR_DT(0)) #define CONFIG_SPI_FLASH_EON /* cs3 */ -#define CONFIG_SF_DEFAULT_SPEED 10000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 -#define CONFIG_SF_DEFAULT_BUS 1 -#define CONFIG_SF_DEFAULT_CS 0 - /* MMC */ #ifdef CONFIG_MMC #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index f7e7877..bc804c5 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -173,10 +173,6 @@ #define CONFIG_SPI_FLASH_STMICRO /* cs0 */ #define CONFIG_SPI_FLASH_SST /* cs1 */ #define CONFIG_SPI_FLASH_EON /* cs2 */ -#if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI) -#define CONFIG_SF_DEFAULT_BUS 1 -#define CONFIG_SF_DEFAULT_CS 0 -#endif #endif #endif diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index 6e36baf..58dd9fb 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -39,10 +39,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SPI_FLASH_STMICRO /* cs0 */ #define CONFIG_SPI_FLASH_SST /* cs1 */ #define CONFIG_SPI_FLASH_EON /* cs2 */ -#if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI) -#define CONFIG_SF_DEFAULT_BUS 1 -#define CONFIG_SF_DEFAULT_CS 0 -#endif #endif /* QSPI */ diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h index 17d543d..4387862 100644 --- a/include/configs/ls1088aqds.h +++ b/include/configs/ls1088aqds.h @@ -384,8 +384,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SPI_FLASH_EON #if !defined(CONFIG_TFABOOT) && \ !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI) -#define CONFIG_SF_DEFAULT_BUS 1 -#define CONFIG_SF_DEFAULT_CS 0 #endif #endif diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index 9d4be18..bcad8a0 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -48,8 +48,6 @@ /* ST M25P40 */ #undef CONFIG_ENV_SPI_MAX_HZ #define CONFIG_ENV_SPI_MAX_HZ 25000000 -#undef CONFIG_SF_DEFAULT_SPEED -#define CONFIG_SF_DEFAULT_SPEED 25000000 /* * Environment variables configurations diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h index d378333..fada0ca 100644 --- a/include/configs/maxbcm.h +++ b/include/configs/maxbcm.h @@ -29,8 +29,6 @@ #define CONFIG_SYS_I2C_SPEED 100000 /* SPI NOR flash default params, used by sf commands */ -#define CONFIG_SF_DEFAULT_SPEED 1000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 /* Environment in SPI NOR flash */ #define CONFIG_ENV_OFFSET (1 << 20) /* 1MiB in */ diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h index 644f339..a1774c0 100644 --- a/include/configs/mccmon6.h +++ b/include/configs/mccmon6.h @@ -43,11 +43,6 @@ #define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M) -#define CONFIG_SF_DEFAULT_BUS 2 -#define CONFIG_SF_DEFAULT_CS 0 -#define CONFIG_SF_DEFAULT_SPEED 25000000 -#define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0) - /* I2C Configs */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_MXC diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index ba0952c..d81194b 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -81,10 +81,6 @@ #else /* !FLASH */ #ifdef SPIFLASH -# define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 -# define CONFIG_SF_DEFAULT_SPEED XILINX_SPI_FLASH_MAX_FREQ -# define CONFIG_SF_DEFAULT_CS XILINX_SPI_FLASH_CS - # ifdef RAMENV # define CONFIG_ENV_SIZE 0x1000 # define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SIZE) diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h index cf9440f..e898133 100644 --- a/include/configs/mvebu_armada-37xx.h +++ b/include/configs/mvebu_armada-37xx.h @@ -61,8 +61,6 @@ #define CONFIG_ENV_SPI_CS 0 /* SPI NOR flash default params, used by sf commands */ -#define CONFIG_SF_DEFAULT_SPEED 1000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ #define CONFIG_MTD_PARTITIONS /* required for UBI partition support */ diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index a6636e1..51f484d 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -56,8 +56,6 @@ #define CONFIG_ENV_SPI_CS 0 /* SPI NOR flash default params, used by sf commands */ -#define CONFIG_SF_DEFAULT_SPEED 1000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE #define CONFIG_ENV_OFFSET 0x180000 /* as Marvell U-Boot version */ diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index 1117139..82ac6cc 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -78,16 +78,6 @@ #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_SF_DEFAULT_BUS 2 -#define CONFIG_SF_DEFAULT_CS 0 -/* this may vary and depends on the installed chip */ -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 -#define CONFIG_SF_DEFAULT_SPEED 24000000 -#endif - #endif /* Framebuffer support */ diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 711aa82..6fe0467 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -28,13 +28,6 @@ #define CONFIG_PHY_ATHEROS -#ifdef CONFIG_CMD_SF -#define CONFIG_SF_DEFAULT_BUS 0 -#define CONFIG_SF_DEFAULT_CS 0 -#define CONFIG_SF_DEFAULT_SPEED 20000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 -#endif - #ifdef CONFIG_SUPPORT_EMMC_BOOT #define EMMC_ENV \ "emmcdev=2\0" \ diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index a80a656..2cce3d5 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -144,13 +144,6 @@ #define CONFIG_ENV_OFFSET (8 * SZ_64K) #endif -#ifdef CONFIG_CMD_SF -#define CONFIG_SF_DEFAULT_BUS 0 -#define CONFIG_SF_DEFAULT_CS 0 -#define CONFIG_SF_DEFAULT_SPEED 20000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 -#endif - /* USB Configs */ #ifdef CONFIG_CMD_USB #define CONFIG_EHCI_HCD_INIT_AFTER_RESET diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index 058856a..c4d8a89 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -147,10 +147,6 @@ #ifdef CONFIG_FSL_QSPI #define CONFIG_SYS_FSL_QSPI_AHB -#define CONFIG_SF_DEFAULT_BUS 0 -#define CONFIG_SF_DEFAULT_CS 0 -#define CONFIG_SF_DEFAULT_SPEED 40000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define FSL_QSPI_FLASH_SIZE SZ_32M #define FSL_QSPI_FLASH_NUM 2 #endif diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 2a7eb22..dc4181d 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -184,10 +184,6 @@ #define FSL_QSPI_FLASH_SIZE SZ_32M #endif #define FSL_QSPI_FLASH_NUM 2 -#define CONFIG_SF_DEFAULT_BUS 1 -#define CONFIG_SF_DEFAULT_CS 0 -#define CONFIG_SF_DEFAULT_SPEED 40000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #endif #ifndef CONFIG_SPL_BUILD diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index c8c088e..42e5115 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -164,10 +164,6 @@ #ifdef CONFIG_FSL_QSPI #define CONFIG_SYS_FSL_QSPI_AHB -#define CONFIG_SF_DEFAULT_BUS 0 -#define CONFIG_SF_DEFAULT_CS 0 -#define CONFIG_SF_DEFAULT_SPEED 40000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define FSL_QSPI_FLASH_NUM 1 #define FSL_QSPI_FLASH_SIZE SZ_32M #endif diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h index c64d092..1fc5c24 100644 --- a/include/configs/mx6ullevk.h +++ b/include/configs/mx6ullevk.h @@ -160,10 +160,6 @@ #ifdef CONFIG_FSL_QSPI #define CONFIG_SYS_FSL_QSPI_AHB -#define CONFIG_SF_DEFAULT_BUS 0 -#define CONFIG_SF_DEFAULT_CS 0 -#define CONFIG_SF_DEFAULT_SPEED 40000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define FSL_QSPI_FLASH_NUM 1 #define FSL_QSPI_FLASH_SIZE SZ_32M #endif diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index ad919a6..39d29de 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -225,10 +225,6 @@ #ifdef CONFIG_FSL_QSPI #define CONFIG_SYS_FSL_QSPI_AHB -#define CONFIG_SF_DEFAULT_BUS 0 -#define CONFIG_SF_DEFAULT_CS 0 -#define CONFIG_SF_DEFAULT_SPEED 40000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define FSL_QSPI_FLASH_NUM 1 #define FSL_QSPI_FLASH_SIZE SZ_64M #define QSPI0_BASE_ADDR QSPI1_IPS_BASE_ADDR diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index c364442..c37a766 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -22,13 +22,6 @@ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART2_BASE -#ifdef CONFIG_CMD_SF -#define CONFIG_SF_DEFAULT_BUS 0 -#define CONFIG_SF_DEFAULT_CS 0 -#define CONFIG_SF_DEFAULT_SPEED 25000000 -#define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0) -#endif - /* I2C Configs */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_MXC diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h index 933f840..fca4eb5 100644 --- a/include/configs/nyan-big.h +++ b/include/configs/nyan-big.h @@ -27,8 +27,6 @@ #define CONFIG_LCD_ALIGNMENT MMU_SECTION_SIZE /* SPI */ -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 -#define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20) #undef CONFIG_LOADADDR diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 2002444..5f5aa57 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -119,7 +119,6 @@ #define CONFIG_SYS_SPI_BASE DAVINCI_SPI1_BASE #define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI1_CLKID) -#define CONFIG_SF_DEFAULT_SPEED 30000000 #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #ifdef CONFIG_USE_SPIFLASH diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index 776835a..6754181 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -17,10 +17,6 @@ #define CONFIG_MXC_UART_BASE UART1_BASE /* SF Configs */ -#define CONFIG_SF_DEFAULT_BUS 2 -#define CONFIG_SF_DEFAULT_CS 0 -#define CONFIG_SF_DEFAULT_SPEED 25000000 -#define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0) /* IO expander */ #define CONFIG_PCA953X diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 8fda0c1..24003c2 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -577,11 +577,6 @@ #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 -#if defined(CONFIG_SPI_FLASH) -#define CONFIG_SF_DEFAULT_SPEED 10000000 -#define CONFIG_SF_DEFAULT_MODE 0 -#endif - #if defined(CONFIG_PCI) /* * General PCI diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h index 5986699..177e8d8 100644 --- a/include/configs/p2371-0000.h +++ b/include/configs/p2371-0000.h @@ -23,8 +23,6 @@ #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) /* SPI */ -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 -#define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20) #include "tegra-common-usb-gadget.h" diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h index c97b226..7205a17 100644 --- a/include/configs/p2371-2180.h +++ b/include/configs/p2371-2180.h @@ -23,8 +23,6 @@ #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) /* SPI */ -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 -#define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20) #include "tegra-common-usb-gadget.h" diff --git a/include/configs/p2571.h b/include/configs/p2571.h index 4920896..02db6bb 100644 --- a/include/configs/p2571.h +++ b/include/configs/p2571.h @@ -24,8 +24,6 @@ #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) /* SPI */ -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 -#define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20) #include "tegra-common-usb-gadget.h" diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h index 5381ed1..8cde12e 100644 --- a/include/configs/pcm051.h +++ b/include/configs/pcm051.h @@ -99,8 +99,6 @@ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START \ + (8 * 1024 * 1024)) -#define CONFIG_SF_DEFAULT_SPEED 24000000 - /* NS16550 Configuration */ #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */ #define CONFIG_SYS_NS16550_COM2 0x48022000 /* UART1 */ diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h index b9bc08b..15dc1b2 100644 --- a/include/configs/pcm058.h +++ b/include/configs/pcm058.h @@ -38,10 +38,6 @@ #define CONFIG_FEC_MXC_PHYADDR 3 /* SPI Flash */ -#define CONFIG_SF_DEFAULT_BUS 0 -#define CONFIG_SF_DEFAULT_CS 0 -#define CONFIG_SF_DEFAULT_SPEED 20000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 /* I2C Configs */ #define CONFIG_SYS_I2C diff --git a/include/configs/pfla02.h b/include/configs/pfla02.h index e2aae19..fe54e54 100644 --- a/include/configs/pfla02.h +++ b/include/configs/pfla02.h @@ -35,10 +35,6 @@ #define CONFIG_FEC_MXC_PHYADDR 3 /* SPI Flash */ -#define CONFIG_SF_DEFAULT_BUS 2 -#define CONFIG_SF_DEFAULT_CS 0 -#define CONFIG_SF_DEFAULT_SPEED 20000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 /* I2C Configs */ #define CONFIG_SYS_I2C diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index 4fc9226..50c6b56 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -29,7 +29,6 @@ #define SDRAM_MAX_SIZE (CONFIG_NR_DRAM_BANKS * SDRAM_BANK_SIZE) #define CONFIG_SPI_FLASH_GIGADEVICE -#define CONFIG_SF_DEFAULT_SPEED 20000000 #ifndef CONFIG_SPL_BUILD /* usb otg */ diff --git a/include/configs/rk3128_common.h b/include/configs/rk3128_common.h index 9451715..0c08d7a 100644 --- a/include/configs/rk3128_common.h +++ b/include/configs/rk3128_common.h @@ -30,7 +30,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x60000000 #define SDRAM_MAX_SIZE 0x80000000 -#define CONFIG_SF_DEFAULT_SPEED 20000000 #define CONFIG_USB_OHCI_NEW #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1 diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h index 36e494e..208ca5a 100644 --- a/include/configs/rk3188_common.h +++ b/include/configs/rk3188_common.h @@ -37,8 +37,6 @@ #define SDRAM_BANK_SIZE (2UL << 30) #define SDRAM_MAX_SIZE 0x80000000 -#define CONFIG_SF_DEFAULT_SPEED 20000000 - #ifndef CONFIG_SPL_BUILD /* usb otg */ diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index c59f5ef..72a54bc 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -40,8 +40,6 @@ #define SDRAM_BANK_SIZE (2UL << 30) #define SDRAM_MAX_SIZE 0xfe000000 -#define CONFIG_SF_DEFAULT_SPEED 20000000 - #ifndef CONFIG_SPL_BUILD /* usb otg */ diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h index 02233d6..71aad70 100644 --- a/include/configs/rk3328_common.h +++ b/include/configs/rk3328_common.h @@ -26,8 +26,6 @@ #define CONFIG_SYS_SDRAM_BASE 0 #define SDRAM_MAX_SIZE 0xff000000 -#define CONFIG_SF_DEFAULT_SPEED 20000000 - #ifndef CONFIG_SPL_BUILD #define ENV_MEM_LAYOUT_SETTINGS \ diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index b977b1f..b412012 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -38,8 +38,6 @@ #define CONFIG_SYS_SDRAM_BASE 0 #define SDRAM_MAX_SIZE 0xf8000000 -#define CONFIG_SF_DEFAULT_SPEED 20000000 - #ifndef CONFIG_SPL_BUILD #define ENV_MEM_LAYOUT_SETTINGS \ diff --git a/include/configs/sama5d27_som1_ek.h b/include/configs/sama5d27_som1_ek.h index 7c7479b..ae51aea 100644 --- a/include/configs/sama5d27_som1_ek.h +++ b/include/configs/sama5d27_som1_ek.h @@ -31,7 +31,6 @@ #undef CONFIG_CMD_NAND /* SPI flash */ -#define CONFIG_SF_DEFAULT_SPEED 66000000 #undef CONFIG_BOOTCOMMAND #ifdef CONFIG_SD_BOOT diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h index 2cec1c7..a3df404 100644 --- a/include/configs/sama5d2_xplained.h +++ b/include/configs/sama5d2_xplained.h @@ -25,11 +25,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ /* SerialFlash */ -#ifdef CONFIG_CMD_SF -#define CONFIG_SF_DEFAULT_BUS 0 -#define CONFIG_SF_DEFAULT_CS 0 -#define CONFIG_SF_DEFAULT_SPEED 30000000 -#endif #ifdef CONFIG_SD_BOOT diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index ca1c2b0..3870671 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -48,10 +48,6 @@ /* SerialFlash */ -#ifdef CONFIG_CMD_SF -#define CONFIG_SF_DEFAULT_SPEED 30000000 -#endif - /* NAND flash */ #ifdef CONFIG_CMD_NAND #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h index bbb1699..d8b61a6 100644 --- a/include/configs/sama5d4_xplained.h +++ b/include/configs/sama5d4_xplained.h @@ -24,10 +24,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ -#ifdef CONFIG_CMD_SF -#define CONFIG_SF_DEFAULT_SPEED 30000000 -#endif - /* NAND flash */ #ifdef CONFIG_CMD_NAND #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h index d580416..8bfda3f 100644 --- a/include/configs/sama5d4ek.h +++ b/include/configs/sama5d4ek.h @@ -24,10 +24,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ -#ifdef CONFIG_CMD_SF -#define CONFIG_SF_DEFAULT_SPEED 30000000 -#endif - /* NAND flash */ #ifdef CONFIG_CMD_NAND #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index d8ed02b..8f2dd5f 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -61,8 +61,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x81000000 /* Default load address */ -#define CONFIG_SF_DEFAULT_SPEED (75000000) - /* Physical Memory Map */ #define PHYS_DRAM_1 0x80000000 /* DRAM Bank #1 */ diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 191204b..09c9b7c 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -69,7 +69,6 @@ * EPCS/EPCQx1 Serial Flash Controller */ #ifdef CONFIG_ALTERA_SPI -#define CONFIG_SF_DEFAULT_SPEED 30000000 /* * The base address is configurable in QSys, each board must specify the * base address based on it's particular FPGA configuration. Please note diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h index 984f118..d9de075 100644 --- a/include/configs/socfpga_sr1500.h +++ b/include/configs/socfpga_sr1500.h @@ -39,7 +39,6 @@ #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 */ -#define CONFIG_SF_DEFAULT_SPEED 100000000 /* * The QSPI NOR flash layout on SR1500: diff --git a/include/configs/socfpga_stratix10_socdk.h b/include/configs/socfpga_stratix10_socdk.h index 0e73239..31c267f 100644 --- a/include/configs/socfpga_stratix10_socdk.h +++ b/include/configs/socfpga_stratix10_socdk.h @@ -60,10 +60,6 @@ /*#define CONFIG_QSPI_RBF_ADDR 0x720000*/ /* Flash device info */ -#define CONFIG_SF_DEFAULT_SPEED (50000000) -#define CONFIG_SF_DEFAULT_MODE (SPI_MODE_3 | SPI_RX_QUAD) -#define CONFIG_SF_DEFAULT_BUS 0 -#define CONFIG_SF_DEFAULT_CS 0 /*#define CONFIG_ENV_IS_IN_SPI_FLASH*/ #ifdef CONFIG_ENV_IS_IN_SPI_FLASH diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h index 33ddc67..fa3d6b8 100644 --- a/include/configs/stmark2.h +++ b/include/configs/stmark2.h @@ -64,7 +64,6 @@ /* DSPI and Serial Flash */ #define CONFIG_CF_DSPI -#define CONFIG_SF_DEFAULT_SPEED 50000000 #define CONFIG_SERIAL_FLASH #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 1 diff --git a/include/configs/taurus.h b/include/configs/taurus.h index f283ab7..1d24577 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -111,10 +111,6 @@ #if defined(CONFIG_SPL_BUILD) /* SPL related */ #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 - -#define CONFIG_SF_DEFAULT_BUS 0 -#define CONFIG_SF_DEFAULT_SPEED 1000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 #endif /* load address */ diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h index 85914ec..b637832 100644 --- a/include/configs/tec-ng.h +++ b/include/configs/tec-ng.h @@ -23,8 +23,6 @@ /* SPI */ #define CONFIG_TEGRA_SLINK_CTRLS 6 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 -#define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20) /* Tag support */ diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index 886456e..59b2546 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -40,8 +40,6 @@ #define CONFIG_USB_MAX_CONTROLLER_COUNT 3 /* SPI NOR flash default params, used by sf commands */ -#define CONFIG_SF_DEFAULT_SPEED 27777777 /* for fast SPL booting */ -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 /* Environment in SPI NOR flash */ #define CONFIG_ENV_OFFSET (1 << 20) /* 1MiB in */ diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 0c7d664..767615a 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -71,7 +71,6 @@ /* SPI Configuration */ #define CONFIG_SYS_SPI_CLK ks_clk_get_rate(KS2_CLK1_6) -#define CONFIG_SF_DEFAULT_SPEED 30000000 #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #define CONFIG_SYS_SPI0 #define CONFIG_SYS_SPI_BASE KS2_SPI0_BASE diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h index f14c4ee..c4f01aa 100644 --- a/include/configs/topic_miami.h +++ b/include/configs/topic_miami.h @@ -48,9 +48,6 @@ #define CONFIG_SYS_MEMTEST_END 0x18000000 /* Faster flash, ours may run at 108 MHz */ -#undef CONFIG_SF_DEFAULT_SPEED -#define CONFIG_SF_DEFAULT_SPEED 108000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #undef CONFIG_SPI_FLASH_WINBOND diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 65cc12f..6c0d4f2 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -34,11 +34,6 @@ #define TQMA6_SPI_FLASH_SECTOR_SIZE SZ_64K -#define CONFIG_SF_DEFAULT_BUS 0 -#define CONFIG_SF_DEFAULT_CS 0 -#define CONFIG_SF_DEFAULT_SPEED 50000000 -#define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0) - /* I2C Configs */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_MXC diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h index 4b1eb7b..417c562 100644 --- a/include/configs/trimslice.h +++ b/include/configs/trimslice.h @@ -21,7 +21,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_TRIMSLICE /* SPI */ -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 /* Environment in SPI */ #define CONFIG_ENV_SPI_MAX_HZ 48000000 diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h index 82cdcce..648c87d 100644 --- a/include/configs/turris_mox.h +++ b/include/configs/turris_mox.h @@ -70,8 +70,6 @@ #define CONFIG_ENV_SPI_CS 0 /* SPI NOR flash default params, used by sf commands */ -#define CONFIG_SF_DEFAULT_SPEED 20000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE /* Environment in SPI NOR flash */ diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h index b90be65..038f639 100644 --- a/include/configs/turris_omnia.h +++ b/include/configs/turris_omnia.h @@ -35,8 +35,6 @@ #endif /* SPI NOR flash default params, used by sf commands */ -#define CONFIG_SF_DEFAULT_SPEED 1000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 #define CONFIG_SPI_FLASH_SPANSION /* diff --git a/include/configs/venice2.h b/include/configs/venice2.h index a86ae21..8ad872d 100644 --- a/include/configs/venice2.h +++ b/include/configs/venice2.h @@ -24,8 +24,6 @@ #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) /* SPI */ -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 -#define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20) #include "tegra-common-usb-gadget.h" diff --git a/include/configs/vinco.h b/include/configs/vinco.h index 9d6001f..715ef2a 100644 --- a/include/configs/vinco.h +++ b/include/configs/vinco.h @@ -38,11 +38,7 @@ #ifdef CONFIG_CMD_SF #define CONFIG_ATMEL_SPI0 #define CONFIG_SPI_FLASH_STMICRO -#define CONFIG_SF_DEFAULT_BUS 0 -#define CONFIG_SF_DEFAULT_CS 0 -#define CONFIG_SF_DEFAULT_SPEED 50000000 #define CONFIG_ENV_SPI_MAX_HZ 50000000 -#define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0) #define CONFIG_ENV_SPI_MODE (SPI_MODE_0) #endif diff --git a/include/configs/x530.h b/include/configs/x530.h index a83d49b..d9c1eff 100644 --- a/include/configs/x530.h +++ b/include/configs/x530.h @@ -47,9 +47,6 @@ #define BBT_CUSTOM_SCAN_POSITION 2048 /* SPI NOR flash default params, used by sf commands */ -#define CONFIG_SF_DEFAULT_BUS 1 -#define CONFIG_SF_DEFAULT_SPEED 50000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 #define MTDIDS_DEFAULT "nand0=nand" #define MTDPARTS_DEFAULT "mtdparts=nand:240M(user),8M(errlog),8M(nand-bbt)" diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index a285fcd..94177c6 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -42,9 +42,6 @@ #endif /* QSPI */ -#ifdef CONFIG_ZYNQ_QSPI -# define CONFIG_SF_DEFAULT_SPEED 30000000 -#endif /* NOR */ #ifdef CONFIG_MTD_NOR_FLASH diff --git a/include/spi_flash.h b/include/spi_flash.h index 7f691e8..97ec2b3 100644 --- a/include/spi_flash.h +++ b/include/spi_flash.h @@ -13,19 +13,6 @@ #include #include -#ifndef CONFIG_SF_DEFAULT_SPEED -# define CONFIG_SF_DEFAULT_SPEED 1000000 -#endif -#ifndef CONFIG_SF_DEFAULT_MODE -# define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 -#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 - struct spi_slave; struct dm_spi_flash_ops { -- cgit v1.1