Skip to contentSkip to conversation

configs: Move CONFIG_SPI_FLASH into defconfigs

PATCH New Vignesh R 2 participants 3 messages Dec 4, 2018 – Jan 25, 2019

lore
Share & tools
lore

Vignesh R

author
#0 lore raw

PATCH 1/1 configs: Move CONFIG_SPI_FLASH into defconfigs

Completely move CONFIG_SPI_FLASH from remaining board header files to defconfigs

---
Done with the help of moveconfig.py. Compile tested on travis-ci:
https://travis-ci.org/r-vignesh/u-boot/builds/463155999

 configs/cgtqmx6eval_defconfig            | 1 +
 configs/chromebit_mickey_defconfig       | 1 +
 configs/chromebook_jerry_defconfig       | 1 +
 configs/chromebook_minnie_defconfig      | 1 +
 configs/evb-rk3036_defconfig             | 1 +
 configs/evb-rk3128_defconfig             | 1 +
 configs/evb-rk3288_defconfig             | 1 +
 configs/evb-rk3328_defconfig             | 1 +
 configs/fennec-rk3288_defconfig          | 1 +
 configs/firefly-rk3288_defconfig         | 1 +
 configs/kylin-rk3036_defconfig           | 1 +
 configs/ls2080aqds_SECURE_BOOT_defconfig | 1 +
 configs/ls2080aqds_defconfig             | 1 +
 configs/ls2080aqds_nand_defconfig        | 1 +
 configs/ls2080aqds_qspi_defconfig        | 1 +
 configs/ls2080aqds_sdcard_defconfig      | 1 +
 configs/miqi-rk3288_defconfig            | 1 +
 configs/phycore-rk3288_defconfig         | 1 +
 configs/popmetal-rk3288_defconfig        | 1 +
 configs/rock2_defconfig                  | 1 +
 configs/rock_defconfig                   | 1 +
 configs/tinker-rk3288_defconfig          | 1 +
 configs/turris_omnia_defconfig           | 1 +
 configs/vyasa-rk3288_defconfig           | 1 +
 include/configs/cgtqmx6eval.h            | 1 -
 include/configs/ls2080aqds.h             | 2 --
 include/configs/rk3036_common.h          | 1 -
 include/configs/rk3128_common.h          | 1 -
 include/configs/rk3188_common.h          | 1 -
 include/configs/rk3288_common.h          | 1 -
 include/configs/rk3328_common.h          | 1 -
 include/configs/turris_omnia.h           | 1 -
 32 files changed, 24 insertions(+), 9 deletions(-)
configs/cgtqmx6eval_defconfig +1 -0
index 015bab0c643b..c6be96c496f1 100644
@@ -54,6 +54,7 @@ CONFIG_DFU_SF=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x12000000
 CONFIG_FSL_ESDHC=y
+CONFIG_SPI_FLASH=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
 CONFIG_SPI=y
configs/chromebit_mickey_defconfig +1 -0
index 79ab6acaecf0..0ab5f632ad09 100644
@@ -60,6 +60,7 @@ CONFIG_CROS_EC_SPI=y
 CONFIG_PWRSEQ=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SPI_FLASH=y
 CONFIG_PINCTRL=y
 CONFIG_SPL_PINCTRL=y
 # CONFIG_SPL_PINCTRL_FULL is not set
configs/chromebook_jerry_defconfig +1 -0
index d892d65bf0a1..68bbc1d2b5c2 100644
@@ -62,6 +62,7 @@ CONFIG_CROS_EC_SPI=y
 CONFIG_PWRSEQ=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SPI_FLASH=y
 CONFIG_PINCTRL=y
 CONFIG_SPL_PINCTRL=y
 # CONFIG_SPL_PINCTRL_FULL is not set
configs/chromebook_minnie_defconfig +1 -0
index b0428740736b..e0b9ceea798b 100644
@@ -61,6 +61,7 @@ CONFIG_CROS_EC_SPI=y
 CONFIG_PWRSEQ=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SPI_FLASH=y
 CONFIG_PINCTRL=y
 CONFIG_SPL_PINCTRL=y
 # CONFIG_SPL_PINCTRL_FULL is not set
