From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lukasz Majewski Date: Mon, 16 Sep 2019 14:03:38 +0200 Subject: [U-Boot] [PATCH 3/3] mtd: spi: Clean up usage of CONFIG_SPI_FLASH_MTD In-Reply-To: <20190913224242.21054-3-frieder.schrempf@kontron.de> References: <20190913224242.21054-1-frieder.schrempf@kontron.de> <20190913224242.21054-3-frieder.schrempf@kontron.de> Message-ID: <20190916140338.7d3f0195@jawa> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: u-boot@lists.denx.de Hi Frieder, > From: Frieder Schrempf > > Most boards currently use SPI_FLASH_MTD only in U-Boot proper, not in > SPL. They often rely on hacks in the board header files to include > this option conditionally. To be able to fix this, we previously > introduced a separate option SPL_SPI_FLASH_MTD. > > Therefore we can now adjust the Makefile and change the code in > sf_probe.c and sf_internal.h to use CONFIG_IS_ENABLED(SPI_FLASH_MTD). > > We also need to move all occurences of CONFIG_SPI_FLASH_MTD from the > header files to the according defconfigs. The affected boards are > socfpga, aristainetos, cm_fx6, display5, ventana, rcar-gen2, dh_imx6 > and da850evm. > > We do this all in one patch to guarantee bisectibility. > > This change was tested with buildman to make sure it does not > introduce any regressions by comparing the resulting binary sizes. > > Signed-off-by: Frieder Schrempf Acked-by: Lukasz Majewski > --- > configs/aristainetos2_defconfig | 1 + > configs/aristainetos2b_defconfig | 1 + > configs/aristainetos_defconfig | 1 + > configs/cm_fx6_defconfig | 1 + > configs/display5_defconfig | 1 + > configs/display5_factory_defconfig | 1 + > configs/socfpga_arria5_defconfig | 1 + > configs/socfpga_cyclone5_defconfig | 1 + > configs/socfpga_dbm_soc1_defconfig | 1 + > configs/socfpga_de0_nano_soc_defconfig | 1 + > configs/socfpga_de10_nano_defconfig | 1 + > configs/socfpga_is1_defconfig | 1 + > configs/socfpga_mcvevk_defconfig | 1 + > configs/socfpga_sockit_defconfig | 1 + > configs/socfpga_socrates_defconfig | 1 + > configs/socfpga_sr1500_defconfig | 1 + > configs/socfpga_vining_fpga_defconfig | 1 + > drivers/mtd/spi/Makefile | 2 +- > drivers/mtd/spi/sf_internal.h | 2 +- > drivers/mtd/spi/sf_probe.c | 6 +++--- > include/configs/aristainetos-common.h | 1 - > include/configs/cm_fx6.h | 7 ------- > include/configs/da850evm.h | 7 +------ > include/configs/dh_imx6.h | 1 - > include/configs/display5.h | 4 ---- > include/configs/gw_ventana.h | 10 +--------- > include/configs/rcar-gen2-common.h | 4 +--- > include/configs/socfpga_common.h | 4 ---- > 28 files changed, 25 insertions(+), 40 deletions(-) > > diff --git a/configs/aristainetos2_defconfig > b/configs/aristainetos2_defconfig index 18ef5d2dce..0bfc117762 100644 > --- a/configs/aristainetos2_defconfig > +++ b/configs/aristainetos2_defconfig > @@ -44,6 +44,7 @@ CONFIG_SF_DEFAULT_CS=1 > CONFIG_SF_DEFAULT_MODE=0 > CONFIG_SF_DEFAULT_SPEED=20000000 > CONFIG_SPI_FLASH_STMICRO=y > +CONFIG_SPI_FLASH_MTD=y > CONFIG_MTD_UBI_FASTMAP=y > CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT=1 > CONFIG_PHYLIB=y > diff --git a/configs/aristainetos2b_defconfig > b/configs/aristainetos2b_defconfig index 1054c05d8c..e2da747a8f 100644 > --- a/configs/aristainetos2b_defconfig > +++ b/configs/aristainetos2b_defconfig > @@ -42,6 +42,7 @@ CONFIG_SPI_FLASH=y > CONFIG_SF_DEFAULT_MODE=0 > CONFIG_SF_DEFAULT_SPEED=20000000 > CONFIG_SPI_FLASH_STMICRO=y > +CONFIG_SPI_FLASH_MTD=y > CONFIG_MTD_UBI_FASTMAP=y > CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT=1 > CONFIG_PHYLIB=y > diff --git a/configs/aristainetos_defconfig > b/configs/aristainetos_defconfig index 4080a7b310..5caf95c22f 100644 > --- a/configs/aristainetos_defconfig > +++ b/configs/aristainetos_defconfig > @@ -43,6 +43,7 @@ CONFIG_SF_DEFAULT_BUS=3 > CONFIG_SF_DEFAULT_MODE=0 > CONFIG_SF_DEFAULT_SPEED=20000000 > CONFIG_SPI_FLASH_STMICRO=y > +CONFIG_SPI_FLASH_MTD=y > CONFIG_MTD_UBI_FASTMAP=y > CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT=1 > CONFIG_PHYLIB=y > diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig > index fd0db4db5c..15be7db027 100644 > --- a/configs/cm_fx6_defconfig > +++ b/configs/cm_fx6_defconfig > @@ -72,6 +72,7 @@ CONFIG_SPI_FLASH_SPANSION=y > CONFIG_SPI_FLASH_STMICRO=y > CONFIG_SPI_FLASH_SST=y > CONFIG_SPI_FLASH_WINBOND=y > +CONFIG_SPI_FLASH_MTD=y > CONFIG_PHYLIB=y > CONFIG_MII=y > CONFIG_DM_PMIC=y > diff --git a/configs/display5_defconfig b/configs/display5_defconfig > index 8609cd5a8c..5a4cc772be 100644 > --- a/configs/display5_defconfig > +++ b/configs/display5_defconfig > @@ -75,6 +75,7 @@ CONFIG_SF_DEFAULT_MODE=0 > CONFIG_SF_DEFAULT_SPEED=50000000 > CONFIG_SPI_FLASH_SPANSION=y > CONFIG_SPI_FLASH_STMICRO=y > +CONFIG_SPI_FLASH_MTD=y > CONFIG_PHYLIB=y > CONFIG_PHY_MARVELL=y > CONFIG_FEC_MXC=y > diff --git a/configs/display5_factory_defconfig > b/configs/display5_factory_defconfig index 70c64260d8..66c68e5ea9 > 100644 --- a/configs/display5_factory_defconfig > +++ b/configs/display5_factory_defconfig > @@ -74,6 +74,7 @@ CONFIG_SF_DEFAULT_MODE=0 > CONFIG_SF_DEFAULT_SPEED=50000000 > CONFIG_SPI_FLASH_SPANSION=y > CONFIG_SPI_FLASH_STMICRO=y > +CONFIG_SPI_FLASH_MTD=y > CONFIG_PHYLIB=y > CONFIG_FEC_MXC=y > CONFIG_MII=y > diff --git a/configs/socfpga_arria5_defconfig > b/configs/socfpga_arria5_defconfig index 89e5ff8c71..30c2d19941 100644 > --- a/configs/socfpga_arria5_defconfig > +++ b/configs/socfpga_arria5_defconfig > @@ -47,6 +47,7 @@ CONFIG_SPI_FLASH=y > CONFIG_SPI_FLASH_SPANSION=y > CONFIG_SPI_FLASH_STMICRO=y > # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set > +CONFIG_SPI_FLASH_MTD=y > CONFIG_PHY_MICREL=y > CONFIG_PHY_MICREL_KSZ90X1=y > CONFIG_DM_ETH=y > diff --git a/configs/socfpga_cyclone5_defconfig > b/configs/socfpga_cyclone5_defconfig index 00f2104276..dfe011b959 > 100644 --- a/configs/socfpga_cyclone5_defconfig > +++ b/configs/socfpga_cyclone5_defconfig > @@ -48,6 +48,7 @@ CONFIG_SPI_FLASH_MACRONIX=y > CONFIG_SPI_FLASH_SPANSION=y > CONFIG_SPI_FLASH_STMICRO=y > # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set > +CONFIG_SPI_FLASH_MTD=y > CONFIG_PHY_MICREL=y > CONFIG_PHY_MICREL_KSZ90X1=y > CONFIG_DM_ETH=y > diff --git a/configs/socfpga_dbm_soc1_defconfig > b/configs/socfpga_dbm_soc1_defconfig index 1877010a19..ee693f3def > 100644 --- a/configs/socfpga_dbm_soc1_defconfig > +++ b/configs/socfpga_dbm_soc1_defconfig > @@ -46,6 +46,7 @@ CONFIG_SYS_I2C_DW=y > CONFIG_DM_MMC=y > CONFIG_MMC_DW=y > CONFIG_MTD_DEVICE=y > +CONFIG_SPI_FLASH_MTD=y > CONFIG_DM_ETH=y > CONFIG_PHY_GIGE=y > CONFIG_ETH_DESIGNWARE=y > diff --git a/configs/socfpga_de0_nano_soc_defconfig > b/configs/socfpga_de0_nano_soc_defconfig index de50f17174..e91d6f62f8 > 100644 --- a/configs/socfpga_de0_nano_soc_defconfig > +++ b/configs/socfpga_de0_nano_soc_defconfig > @@ -43,6 +43,7 @@ CONFIG_SYS_I2C_DW=y > CONFIG_DM_MMC=y > CONFIG_MMC_DW=y > CONFIG_MTD_DEVICE=y > +CONFIG_SPI_FLASH_MTD=y > CONFIG_PHY_MICREL=y > CONFIG_PHY_MICREL_KSZ90X1=y > CONFIG_DM_ETH=y > diff --git a/configs/socfpga_de10_nano_defconfig > b/configs/socfpga_de10_nano_defconfig index 03961195ac..ffe9d6c10c > 100644 --- a/configs/socfpga_de10_nano_defconfig > +++ b/configs/socfpga_de10_nano_defconfig > @@ -39,6 +39,7 @@ CONFIG_SYS_I2C_DW=y > CONFIG_DM_MMC=y > CONFIG_MMC_DW=y > CONFIG_MTD_DEVICE=y > +CONFIG_SPI_FLASH_MTD=y > CONFIG_PHY_MICREL=y > CONFIG_PHY_MICREL_KSZ90X1=y > CONFIG_DM_ETH=y > diff --git a/configs/socfpga_is1_defconfig > b/configs/socfpga_is1_defconfig index 6ea06c1104..76ab87250b 100644 > --- a/configs/socfpga_is1_defconfig > +++ b/configs/socfpga_is1_defconfig > @@ -43,6 +43,7 @@ CONFIG_SYS_I2C_DW=y > CONFIG_MTD_DEVICE=y > CONFIG_SPI_FLASH=y > CONFIG_SPI_FLASH_STMICRO=y > +CONFIG_SPI_FLASH_MTD=y > CONFIG_PHY_MICREL=y > CONFIG_PHY_MICREL_KSZ90X1=y > CONFIG_DM_ETH=y > diff --git a/configs/socfpga_mcvevk_defconfig > b/configs/socfpga_mcvevk_defconfig index 161bd6fca3..4d3caaa8ad 100644 > --- a/configs/socfpga_mcvevk_defconfig > +++ b/configs/socfpga_mcvevk_defconfig > @@ -42,6 +42,7 @@ CONFIG_DM_I2C=y > CONFIG_SYS_I2C_DW=y > CONFIG_DM_MMC=y > CONFIG_MMC_DW=y > +CONFIG_SPI_FLASH_MTD=y > CONFIG_DM_ETH=y > CONFIG_PHY_GIGE=y > CONFIG_ETH_DESIGNWARE=y > diff --git a/configs/socfpga_sockit_defconfig > b/configs/socfpga_sockit_defconfig index 8ec1c05571..0ffcfda21e 100644 > --- a/configs/socfpga_sockit_defconfig > +++ b/configs/socfpga_sockit_defconfig > @@ -48,6 +48,7 @@ CONFIG_SPI_FLASH_MACRONIX=y > CONFIG_SPI_FLASH_SPANSION=y > CONFIG_SPI_FLASH_STMICRO=y > # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set > +CONFIG_SPI_FLASH_MTD=y > CONFIG_PHY_MICREL=y > CONFIG_PHY_MICREL_KSZ90X1=y > CONFIG_DM_ETH=y > diff --git a/configs/socfpga_socrates_defconfig > b/configs/socfpga_socrates_defconfig index 15f81d1a4b..193af0b0df > 100644 --- a/configs/socfpga_socrates_defconfig > +++ b/configs/socfpga_socrates_defconfig > @@ -48,6 +48,7 @@ CONFIG_SPI_FLASH=y > CONFIG_SPI_FLASH_MACRONIX=y > CONFIG_SPI_FLASH_SPANSION=y > CONFIG_SPI_FLASH_STMICRO=y > +CONFIG_SPI_FLASH_MTD=y > CONFIG_PHY_MICREL=y > CONFIG_PHY_MICREL_KSZ90X1=y > CONFIG_DM_ETH=y > diff --git a/configs/socfpga_sr1500_defconfig > b/configs/socfpga_sr1500_defconfig index 941bf1124a..899dd8396b 100644 > --- a/configs/socfpga_sr1500_defconfig > +++ b/configs/socfpga_sr1500_defconfig > @@ -49,6 +49,7 @@ CONFIG_SPI_FLASH=y > CONFIG_SF_DEFAULT_SPEED=100000000 > CONFIG_SPI_FLASH_STMICRO=y > # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set > +CONFIG_SPI_FLASH_MTD=y > CONFIG_PHY_MARVELL=y > CONFIG_DM_ETH=y > CONFIG_PHY_GIGE=y > diff --git a/configs/socfpga_vining_fpga_defconfig > b/configs/socfpga_vining_fpga_defconfig index 96f806ab5f..f96f536169 > 100644 --- a/configs/socfpga_vining_fpga_defconfig > +++ b/configs/socfpga_vining_fpga_defconfig > @@ -72,6 +72,7 @@ CONFIG_SPI_FLASH=y > CONFIG_SPI_FLASH_SPANSION=y > CONFIG_SPI_FLASH_STMICRO=y > # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set > +CONFIG_SPI_FLASH_MTD=y > CONFIG_MTD_UBI_FASTMAP=y > CONFIG_PHY_MICREL=y > CONFIG_PHY_MICREL_KSZ90X1=y > diff --git a/drivers/mtd/spi/Makefile b/drivers/mtd/spi/Makefile > index f99f6cb16e..fb67ba32c6 100644 > --- a/drivers/mtd/spi/Makefile > +++ b/drivers/mtd/spi/Makefile > @@ -19,5 +19,5 @@ endif > > obj-$(CONFIG_SPI_FLASH) += spi-nor.o > obj-$(CONFIG_SPI_FLASH_DATAFLASH) += sf_dataflash.o sf.o > -obj-$(CONFIG_SPI_FLASH_MTD) += sf_mtd.o > +obj-$(CONFIG_$(SPL_)SPI_FLASH_MTD) += sf_mtd.o > obj-$(CONFIG_SPI_FLASH_SANDBOX) += sandbox.o > diff --git a/drivers/mtd/spi/sf_internal.h > b/drivers/mtd/spi/sf_internal.h index a6bf734830..8542b03685 100644 > --- a/drivers/mtd/spi/sf_internal.h > +++ b/drivers/mtd/spi/sf_internal.h > @@ -94,7 +94,7 @@ int spi_flash_cmd_write(struct spi_slave *spi, > const u8 *cmd, size_t cmd_len, int > spi_flash_cmd_get_sw_write_prot(struct spi_flash *flash); > > -#ifdef CONFIG_SPI_FLASH_MTD > +#if CONFIG_IS_ENABLED(SPI_FLASH_MTD) > int spi_flash_mtd_register(struct spi_flash *flash); > void spi_flash_mtd_unregister(void); > #endif > diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c > index 73297e1a0a..f051e473ff 100644 > --- a/drivers/mtd/spi/sf_probe.c > +++ b/drivers/mtd/spi/sf_probe.c > @@ -44,7 +44,7 @@ static int spi_flash_probe_slave(struct spi_flash > *flash) if (ret) > goto err_read_id; > > -#ifdef CONFIG_SPI_FLASH_MTD > +#if CONFIG_IS_ENABLED(SPI_FLASH_MTD) > ret = spi_flash_mtd_register(flash); > #endif > > @@ -83,7 +83,7 @@ struct spi_flash *spi_flash_probe(unsigned int > busnum, unsigned int cs, > void spi_flash_free(struct spi_flash *flash) > { > -#ifdef CONFIG_SPI_FLASH_MTD > +#if CONFIG_IS_ENABLED(SPI_FLASH_MTD) > spi_flash_mtd_unregister(); > #endif > spi_free_slave(flash->spi); > @@ -152,7 +152,7 @@ static int spi_flash_std_probe(struct udevice > *dev) > static int spi_flash_std_remove(struct udevice *dev) > { > -#ifdef CONFIG_SPI_FLASH_MTD > +#if CONFIG_IS_ENABLED(SPI_FLASH_MTD) > spi_flash_mtd_unregister(); > #endif > return 0; > diff --git a/include/configs/aristainetos-common.h > b/include/configs/aristainetos-common.h index e998d9b1b2..b451c7e7dc > 100644 --- a/include/configs/aristainetos-common.h > +++ b/include/configs/aristainetos-common.h > @@ -30,7 +30,6 @@ > #define CONFIG_ETHPRIME "FEC" > #define CONFIG_FEC_MXC_PHYADDR 0 > > -#define CONFIG_SPI_FLASH_MTD > #define CONFIG_SYS_SPI_ST_ENABLE_WP_PIN > > #define CONFIG_EXTRA_ENV_SETTINGS \ > diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h > index b957e9cba4..c1a6625fcb 100644 > --- a/include/configs/cm_fx6.h > +++ b/include/configs/cm_fx6.h > @@ -38,13 +38,6 @@ > #define CONFIG_MXC_UART_BASE UART4_BASE > #define CONFIG_SYS_BAUDRATE_TABLE {9600, 19200, 38400, 57600, > 115200} > -/* SPI flash */ > - > -/* MTD support */ > -#ifndef CONFIG_SPL_BUILD > -#define CONFIG_SPI_FLASH_MTD > -#endif > - > /* Environment */ > #define CONFIG_ENV_SECT_SIZE (64 * 1024) > #define CONFIG_ENV_SIZE (8 * 1024) > diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h > index 41f0813a01..6876134a00 100644 > --- a/include/configs/da850evm.h > +++ b/include/configs/da850evm.h > @@ -190,16 +190,11 @@ > #define CONFIG_ENV_SECT_SIZE CONFIG_SYS_FLASH_SECT_SZ > #endif > > -#ifdef CONFIG_USE_SPIFLASH > -#ifdef CONFIG_ENV_IS_IN_SPI_FLASH > +#if defined(CONFIG_USE_SPIFLASH) && > defined(CONFIG_ENV_IS_IN_SPI_FLASH) #define CONFIG_ENV_SIZE > (64 << 10) #define CONFIG_ENV_OFFSET > (512 << 10) #define CONFIG_ENV_SECT_SIZE (64 << 10) > #endif > -#ifdef CONFIG_SPL_BUILD > -#undef CONFIG_SPI_FLASH_MTD > -#endif > -#endif > Chciałbym się jeszcze dopytać - czy restauracja Kaskada / Aruana o > /* > * U-Boot general configuration > diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h > index c516e6ed4c..485bc2d997 100644 > --- a/include/configs/dh_imx6.h > +++ b/include/configs/dh_imx6.h > @@ -59,7 +59,6 @@ > #if defined(CONFIG_SPL_BUILD) > #undef CONFIG_DM_SPI > #undef CONFIG_DM_SPI_FLASH > -#undef CONFIG_SPI_FLASH_MTD > #endif > > /* UART */ > diff --git a/include/configs/display5.h b/include/configs/display5.h > index e503e4a0ce..64f211307a 100644 > --- a/include/configs/display5.h > +++ b/include/configs/display5.h > @@ -35,10 +35,6 @@ > * 0x1540000 - 0x1640000 : SPI.factory (1MiB) > */ > > -#ifndef CONFIG_SPL_BUILD > -#define CONFIG_SPI_FLASH_MTD > -#endif > - > /* Below values are "dummy" - only to avoid build break */ > #define CONFIG_SYS_SPI_KERNEL_OFFS 0x150000 > #define CONFIG_SYS_SPI_ARGS_OFFS 0x140000 > diff --git a/include/configs/gw_ventana.h > b/include/configs/gw_ventana.h index a27627e721..e543061bff 100644 > --- a/include/configs/gw_ventana.h > +++ b/include/configs/gw_ventana.h > @@ -47,15 +47,7 @@ > #define CONFIG_MXC_UART > #define CONFIG_MXC_UART_BASE UART2_BASE > > -#ifdef CONFIG_SPI_FLASH > - > -/* SPI */ > -#ifdef CONFIG_CMD_SF > - #define CONFIG_SPI_FLASH_MTD > - /* GPIO 3-19 (21248) */ > -#endif > - > -#elif defined(CONFIG_SPL_NAND_SUPPORT) > +#if !defined(CONFIG_SPI_FLASH) && defined(CONFIG_SPL_NAND_SUPPORT) > /* Enable NAND support */ > #ifdef CONFIG_CMD_NAND > #define CONFIG_SYS_MAX_NAND_DEVICE 1 > diff --git a/include/configs/rcar-gen2-common.h > b/include/configs/rcar-gen2-common.h index 71a5909045..e940a8b70a > 100644 --- a/include/configs/rcar-gen2-common.h > +++ b/include/configs/rcar-gen2-common.h > @@ -46,11 +46,9 @@ > #define CONFIG_ENV_SIZE_REDUND (CONFIG_SYS_MONITOR_LEN) > > /* SF MTD */ > -#if defined(CONFIG_SPI_FLASH_MTD) && !defined(CONFIG_SPL_BUILD) > -#else > +#ifdef CONFIG_SPL_BUILD > #undef CONFIG_DM_SPI > #undef CONFIG_DM_SPI_FLASH > -#undef CONFIG_SPI_FLASH_MTD > #endif > > /* Timer */ > diff --git a/include/configs/socfpga_common.h > b/include/configs/socfpga_common.h index b11fe021a7..96b32cd99a 100644 > --- a/include/configs/socfpga_common.h > +++ b/include/configs/socfpga_common.h > @@ -133,10 +133,6 @@ > /* > * QSPI support > */ > -/* Enable multiple SPI NOR flash manufacturers */ > -#ifndef CONFIG_SPL_BUILD > -#define CONFIG_SPI_FLASH_MTD > -#endif > /* QSPI reference clock */ > #ifndef __ASSEMBLY__ > unsigned int cm_get_qspi_controller_clk_hz(void); Best regards, Lukasz Majewski -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 488 bytes Desc: OpenPGP digital signature URL: