From mboxrd@z Thu Jan 1 00:00:00 1970 From: Miquel Raynal Date: Wed, 5 Dec 2018 12:25:07 +0100 Subject: [U-Boot] [PATCH v3 16/28] configs: move CONFIG_MTD in defconfigs when set in arch includes In-Reply-To: <20181205111728.616bfad6@bbrezillon> References: <20181204235714.11805-1-miquel.raynal@bootlin.com> <20181204235714.11805-17-miquel.raynal@bootlin.com> <20181205111728.616bfad6@bbrezillon> Message-ID: <20181205122507.361e08ad@xps13> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable To: u-boot@lists.denx.de Hi Boris, Boris Brezillon wrote on Wed, 5 Dec 2018 11:17:28 +0100: > On Wed, 5 Dec 2018 00:57:02 +0100 > Miquel Raynal wrote: >=20 > > Let's be consistent and always declare CONFIG_MTD from the defconfig > > file when needed. > >=20 > > Signed-off-by: Miquel Raynal =20 >=20 > Reviewed-by: Boris Brezillon >=20 > One comment below. >=20 > > --- > > configs/socfpga_stratix10_defconfig | 1 + > > configs/turris_mox_defconfig | 1 + > > include/configs/mvebu_armada-37xx.h | 1 - > > include/configs/socfpga_stratix10_socdk.h | 1 - > > 4 files changed, 2 insertions(+), 2 deletions(-) > >=20 > > diff --git a/configs/socfpga_stratix10_defconfig b/configs/socfpga_stra= tix10_defconfig > > index 5f3d733a8b..292dbd6973 100644 > > --- a/configs/socfpga_stratix10_defconfig > > +++ b/configs/socfpga_stratix10_defconfig > > @@ -38,6 +38,7 @@ CONFIG_DM_I2C=3Dy > > CONFIG_SYS_I2C_DW=3Dy > > CONFIG_DM_MMC=3Dy > > CONFIG_MMC_DW=3Dy > > +CONFIG_MTD=3Dy > > CONFIG_SPI_FLASH=3Dy > > CONFIG_SPI_FLASH_BAR=3Dy > > CONFIG_SPI_FLASH_SPANSION=3Dy > > diff --git a/configs/turris_mox_defconfig b/configs/turris_mox_defconfig > > index 749ed31acd..13e2af7e1b 100644 > > --- a/configs/turris_mox_defconfig > > +++ b/configs/turris_mox_defconfig > > @@ -42,6 +42,7 @@ CONFIG_DM_MMC=3Dy > > CONFIG_MMC_SDHCI=3Dy > > CONFIG_MMC_SDHCI_SDMA=3Dy > > CONFIG_MMC_SDHCI_XENON=3Dy > > +CONFIG_MTD=3Dy > > CONFIG_SPI_FLASH=3Dy > > CONFIG_SPI_FLASH_MACRONIX=3Dy > > CONFIG_SPI_FLASH_SPANSION=3Dy > > diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mveb= u_armada-37xx.h > > index f93ab0f830..640267c9c2 100644 > > --- a/include/configs/mvebu_armada-37xx.h > > +++ b/include/configs/mvebu_armada-37xx.h > > @@ -64,7 +64,6 @@ > > #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 /* needed for mtdparts commands */ > > #define CONFIG_MTD_PARTITIONS /* required for UBI partition support */ > > =20 > > /* Environment in SPI NOR flash */ > > diff --git a/include/configs/socfpga_stratix10_socdk.h b/include/config= s/socfpga_stratix10_socdk.h > > index 22e1dc84a1..967784e379 100644 > > --- a/include/configs/socfpga_stratix10_socdk.h > > +++ b/include/configs/socfpga_stratix10_socdk.h > > @@ -76,7 +76,6 @@ > > #endif /* CONFIG_ENV_IS_IN_SPI_FLASH */ > > =20 > > #ifndef CONFIG_SPL_BUILD > > -#define CONFIG_MTD > > #define CONFIG_MTD_PARTITIONS =20 >=20 > Do you get rid of CONFIG_MTD_PARTITIONS at some point? Not anymore. I know it would be preferable to push all MTD configurations in defconfigs but precisely in this case the definition is enclosed in a "#ifndef CONFIG_SPL_BUILD" condition, which makes the move to defconfig inconsistent. This is the reason why I decided to keep this definition in header files for now (another one in Armada 37xx header). >=20 > > #define MTDIDS_DEFAULT "nor0=3Dff705000.spi.0" > > #endif /* CONFIG_SPL_BUILD */ =20 >=20 Thanks, Miqu=C3=A8l