configs/evb-rk3036_defconfig +1 -0
index 787d6f95c1bb..ba70bc6727f4 100644
@@ -41,6 +41,7 @@ CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_LED=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SPI_FLASH=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_ROCKCHIP_RK3036=y
 # CONFIG_SPL_DM_SERIAL is not set
configs/evb-rk3128_defconfig +1 -0
index 044e60735af0..2d2460c9c654 100644
@@ -29,6 +29,7 @@ CONFIG_ROCKCHIP_GPIO=y
 CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SPI_FLASH=y
 CONFIG_PHY=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_ROCKCHIP_RK3128=y
configs/evb-rk3288_defconfig +1 -0
index 1485844aa6c6..cf691df3c898 100644
@@ -52,6 +52,7 @@ CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
configs/evb-rk3328_defconfig +1 -0
index 5b3bb8eae7bc..3f04d9d644ab 100644
@@ -32,6 +32,7 @@ CONFIG_ROCKCHIP_GPIO=y
 CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
configs/fennec-rk3288_defconfig +1 -0
index 8860edfd2f40..d70d45734cf0 100644
@@ -51,6 +51,7 @@ CONFIG_ROCKCHIP_GPIO=y
 CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
configs/firefly-rk3288_defconfig +1 -0
index b0db15ddc9a5..31bf1f8b4161 100644
@@ -54,6 +54,7 @@ CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
configs/kylin-rk3036_defconfig +1 -0
index eb305e02aaa5..2d0bdd4524e0 100644
@@ -39,6 +39,7 @@ CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_LED=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SPI_FLASH=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_ROCKCHIP_RK3036=y
 CONFIG_DM_REGULATOR_FIXED=y
configs/ls2080aqds_SECURE_BOOT_defconfig +1 -0
index 6a2a52204628..c5e33e5a401d 100644
@@ -38,6 +38,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_DM_SPI_FLASH=y
+CONFIG_SPI_FLASH=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
configs/ls2080aqds_defconfig +1 -0
index f4a361a64dad..4b8ae66c4ef5 100644
@@ -39,6 +39,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_DM_SPI_FLASH=y
+CONFIG_SPI_FLASH=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
configs/ls2080aqds_nand_defconfig +1 -0
index 1f93a8378cca..f1f979aebe06 100644
@@ -45,6 +45,7 @@ CONFIG_FSL_CAAM=y
 CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
 CONFIG_DM_SPI_FLASH=y
+CONFIG_SPI_FLASH=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
configs/ls2080aqds_qspi_defconfig +1 -0
index 32eec9a99d9f..f42e05562819 100644
@@ -36,6 +36,7 @@ CONFIG_FSL_CAAM=y
 CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
 CONFIG_DM_SPI_FLASH=y
+CONFIG_SPI_FLASH=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
configs/ls2080aqds_sdcard_defconfig +1 -0
index a71913d65ccd..5e7102ff852a 100644
@@ -43,6 +43,7 @@ CONFIG_DM=y
 CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
 CONFIG_DM_SPI_FLASH=y
+CONFIG_SPI_FLASH=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
configs/miqi-rk3288_defconfig +1 -0
index f650a720c7fe..e73ae96502df 100644
@@ -51,6 +51,7 @@ CONFIG_ROCKCHIP_GPIO=y
 CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
configs/phycore-rk3288_defconfig +1 -0
index ef7abddbf1fd..80e9fb5fac69 100644
@@ -55,6 +55,7 @@ CONFIG_MISC=y
 CONFIG_I2C_EEPROM=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
configs/popmetal-rk3288_defconfig +1 -0
index 0e10d1a2254a..9d33fbc86a09 100644
@@ -51,6 +51,7 @@ CONFIG_ROCKCHIP_GPIO=y
 CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
configs/rock2_defconfig +1 -0
index 6289506bdd8a..bf8631105e4d 100644
@@ -51,6 +51,7 @@ CONFIG_ROCKCHIP_GPIO=y
 CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
configs/rock_defconfig +1 -0
index 0c41ac9f20cf..59e65d5a664e 100644
@@ -40,6 +40,7 @@ CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_LED=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SPI_FLASH=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_ROCKCHIP_RK3188=y
 CONFIG_DM_PMIC=y
