diff options
| author | Stefano Babic <sbabic@denx.de> | 2019-03-31 19:54:10 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2019-03-31 19:54:10 +0200 |
| commit | 66c433ed4342e5761ee9b048c85fe47d31130b2e (patch) | |
| tree | 60977b825765ebe490b01aae2154002eeea6a76b /include/configs | |
| parent | 4b387deb78dcbe491c1f73fdd758f4ca3307bbbe (diff) | |
| parent | c3aef9339ce0592b06c8d44cf2eaf9e6f3713e4f (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot
Signed-off-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'include/configs')
162 files changed, 24 insertions, 728 deletions
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 42b3337216..e8c9cdd73d 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -99,10 +99,6 @@ #define CONFIG_ENV_OVERWRITE #if defined(CONFIG_SPIFLASH) -#define CONFIG_ENV_SPI_BUS 0 -#define CONFIG_ENV_SPI_CS 0 -#define CONFIG_ENV_SPI_MAX_HZ 10000000 -#define CONFIG_ENV_SPI_MODE 0 #define CONFIG_ENV_SIZE 0x2000 /* 8KB */ #define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 @@ -506,8 +502,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 71e840a4b8..c01071e60d 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) @@ -257,10 +253,6 @@ extern unsigned long get_sdram_size(void); * Environment */ #if defined(CONFIG_RAMBOOT_SPIFLASH) -#define CONFIG_ENV_SPI_BUS 0 -#define CONFIG_ENV_SPI_CS 0 -#define CONFIG_ENV_SPI_MAX_HZ 10000000 -#define CONFIG_ENV_SPI_MODE 0 #define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index f385509daf..68100f1d52 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) @@ -458,10 +454,6 @@ combinations. this should be removed later #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #elif defined(CONFIG_RAMBOOT_SPIFLASH) -#define CONFIG_ENV_SPI_BUS 0 -#define CONFIG_ENV_SPI_CS 0 -#define CONFIG_ENV_SPI_MAX_HZ 10000000 -#define CONFIG_ENV_SPI_MODE 0 #define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index ebf44b5529..9b83a50fdf 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 */ @@ -382,10 +380,6 @@ */ #if defined(CONFIG_SYS_RAMBOOT) #if defined(CONFIG_RAMBOOT_SPIFLASH) -#define CONFIG_ENV_SPI_BUS 0 -#define CONFIG_ENV_SPI_CS 0 -#define CONFIG_ENV_SPI_MAX_HZ 10000000 -#define CONFIG_ENV_SPI_MODE 0 #define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h index 83d774527a..514733eef7 100644 --- a/include/configs/M52277EVB.h +++ b/include/configs/M52277EVB.h @@ -177,9 +177,6 @@ * Environment is not embedded in u-boot. First time runing may have env * crc error warning if there is no correct environment on the flash. */ -#ifdef CONFIG_CF_SBF -# define CONFIG_ENV_SPI_CS 2 -#endif #define CONFIG_ENV_OVERWRITE 1 /*----------------------------------------------------------------------- diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h index 4b8ef38c0b..f7b0669fc5 100644 --- a/include/configs/M54418TWR.h +++ b/include/configs/M54418TWR.h @@ -238,7 +238,6 @@ #endif #if defined(CONFIG_CF_SBF) -#define CONFIG_ENV_SPI_CS 1 #define CONFIG_ENV_OFFSET 0x40000 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x10000 diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h index 87cdbae1db..57c8572aba 100644 --- a/include/configs/M54451EVB.h +++ b/include/configs/M54451EVB.h @@ -198,7 +198,6 @@ * crc error warning if there is no correct environment on the flash. */ #if defined(CONFIG_SYS_STMICRO_BOOT) -# define CONFIG_ENV_SPI_CS 1 # define CONFIG_ENV_OFFSET 0x20000 # define CONFIG_ENV_SIZE 0x2000 # define CONFIG_ENV_SECT_SIZE 0x10000 diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h index d41b7c4492..448dfc98a9 100644 --- a/include/configs/M54455EVB.h +++ b/include/configs/M54455EVB.h @@ -248,9 +248,6 @@ * Environment is not embedded in u-boot. First time runing may have env * crc error warning if there is no correct environment on the flash. */ -#ifdef CONFIG_CF_SBF -# define CONFIG_ENV_SPI_CS 1 -#endif #undef CONFIG_ENV_OVERWRITE /*----------------------------------------------------------------------- diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 1413b3dcfe..819129033f 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. @@ -529,10 +524,6 @@ #if defined(CONFIG_SYS_RAMBOOT) #if defined(CONFIG_RAMBOOT_SPIFLASH) -#define CONFIG_ENV_SPI_BUS 0 -#define CONFIG_ENV_SPI_CS 0 -#define CONFIG_ENV_SPI_MAX_HZ 10000000 -#define CONFIG_ENV_SPI_MODE 0 #define CONFIG_ENV_SIZE 0x2000 /* 8KB */ #define CONFIG_ENV_OFFSET 0xF0000 #define CONFIG_ENV_SECT_SIZE 0x10000 diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 134ffe5271..4be40d0d02 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) @@ -646,10 +644,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #elif defined(CONFIG_SPIFLASH) -#define CONFIG_ENV_SPI_BUS 0 -#define CONFIG_ENV_SPI_CS 0 -#define CONFIG_ENV_SPI_MAX_HZ 10000000 -#define CONFIG_ENV_SPI_MODE 0 #define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 3ccfeca890..bdbf119c32 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. @@ -506,10 +503,6 @@ * Environment */ #ifdef CONFIG_SPIFLASH -#define CONFIG_ENV_SPI_BUS 0 -#define CONFIG_ENV_SPI_CS 0 -#define CONFIG_ENV_SPI_MAX_HZ 10000000 -#define CONFIG_ENV_SPI_MODE 0 #define CONFIG_ENV_SIZE 0x2000 /* 8KB */ #define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index bd2913e8d4..b433308fff 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -49,10 +49,6 @@ #define CONFIG_ENV_OVERWRITE #if defined(CONFIG_SPIFLASH) - #define CONFIG_ENV_SPI_BUS 0 - #define CONFIG_ENV_SPI_CS 0 - #define CONFIG_ENV_SPI_MAX_HZ 10000000 - #define CONFIG_ENV_SPI_MODE 0 #define CONFIG_ENV_SIZE 0x2000 /* 8KB */ #define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 @@ -350,8 +346,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/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h index d62fd35e81..1539e8fabb 100644 --- a/include/configs/SBx81LIFKW.h +++ b/include/configs/SBx81LIFKW.h @@ -56,10 +56,6 @@ /* * Environment variables configurations */ -#define CONFIG_ENV_SPI_BUS 0 -#define CONFIG_ENV_SPI_CS 0 -#define CONFIG_ENV_SPI_MAX_HZ 20000000 /* 20Mhz */ -#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE #define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K */ #define CONFIG_ENV_SIZE 0x02000 #define CONFIG_ENV_OFFSET 0xc0000 /* env starts here - 768K */ diff --git a/include/configs/SBx81LIFXCAT.h b/include/configs/SBx81LIFXCAT.h index 3c8c216d89..af19193052 100644 --- a/include/configs/SBx81LIFXCAT.h +++ b/include/configs/SBx81LIFXCAT.h @@ -56,10 +56,6 @@ /* * Environment variables configurations */ -#define CONFIG_ENV_SPI_BUS 0 -#define CONFIG_ENV_SPI_CS 0 -#define CONFIG_ENV_SPI_MAX_HZ 20000000 /* 20Mhz */ -#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE #define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K */ #define CONFIG_ENV_SIZE 0x02000 #define CONFIG_ENV_OFFSET 0xc0000 /* env starts here - 768K */ diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index c63dfd3186..ef94097e09 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -129,10 +129,6 @@ #endif #if defined(CONFIG_SPIFLASH) -#define CONFIG_ENV_SPI_BUS 0 -#define CONFIG_ENV_SPI_CS 0 -#define CONFIG_ENV_SPI_MAX_HZ 10000000 -#define CONFIG_ENV_SPI_MODE 0 #define CONFIG_ENV_SIZE 0x2000 /* 8KB */ #define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 @@ -501,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/T102xRDB.h b/include/configs/T102xRDB.h index b0f93abf98..551ba6d935 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -144,10 +144,6 @@ #endif #if defined(CONFIG_SPIFLASH) -#define CONFIG_ENV_SPI_BUS 0 -#define CONFIG_ENV_SPI_CS 0 -#define CONFIG_ENV_SPI_MAX_HZ 10000000 -#define CONFIG_ENV_SPI_MODE 0 #define CONFIG_ENV_SIZE 0x2000 /* 8KB */ #define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ #if defined(CONFIG_TARGET_T1024RDB) @@ -497,8 +493,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 147ef71084..417383c7f0 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -59,10 +59,6 @@ #ifdef CONFIG_MTD_NOR_FLASH #if defined(CONFIG_SPIFLASH) -#define CONFIG_ENV_SPI_BUS 0 -#define CONFIG_ENV_SPI_CS 0 -#define CONFIG_ENV_SPI_MAX_HZ 10000000 -#define CONFIG_ENV_SPI_MODE 0 #define CONFIG_ENV_SIZE 0x2000 /* 8KB */ #define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 @@ -415,8 +411,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 4cecab3401..a7e0f8f508 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -521,12 +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 -#define CONFIG_ENV_SPI_MODE 0 /* * General PCI diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 9ca384cc0c..0d53ad50df 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -125,10 +125,6 @@ #endif #if defined(CONFIG_SPIFLASH) -#define CONFIG_ENV_SPI_BUS 0 -#define CONFIG_ENV_SPI_CS 0 -#define CONFIG_ENV_SPI_MAX_HZ 10000000 -#define CONFIG_ENV_SPI_MODE 0 #define CONFIG_ENV_SIZE 0x2000 /* 8KB */ #define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 @@ -493,11 +489,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 446e4268ef..a78dd810c6 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -110,10 +110,6 @@ #define CONFIG_SYS_MEMTEST_END 0x00400000 #if defined(CONFIG_SPIFLASH) -#define CONFIG_ENV_SPI_BUS 0 -#define CONFIG_ENV_SPI_CS 0 -#define CONFIG_ENV_SPI_MAX_HZ 10000000 -#define CONFIG_ENV_SPI_MODE 0 #define CONFIG_ENV_SIZE 0x2000 /* 8KB */ #define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 @@ -435,10 +431,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 06939015d0..9e70412298 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -74,10 +74,6 @@ #include "t4qds.h" #if defined(CONFIG_SPIFLASH) -#define CONFIG_ENV_SPI_BUS 0 -#define CONFIG_ENV_SPI_CS 0 -#define CONFIG_ENV_SPI_MAX_HZ 10000000 -#define CONFIG_ENV_SPI_MODE 0 #define CONFIG_ENV_SIZE 0x2000 /* 8KB */ #define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 @@ -362,8 +358,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 f42a4f4af0..71258c805d 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -280,10 +280,6 @@ "bootm 0x01000000 - 0x00f00000" #if defined(CONFIG_SPIFLASH) -#define CONFIG_ENV_SPI_BUS 0 -#define CONFIG_ENV_SPI_CS 0 -#define CONFIG_ENV_SPI_MAX_HZ 10000000 -#define CONFIG_ENV_SPI_MODE 0 #define CONFIG_ENV_SIZE 0x2000 /* 8KB */ #define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 @@ -507,8 +503,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 6a0254a55b..b518c222d4 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 @@ -331,10 +328,6 @@ #else -#define CONFIG_ENV_SPI_BUS 0 -#define CONFIG_ENV_SPI_CS 0 -#define CONFIG_ENV_SPI_MAX_HZ 10000000 -#define CONFIG_ENV_SPI_MODE 0 #ifdef CONFIG_RAMBOOT_SPIFLASH diff --git a/include/configs/adp-ae3xx.h b/include/configs/adp-ae3xx.h index 915f4164ee..1fe33917d0 100644 --- a/include/configs/adp-ae3xx.h +++ b/include/configs/adp-ae3xx.h @@ -201,10 +201,6 @@ #define CONFIG_SYS_MAX_FLASH_SECT 512 /* environments */ -#define CONFIG_ENV_SPI_BUS 0 -#define CONFIG_ENV_SPI_CS 0 -#define CONFIG_ENV_SPI_MAX_HZ 50000000 -#define CONFIG_ENV_SPI_MODE 0 #define CONFIG_ENV_SECT_SIZE 0x1000 #define CONFIG_ENV_OFFSET 0x140000 #define CONFIG_ENV_SIZE 8192 @@ -212,10 +208,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 0c9de6125d..e2c70605b2 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 @@ -218,10 +212,6 @@ #define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_ENV_OFFSET (768 * 1024) #define CONFIG_ENV_SECT_SIZE (64 * 1024) -#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS -#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS -#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE -#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #define CONFIG_SYS_FSL_USDHC_NUM 3 diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 3bd96b921b..0834ff5021 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -284,7 +284,6 @@ #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT -#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #define CONFIG_ENV_SECT_SIZE (4 << 10) /* 4 KB sectors */ #define CONFIG_ENV_OFFSET (768 << 10) /* 768 KiB in */ #define CONFIG_ENV_OFFSET_REDUND (896 << 10) /* 896 KiB in */ @@ -306,7 +305,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 ed71f4ce56..5a6080645a 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -115,7 +115,6 @@ #ifdef CONFIG_QSPI_BOOT #define CONFIG_SYS_REDUNDAND_ENVIRONMENT -#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #define CONFIG_ENV_SECT_SIZE (64 << 10) /* 64 KB sectors */ #define CONFIG_ENV_OFFSET 0x110000 #define CONFIG_ENV_OFFSET_REDUND 0x120000 @@ -124,8 +123,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 70aa425060..48999847ee 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/ap121.h b/include/configs/ap121.h index 96850b5761..0e8c3f70d9 100644 --- a/include/configs/ap121.h +++ b/include/configs/ap121.h @@ -30,7 +30,6 @@ "mtdparts default;" \ "bootm 0x9f650000" -#define CONFIG_ENV_SPI_MAX_HZ 25000000 #define CONFIG_ENV_OFFSET 0x40000 #define CONFIG_ENV_SECT_SIZE 0x10000 #define CONFIG_ENV_SIZE 0x10000 diff --git a/include/configs/ap143.h b/include/configs/ap143.h index 4dbca917e3..fa6921022d 100644 --- a/include/configs/ap143.h +++ b/include/configs/ap143.h @@ -34,7 +34,6 @@ "mtdparts default;" \ "bootm 0x9f680000" -#define CONFIG_ENV_SPI_MAX_HZ 25000000 #define CONFIG_ENV_OFFSET 0x40000 #define CONFIG_ENV_SECT_SIZE 0x10000 #define CONFIG_ENV_SIZE 0x10000 diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h index ca974c015f..4f28f52402 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 \ @@ -151,10 +149,6 @@ /* Environment organization */ #define CONFIG_ENV_SIZE (12 * 1024) #define CONFIG_SYS_REDUNDAND_ENVIRONMENT -#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS -#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS -#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED -#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE #define CONFIG_ENV_SECT_SIZE (0x010000) #define CONFIG_ENV_OFFSET (0x0d0000) #define CONFIG_ENV_OFFSET_REDUND (0x0e0000) diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h index c53ba89838..03e2a2bfbd 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 67b2e5879c..00e5667499 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 91069a2c98..cfe0e053b6 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/at91sam9260ek.h b/include/configs/at91sam9260ek.h index 2177512fe8..95710fb4c8 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -118,7 +118,6 @@ #define CONFIG_ENV_OFFSET 0x4200 #define CONFIG_ENV_SIZE 0x4200 #define CONFIG_ENV_SECT_SIZE 0x210 -#define CONFIG_ENV_SPI_MAX_HZ 15000000 #define CONFIG_BOOTCOMMAND "sf probe 0:0; " \ "sf read 0x22000000 0x84000 0x294000; " \ "bootm 0x22000000" @@ -128,7 +127,6 @@ #define CONFIG_ENV_OFFSET 0x4200 #define CONFIG_ENV_SIZE 0x4200 #define CONFIG_ENV_SECT_SIZE 0x210 -#define CONFIG_ENV_SPI_MAX_HZ 15000000 #define CONFIG_BOOTCOMMAND "sf probe 0:1; " \ "sf read 0x22000000 0x84000 0x294000; " \ "bootm 0x22000000" diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index 1c7fbe111f..599e2627f6 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -104,7 +104,6 @@ #define CONFIG_ENV_OFFSET 0x4200 #define CONFIG_ENV_SIZE 0x4200 #define CONFIG_ENV_SECT_SIZE 0x210 -#define CONFIG_ENV_SPI_MAX_HZ 15000000 #define CONFIG_BOOTCOMMAND "sf probe 0; " \ "sf read 0x22000000 0x84000 0x294000; " \ "bootm 0x22000000" @@ -115,7 +114,6 @@ #define CONFIG_ENV_OFFSET 0x4200 #define CONFIG_ENV_SIZE 0x4200 #define CONFIG_ENV_SECT_SIZE 0x210 -#define CONFIG_ENV_SPI_MAX_HZ 15000000 #define CONFIG_BOOTCOMMAND "sf probe 0:3; " \ "sf read 0x22000000 0x84000 0x294000; " \ "bootm 0x22000000" diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index 856e0328e7..6b1db9ff1e 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -222,7 +222,6 @@ #define CONFIG_ENV_OFFSET 0x4200 #define CONFIG_ENV_SIZE 0x4200 #define CONFIG_ENV_SECT_SIZE 0x210 -#define CONFIG_ENV_SPI_MAX_HZ 15000000 #define CONFIG_BOOTCOMMAND "sf probe 0; " \ "sf read 0x22000000 0x84000 0x294000; " \ "bootm 0x22000000" diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index 777a99b730..d83546d8e6 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/at91sam9rlek.h b/include/configs/at91sam9rlek.h index b052071478..3e18716e20 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -76,7 +76,6 @@ #define CONFIG_ENV_OFFSET 0x4200 #define CONFIG_ENV_SIZE 0x4200 #define CONFIG_ENV_SECT_SIZE 0x210 -#define CONFIG_ENV_SPI_MAX_HZ 15000000 #define CONFIG_BOOTCOMMAND "sf probe 0; " \ "sf read 0x22000000 0x84000 0x294000; " \ "bootm 0x22000000" diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 6adb965c3c..1abca55112 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 @@ -87,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" @@ -96,7 +92,6 @@ #define CONFIG_ENV_OFFSET 0x4200 #define CONFIG_ENV_SIZE 0x4200 #define CONFIG_ENV_SECT_SIZE 0x210 -#define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_BOOTCOMMAND "sf probe 0; " \ "sf read 0x22000000 0x84000 0x294000; " \ "bootm 0x22000000" diff --git a/include/configs/ax25-ae350.h b/include/configs/ax25-ae350.h index e3eb92832a..395f3a442d 100644 --- a/include/configs/ax25-ae350.h +++ b/include/configs/ax25-ae350.h @@ -113,18 +113,10 @@ #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 /* 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/axs10x.h b/include/configs/axs10x.h index 0f4d78a594..0c5a3af4cc 100644 --- a/include/configs/axs10x.h +++ b/include/configs/axs10x.h @@ -32,12 +32,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x82000000 /* - * NAND Flash configuration - */ -#define CONFIG_SYS_NAND_BASE (ARC_FPGA_PERIPHERAL_BASE + 0x16000) -#define CONFIG_SYS_MAX_NAND_DEVICE 1 - -/* * UART configuration */ #define CONFIG_SYS_NS16550_SERIAL diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index df5d5bdc4a..fb9c2a6d04 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -453,7 +453,6 @@ DEFAULT_LINUX_BOOT_ENV \ #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT -#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #define CONFIG_ENV_SECT_SIZE (4 << 10) /* 4 KB sectors */ #define CONFIG_ENV_OFFSET (768 << 10) /* 768 KiB in */ #define CONFIG_ENV_OFFSET_REDUND (896 << 10) /* 896 KiB in */ @@ -466,7 +465,6 @@ DEFAULT_LINUX_BOOT_ENV \ #endif /* SPI flash. */ -#define CONFIG_SF_DEFAULT_SPEED 24000000 /* Network. */ #define CONFIG_PHY_SMSC diff --git a/include/configs/bcm7445.h b/include/configs/bcm7445.h index 8c675f7733..6984edde18 100644 --- a/include/configs/bcm7445.h +++ b/include/configs/bcm7445.h @@ -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 */ diff --git a/include/configs/beaver.h b/include/configs/beaver.h index a11a800a71..4c5826cd98 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 ec6b01f144..832dbbaafc 100644 --- a/include/configs/bg0900.h +++ b/include/configs/bg0900.h @@ -19,24 +19,8 @@ #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_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 -#define CONFIG_ENV_SPI_MODE SPI_MODE_0 -#endif - #endif /* Boot Linux */ diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index 5badd2da8b..ae9b75bb87 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -187,11 +187,9 @@ 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 -#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE #define CONFIG_ENV_OFFSET 0x20000 #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + \ diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h index 6b2553c73b..8d541a18ee 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 74305f1b6e..e6abfe2eb3 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 e01bf5bf1b..ad0a64a936 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 @@ -220,10 +217,6 @@ #if defined(CONFIG_ENV_IS_IN_SPI_FLASH) #define CONFIG_ENV_OFFSET (768 * 1024) #define CONFIG_ENV_SECT_SIZE (64 * 1024) -#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS -#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS -#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE -#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #endif #endif /* __CONFIG_CGTQMX6EVAL_H */ diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h index 80f0b4f56d..bf2bb44d48 100644 --- a/include/configs/cl-som-am57x.h +++ b/include/configs/cl-som-am57x.h @@ -27,8 +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 */ /* Offsets: 0K - SPL1, 64K - SPL2, 128K - SPL3, 192K - SPL4, 256K - U-Boot */ @@ -44,7 +42,6 @@ #define CONFIG_ENV_SECT_SIZE (64 * 1024) #define CONFIG_ENV_OFFSET (768 * 1024) -#define CONFIG_ENV_SPI_MAX_HZ 48000000 /* EEPROM */ #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h index f84a11215e..26d1a97891 100644 --- a/include/configs/cl-som-imx7.h +++ b/include/configs/cl-som-imx7.h @@ -140,19 +140,11 @@ (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 #define CONFIG_ENV_OFFSET (768 * 1024) #define CONFIG_ENV_SECT_SIZE (64 * 1024) -#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS -#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS -#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE -#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED /* MMC Config*/ #define CONFIG_FSL_USDHC diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index f9510826d7..c51cf28450 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 f7e82dfbdb..dfd96ff8d5 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 @@ -50,10 +46,6 @@ #endif /* Environment */ -#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED -#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE -#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS -#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS #define CONFIG_ENV_SECT_SIZE (64 * 1024) #define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_ENV_OFFSET (768 * 1024) diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index 79eb865bf9..ffe4a44c86 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 @@ -87,7 +85,6 @@ #define CONFIG_ENV_SECT_SIZE (64 * 1024) #define CONFIG_ENV_OFFSET (768 * 1024) -#define CONFIG_ENV_SPI_MAX_HZ 48000000 #define CONFIG_EXTRA_ENV_SETTINGS \ "loadaddr=0x80200000\0" \ diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 1908d35bcc..f1c3522c68 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 */ @@ -281,10 +275,6 @@ #if defined(CONFIG_TRAILBLAZER) #define CONFIG_ENV_SIZE 0x2000 /* 8KB */ #elif defined(CONFIG_RAMBOOT_SPIFLASH) -#define CONFIG_ENV_SPI_BUS 0 -#define CONFIG_ENV_SPI_CS 0 -#define CONFIG_ENV_SPI_MAX_HZ 10000000 -#define CONFIG_ENV_SPI_MODE 0 #define CONFIG_ENV_SIZE 0x2000 /* 8KB */ #define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index 06c93c3e66..91308377c2 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -26,17 +26,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 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 - -/* * SDIO/MMC Card Configuration */ #define CONFIG_SYS_MMC_BASE MVEBU_SDIO_BASE @@ -54,7 +43,6 @@ #define CONFIG_EHCI_IS_TDI /* Environment in SPI NOR flash */ -#define CONFIG_ENV_SPI_BUS 1 #define CONFIG_ENV_OFFSET (1 << 20) /* 1MiB in */ #define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */ #define CONFIG_ENV_SECT_SIZE (256 << 10) /* 256KiB sectors */ diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index cd791507ee..f974291eac 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -60,10 +60,6 @@ #define CONFIG_ENV_OVERWRITE #if defined(CONFIG_SPIFLASH) -#define CONFIG_ENV_SPI_BUS 0 -#define CONFIG_ENV_SPI_CS 0 -#define CONFIG_ENV_SPI_MAX_HZ 10000000 -#define CONFIG_ENV_SPI_MODE 0 #define CONFIG_ENV_SIZE 0x2000 /* 8KB */ #define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 @@ -358,8 +354,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 14a3046f19..583f994807 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -123,10 +123,7 @@ #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 #ifdef CONFIG_USE_SPIFLASH #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8000 diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h index 9b25a9d59d..e8a4e3c1f4 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 4c30077060..55968c2749 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 626a406cff..f1bdc2d3e7 100644 --- a/include/configs/db-88f6820-amc.h +++ b/include/configs/db-88f6820-amc.h @@ -17,15 +17,11 @@ */ /* 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 /* Environment in SPI NOR flash */ -#define CONFIG_ENV_SPI_BUS 1 #define CONFIG_ENV_OFFSET (1 << 20) /* 1MiB in */ #define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */ #define CONFIG_ENV_SECT_SIZE (256 << 10) /* 256KiB sectors */ diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index 1f328e97c5..d378052a8f 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -26,12 +26,8 @@ /* * 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 */ -#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 6cba326927..b78dbcb6b9 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 9231bd853f..48514ff076 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 @@ -169,10 +163,6 @@ #define CONFIG_ENV_OFFSET_REDUND \ (CONFIG_ENV_OFFSET + CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE -#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS -#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS -#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE -#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #endif #endif /* __DH_IMX6_CONFIG_H */ diff --git a/include/configs/display5.h b/include/configs/display5.h index 1fb7469182..8ab47abfa8 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 @@ -380,11 +374,6 @@ #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + \ CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE - -#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS -#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS -#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE -#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #endif #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index f36a9c3e08..10eac20aa0 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 /* @@ -93,7 +91,6 @@ #define CONFIG_SYS_SPI_ARGS_SIZE 0x80000 #if defined(CONFIG_QSPI_BOOT) #define CONFIG_SYS_REDUNDAND_ENVIRONMENT -#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #define CONFIG_ENV_SIZE (64 << 10) #define CONFIG_ENV_SECT_SIZE (64 << 10) /* 64 KB sectors */ #define CONFIG_ENV_OFFSET 0x1C0000 diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index f4d717213c..28bda14c3d 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -35,9 +35,6 @@ #endif #ifdef CONFIG_CMD_SF -#define CONFIG_ENV_SPI_BUS 0 -#define CONFIG_ENV_SPI_CS 0 -#define CONFIG_ENV_SPI_MAX_HZ 50000000 /* 50 MHz */ #endif /* diff --git a/include/configs/ds109.h b/include/configs/ds109.h index 2c7928e88c..07367cfef0 100644 --- a/include/configs/ds109.h +++ b/include/configs/ds109.h @@ -38,9 +38,6 @@ #endif #ifdef CONFIG_CMD_SF -#define CONFIG_ENV_SPI_BUS 0 -#define CONFIG_ENV_SPI_CS 0 -#define CONFIG_ENV_SPI_MAX_HZ 50000000 /* 50 MHz */ #endif /* diff --git a/include/configs/ds414.h b/include/configs/ds414.h index 4ba050553a..275a2b4788 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 30c0c7fee7..c636bf9457 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 a644e67816..88f2e17d40 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -52,8 +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 /* * I2C Configuration diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h index b472a6c5a2..bf70ea0029 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 7e7de4dae6..5142680e7d 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 @@ -90,10 +83,6 @@ #define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_ENV_OFFSET (768 * 1024) #define CONFIG_ENV_SECT_SIZE (8 * 1024) -#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS -#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS -#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE -#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #endif /* Framebuffer */ diff --git a/include/configs/espresso7420.h b/include/configs/espresso7420.h index 4e3b26c25c..5aeb009f03 100644 --- a/include/configs/espresso7420.h +++ b/include/configs/espresso7420.h @@ -21,8 +21,6 @@ /* select serial console configuration */ #define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0" -#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0" - /* DRAM Memory Banks */ #define SDRAM_BANK_SIZE (256UL << 20UL) /* 256 MB */ diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index 0d84c97b98..b86b54209c 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -54,7 +54,6 @@ #define CONFIG_ENV_OFFSET 0x3DE000 #define CONFIG_ENV_SIZE (132 << 10) #define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE -#define CONFIG_ENV_SPI_MAX_HZ 15000000 /* NAND flash */ #ifdef CONFIG_CMD_NAND diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h index cd2a9046af..db1fc934bb 100644 --- a/include/configs/exynos5-common.h +++ b/include/configs/exynos5-common.h @@ -108,16 +108,9 @@ #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 #define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE -#define CONFIG_ENV_SPI_BUS 1 -#define CONFIG_ENV_SPI_MAX_HZ 50000000 #endif /* Ethernet Controllor Driver */ diff --git a/include/configs/exynos5-dt-common.h b/include/configs/exynos5-dt-common.h index 696f009de9..a87182ae84 100644 --- a/include/configs/exynos5-dt-common.h +++ b/include/configs/exynos5-dt-common.h @@ -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 diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index e0e1f713ef..3336578071 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 @@ -178,10 +172,6 @@ #define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_ENV_OFFSET (768 * 1024) #define CONFIG_ENV_SECT_SIZE (64 * 1024) -#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS -#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS -#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE -#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #define CONFIG_SYS_FSL_USDHC_NUM 3 diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 6e23fa29b3..84ee44e872 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) @@ -185,10 +181,6 @@ #define CONFIG_ENV_OFFSET (512 * SZ_1K) #define CONFIG_ENV_SECT_SIZE (64 * SZ_1K) #define CONFIG_ENV_SIZE (8 * SZ_1K) - #define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS - #define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS - #define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE - #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #endif /* Environment */ diff --git a/include/configs/helios4.h b/include/configs/helios4.h index 4e98f19a40..df4d8bcb3b 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 @@ -49,13 +45,6 @@ CONFIG_SYS_SCSI_MAX_LUN) #ifdef CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI -/* - * SPI Flash configuration for the environment access - */ -#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS -#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS -#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED - /* Environment in SPI NOR flash */ #define CONFIG_ENV_SECT_SIZE SZ_64K #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h index 7b2c7947e9..65044690d6 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 90f9a9922c..b1aec98a37 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 0de83f6723..a2e9cf1fa5 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -33,14 +33,8 @@ #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 -#define CONFIG_ENV_SPI_CS 0 -#define CONFIG_ENV_SPI_MAX_HZ 8100000 -#define CONFIG_ENV_SPI_MODE SPI_MODE_3 #endif /* Reserve 4 MB for malloc */ diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h index d4da9dd213..a52d1df120 100644 --- a/include/configs/km/kmp204x-common.h +++ b/include/configs/km/kmp204x-common.h @@ -39,10 +39,6 @@ #define CONFIG_SYS_DPAA_RMAN /* RMan */ /* Environment in SPI Flash */ -#define CONFIG_ENV_SPI_BUS 0 -#define CONFIG_ENV_SPI_CS 0 -#define CONFIG_ENV_SPI_MAX_HZ 20000000 -#define CONFIG_ENV_SPI_MODE 0 #define CONFIG_ENV_OFFSET 0x100000 /* 1MB for u-boot */ #define CONFIG_ENV_SIZE 0x004000 /* 16K env */ #define CONFIG_ENV_SECT_SIZE 0x010000 @@ -252,8 +248,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/lacie_kw.h b/include/configs/lacie_kw.h index 1f619a0d27..1ba28b501f 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -65,10 +65,8 @@ #include "mv-common.h" /* Remove or override few declarations from mv-common.h */ -#undef CONFIG_ENV_SPI_MAX_HZ #undef CONFIG_SYS_IDE_MAXBUS #undef CONFIG_SYS_IDE_MAXDEVICE -#define CONFIG_ENV_SPI_MAX_HZ 20000000 /* 20Mhz */ /* * Enable platform initialisation via misc_init_r() function diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h index c631e26785..1e239ecadd 100644 --- a/include/configs/legoev3.h +++ b/include/configs/legoev3.h @@ -47,8 +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 /* * I2C Configuration diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h index 04639c175f..3a42210c6e 100644 --- a/include/configs/ls1012a_common.h +++ b/include/configs/ls1012a_common.h @@ -40,10 +40,6 @@ #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_TFABOOT) #define CONFIG_SYS_QE_FW_IN_SPIFLASH #define CONFIG_SYS_FMAN_FW_ADDR 0x400d0000 -#define CONFIG_ENV_SPI_BUS 0 -#define CONFIG_ENV_SPI_CS 0 -#define CONFIG_ENV_SPI_MAX_HZ 1000000 -#define CONFIG_ENV_SPI_MODE 0x03 #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_FSL_SPI_INTERFACE #define CONFIG_SF_DATAFLASH diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h index c76bfdc8f8..fb0d1ba6b2 100644 --- a/include/configs/ls1012aqds.h +++ b/include/configs/ls1012aqds.h @@ -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 @@ -99,11 +97,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/ls1021aiot.h b/include/configs/ls1021aiot.h index 6be8df109b..4af3988886 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -85,6 +85,8 @@ #define CONFIG_SYS_DDR_SDRAM_BASE 0x80000000UL #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE +#define CONFIG_CHIP_SELECTS_PER_CTRL 4 + /* * Serial Port */ diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 4b6760b600..da55bf2f43 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -104,6 +104,8 @@ #define CONFIG_SYS_DDR_SDRAM_BASE 0x80000000UL #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE +#define CONFIG_CHIP_SELECTS_PER_CTRL 4 + #if !defined(CONFIG_SD_BOOT) && !defined(CONFIG_NAND_BOOT) && \ !defined(CONFIG_QSPI_BOOT) #define CONFIG_SYS_QE_FMAN_FW_IN_NOR diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index f7e7877414..2e9d476483 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 @@ -190,10 +186,6 @@ #define CONFIG_SYS_FMAN_FW_ADDR 0x900000 #define CONFIG_SYS_QE_FW_ADDR 0x940000 -#define CONFIG_ENV_SPI_BUS 0 -#define CONFIG_ENV_SPI_CS 0 -#define CONFIG_ENV_SPI_MAX_HZ 1000000 -#define CONFIG_ENV_SPI_MODE 0x03 #else #ifdef CONFIG_NAND_BOOT @@ -212,10 +204,6 @@ #elif defined(CONFIG_QSPI_BOOT) #define CONFIG_SYS_QE_FW_IN_SPIFLASH #define CONFIG_SYS_FMAN_FW_ADDR 0x40900000 -#define CONFIG_ENV_SPI_BUS 0 -#define CONFIG_ENV_SPI_CS 0 -#define CONFIG_ENV_SPI_MAX_HZ 1000000 -#define CONFIG_ENV_SPI_MODE 0x03 #else #define CONFIG_SYS_QE_FMAN_FW_IN_NOR /* FMan fireware Pre-load address */ diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index d9fcd3af5e..24ff2d1547 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -170,10 +170,6 @@ #ifdef CONFIG_TFABOOT #define CONFIG_SYS_FMAN_FW_ADDR 0x900000 -#define CONFIG_ENV_SPI_BUS 0 -#define CONFIG_ENV_SPI_CS 0 -#define CONFIG_ENV_SPI_MAX_HZ 1000000 -#define CONFIG_ENV_SPI_MODE 0x03 #else #ifdef CONFIG_SD_BOOT /* @@ -186,10 +182,6 @@ #elif defined(CONFIG_QSPI_BOOT) #define CONFIG_SYS_QE_FW_IN_SPIFLASH #define CONFIG_SYS_FMAN_FW_ADDR 0x40900000 -#define CONFIG_ENV_SPI_BUS 0 -#define CONFIG_ENV_SPI_CS 0 -#define CONFIG_ENV_SPI_MAX_HZ 1000000 -#define CONFIG_ENV_SPI_MODE 0x03 #elif defined(CONFIG_NAND_BOOT) #define CONFIG_SYS_QE_FMAN_FW_IN_NAND #define CONFIG_SYS_FMAN_FW_ADDR (36 * CONFIG_SYS_NAND_BLOCK_SIZE) diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index 6e36baf4ca..58dd9fb1a1 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/ls1088a_common.h b/include/configs/ls1088a_common.h index a80ce92881..50c18f1542 100644 --- a/include/configs/ls1088a_common.h +++ b/include/configs/ls1088a_common.h @@ -147,7 +147,7 @@ unsigned long long get_qixis_addr(void); */ #if defined(CONFIG_FSL_MC_ENET) -#define CONFIG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE (512UL * 1024 * 1024) +#define CONFIG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE (128UL * 1024 * 1024) #endif /* Command line configuration */ #define CONFIG_CMD_CACHE diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h index 17d543d960..4387862582 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/ls2080a_common.h b/include/configs/ls2080a_common.h index 60a0b42503..454c9e94b6 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -152,7 +152,7 @@ unsigned long long get_qixis_addr(void); * 512MB aligned, so the min size to hide is 512MB. */ #ifdef CONFIG_FSL_MC_ENET -#define CONFIG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE (512UL * 1024 * 1024) +#define CONFIG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE (128UL * 1024 * 1024) #endif /* Command line configuration */ diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index 9d4be18413..72e62658d0 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -45,12 +45,6 @@ /* loading initramfs images without uimage header */ -/* 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/lx2160a_common.h b/include/configs/lx2160a_common.h index 4b5608b5a3..637619cb55 100644 --- a/include/configs/lx2160a_common.h +++ b/include/configs/lx2160a_common.h @@ -100,7 +100,7 @@ * 512MB aligned, so the min size to hide is 512MB. */ #ifdef CONFIG_FSL_MC_ENET -#define CONFIG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE (512UL * 1024 * 1024) +#define CONFIG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE (256UL * 1024 * 1024) #endif /* I2C bus multiplexer */ diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h index d378333ab1..fada0ca78d 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 644f339993..a1774c027a 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/meesc.h b/include/configs/meesc.h index 0a03a2f5c7..a1fd5f6195 100644 --- a/include/configs/meesc.h +++ b/include/configs/meesc.h @@ -99,7 +99,6 @@ #define CONFIG_ENV_OFFSET 0x4200 #define CONFIG_ENV_SIZE 0x4200 #define CONFIG_ENV_SECT_SIZE 0x210 -#define CONFIG_ENV_SPI_MAX_HZ 15000000 #elif CONFIG_SYS_USE_NANDFLASH diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index ba0952c73c..d1ab40ec13 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -81,18 +81,11 @@ #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) # else /* SPIFLASH && !RAMENV */ -# define CONFIG_ENV_SPI_MODE SPI_MODE_3 -# define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED -# define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS /* 128K(two sectors) for env */ # define CONFIG_ENV_SECT_SIZE 0x10000 # define CONFIG_ENV_SIZE (2 * CONFIG_ENV_SECT_SIZE) diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h index cf9440f90c..10b94f438f 100644 --- a/include/configs/mvebu_armada-37xx.h +++ b/include/configs/mvebu_armada-37xx.h @@ -57,13 +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_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 a6636e19e8..f4972b64dc 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -52,13 +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_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 */ #define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */ diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index 1117139f1c..dd045804ae 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -48,10 +48,6 @@ #define CONFIG_ENV_OFFSET 0x40000 /* 256K */ #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) #define CONFIG_ENV_SECT_SIZE 0x1000 -#define CONFIG_ENV_SPI_CS 0 -#define CONFIG_ENV_SPI_BUS 2 -#define CONFIG_ENV_SPI_MAX_HZ 24000000 -#define CONFIG_ENV_SPI_MODE SPI_MODE_0 #endif /* UBI and NAND partitioning */ @@ -74,22 +70,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 - -/* 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 */ #ifdef CONFIG_VIDEO #define CONFIG_VIDEO_LOGO diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h index 4765764f83..993d131e96 100644 --- a/include/configs/mx31pdk.h +++ b/include/configs/mx31pdk.h @@ -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 diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 711aa82f9c..6fe0467229 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 a80a656c3b..5d649f6e2f 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -136,21 +136,10 @@ #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 -#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 058856ac86..c4d8a8939c 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 2a7eb224c4..dc4181dbf8 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 c8c088e665..42e511591c 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 c64d0929ab..1fc5c24dec 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 ad919a671f..39d29de744 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 c364442244..d941caa905 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 @@ -165,10 +158,6 @@ #elif defined(CONFIG_ENV_IS_IN_SPI_FLASH) #define CONFIG_ENV_OFFSET (768 * 1024) #define CONFIG_ENV_SECT_SIZE (8 * 1024) -#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS -#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS -#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE -#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #endif /* diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h index 933f84028f..fca4eb59a4 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/odroid.h b/include/configs/odroid.h index b8809c8dcc..9f2d43e3fa 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -132,7 +132,7 @@ "setenv kernelname Image.itb;" \ "run loadkernel;" \ "run kernel_args;" \ - "bootm ${kernel_addr_r}#${boardname}\0" \ + "bootm ${kernel_addr_r}#${board_name}\0" \ "boot_uimg=" \ "setenv kernelname uImage;" \ "run check_dtb;" \ diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index f178549a72..af6004eaf5 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -7,7 +7,7 @@ #ifndef __CONFIG_ODROID_XU3_H #define __CONFIG_ODROID_XU3_H -#include "exynos5420-common.h" +#include <configs/exynos5420-common.h> #include <configs/exynos5-common.h> #define CONFIG_BOARD_COMMON @@ -18,7 +18,7 @@ #define TZPC_BASE_OFFSET 0x10000 -#define SDRAM_BANK_SIZE (256UL << 20UL) /* 256 MB */ +#define SDRAM_BANK_SIZE (256UL << 20UL) /* 256 MB */ /* Reserve the last 22 MiB for the secure firmware */ #define CONFIG_SYS_MEM_TOP_HIDE (22UL << 20UL) #define CONFIG_TZSW_RESERVED_DRAM_SIZE CONFIG_SYS_MEM_TOP_HIDE @@ -28,7 +28,7 @@ #define CONFIG_ENV_SIZE (SZ_1K * 16) #define CONFIG_ENV_OFFSET (SZ_1K * 3136) /* ~3 MiB offset */ -#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR - 0x1000000) +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR - 0x1000000) #define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0" @@ -38,7 +38,7 @@ /* DFU */ #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_32M #define DFU_DEFAULT_POLL_TIMEOUT 300 -#define DFU_MANIFEST_POLL_TIMEOUT 25000 +#define DFU_MANIFEST_POLL_TIMEOUT 25000 /* THOR */ #define CONFIG_G_DNL_THOR_VENDOR_NUM CONFIG_USB_GADGET_VENDOR_NUM @@ -84,12 +84,16 @@ #define CONFIG_SET_DFU_ALT_INFO #define CONFIG_SET_DFU_ALT_BUF_LEN (SZ_1K) -/* Set soc_rev, soc_id, board_rev, boardname, fdtfile */ -#define CONFIG_ODROID_REV_AIN 9 +/* Set soc_rev, soc_id, board_rev, board_name, fdtfile */ +#define CONFIG_ODROID_REV_AIN 9 #define CONFIG_REVISION_TAG +/* + * Need to override existing one (smdk5420) with odroid so set_board_info will + * use proper prefix when creating full board_name (SYS_BOARD + type) + */ #undef CONFIG_SYS_BOARD -#define CONFIG_SYS_BOARD "odroid" +#define CONFIG_SYS_BOARD "odroid" /* Define new extra env settings, including DFU settings */ #undef CONFIG_EXTRA_ENV_SETTINGS @@ -101,7 +105,7 @@ "rootfstype=ext4\0" \ "console=" CONFIG_DEFAULT_CONSOLE \ "fdtfile=exynos5422-odroidxu3.dtb\0" \ - "boardname=odroidxu3\0" \ + "board_name=odroidxu3\0" \ "mmcbootdev=0\0" \ "mmcrootdev=0\0" \ "mmcbootpart=1\0" \ diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 2002444e42..1786e099ad 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -119,8 +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 #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8000 diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index 776835a766..925e7ae3db 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 @@ -103,10 +99,6 @@ #define CONFIG_ENV_OFFSET (1024 * 1024) /* M25P16 has an erase size of 64 KiB */ #define CONFIG_ENV_SECT_SIZE (64 * 1024) -#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS -#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS -#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE -#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #define CONFIG_BOOTP_SERVERIP #define CONFIG_BOOTP_BOOTFILE diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 8fda0c1e22..8fa91fb81d 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 @@ -705,10 +700,6 @@ * Environment */ #ifdef CONFIG_SPIFLASH -#define CONFIG_ENV_SPI_BUS 0 -#define CONFIG_ENV_SPI_CS 0 -#define CONFIG_ENV_SPI_MAX_HZ 10000000 -#define CONFIG_ENV_SPI_MODE 0 #define CONFIG_ENV_SIZE 0x2000 /* 8KB */ #define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h index 59866997e3..177e8d8dfe 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 c97b226027..7205a17e5d 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 4920896e9c..02db6bb79f 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 5381ed1f45..8cde12e375 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 b9bc08b388..b0415b28ad 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 @@ -82,10 +78,6 @@ #define CONFIG_ENV_SIZE (16 * 1024) #define CONFIG_ENV_OFFSET (1024 * SZ_1K) #define CONFIG_ENV_SECT_SIZE (64 * SZ_1K) -#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS -#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS -#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE -#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #define CONFIG_SYS_REDUNDAND_ENVIRONMENT #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + \ CONFIG_ENV_SECT_SIZE) diff --git a/include/configs/pfla02.h b/include/configs/pfla02.h index e2aae19484..3a9b85acd8 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 @@ -83,10 +79,6 @@ #define CONFIG_ENV_SIZE (16 * 1024) #define CONFIG_ENV_OFFSET (1024 * SZ_1K) #define CONFIG_ENV_SECT_SIZE (64 * SZ_1K) -#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS -#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS -#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE -#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #define CONFIG_SYS_REDUNDAND_ENVIRONMENT #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + \ CONFIG_ENV_SECT_SIZE) diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index e88948c7f5..c1ce12217a 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -207,7 +207,6 @@ #define CONFIG_ENV_OFFSET 0x4200 #define CONFIG_ENV_SIZE 0x4200 #define CONFIG_ENV_SECT_SIZE 0x210 -#define CONFIG_ENV_SPI_MAX_HZ 15000000 #define CONFIG_BOOTCOMMAND "sf probe 0; " \ "sf read 0x22000000 0x84000 0x210000; " \ "bootm 0x22000000" diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index f11879b4e9..b09d8515d3 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -236,7 +236,6 @@ #define CONFIG_ENV_OFFSET 0x4200 #define CONFIG_ENV_SIZE 0x4200 #define CONFIG_ENV_SECT_SIZE 0x210 -#define CONFIG_ENV_SPI_MAX_HZ 15000000 #define CONFIG_BOOTCOMMAND "sf probe 0; " \ "sf read 0x22000000 0x84000 0x294000; " \ "bootm 0x22000000" diff --git a/include/configs/puma_rk3399.h b/include/configs/puma_rk3399.h index 45a4ccc18f..4d6085d2dd 100644 --- a/include/configs/puma_rk3399.h +++ b/include/configs/puma_rk3399.h @@ -12,10 +12,6 @@ #define CONFIG_SYS_MMC_ENV_DEV 1 #elif defined(CONFIG_ENV_IS_IN_SPI_FLASH) #define CONFIG_ENV_SECT_SIZE (8 * 1024) -#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS -#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS -#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE -#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #endif #define SDRAM_BANK_SIZE (2UL << 30) diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index 4fc9226712..50c6b560d0 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 9451715805..0c08d7af5b 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 36e494ee95..208ca5ab74 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 c59f5eff7a..72a54bc0ab 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 02233d6a66..71aad7029a 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 b977b1faa7..b412012582 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 7c7479b4d4..ae51aea2e8 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 2cec1c7b42..a3df404ca0 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 ca1c2b0861..3870671850 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 bbb16993ec..d8b61a696c 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 d58041650c..8bfda3ff7a 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 d8ed02bf79..f44a4280f4 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 */ @@ -181,7 +179,6 @@ * 0x442000 - 0x800000 : Userland */ #if defined(CONFIG_SPI_BOOT) -# define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED # define CONFIG_ENV_OFFSET (892 << 10) /* 892 KiB in */ # define CONFIG_ENV_SECT_SIZE (4 << 10) /* 4 KB sectors */ #endif /* SPI support */ diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 181af9b646..09c9b7ca9e 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 @@ -248,8 +247,10 @@ unsigned int cm_get_qspi_controller_clk_hz(void); * 0xFFEz_zzzz ...... Malloc area (grows up to top) * 0xFFE3_FFFF ...... End of SRAM (top) */ +#ifndef CONFIG_SPL_TEXT_BASE #define CONFIG_SPL_TEXT_BASE CONFIG_SYS_INIT_RAM_ADDR #define CONFIG_SPL_MAX_SIZE CONFIG_SYS_INIT_RAM_SIZE +#endif #if defined(CONFIG_TARGET_SOCFPGA_ARRIA10) /* SPL memory allocation configuration, this is for FAT implementation */ diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h index 984f1183fd..b6a98611c0 100644 --- a/include/configs/socfpga_sr1500.h +++ b/include/configs/socfpga_sr1500.h @@ -35,11 +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 */ -#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 0e73239f56..31c267f55d 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 33ddc67bf4..17f92d89c9 100644 --- a/include/configs/stmark2.h +++ b/include/configs/stmark2.h @@ -64,10 +64,7 @@ /* 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 #define CONFIG_SYS_SBFHDR_SIZE 0x7 @@ -153,7 +150,6 @@ #if defined(CONFIG_CF_SBF) #define CONFIG_ENV_IS_IN_SPI_FLASH 1 -#define CONFIG_ENV_SPI_CS 1 #define CONFIG_ENV_OFFSET 0x40000 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x10000 diff --git a/include/configs/taurus.h b/include/configs/taurus.h index f283ab7fca..1d24577993 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 85914ec695..b637832a5e 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 886456ec26..59b2546f0b 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_common.h b/include/configs/ti_armv7_common.h index 1e2a62dd6f..828fb1b2a5 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -52,7 +52,7 @@ #define DEFAULT_FIT_TI_ARGS \ "boot_fit=0\0" \ - "fit_loadaddr=0x87000000\0" \ + "fit_loadaddr=0x90000000\0" \ "fit_bootfile=fitImage\0" \ "update_to_fit=setenv loadaddr ${fit_loadaddr}; setenv bootfile ${fit_bootfile}\0" \ "loadfit=run args_mmc; bootm ${loadaddr}#${fdtfile};\0" \ diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 0c7d664868..fb8c082c1d 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -71,8 +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 #define CONFIG_SYS_SPI0_NUM_CS 4 diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h index f14c4ee3a8..69aa79bafc 100644 --- a/include/configs/topic_miami.h +++ b/include/configs/topic_miami.h @@ -48,10 +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 /* Setup proper boot sequences for Miami boards */ diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 65cc12f1c1..13e3d60bfe 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 @@ -159,11 +154,6 @@ #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + \ CONFIG_ENV_SECT_SIZE) -#define CONFIG_ENV_SPI_BUS (CONFIG_SF_DEFAULT_BUS) -#define CONFIG_ENV_SPI_CS (CONFIG_SF_DEFAULT_CS) -#define CONFIG_ENV_SPI_MAX_HZ (CONFIG_SF_DEFAULT_SPEED) -#define CONFIG_ENV_SPI_MODE (CONFIG_SF_DEFAULT_MODE) - #define TQMA6_FDT_OFFSET (CONFIG_ENV_OFFSET_REDUND + \ CONFIG_ENV_SECT_SIZE) #define TQMA6_FDT_SECT_SIZE (TQMA6_SPI_FLASH_SECTOR_SIZE) diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h index 4b1eb7b1c8..93db175288 100644 --- a/include/configs/trimslice.h +++ b/include/configs/trimslice.h @@ -21,11 +21,8 @@ #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 -#define CONFIG_ENV_SPI_MODE SPI_MODE_0 #define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE /* 1MiB flash, environment located as high as possible */ #define CONFIG_ENV_OFFSET (SZ_1M - CONFIG_ENV_SIZE) diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h index 82cdccecc1..5d5394e3e5 100644 --- a/include/configs/turris_mox.h +++ b/include/configs/turris_mox.h @@ -66,13 +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_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 */ #define CONFIG_ENV_OFFSET 0x180000 /* as Marvell U-Boot version */ diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h index b90be65a4f..038f6398eb 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/usb_a9263.h b/include/configs/usb_a9263.h index aa8738fe73..fa38274d56 100644 --- a/include/configs/usb_a9263.h +++ b/include/configs/usb_a9263.h @@ -82,7 +82,6 @@ #define CONFIG_ENV_OFFSET 0x2000 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE -#define CONFIG_ENV_SPI_MAX_HZ 15000000 #define CONFIG_BOOTCOMMAND "nboot 21000000 0" #define CONFIG_EXTRA_ENV_SETTINGS \ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \ diff --git a/include/configs/vcoreiii.h b/include/configs/vcoreiii.h index 8c30c6f09a..2840c7b815 100644 --- a/include/configs/vcoreiii.h +++ b/include/configs/vcoreiii.h @@ -34,8 +34,6 @@ #define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SECT_SIZE) -#define CONFIG_ENV_SPI_MAX_HZ 0 /* This force to read from DT */ -#define CONFIG_ENV_SPI_MODE 0 /* This force to read from DT */ #endif #define CONFIG_SYS_SDRAM_BASE 0x80000000 diff --git a/include/configs/venice2.h b/include/configs/venice2.h index a86ae212f2..8ad872d94f 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 9d6001ff03..ec22a30cda 100644 --- a/include/configs/vinco.h +++ b/include/configs/vinco.h @@ -38,12 +38,6 @@ #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 /* MMC */ @@ -69,8 +63,6 @@ #ifdef CONFIG_SPI_BOOT /* bootstrap + u-boot + env + linux in serial flash */ -#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS -#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS /* Use our own mapping for the VInCo platform */ #undef CONFIG_ENV_OFFSET #undef CONFIG_ENV_SIZE diff --git a/include/configs/x530.h b/include/configs/x530.h index a83d49ba35..80c898ef7c 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)" @@ -63,8 +60,6 @@ #define CONFIG_EHCI_IS_TDI /* Environment in SPI NOR flash */ -#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS -#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE #define CONFIG_ENV_OFFSET (1 << 20) /* 1MiB in */ #define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */ #define CONFIG_ENV_SECT_SIZE (256 << 10) /* 256KiB sectors */ diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index a285fcdece..94177c6fcb 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 |