Re: [U-Boot] [PATCH 3/3] mtd: spi: Clean up usage of CONFIG_SPI_FLASH_MTD
On Wed, Oct 23, 2019 at 12:57 PM Stefan Roese wrote: > > On 23.10.19 09:09, Jagan Teki wrote: > > On Wed, Oct 23, 2019 at 12:35 PM Schrempf Frieder > > wrote: > >> > >> Hi Jagan, > >> > >> On 22.10.19 20:16, Jagan Teki wrote: > >>> On Sat, Sep 14, 2019 at 4:14 AM Schrempf Frieder > >>> wrote: > > 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 > --- > 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=2000 > 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=2000 > 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=2000 > 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 >
Re: [U-Boot] [PATCH 3/3] mtd: spi: Clean up usage of CONFIG_SPI_FLASH_MTD
On Wed, Oct 23, 2019 at 12:56 PM Schrempf Frieder wrote: > > On 23.10.19 09:09, Jagan Teki wrote: > > On Wed, Oct 23, 2019 at 12:35 PM Schrempf Frieder > > wrote: > >> > >> Hi Jagan, > >> > >> On 22.10.19 20:16, Jagan Teki wrote: > >>> On Sat, Sep 14, 2019 at 4:14 AM Schrempf Frieder > >>> wrote: > > 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 > --- > 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=2000 > 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=2000 > 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=2000 > 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
Re: [U-Boot] [PATCH 3/3] mtd: spi: Clean up usage of CONFIG_SPI_FLASH_MTD
On 23.10.19 09:09, Jagan Teki wrote: On Wed, Oct 23, 2019 at 12:35 PM Schrempf Frieder wrote: Hi Jagan, On 22.10.19 20:16, Jagan Teki wrote: On Sat, Sep 14, 2019 at 4:14 AM Schrempf Frieder wrote: 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 --- 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=2000 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=2000 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=2000 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=5000 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=5000 CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y +CONFIG_SPI_FLASH_MTD=y CONFIG_PHYLIB=y
Re: [U-Boot] [PATCH 3/3] mtd: spi: Clean up usage of CONFIG_SPI_FLASH_MTD
On 23.10.19 09:09, Jagan Teki wrote: > On Wed, Oct 23, 2019 at 12:35 PM Schrempf Frieder > wrote: >> >> Hi Jagan, >> >> On 22.10.19 20:16, Jagan Teki wrote: >>> On Sat, Sep 14, 2019 at 4:14 AM Schrempf Frieder >>> wrote: 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 --- 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=2000 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=2000 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=2000 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
Re: [U-Boot] [PATCH 3/3] mtd: spi: Clean up usage of CONFIG_SPI_FLASH_MTD
Hi Jagan, > On Wed, Oct 23, 2019 at 12:35 PM Schrempf Frieder > wrote: > > > > Hi Jagan, > > > > On 22.10.19 20:16, Jagan Teki wrote: > > > On Sat, Sep 14, 2019 at 4:14 AM Schrempf Frieder > > > wrote: > > >> > > >> 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 > > >> --- > > >> 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=2000 > > >> 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=2000 > > >> 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=2000 > > >> 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 > > >>
Re: [U-Boot] [PATCH 3/3] mtd: spi: Clean up usage of CONFIG_SPI_FLASH_MTD
Hi Jagan, On 22.10.19 20:16, Jagan Teki wrote: > On Sat, Sep 14, 2019 at 4:14 AM Schrempf Frieder > wrote: >> >> 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 >> --- >> 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=2000 >> 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=2000 >> 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=2000 >> 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=5000 >> 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 >> +++
Re: [U-Boot] [PATCH 3/3] mtd: spi: Clean up usage of CONFIG_SPI_FLASH_MTD
On Wed, Oct 23, 2019 at 12:35 PM Schrempf Frieder wrote: > > Hi Jagan, > > On 22.10.19 20:16, Jagan Teki wrote: > > On Sat, Sep 14, 2019 at 4:14 AM Schrempf Frieder > > wrote: > >> > >> 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 > >> --- > >> 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=2000 > >> 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=2000 > >> 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=2000 > >> 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=5000 > >> CONFIG_SPI_FLASH_SPANSION=y > >> CONFIG_SPI_FLASH_STMICRO=y > >>
Re: [U-Boot] [PATCH 3/3] mtd: spi: Clean up usage of CONFIG_SPI_FLASH_MTD
On Sat, Sep 14, 2019 at 4:14 AM Schrempf Frieder wrote: > > 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 > --- > 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=2000 > 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=2000 > 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=2000 > 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=5000 > 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=5000 > 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 >
Re: [U-Boot] [PATCH 3/3] mtd: spi: Clean up usage of CONFIG_SPI_FLASH_MTD
On Thu, Sep 26, 2019 at 7:32 PM Schrempf Frieder wrote: > > On 14.09.19 00:44, Schrempf Frieder wrote: > > 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 > > I don't know much about the U-Boot release cycle, so maybe these are > stupid questions. > > Jagan, I saw that these 3 patches are assigned to you. When will you > pick them? For the current release, or the next one? Next release, since it out of MW. ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 3/3] mtd: spi: Clean up usage of CONFIG_SPI_FLASH_MTD
On 14.09.19 00:44, Schrempf Frieder wrote: > 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 I don't know much about the U-Boot release cycle, so maybe these are stupid questions. Jagan, I saw that these 3 patches are assigned to you. When will you pick them? For the current release, or the next one? Do we still need an ack for patch 2/3 from the stm32mp maintainers? Thanks, Frieder ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 3/3] mtd: spi: Clean up usage of CONFIG_SPI_FLASH_MTD
Hello Frieder, Am 14.09.2019 um 00:44 schrieb Schrempf 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 --- 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(-) Reviewed-by: Heiko Schocher bye, Heiko -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: h...@denx.de ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 3/3] mtd: spi: Clean up usage of CONFIG_SPI_FLASH_MTD
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=2000 > 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=2000 > 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=2000 > 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=5000 > 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=5000 > 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
Re: [U-Boot] [PATCH 3/3] mtd: spi: Clean up usage of CONFIG_SPI_FLASH_MTD
On Mon, Sep 16, 2019 at 9:36 AM Stefan Roese wrote: > > On 14.09.19 00:44, Schrempf Frieder wrote: > > 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 > > Reviewed-by: Stefan Roese Reviewed-by: Simon Goldschmidt > > Thanks, > Stefan ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 3/3] mtd: spi: Clean up usage of CONFIG_SPI_FLASH_MTD
On 14.09.19 00:44, Schrempf Frieder wrote: 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 Reviewed-by: Stefan Roese Thanks, Stefan ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 3/3] mtd: spi: Clean up usage of CONFIG_SPI_FLASH_MTD
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 --- 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=2000 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=2000 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=2000 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=5000 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=5000 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 #