configs/tinker-rk3288_defconfig +1 -0
index 5a69a683843e..4d8108d0b6e2 100644
@@ -54,6 +54,7 @@ CONFIG_MISC=y
 CONFIG_I2C_EEPROM=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
configs/turris_omnia_defconfig +1 -0
index aad80447821b..38c5de18bb2d 100644
@@ -41,6 +41,7 @@ CONFIG_MISC=y
 CONFIG_ATSHA204A=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_MV=y
+CONFIG_SPI_FLASH=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
 CONFIG_MVNETA=y
configs/vyasa-rk3288_defconfig +1 -0
index b23cd6a236d2..45355c432e3d 100644
@@ -49,6 +49,7 @@ CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
include/configs/cgtqmx6eval.h +0 -1
index 5d247886aeda..e01bf5bf1bbb 100644
@@ -31,7 +31,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 
 /* SPI NOR */
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 #define CONFIG_SPI_FLASH_SST
 #define CONFIG_SF_DEFAULT_BUS		0
include/configs/ls2080aqds.h +0 -2
index f192839fa916..2a7cb0ab30c0 100644
@@ -285,8 +285,6 @@ unsigned long get_board_ddr_clk(void);
 
 /* SPI */
 #if defined(CONFIG_FSL_QSPI) || defined(CONFIG_FSL_DSPI)
-#define CONFIG_SPI_FLASH
-
 #ifdef CONFIG_FSL_DSPI
 #define CONFIG_SPI_FLASH_STMICRO
 #define CONFIG_SPI_FLASH_SST
include/configs/rk3036_common.h +0 -1
index d4e5406101d3..065d9003145e 100644
@@ -31,7 +31,6 @@
 #define SDRAM_BANK_SIZE			(512UL << 20UL)
 #define SDRAM_MAX_SIZE                  (CONFIG_NR_DRAM_BANKS * SDRAM_BANK_SIZE)
 
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_GIGADEVICE
 #define CONFIG_SF_DEFAULT_SPEED 20000000
 
include/configs/rk3128_common.h +0 -1
index 3e9e642b783b..dff808d1171f 100644
@@ -33,7 +33,6 @@
 #define CONFIG_SYS_SDRAM_BASE		0x60000000
 #define SDRAM_MAX_SIZE			0x80000000
 
-#define CONFIG_SPI_FLASH
 #define CONFIG_SF_DEFAULT_SPEED 20000000
 #define CONFIG_USB_OHCI_NEW
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS     1
include/configs/rk3188_common.h +0 -1
index d1837d5c4e4b..2f443bd561f6 100644
@@ -40,7 +40,6 @@
 #define SDRAM_BANK_SIZE			(2UL << 30)
 #define SDRAM_MAX_SIZE			0x80000000
 
-#define CONFIG_SPI_FLASH
 #define CONFIG_SF_DEFAULT_SPEED 20000000
 
 #ifndef CONFIG_SPL_BUILD
include/configs/rk3288_common.h +0 -1
index 5388b1391e96..a30f6e579628 100644
@@ -43,7 +43,6 @@
 #define SDRAM_BANK_SIZE			(2UL << 30)
 #define SDRAM_MAX_SIZE			0xfe000000
 
-#define CONFIG_SPI_FLASH
 #define CONFIG_SF_DEFAULT_SPEED 20000000
 
 #ifndef CONFIG_SPL_BUILD
include/configs/rk3328_common.h +0 -1
index 9174c67cad2c..48351ec0f97d 100644
@@ -30,7 +30,6 @@
 #define CONFIG_SYS_SDRAM_BASE		0
 #define SDRAM_MAX_SIZE			0xff000000
 
-#define CONFIG_SPI_FLASH
 #define CONFIG_SF_DEFAULT_SPEED 20000000
 
 #ifndef CONFIG_SPL_BUILD
