From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vignesh R Date: Fri, 25 Jan 2019 20:11:11 +0530 Subject: [U-Boot] [PATCH] configs: Move CONFIG_SPI_FLASH into defconfigs In-Reply-To: <20181204084554.16210-1-vigneshr@ti.com> References: <20181204084554.16210-1-vigneshr@ti.com> Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 04/12/18 2:15 PM, Vignesh R wrote: > Completely move CONFIG_SPI_FLASH from remaining board header files to > defconfigs > > Signed-off-by: Vignesh R > --- > Done with the help of moveconfig.py. Compile tested on travis-ci: > https://travis-ci.org/r-vignesh/u-boot/builds/463155999 > Gentle ping... > 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(-) > > diff --git a/configs/cgtqmx6eval_defconfig b/configs/cgtqmx6eval_defconfig > index 015bab0c643b..c6be96c496f1 100644 > --- a/configs/cgtqmx6eval_defconfig > +++ b/configs/cgtqmx6eval_defconfig > @@ -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 > diff --git a/configs/chromebit_mickey_defconfig b/configs/chromebit_mickey_defconfig > index 79ab6acaecf0..0ab5f632ad09 100644 > --- a/configs/chromebit_mickey_defconfig > +++ b/configs/chromebit_mickey_defconfig > @@ -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 > diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig > index d892d65bf0a1..68bbc1d2b5c2 100644 > --- a/configs/chromebook_jerry_defconfig > +++ b/configs/chromebook_jerry_defconfig > @@ -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 > diff --git a/configs/chromebook_minnie_defconfig b/configs/chromebook_minnie_defconfig > index b0428740736b..e0b9ceea798b 100644 > --- a/configs/chromebook_minnie_defconfig > +++ b/configs/chromebook_minnie_defconfig > @@ -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 > diff --git a/configs/evb-rk3036_defconfig b/configs/evb-rk3036_defconfig > index 787d6f95c1bb..ba70bc6727f4 100644 > --- a/configs/evb-rk3036_defconfig > +++ b/configs/evb-rk3036_defconfig > @@ -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 > diff --git a/configs/evb-rk3128_defconfig b/configs/evb-rk3128_defconfig > index 044e60735af0..2d2460c9c654 100644 > --- a/configs/evb-rk3128_defconfig > +++ b/configs/evb-rk3128_defconfig > @@ -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 > diff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig > index 1485844aa6c6..cf691df3c898 100644 > --- a/configs/evb-rk3288_defconfig > +++ b/configs/evb-rk3288_defconfig > @@ -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 > diff --git a/configs/evb-rk3328_defconfig b/configs/evb-rk3328_defconfig > index 5b3bb8eae7bc..3f04d9d644ab 100644 > --- a/configs/evb-rk3328_defconfig > +++ b/configs/evb-rk3328_defconfig > @@ -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 > diff --git a/configs/fennec-rk3288_defconfig b/configs/fennec-rk3288_defconfig > index 8860edfd2f40..d70d45734cf0 100644 > --- a/configs/fennec-rk3288_defconfig > +++ b/configs/fennec-rk3288_defconfig > @@ -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 > diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig > index b0db15ddc9a5..31bf1f8b4161 100644 > --- a/configs/firefly-rk3288_defconfig > +++ b/configs/firefly-rk3288_defconfig > @@ -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 > diff --git a/configs/kylin-rk3036_defconfig b/configs/kylin-rk3036_defconfig > index eb305e02aaa5..2d0bdd4524e0 100644 > --- a/configs/kylin-rk3036_defconfig > +++ b/configs/kylin-rk3036_defconfig > @@ -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 > diff --git a/configs/ls2080aqds_SECURE_BOOT_defconfig b/configs/ls2080aqds_SECURE_BOOT_defconfig > index 6a2a52204628..c5e33e5a401d 100644 > --- a/configs/ls2080aqds_SECURE_BOOT_defconfig > +++ b/configs/ls2080aqds_SECURE_BOOT_defconfig > @@ -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 > diff --git a/configs/ls2080aqds_defconfig b/configs/ls2080aqds_defconfig > index f4a361a64dad..4b8ae66c4ef5 100644 > --- a/configs/ls2080aqds_defconfig > +++ b/configs/ls2080aqds_defconfig > @@ -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 > diff --git a/configs/ls2080aqds_nand_defconfig b/configs/ls2080aqds_nand_defconfig > index 1f93a8378cca..f1f979aebe06 100644 > --- a/configs/ls2080aqds_nand_defconfig > +++ b/configs/ls2080aqds_nand_defconfig > @@ -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 > diff --git a/configs/ls2080aqds_qspi_defconfig b/configs/ls2080aqds_qspi_defconfig > index 32eec9a99d9f..f42e05562819 100644 > --- a/configs/ls2080aqds_qspi_defconfig > +++ b/configs/ls2080aqds_qspi_defconfig > @@ -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 > diff --git a/configs/ls2080aqds_sdcard_defconfig b/configs/ls2080aqds_sdcard_defconfig > index a71913d65ccd..5e7102ff852a 100644 > --- a/configs/ls2080aqds_sdcard_defconfig > +++ b/configs/ls2080aqds_sdcard_defconfig > @@ -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 > diff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig > index f650a720c7fe..e73ae96502df 100644 > --- a/configs/miqi-rk3288_defconfig > +++ b/configs/miqi-rk3288_defconfig > @@ -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 > diff --git a/configs/phycore-rk3288_defconfig b/configs/phycore-rk3288_defconfig > index ef7abddbf1fd..80e9fb5fac69 100644 > --- a/configs/phycore-rk3288_defconfig > +++ b/configs/phycore-rk3288_defconfig > @@ -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 > diff --git a/configs/popmetal-rk3288_defconfig b/configs/popmetal-rk3288_defconfig > index 0e10d1a2254a..9d33fbc86a09 100644 > --- a/configs/popmetal-rk3288_defconfig > +++ b/configs/popmetal-rk3288_defconfig > @@ -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 > diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig > index 6289506bdd8a..bf8631105e4d 100644 > --- a/configs/rock2_defconfig > +++ b/configs/rock2_defconfig > @@ -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 > diff --git a/configs/rock_defconfig b/configs/rock_defconfig > index 0c41ac9f20cf..59e65d5a664e 100644 > --- a/configs/rock_defconfig > +++ b/configs/rock_defconfig > @@ -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 > diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig > index 5a69a683843e..4d8108d0b6e2 100644 > --- a/configs/tinker-rk3288_defconfig > +++ b/configs/tinker-rk3288_defconfig > @@ -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 > diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig > index aad80447821b..38c5de18bb2d 100644 > --- a/configs/turris_omnia_defconfig > +++ b/configs/turris_omnia_defconfig > @@ -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 > diff --git a/configs/vyasa-rk3288_defconfig b/configs/vyasa-rk3288_defconfig > index b23cd6a236d2..45355c432e3d 100644 > --- a/configs/vyasa-rk3288_defconfig > +++ b/configs/vyasa-rk3288_defconfig > @@ -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 > diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h > index 5d247886aeda..e01bf5bf1bbb 100644 > --- a/include/configs/cgtqmx6eval.h > +++ b/include/configs/cgtqmx6eval.h > @@ -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 > diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h > index f192839fa916..2a7cb0ab30c0 100644 > --- a/include/configs/ls2080aqds.h > +++ b/include/configs/ls2080aqds.h > @@ -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 > diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h > index d4e5406101d3..065d9003145e 100644 > --- a/include/configs/rk3036_common.h > +++ b/include/configs/rk3036_common.h > @@ -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 > > diff --git a/include/configs/rk3128_common.h b/include/configs/rk3128_common.h > index 3e9e642b783b..dff808d1171f 100644 > --- a/include/configs/rk3128_common.h > +++ b/include/configs/rk3128_common.h > @@ -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 > diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h > index d1837d5c4e4b..2f443bd561f6 100644 > --- a/include/configs/rk3188_common.h > +++ b/include/configs/rk3188_common.h > @@ -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 > diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h > index 5388b1391e96..a30f6e579628 100644 > --- a/include/configs/rk3288_common.h > +++ b/include/configs/rk3288_common.h > @@ -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 > diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h > index 9174c67cad2c..48351ec0f97d 100644 > --- a/include/configs/rk3328_common.h > +++ b/include/configs/rk3328_common.h > @@ -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 > diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h > index 598674c96e85..7d2d7a8db0cd 100644 > --- a/include/configs/turris_omnia.h > +++ b/include/configs/turris_omnia.h > @@ -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 > > /* > -- Regards Vignesh