include/configs/turris_omnia.h +0 -1
index 598674c96e85..7d2d7a8db0cd 100644
@@ -37,7 +37,6 @@
 /* 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
 #define CONFIG_SPI_FLASH_SPANSION
 
 /*
Signature · 1 line
2.19.2
author
#1 lore raw

PATCH 1/1 configs: Move CONFIG_SPI_FLASH into defconfigs

Quoted 8 lines · Vignesh R

Completely move CONFIG_SPI_FLASH from remaining board header files to defconfigs

---
Done with the help of moveconfig.py. Compile tested on travis-ci:
https://travis-ci.org/r-vignesh/u-boot/builds/463155999

Gentle ping...

Quoted 420 lines
 configs/cgtqmx6eval_defconfig            | 1 +
 configs/chromebit_mickey_defconfig       | 1 +
 configs/chromebook_jerry_defconfig       | 1 +
 configs/chromebook_minnie_defconfig      | 1 +
 configs/evb-rk3036_defconfig             | 1 +
 configs/evb-rk3128_defconfig             | 1 +
 configs/evb-rk3288_defconfig             | 1 +
 configs/evb-rk3328_defconfig             | 1 +
 configs/fennec-rk3288_defconfig          | 1 +
 configs/firefly-rk3288_defconfig         | 1 +
 configs/kylin-rk3036_defconfig           | 1 +
 configs/ls2080aqds_SECURE_BOOT_defconfig | 1 +
 configs/ls2080aqds_defconfig             | 1 +
 configs/ls2080aqds_nand_defconfig        | 1 +
 configs/ls2080aqds_qspi_defconfig        | 1 +
 configs/ls2080aqds_sdcard_defconfig      | 1 +
 configs/miqi-rk3288_defconfig            | 1 +
 configs/phycore-rk3288_defconfig         | 1 +
 configs/popmetal-rk3288_defconfig        | 1 +
 configs/rock2_defconfig                  | 1 +
 configs/rock_defconfig                   | 1 +
 configs/tinker-rk3288_defconfig          | 1 +
 configs/turris_omnia_defconfig           | 1 +
 configs/vyasa-rk3288_defconfig           | 1 +
 include/configs/cgtqmx6eval.h            | 1 -
 include/configs/ls2080aqds.h             | 2 --
 include/configs/rk3036_common.h          | 1 -
 include/configs/rk3128_common.h          | 1 -
 include/configs/rk3188_common.h          | 1 -
 include/configs/rk3288_common.h          | 1 -
 include/configs/rk3328_common.h          | 1 -
 include/configs/turris_omnia.h           | 1 -
 32 files changed, 24 insertions(+), 9 deletions(-)
configs/cgtqmx6eval_defconfig +1 -0
index 015bab0c643b..c6be96c496f1 100644
@@ -54,6 +54,7 @@ CONFIG_DFU_SF=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x12000000
 CONFIG_FSL_ESDHC=y
+CONFIG_SPI_FLASH=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
 CONFIG_SPI=y
configs/chromebit_mickey_defconfig +1 -0
index 79ab6acaecf0..0ab5f632ad09 100644
@@ -60,6 +60,7 @@ CONFIG_CROS_EC_SPI=y
 CONFIG_PWRSEQ=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SPI_FLASH=y
 CONFIG_PINCTRL=y
 CONFIG_SPL_PINCTRL=y
 # CONFIG_SPL_PINCTRL_FULL is not set
configs/chromebook_jerry_defconfig +1 -0
index d892d65bf0a1..68bbc1d2b5c2 100644
@@ -62,6 +62,7 @@ CONFIG_CROS_EC_SPI=y
 CONFIG_PWRSEQ=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SPI_FLASH=y
 CONFIG_PINCTRL=y
 CONFIG_SPL_PINCTRL=y
 # CONFIG_SPL_PINCTRL_FULL is not set
configs/chromebook_minnie_defconfig +1 -0
index b0428740736b..e0b9ceea798b 100644
@@ -61,6 +61,7 @@ CONFIG_CROS_EC_SPI=y
 CONFIG_PWRSEQ=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SPI_FLASH=y
 CONFIG_PINCTRL=y
 CONFIG_SPL_PINCTRL=y
 # CONFIG_SPL_PINCTRL_FULL is not set
configs/evb-rk3036_defconfig +1 -0
index 787d6f95c1bb..ba70bc6727f4 100644
@@ -41,6 +41,7 @@ CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_LED=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SPI_FLASH=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_ROCKCHIP_RK3036=y
 # CONFIG_SPL_DM_SERIAL is not set
configs/evb-rk3128_defconfig +1 -0
index 044e60735af0..2d2460c9c654 100644
@@ -29,6 +29,7 @@ CONFIG_ROCKCHIP_GPIO=y
 CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SPI_FLASH=y
 CONFIG_PHY=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_ROCKCHIP_RK3128=y
configs/evb-rk3288_defconfig +1 -0
index 1485844aa6c6..cf691df3c898 100644
@@ -52,6 +52,7 @@ CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
configs/evb-rk3328_defconfig +1 -0
index 5b3bb8eae7bc..3f04d9d644ab 100644
@@ -32,6 +32,7 @@ CONFIG_ROCKCHIP_GPIO=y
 CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
configs/fennec-rk3288_defconfig +1 -0
index 8860edfd2f40..d70d45734cf0 100644
@@ -51,6 +51,7 @@ CONFIG_ROCKCHIP_GPIO=y
 CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
configs/firefly-rk3288_defconfig +1 -0
index b0db15ddc9a5..31bf1f8b4161 100644
@@ -54,6 +54,7 @@ CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
configs/kylin-rk3036_defconfig +1 -0
index eb305e02aaa5..2d0bdd4524e0 100644
@@ -39,6 +39,7 @@ CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_LED=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SPI_FLASH=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_ROCKCHIP_RK3036=y
 CONFIG_DM_REGULATOR_FIXED=y
configs/ls2080aqds_SECURE_BOOT_defconfig +1 -0
index 6a2a52204628..c5e33e5a401d 100644
@@ -38,6 +38,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_DM_SPI_FLASH=y
+CONFIG_SPI_FLASH=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
configs/ls2080aqds_defconfig +1 -0
index f4a361a64dad..4b8ae66c4ef5 100644
@@ -39,6 +39,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_DM_SPI_FLASH=y
+CONFIG_SPI_FLASH=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
configs/ls2080aqds_nand_defconfig +1 -0
index 1f93a8378cca..f1f979aebe06 100644
@@ -45,6 +45,7 @@ CONFIG_FSL_CAAM=y
 CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
 CONFIG_DM_SPI_FLASH=y
+CONFIG_SPI_FLASH=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
configs/ls2080aqds_qspi_defconfig +1 -0
index 32eec9a99d9f..f42e05562819 100644
@@ -36,6 +36,7 @@ CONFIG_FSL_CAAM=y
 CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
 CONFIG_DM_SPI_FLASH=y
+CONFIG_SPI_FLASH=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
configs/ls2080aqds_sdcard_defconfig +1 -0
index a71913d65ccd..5e7102ff852a 100644
@@ -43,6 +43,7 @@ CONFIG_DM=y
 CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
 CONFIG_DM_SPI_FLASH=y
+CONFIG_SPI_FLASH=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
configs/miqi-rk3288_defconfig +1 -0
index f650a720c7fe..e73ae96502df 100644
@@ -51,6 +51,7 @@ CONFIG_ROCKCHIP_GPIO=y
 CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
configs/phycore-rk3288_defconfig +1 -0
index ef7abddbf1fd..80e9fb5fac69 100644
@@ -55,6 +55,7 @@ CONFIG_MISC=y
 CONFIG_I2C_EEPROM=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
configs/popmetal-rk3288_defconfig +1 -0
index 0e10d1a2254a..9d33fbc86a09 100644
@@ -51,6 +51,7 @@ CONFIG_ROCKCHIP_GPIO=y
 CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
configs/rock2_defconfig +1 -0
index 6289506bdd8a..bf8631105e4d 100644
@@ -51,6 +51,7 @@ CONFIG_ROCKCHIP_GPIO=y
 CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
configs/rock_defconfig +1 -0
index 0c41ac9f20cf..59e65d5a664e 100644
@@ -40,6 +40,7 @@ CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_LED=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SPI_FLASH=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_ROCKCHIP_RK3188=y
 CONFIG_DM_PMIC=y
configs/tinker-rk3288_defconfig +1 -0
index 5a69a683843e..4d8108d0b6e2 100644
@@ -54,6 +54,7 @@ CONFIG_MISC=y
 CONFIG_I2C_EEPROM=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
configs/turris_omnia_defconfig +1 -0
index aad80447821b..38c5de18bb2d 100644
@@ -41,6 +41,7 @@ CONFIG_MISC=y
 CONFIG_ATSHA204A=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_MV=y
+CONFIG_SPI_FLASH=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
 CONFIG_MVNETA=y
configs/vyasa-rk3288_defconfig +1 -0
index b23cd6a236d2..45355c432e3d 100644
@@ -49,6 +49,7 @@ CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
include/configs/cgtqmx6eval.h +0 -1
index 5d247886aeda..e01bf5bf1bbb 100644
@@ -31,7 +31,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 
 /* SPI NOR */
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 #define CONFIG_SPI_FLASH_SST
 #define CONFIG_SF_DEFAULT_BUS		0
include/configs/ls2080aqds.h +0 -2
index f192839fa916..2a7cb0ab30c0 100644
@@ -285,8 +285,6 @@ unsigned long get_board_ddr_clk(void);
 
 /* SPI */
 #if defined(CONFIG_FSL_QSPI) || defined(CONFIG_FSL_DSPI)
-#define CONFIG_SPI_FLASH
-
 #ifdef CONFIG_FSL_DSPI
 #define CONFIG_SPI_FLASH_STMICRO
 #define CONFIG_SPI_FLASH_SST
include/configs/rk3036_common.h +0 -1
index d4e5406101d3..065d9003145e 100644
@@ -31,7 +31,6 @@
 #define SDRAM_BANK_SIZE			(512UL << 20UL)
 #define SDRAM_MAX_SIZE                  (CONFIG_NR_DRAM_BANKS * SDRAM_BANK_SIZE)
 
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_GIGADEVICE
 #define CONFIG_SF_DEFAULT_SPEED 20000000
 
include/configs/rk3128_common.h +0 -1
index 3e9e642b783b..dff808d1171f 100644
@@ -33,7 +33,6 @@
 #define CONFIG_SYS_SDRAM_BASE		0x60000000
 #define SDRAM_MAX_SIZE			0x80000000
 
-#define CONFIG_SPI_FLASH
 #define CONFIG_SF_DEFAULT_SPEED 20000000
 #define CONFIG_USB_OHCI_NEW
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS     1
include/configs/rk3188_common.h +0 -1
index d1837d5c4e4b..2f443bd561f6 100644
@@ -40,7 +40,6 @@
 #define SDRAM_BANK_SIZE			(2UL << 30)
 #define SDRAM_MAX_SIZE			0x80000000
 
-#define CONFIG_SPI_FLASH
 #define CONFIG_SF_DEFAULT_SPEED 20000000
 
 #ifndef CONFIG_SPL_BUILD
include/configs/rk3288_common.h +0 -1
index 5388b1391e96..a30f6e579628 100644
@@ -43,7 +43,6 @@
 #define SDRAM_BANK_SIZE			(2UL << 30)
 #define SDRAM_MAX_SIZE			0xfe000000
 
-#define CONFIG_SPI_FLASH
 #define CONFIG_SF_DEFAULT_SPEED 20000000
 
 #ifndef CONFIG_SPL_BUILD
include/configs/rk3328_common.h +0 -1
index 9174c67cad2c..48351ec0f97d 100644
@@ -30,7 +30,6 @@
 #define CONFIG_SYS_SDRAM_BASE		0
 #define SDRAM_MAX_SIZE			0xff000000
 
-#define CONFIG_SPI_FLASH
 #define CONFIG_SF_DEFAULT_SPEED 20000000
 
 #ifndef CONFIG_SPL_BUILD
include/configs/turris_omnia.h +0 -1
index 598674c96e85..7d2d7a8db0cd 100644
@@ -37,7 +37,6 @@
 /* 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
 #define CONFIG_SPI_FLASH_SPANSION
 
 /*
Signature · 2 lines
Regards
Vignesh
#2 lore raw

PATCH 1/1 configs: Move CONFIG_SPI_FLASH into defconfigs

Quoted 11 lines · Vignesh R
Quoted 8 lines · Vignesh R

Completely move CONFIG_SPI_FLASH from remaining board header files to defconfigs

---
Done with the help of moveconfig.py. Compile tested on travis-ci:
https://travis-ci.org/r-vignesh/u-boot/builds/463155999

Gentle ping...

Sorry, these kind of changes are always on my list but by their nature I need to grab just one, put it through a before/after build to check for size changes and push it. I hope to get to this one soon.

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