* [PATCH v2 01/12] ARM: imx/mxs defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
2014-05-01 6:26 [PATCH v2 00/12] defconfigs: add MTD_SPI_NOR (new subsystem dependency for M25P80) Brian Norris
@ 2014-05-01 6:26 ` Brian Norris
2014-05-01 6:43 ` Paul Bolle
2014-05-06 13:55 ` Shawn Guo
2014-05-01 6:26 ` [PATCH v2 02/12] ARM: " Brian Norris
` (7 subsequent siblings)
8 siblings, 2 replies; 22+ messages in thread
From: Brian Norris @ 2014-05-01 6:26 UTC (permalink / raw)
To: linux-arm-kernel
These defconfigs contain the CONFIG_M25P80 symbol, which is now
dependent on the MTD_SPI_NOR symbol. Add CONFIG_MTD_SPI_NOR to satisfy
the new dependency.
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Cc: Shawn Guo <shawn.guo@freescale.com>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-kernel at vger.kernel.org
Reviewed-by: Marek Vasut <marex@denx.de>
---
arch/arm/configs/imx_v6_v7_defconfig | 1 +
arch/arm/configs/mxs_defconfig | 1 +
2 files changed, 2 insertions(+)
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index 09e974392fa1..c098195e9bd3 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -89,6 +89,7 @@ CONFIG_MTD_SST25L=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_GPMI_NAND=y
CONFIG_MTD_NAND_MXC=y
+CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_UBI=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_RAM=y
diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig
index 6150108e15de..eac87f4fae07 100644
--- a/arch/arm/configs/mxs_defconfig
+++ b/arch/arm/configs/mxs_defconfig
@@ -55,6 +55,7 @@ CONFIG_MTD_M25P80=y
CONFIG_MTD_SST25L=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_GPMI_NAND=y
+CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_UBI=y
# CONFIG_BLK_DEV is not set
CONFIG_EEPROM_AT24=y
--
1.8.3.2
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH v2 01/12] ARM: imx/mxs defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
2014-05-01 6:26 ` [PATCH v2 01/12] ARM: imx/mxs defconfigs: add MTD_SPI_NOR (new " Brian Norris
@ 2014-05-01 6:43 ` Paul Bolle
2014-05-06 13:55 ` Shawn Guo
1 sibling, 0 replies; 22+ messages in thread
From: Paul Bolle @ 2014-05-01 6:43 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, 2014-04-30 at 23:26 -0700, Brian Norris wrote:
> These defconfigs contain the CONFIG_M25P80 symbol, which is now
That's a typo: use "the MTD_M25P80 symbol" (but only if you need to
resend anyway, I'd say; the same typo can be found in the subject too).
> dependent on the MTD_SPI_NOR symbol. Add CONFIG_MTD_SPI_NOR to satisfy
> the new dependency.
>
> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
> Cc: Shawn Guo <shawn.guo@freescale.com>
> Cc: Sascha Hauer <kernel@pengutronix.de>
> Cc: linux-arm-kernel at lists.infradead.org
> Cc: linux-kernel at vger.kernel.org
> Reviewed-by: Marek Vasut <marex@denx.de>
Paul Bolle
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH v2 01/12] ARM: imx/mxs defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
2014-05-01 6:26 ` [PATCH v2 01/12] ARM: imx/mxs defconfigs: add MTD_SPI_NOR (new " Brian Norris
2014-05-01 6:43 ` Paul Bolle
@ 2014-05-06 13:55 ` Shawn Guo
1 sibling, 0 replies; 22+ messages in thread
From: Shawn Guo @ 2014-05-06 13:55 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Apr 30, 2014 at 11:26:36PM -0700, Brian Norris wrote:
> These defconfigs contain the CONFIG_M25P80 symbol, which is now
> dependent on the MTD_SPI_NOR symbol. Add CONFIG_MTD_SPI_NOR to satisfy
> the new dependency.
>
> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
> Cc: Shawn Guo <shawn.guo@freescale.com>
> Cc: Sascha Hauer <kernel@pengutronix.de>
> Cc: linux-arm-kernel at lists.infradead.org
> Cc: linux-kernel at vger.kernel.org
> Reviewed-by: Marek Vasut <marex@denx.de>
Applied, thanks.
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH v2 02/12] ARM: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
2014-05-01 6:26 [PATCH v2 00/12] defconfigs: add MTD_SPI_NOR (new subsystem dependency for M25P80) Brian Norris
2014-05-01 6:26 ` [PATCH v2 01/12] ARM: imx/mxs defconfigs: add MTD_SPI_NOR (new " Brian Norris
@ 2014-05-01 6:26 ` Brian Norris
2014-05-01 8:54 ` Simon Horman
2014-05-01 6:26 ` [PATCH v2 03/12] ARM: keystone: " Brian Norris
` (6 subsequent siblings)
8 siblings, 1 reply; 22+ messages in thread
From: Brian Norris @ 2014-05-01 6:26 UTC (permalink / raw)
To: linux-arm-kernel
These defconfigs contain the CONFIG_M25P80 symbol, which is now
dependent on the MTD_SPI_NOR symbol. Add CONFIG_MTD_SPI_NOR to satisfy
the new dependency.
At the same time, drop the now-nonexistent CONFIG_MTD_CHAR symbol.
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Olof Johansson <olof@lixom.net>
Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-kernel at vger.kernel.org
---
This patch catches all the configs I couldn't find a sub-arch for, plus the ARM
multiplatform defconfigs
arch/arm/configs/bockw_defconfig | 2 +-
arch/arm/configs/koelsch_defconfig | 1 +
arch/arm/configs/lager_defconfig | 1 +
arch/arm/configs/multi_v5_defconfig | 1 +
arch/arm/configs/multi_v7_defconfig | 1 +
5 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/arch/arm/configs/bockw_defconfig b/arch/arm/configs/bockw_defconfig
index e816140d81c5..28339e072a71 100644
--- a/arch/arm/configs/bockw_defconfig
+++ b/arch/arm/configs/bockw_defconfig
@@ -50,11 +50,11 @@ CONFIG_DEVTMPFS_MOUNT=y
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
# CONFIG_FW_LOADER is not set
CONFIG_MTD=y
-CONFIG_MTD_CHAR=y
CONFIG_MTD_BLOCK=y
CONFIG_MTD_CFI=y
CONFIG_MTD_CFI_AMDSTD=y
CONFIG_MTD_M25P80=y
+CONFIG_MTD_SPI_NOR=y
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y
CONFIG_NETDEVICES=y
diff --git a/arch/arm/configs/koelsch_defconfig b/arch/arm/configs/koelsch_defconfig
index 86faab565a96..dcd55f20d36e 100644
--- a/arch/arm/configs/koelsch_defconfig
+++ b/arch/arm/configs/koelsch_defconfig
@@ -42,6 +42,7 @@ CONFIG_ATA=y
CONFIG_SATA_RCAR=y
CONFIG_MTD=y
CONFIG_MTD_M25P80=y
+CONFIG_MTD_SPI_NOR=y
CONFIG_NETDEVICES=y
# CONFIG_NET_VENDOR_ARC is not set
# CONFIG_NET_CADENCE is not set
diff --git a/arch/arm/configs/lager_defconfig b/arch/arm/configs/lager_defconfig
index 58702440472a..c4dbd778458b 100644
--- a/arch/arm/configs/lager_defconfig
+++ b/arch/arm/configs/lager_defconfig
@@ -53,6 +53,7 @@ CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
CONFIG_MTD=y
CONFIG_MTD_M25P80=y
+CONFIG_MTD_SPI_NOR=y
CONFIG_BLK_DEV_SD=y
CONFIG_ATA=y
CONFIG_SATA_RCAR=y
diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig
index aa3dfb084fed..aaf23933fb91 100644
--- a/arch/arm/configs/multi_v5_defconfig
+++ b/arch/arm/configs/multi_v5_defconfig
@@ -56,6 +56,7 @@ CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_M25P80=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_ORION=y
+CONFIG_MTD_SPI_NOR=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_EEPROM_AT24=y
# CONFIG_SCSI_PROC_FS is not set
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index d4e8a47a2f7c..9937db16050c 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -108,6 +108,7 @@ CONFIG_CMA_SIZE_MBYTES=64
CONFIG_OMAP_OCP2SCP=y
CONFIG_MTD=y
CONFIG_MTD_M25P80=y
+CONFIG_MTD_SPI_NOR=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_ICS932S401=y
CONFIG_APDS9802ALS=y
--
1.8.3.2
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH v2 02/12] ARM: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
2014-05-01 6:26 ` [PATCH v2 02/12] ARM: " Brian Norris
@ 2014-05-01 8:54 ` Simon Horman
2014-05-06 18:12 ` Brian Norris
0 siblings, 1 reply; 22+ messages in thread
From: Simon Horman @ 2014-05-01 8:54 UTC (permalink / raw)
To: linux-arm-kernel
[ CC linux-sh and Magnus Damm (shmobile co-maintainer) ]
On Wed, Apr 30, 2014 at 11:26:37PM -0700, Brian Norris wrote:
> These defconfigs contain the CONFIG_M25P80 symbol, which is now
> dependent on the MTD_SPI_NOR symbol. Add CONFIG_MTD_SPI_NOR to satisfy
> the new dependency.
>
> At the same time, drop the now-nonexistent CONFIG_MTD_CHAR symbol.
>
> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
> Cc: Russell King <linux@arm.linux.org.uk>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Olof Johansson <olof@lixom.net>
> Cc: linux-arm-kernel at lists.infradead.org
> Cc: linux-kernel at vger.kernel.org
> ---
> This patch catches all the configs I couldn't find a sub-arch for, plus the ARM
> multiplatform defconfigs
>
> arch/arm/configs/bockw_defconfig | 2 +-
> arch/arm/configs/koelsch_defconfig | 1 +
> arch/arm/configs/lager_defconfig | 1 +
The above changes are for shmobile SoC defconfigs which I maintain
(as is one other patch in the series).
While the below ones are not.
With regards to updating shmobile configuration options,
we have recently moved towards using Kconfig rather than
defconfig in cases where selecting A means we really ought
to select B too. Something along the lines of:
select CONFIG_MTD_SPI_NOR if CONFIG_MTD_M25P80
Do you consider that CONFIG_MTD_SPI_NOR should always
be selected if CONFIG_MTD_M25P80 if selected?
If so, perhaps it would be best to update the CONFIG_MTD_M25P80 Kconfig
node to select CONFIG_MTD_M25P80. This would probably imply that most
if not all of this series would no longer be needed.
If not, would you be able to make a patch to add something like
the above snippet to arch/arm/shmobile/Kconfig (probably more than once)
and drop the changes to shmobile defconfigs from this series?
> arch/arm/configs/multi_v5_defconfig | 1 +
> arch/arm/configs/multi_v7_defconfig | 1 +
> 5 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/configs/bockw_defconfig b/arch/arm/configs/bockw_defconfig
> index e816140d81c5..28339e072a71 100644
> --- a/arch/arm/configs/bockw_defconfig
> +++ b/arch/arm/configs/bockw_defconfig
> @@ -50,11 +50,11 @@ CONFIG_DEVTMPFS_MOUNT=y
> # CONFIG_PREVENT_FIRMWARE_BUILD is not set
> # CONFIG_FW_LOADER is not set
> CONFIG_MTD=y
> -CONFIG_MTD_CHAR=y
The above change seems unrelated to the subject of the patch.
If its valid then I'd prefer it submitted as a separate patch.
> CONFIG_MTD_BLOCK=y
> CONFIG_MTD_CFI=y
> CONFIG_MTD_CFI_AMDSTD=y
> CONFIG_MTD_M25P80=y
> +CONFIG_MTD_SPI_NOR=y
> CONFIG_SCSI=y
> CONFIG_BLK_DEV_SD=y
> CONFIG_NETDEVICES=y
> diff --git a/arch/arm/configs/koelsch_defconfig b/arch/arm/configs/koelsch_defconfig
> index 86faab565a96..dcd55f20d36e 100644
> --- a/arch/arm/configs/koelsch_defconfig
> +++ b/arch/arm/configs/koelsch_defconfig
> @@ -42,6 +42,7 @@ CONFIG_ATA=y
> CONFIG_SATA_RCAR=y
> CONFIG_MTD=y
> CONFIG_MTD_M25P80=y
> +CONFIG_MTD_SPI_NOR=y
> CONFIG_NETDEVICES=y
> # CONFIG_NET_VENDOR_ARC is not set
> # CONFIG_NET_CADENCE is not set
> diff --git a/arch/arm/configs/lager_defconfig b/arch/arm/configs/lager_defconfig
> index 58702440472a..c4dbd778458b 100644
> --- a/arch/arm/configs/lager_defconfig
> +++ b/arch/arm/configs/lager_defconfig
> @@ -53,6 +53,7 @@ CONFIG_DEVTMPFS=y
> CONFIG_DEVTMPFS_MOUNT=y
> CONFIG_MTD=y
> CONFIG_MTD_M25P80=y
> +CONFIG_MTD_SPI_NOR=y
> CONFIG_BLK_DEV_SD=y
> CONFIG_ATA=y
> CONFIG_SATA_RCAR=y
> diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig
> index aa3dfb084fed..aaf23933fb91 100644
> --- a/arch/arm/configs/multi_v5_defconfig
> +++ b/arch/arm/configs/multi_v5_defconfig
> @@ -56,6 +56,7 @@ CONFIG_MTD_PHYSMAP=y
> CONFIG_MTD_M25P80=y
> CONFIG_MTD_NAND=y
> CONFIG_MTD_NAND_ORION=y
> +CONFIG_MTD_SPI_NOR=y
> CONFIG_BLK_DEV_LOOP=y
> CONFIG_EEPROM_AT24=y
> # CONFIG_SCSI_PROC_FS is not set
> diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
> index d4e8a47a2f7c..9937db16050c 100644
> --- a/arch/arm/configs/multi_v7_defconfig
> +++ b/arch/arm/configs/multi_v7_defconfig
> @@ -108,6 +108,7 @@ CONFIG_CMA_SIZE_MBYTES=64
> CONFIG_OMAP_OCP2SCP=y
> CONFIG_MTD=y
> CONFIG_MTD_M25P80=y
> +CONFIG_MTD_SPI_NOR=y
> CONFIG_BLK_DEV_LOOP=y
> CONFIG_ICS932S401=y
> CONFIG_APDS9802ALS=y
> --
> 1.8.3.2
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH v2 02/12] ARM: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
2014-05-01 8:54 ` Simon Horman
@ 2014-05-06 18:12 ` Brian Norris
2014-05-11 0:43 ` Simon Horman
0 siblings, 1 reply; 22+ messages in thread
From: Brian Norris @ 2014-05-06 18:12 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, May 01, 2014 at 05:54:47PM +0900, Simon Horman wrote:
> [ CC linux-sh and Magnus Damm (shmobile co-maintainer) ]
>
> On Wed, Apr 30, 2014 at 11:26:37PM -0700, Brian Norris wrote:
> > These defconfigs contain the CONFIG_M25P80 symbol, which is now
> > dependent on the MTD_SPI_NOR symbol. Add CONFIG_MTD_SPI_NOR to satisfy
> > the new dependency.
> >
> > At the same time, drop the now-nonexistent CONFIG_MTD_CHAR symbol.
> >
> > Signed-off-by: Brian Norris <computersforpeace@gmail.com>
> > Cc: Russell King <linux@arm.linux.org.uk>
> > Cc: Arnd Bergmann <arnd@arndb.de>
> > Cc: Olof Johansson <olof@lixom.net>
> > Cc: linux-arm-kernel at lists.infradead.org
> > Cc: linux-kernel at vger.kernel.org
> > ---
> > This patch catches all the configs I couldn't find a sub-arch for, plus the ARM
> > multiplatform defconfigs
> >
> > arch/arm/configs/bockw_defconfig | 2 +-
> > arch/arm/configs/koelsch_defconfig | 1 +
> > arch/arm/configs/lager_defconfig | 1 +
>
> The above changes are for shmobile SoC defconfigs which I maintain
> (as is one other patch in the series).
> While the below ones are not.
This is admittedly a confusing process. I have to parse each defconfig
to figure out what the mach-* is, then read MAINTAINERS. Perhaps you can
update your MAINTAINERS entries? This is a wide problem, that makes
patch submission for defconfigs even more difficult.
Olof, other ARM SOC maintainers,
What do you recommend? Should I send another couple of patches just to
split this trivial patch? Olof mentioned taking some patch(es) directly,
and handling merge conflicts when they come.
> With regards to updating shmobile configuration options,
> we have recently moved towards using Kconfig rather than
> defconfig in cases where selecting A means we really ought
> to select B too. Something along the lines of:
>
> select CONFIG_MTD_SPI_NOR if CONFIG_MTD_M25P80
That seems like you're just avoiding touching defconfig for the sake of
not touching defconfig. Additionally, this method only really makes
sense for an upgrade path (otherwise, how would you configure MTD_M25P80
&& !MTD_SPI_NOR?). Is this approach consistent across other mach-*?
> Do you consider that CONFIG_MTD_SPI_NOR should always
> be selected if CONFIG_MTD_M25P80 if selected?
Yes. That's what "depends on" means.
BTW, M25P80 will likely be moved under the SPI-NOR submenu eventually
(its driver is not really a "Standalone MTD" anymore), but currently
this is just a "depends on".
> If so, perhaps it would be best to update the CONFIG_MTD_M25P80 Kconfig
> node to select CONFIG_MTD_M25P80. This would probably imply that most
> if not all of this series would no longer be needed.
I do not understand this paragraph. How does M25P80 select M25P80?
> If not, would you be able to make a patch to add something like
> the above snippet to arch/arm/shmobile/Kconfig (probably more than once)
> and drop the changes to shmobile defconfigs from this series?
Feel free to submit your own patch if you don't want mine.
> > arch/arm/configs/multi_v5_defconfig | 1 +
> > arch/arm/configs/multi_v7_defconfig | 1 +
> > 5 files changed, 5 insertions(+), 1 deletion(-)
> >
> > diff --git a/arch/arm/configs/bockw_defconfig b/arch/arm/configs/bockw_defconfig
> > index e816140d81c5..28339e072a71 100644
> > --- a/arch/arm/configs/bockw_defconfig
> > +++ b/arch/arm/configs/bockw_defconfig
> > @@ -50,11 +50,11 @@ CONFIG_DEVTMPFS_MOUNT=y
> > # CONFIG_PREVENT_FIRMWARE_BUILD is not set
> > # CONFIG_FW_LOADER is not set
> > CONFIG_MTD=y
> > -CONFIG_MTD_CHAR=y
>
> The above change seems unrelated to the subject of the patch.
>
> If its valid then I'd prefer it submitted as a separate patch.
Seriously? It's mentioned in the commit description, and it's really
really trivial.
Brian
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH v2 02/12] ARM: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
2014-05-06 18:12 ` Brian Norris
@ 2014-05-11 0:43 ` Simon Horman
0 siblings, 0 replies; 22+ messages in thread
From: Simon Horman @ 2014-05-11 0:43 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, May 06, 2014 at 11:12:40AM -0700, Brian Norris wrote:
> On Thu, May 01, 2014 at 05:54:47PM +0900, Simon Horman wrote:
> > [ CC linux-sh and Magnus Damm (shmobile co-maintainer) ]
> >
> > On Wed, Apr 30, 2014 at 11:26:37PM -0700, Brian Norris wrote:
> > > These defconfigs contain the CONFIG_M25P80 symbol, which is now
> > > dependent on the MTD_SPI_NOR symbol. Add CONFIG_MTD_SPI_NOR to satisfy
> > > the new dependency.
> > >
> > > At the same time, drop the now-nonexistent CONFIG_MTD_CHAR symbol.
> > >
> > > Signed-off-by: Brian Norris <computersforpeace@gmail.com>
> > > Cc: Russell King <linux@arm.linux.org.uk>
> > > Cc: Arnd Bergmann <arnd@arndb.de>
> > > Cc: Olof Johansson <olof@lixom.net>
> > > Cc: linux-arm-kernel at lists.infradead.org
> > > Cc: linux-kernel at vger.kernel.org
> > > ---
> > > This patch catches all the configs I couldn't find a sub-arch for, plus the ARM
> > > multiplatform defconfigs
> > >
> > > arch/arm/configs/bockw_defconfig | 2 +-
> > > arch/arm/configs/koelsch_defconfig | 1 +
> > > arch/arm/configs/lager_defconfig | 1 +
> >
> > The above changes are for shmobile SoC defconfigs which I maintain
> > (as is one other patch in the series).
> > While the below ones are not.
>
> This is admittedly a confusing process. I have to parse each defconfig
> to figure out what the mach-* is, then read MAINTAINERS. Perhaps you can
> update your MAINTAINERS entries? This is a wide problem, that makes
> patch submission for defconfigs even more difficult.
U understand it is confusing.
I'll see about updating my MAINTAINERS entries accordingly.
> Olof, other ARM SOC maintainers,
>
> What do you recommend? Should I send another couple of patches just to
> split this trivial patch? Olof mentioned taking some patch(es) directly,
> and handling merge conflicts when they come.
>
> > With regards to updating shmobile configuration options,
> > we have recently moved towards using Kconfig rather than
> > defconfig in cases where selecting A means we really ought
> > to select B too. Something along the lines of:
> >
> > select CONFIG_MTD_SPI_NOR if CONFIG_MTD_M25P80
>
> That seems like you're just avoiding touching defconfig for the sake of
> not touching defconfig. Additionally, this method only really makes
> sense for an upgrade path (otherwise, how would you configure MTD_M25P80
> && !MTD_SPI_NOR?). Is this approach consistent across other mach-*?
I do not fully understand your patchset. But from my point of view
it seems to me that the key question is "is it desirable to configure
MTD_M25P80 && !MTD_SPI_NOR". I suspect not as below you confirm
that MTD_SPI_NOR should always be selected if MTD_M25P80 if selected.
> > Do you consider that CONFIG_MTD_SPI_NOR should always
> > be selected if CONFIG_MTD_M25P80 if selected?
>
> Yes. That's what "depends on" means.
In that case I think that dependency should be expressed using Kconfig.
That way anyone (or any defconfig) that selects MTD_M25P80 will
also get MTD_SPI_NOR selected without needing to know that the former
depends on the later.
> BTW, M25P80 will likely be moved under the SPI-NOR submenu eventually
> (its driver is not really a "Standalone MTD" anymore), but currently
> this is just a "depends on".
>
> > If so, perhaps it would be best to update the CONFIG_MTD_M25P80 Kconfig
> > node to select CONFIG_MTD_M25P80. This would probably imply that most
> > if not all of this series would no longer be needed.
>
> I do not understand this paragraph. How does M25P80 select M25P80?
Sorry, I meant to say "... update the MTD_M25P80 Kconfig node
to select MTD_SPI_NOR".
> > If not, would you be able to make a patch to add something like
> > the above snippet to arch/arm/shmobile/Kconfig (probably more than once)
> > and drop the changes to shmobile defconfigs from this series?
>
> Feel free to submit your own patch if you don't want mine.
>
> > > arch/arm/configs/multi_v5_defconfig | 1 +
> > > arch/arm/configs/multi_v7_defconfig | 1 +
> > > 5 files changed, 5 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/arch/arm/configs/bockw_defconfig b/arch/arm/configs/bockw_defconfig
> > > index e816140d81c5..28339e072a71 100644
> > > --- a/arch/arm/configs/bockw_defconfig
> > > +++ b/arch/arm/configs/bockw_defconfig
> > > @@ -50,11 +50,11 @@ CONFIG_DEVTMPFS_MOUNT=y
> > > # CONFIG_PREVENT_FIRMWARE_BUILD is not set
> > > # CONFIG_FW_LOADER is not set
> > > CONFIG_MTD=y
> > > -CONFIG_MTD_CHAR=y
> >
> > The above change seems unrelated to the subject of the patch.
> >
> > If its valid then I'd prefer it submitted as a separate patch.
>
> Seriously? It's mentioned in the commit description, and it's really
> really trivial.
Sorry, I missed it in the changelog.
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH v2 03/12] ARM: keystone: add MTD_SPI_NOR (new dependency for M25P80)
2014-05-01 6:26 [PATCH v2 00/12] defconfigs: add MTD_SPI_NOR (new subsystem dependency for M25P80) Brian Norris
2014-05-01 6:26 ` [PATCH v2 01/12] ARM: imx/mxs defconfigs: add MTD_SPI_NOR (new " Brian Norris
2014-05-01 6:26 ` [PATCH v2 02/12] ARM: " Brian Norris
@ 2014-05-01 6:26 ` Brian Norris
2014-05-01 14:16 ` Santosh Shilimkar
2014-05-01 6:26 ` [PATCH v2 04/12] ARM: tegra: " Brian Norris
` (5 subsequent siblings)
8 siblings, 1 reply; 22+ messages in thread
From: Brian Norris @ 2014-05-01 6:26 UTC (permalink / raw)
To: linux-arm-kernel
This defconfig contains the CONFIG_M25P80 symbol, which is now
dependent on the MTD_SPI_NOR symbol. Add CONFIG_MTD_SPI_NOR to satisfy
the new dependency.
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-kernel at vger.kernel.org
---
arch/arm/configs/keystone_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/configs/keystone_defconfig b/arch/arm/configs/keystone_defconfig
index ec9a41d50680..b3057730689f 100644
--- a/arch/arm/configs/keystone_defconfig
+++ b/arch/arm/configs/keystone_defconfig
@@ -112,6 +112,7 @@ CONFIG_MTD_PLATRAM=y
CONFIG_MTD_M25P80=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_DAVINCI=y
+CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_UBI=y
CONFIG_PROC_DEVICETREE=y
CONFIG_BLK_DEV_LOOP=y
--
1.8.3.2
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH v2 03/12] ARM: keystone: add MTD_SPI_NOR (new dependency for M25P80)
2014-05-01 6:26 ` [PATCH v2 03/12] ARM: keystone: " Brian Norris
@ 2014-05-01 14:16 ` Santosh Shilimkar
0 siblings, 0 replies; 22+ messages in thread
From: Santosh Shilimkar @ 2014-05-01 14:16 UTC (permalink / raw)
To: linux-arm-kernel
On Thursday 01 May 2014 02:26 AM, Brian Norris wrote:
> This defconfig contains the CONFIG_M25P80 symbol, which is now
> dependent on the MTD_SPI_NOR symbol. Add CONFIG_MTD_SPI_NOR to satisfy
> the new dependency.
>
> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
> Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
> Cc: linux-arm-kernel at lists.infradead.org
> Cc: linux-kernel at vger.kernel.org
> ---
I will pick this up for 3.16.
> arch/arm/configs/keystone_defconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm/configs/keystone_defconfig b/arch/arm/configs/keystone_defconfig
> index ec9a41d50680..b3057730689f 100644
> --- a/arch/arm/configs/keystone_defconfig
> +++ b/arch/arm/configs/keystone_defconfig
> @@ -112,6 +112,7 @@ CONFIG_MTD_PLATRAM=y
> CONFIG_MTD_M25P80=y
> CONFIG_MTD_NAND=y
> CONFIG_MTD_NAND_DAVINCI=y
> +CONFIG_MTD_SPI_NOR=y
> CONFIG_MTD_UBI=y
> CONFIG_PROC_DEVICETREE=y
> CONFIG_BLK_DEV_LOOP=y
>
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH v2 04/12] ARM: tegra: add MTD_SPI_NOR (new dependency for M25P80)
2014-05-01 6:26 [PATCH v2 00/12] defconfigs: add MTD_SPI_NOR (new subsystem dependency for M25P80) Brian Norris
` (2 preceding siblings ...)
2014-05-01 6:26 ` [PATCH v2 03/12] ARM: keystone: " Brian Norris
@ 2014-05-01 6:26 ` Brian Norris
2014-05-01 17:26 ` Stephen Warren
2014-05-01 6:26 ` [PATCH v2 05/12] ARM: lpc32xx: " Brian Norris
` (4 subsequent siblings)
8 siblings, 1 reply; 22+ messages in thread
From: Brian Norris @ 2014-05-01 6:26 UTC (permalink / raw)
To: linux-arm-kernel
This defconfig contains the CONFIG_M25P80 symbol, which is now
dependent on the MTD_SPI_NOR symbol. Add CONFIG_MTD_SPI_NOR to satisfy
the new dependency.
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-kernel at vger.kernel.org
---
arch/arm/configs/tegra_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index 2926281368ab..e4464986d7b4 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -90,6 +90,7 @@ CONFIG_DMA_CMA=y
CONFIG_CMA_SIZE_MBYTES=64
CONFIG_MTD=y
CONFIG_MTD_M25P80=y
+CONFIG_MTD_SPI_NOR=y
CONFIG_PROC_DEVICETREE=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_AD525X_DPOT=y
--
1.8.3.2
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH v2 05/12] ARM: lpc32xx: add MTD_SPI_NOR (new dependency for M25P80)
2014-05-01 6:26 [PATCH v2 00/12] defconfigs: add MTD_SPI_NOR (new subsystem dependency for M25P80) Brian Norris
` (3 preceding siblings ...)
2014-05-01 6:26 ` [PATCH v2 04/12] ARM: tegra: " Brian Norris
@ 2014-05-01 6:26 ` Brian Norris
2014-05-01 17:21 ` Roland Stigge
2014-05-01 6:26 ` [PATCH v2 06/12] ARM: at91: " Brian Norris
` (3 subsequent siblings)
8 siblings, 1 reply; 22+ messages in thread
From: Brian Norris @ 2014-05-01 6:26 UTC (permalink / raw)
To: linux-arm-kernel
This defconfig contains the CONFIG_M25P80 symbol, which is now
dependent on the MTD_SPI_NOR symbol. Add CONFIG_MTD_SPI_NOR to satisfy
the new dependency.
At the same time, drop the now-nonexistent CONFIG_MTD_CHAR symbol.
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Cc: Roland Stigge <stigge@antcom.de>
Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-kernel at vger.kernel.org
---
arch/arm/configs/lpc32xx_defconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/configs/lpc32xx_defconfig b/arch/arm/configs/lpc32xx_defconfig
index 398a367ffce8..2de54c35fb47 100644
--- a/arch/arm/configs/lpc32xx_defconfig
+++ b/arch/arm/configs/lpc32xx_defconfig
@@ -53,12 +53,12 @@ CONFIG_DEVTMPFS_MOUNT=y
# CONFIG_FW_LOADER is not set
CONFIG_MTD=y
CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_CHAR=y
CONFIG_MTD_BLOCK=y
CONFIG_MTD_M25P80=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_SLC_LPC32XX=y
CONFIG_MTD_NAND_MLC_LPC32XX=y
+CONFIG_MTD_SPI_NOR=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_CRYPTOLOOP=y
CONFIG_BLK_DEV_RAM=y
--
1.8.3.2
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH v2 05/12] ARM: lpc32xx: add MTD_SPI_NOR (new dependency for M25P80)
2014-05-01 6:26 ` [PATCH v2 05/12] ARM: lpc32xx: " Brian Norris
@ 2014-05-01 17:21 ` Roland Stigge
2014-05-06 17:15 ` Brian Norris
0 siblings, 1 reply; 22+ messages in thread
From: Roland Stigge @ 2014-05-01 17:21 UTC (permalink / raw)
To: linux-arm-kernel
On 01/05/14 08:26, Brian Norris wrote:
> This defconfig contains the CONFIG_M25P80 symbol, which is now
> dependent on the MTD_SPI_NOR symbol. Add CONFIG_MTD_SPI_NOR to satisfy
> the new dependency.
Can't the CONFIG_M25P80 declare its dependency on CONFIG_MTD_SPI_NOR
itself, or put CONFIG_M25P80 etc. into a submenu under CONFIG_MTD_SPI_NOR?
>
> At the same time, drop the now-nonexistent CONFIG_MTD_CHAR symbol.
>
> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
> Cc: Roland Stigge <stigge@antcom.de>
> Cc: linux-arm-kernel at lists.infradead.org
> Cc: linux-kernel at vger.kernel.org
> ---
> arch/arm/configs/lpc32xx_defconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/configs/lpc32xx_defconfig b/arch/arm/configs/lpc32xx_defconfig
> index 398a367ffce8..2de54c35fb47 100644
> --- a/arch/arm/configs/lpc32xx_defconfig
> +++ b/arch/arm/configs/lpc32xx_defconfig
> @@ -53,12 +53,12 @@ CONFIG_DEVTMPFS_MOUNT=y
> # CONFIG_FW_LOADER is not set
> CONFIG_MTD=y
> CONFIG_MTD_CMDLINE_PARTS=y
> -CONFIG_MTD_CHAR=y
> CONFIG_MTD_BLOCK=y
> CONFIG_MTD_M25P80=y
> CONFIG_MTD_NAND=y
> CONFIG_MTD_NAND_SLC_LPC32XX=y
> CONFIG_MTD_NAND_MLC_LPC32XX=y
> +CONFIG_MTD_SPI_NOR=y
> CONFIG_BLK_DEV_LOOP=y
> CONFIG_BLK_DEV_CRYPTOLOOP=y
> CONFIG_BLK_DEV_RAM=y
>
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH v2 05/12] ARM: lpc32xx: add MTD_SPI_NOR (new dependency for M25P80)
2014-05-01 17:21 ` Roland Stigge
@ 2014-05-06 17:15 ` Brian Norris
0 siblings, 0 replies; 22+ messages in thread
From: Brian Norris @ 2014-05-06 17:15 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, May 01, 2014 at 07:21:06PM +0200, Roland Stigge wrote:
> On 01/05/14 08:26, Brian Norris wrote:
> > This defconfig contains the CONFIG_M25P80 symbol, which is now
> > dependent on the MTD_SPI_NOR symbol. Add CONFIG_MTD_SPI_NOR to satisfy
> > the new dependency.
>
> Can't the CONFIG_M25P80 declare its dependency on CONFIG_MTD_SPI_NOR
> itself, or put CONFIG_M25P80 etc. into a submenu under CONFIG_MTD_SPI_NOR?
It does declared the dependency already. And I plan to move it under the
SPI-NOR submenu too.
But as I stated in the cover letter (I'm not sure if it made it through
to all the cross-posted ML's):
http://article.gmane.org/gmane.linux.ports.ppc.embedded/69885
"Note that without the new CONFIG_MTD_SPI_NOR symbol in your
defconfig, Kconfig will automatically drop M25P80 for you."
So declaring the dependency is half the battle, but you still have to
include your dependencies in your defconfig.
Brian
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH v2 06/12] ARM: at91: add MTD_SPI_NOR (new dependency for M25P80)
2014-05-01 6:26 [PATCH v2 00/12] defconfigs: add MTD_SPI_NOR (new subsystem dependency for M25P80) Brian Norris
` (4 preceding siblings ...)
2014-05-01 6:26 ` [PATCH v2 05/12] ARM: lpc32xx: " Brian Norris
@ 2014-05-01 6:26 ` Brian Norris
2014-09-02 8:36 ` Nicolas Ferre
2014-05-01 6:26 ` [PATCH v2 07/12] ARM: shmobile: " Brian Norris
` (2 subsequent siblings)
8 siblings, 1 reply; 22+ messages in thread
From: Brian Norris @ 2014-05-01 6:26 UTC (permalink / raw)
To: linux-arm-kernel
This defconfig contains the CONFIG_M25P80 symbol, which is now
dependent on the MTD_SPI_NOR symbol. Add CONFIG_MTD_SPI_NOR to satisfy
the new dependency.
At the same time, drop the now-nonexistent CONFIG_MTD_CHAR symbol.
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Cc: Andrew Victor <linux@maxim.org.za>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-kernel at vger.kernel.org
---
arch/arm/configs/sama5_defconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig
index dc3881e07630..8282ebab6e52 100644
--- a/arch/arm/configs/sama5_defconfig
+++ b/arch/arm/configs/sama5_defconfig
@@ -65,12 +65,12 @@ CONFIG_DEVTMPFS_MOUNT=y
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
CONFIG_MTD=y
CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_CHAR=y
CONFIG_MTD_BLOCK=y
CONFIG_MTD_CFI=y
CONFIG_MTD_M25P80=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_ATMEL=y
+CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_UBI=y
CONFIG_MTD_UBI_GLUEBI=y
CONFIG_PROC_DEVICETREE=y
--
1.8.3.2
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH v2 06/12] ARM: at91: add MTD_SPI_NOR (new dependency for M25P80)
2014-05-01 6:26 ` [PATCH v2 06/12] ARM: at91: " Brian Norris
@ 2014-09-02 8:36 ` Nicolas Ferre
0 siblings, 0 replies; 22+ messages in thread
From: Nicolas Ferre @ 2014-09-02 8:36 UTC (permalink / raw)
To: linux-arm-kernel
On 01/05/2014 08:26, Brian Norris :
> This defconfig contains the CONFIG_M25P80 symbol, which is now
> dependent on the MTD_SPI_NOR symbol. Add CONFIG_MTD_SPI_NOR to satisfy
> the new dependency.
>
> At the same time, drop the now-nonexistent CONFIG_MTD_CHAR symbol.
>
> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
> Cc: Andrew Victor <linux@maxim.org.za>
> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Okay, now taken in at91-3.18-defconfig, thanks:
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
> Cc: linux-arm-kernel at lists.infradead.org
> Cc: linux-kernel at vger.kernel.org
> ---
> arch/arm/configs/sama5_defconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig
> index dc3881e07630..8282ebab6e52 100644
> --- a/arch/arm/configs/sama5_defconfig
> +++ b/arch/arm/configs/sama5_defconfig
> @@ -65,12 +65,12 @@ CONFIG_DEVTMPFS_MOUNT=y
> # CONFIG_PREVENT_FIRMWARE_BUILD is not set
> CONFIG_MTD=y
> CONFIG_MTD_CMDLINE_PARTS=y
> -CONFIG_MTD_CHAR=y
> CONFIG_MTD_BLOCK=y
> CONFIG_MTD_CFI=y
> CONFIG_MTD_M25P80=y
> CONFIG_MTD_NAND=y
> CONFIG_MTD_NAND_ATMEL=y
> +CONFIG_MTD_SPI_NOR=y
> CONFIG_MTD_UBI=y
> CONFIG_MTD_UBI_GLUEBI=y
> CONFIG_PROC_DEVICETREE=y
>
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH v2 07/12] ARM: shmobile: add MTD_SPI_NOR (new dependency for M25P80)
2014-05-01 6:26 [PATCH v2 00/12] defconfigs: add MTD_SPI_NOR (new subsystem dependency for M25P80) Brian Norris
` (5 preceding siblings ...)
2014-05-01 6:26 ` [PATCH v2 06/12] ARM: at91: " Brian Norris
@ 2014-05-01 6:26 ` Brian Norris
2014-05-01 6:26 ` [PATCH v2 08/12] ARM: marvell: " Brian Norris
2014-08-07 21:36 ` [PATCH v2 00/12] defconfigs: add MTD_SPI_NOR (new subsystem " Geert Uytterhoeven
8 siblings, 0 replies; 22+ messages in thread
From: Brian Norris @ 2014-05-01 6:26 UTC (permalink / raw)
To: linux-arm-kernel
This defconfig contains the CONFIG_M25P80 symbol, which is now
dependent on the MTD_SPI_NOR symbol. Add CONFIG_MTD_SPI_NOR to satisfy
the new dependency.
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Cc: Simon Horman <horms@verge.net.au>
Cc: Magnus Damm <magnus.damm@gmail.com>
Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-kernel at vger.kernel.org
---
arch/arm/configs/shmobile_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig
index 83b07258a385..ddfdc36be9c8 100644
--- a/arch/arm/configs/shmobile_defconfig
+++ b/arch/arm/configs/shmobile_defconfig
@@ -43,6 +43,7 @@ CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
CONFIG_MTD=y
CONFIG_MTD_M25P80=y
+CONFIG_MTD_SPI_NOR=y
CONFIG_BLK_DEV_SD=y
CONFIG_ATA=y
CONFIG_SATA_RCAR=y
--
1.8.3.2
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH v2 08/12] ARM: marvell: add MTD_SPI_NOR (new dependency for M25P80)
2014-05-01 6:26 [PATCH v2 00/12] defconfigs: add MTD_SPI_NOR (new subsystem dependency for M25P80) Brian Norris
` (6 preceding siblings ...)
2014-05-01 6:26 ` [PATCH v2 07/12] ARM: shmobile: " Brian Norris
@ 2014-05-01 6:26 ` Brian Norris
2014-05-01 17:53 ` Ezequiel Garcia
2014-05-05 1:03 ` Jason Cooper
2014-08-07 21:36 ` [PATCH v2 00/12] defconfigs: add MTD_SPI_NOR (new subsystem " Geert Uytterhoeven
8 siblings, 2 replies; 22+ messages in thread
From: Brian Norris @ 2014-05-01 6:26 UTC (permalink / raw)
To: linux-arm-kernel
These defconfigs contain the CONFIG_M25P80 symbol, which is now
dependent on the MTD_SPI_NOR symbol. Add CONFIG_MTD_SPI_NOR to satisfy
the new dependency.
At the same time, drop the now-nonexistent CONFIG_MTD_CHAR symbol.
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-kernel at vger.kernel.org
Acked-by: Jason Cooper <jason@lakedaemon.net>
---
arch/arm/configs/dove_defconfig | 2 +-
arch/arm/configs/kirkwood_defconfig | 1 +
arch/arm/configs/mvebu_v5_defconfig | 1 +
arch/arm/configs/mvebu_v7_defconfig | 1 +
4 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/arm/configs/dove_defconfig b/arch/arm/configs/dove_defconfig
index f15955144175..701677f9248c 100644
--- a/arch/arm/configs/dove_defconfig
+++ b/arch/arm/configs/dove_defconfig
@@ -37,7 +37,6 @@ CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
CONFIG_MTD=y
CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_CHAR=y
CONFIG_MTD_BLOCK=y
CONFIG_MTD_CFI=y
CONFIG_MTD_JEDECPROBE=y
@@ -48,6 +47,7 @@ CONFIG_MTD_CFI_INTELEXT=y
CONFIG_MTD_CFI_STAA=y
CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_M25P80=y
+CONFIG_MTD_SPI_NOR=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=1
diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig
index 2e762d94e94b..b9e480c10b10 100644
--- a/arch/arm/configs/kirkwood_defconfig
+++ b/arch/arm/configs/kirkwood_defconfig
@@ -61,6 +61,7 @@ CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_M25P80=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_ORION=y
+CONFIG_MTD_SPI_NOR=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_EEPROM_AT24=y
# CONFIG_SCSI_PROC_FS is not set
diff --git a/arch/arm/configs/mvebu_v5_defconfig b/arch/arm/configs/mvebu_v5_defconfig
index 36484a37a1ca..85d20666cef5 100644
--- a/arch/arm/configs/mvebu_v5_defconfig
+++ b/arch/arm/configs/mvebu_v5_defconfig
@@ -50,6 +50,7 @@ CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_M25P80=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_ORION=y
+CONFIG_MTD_SPI_NOR=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_EEPROM_AT24=y
# CONFIG_SCSI_PROC_FS is not set
diff --git a/arch/arm/configs/mvebu_v7_defconfig b/arch/arm/configs/mvebu_v7_defconfig
index a34713d8db9f..ae45bf05fa00 100644
--- a/arch/arm/configs/mvebu_v7_defconfig
+++ b/arch/arm/configs/mvebu_v7_defconfig
@@ -53,6 +53,7 @@ CONFIG_I2C_MV64XXX=y
CONFIG_MTD=y
CONFIG_MTD_CHAR=y
CONFIG_MTD_M25P80=y
+CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_CFI=y
CONFIG_MTD_CFI_INTELEXT=y
CONFIG_MTD_CFI_AMDSTD=y
--
1.8.3.2
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH v2 08/12] ARM: marvell: add MTD_SPI_NOR (new dependency for M25P80)
2014-05-01 6:26 ` [PATCH v2 08/12] ARM: marvell: " Brian Norris
@ 2014-05-01 17:53 ` Ezequiel Garcia
2014-05-05 1:03 ` Jason Cooper
1 sibling, 0 replies; 22+ messages in thread
From: Ezequiel Garcia @ 2014-05-01 17:53 UTC (permalink / raw)
To: linux-arm-kernel
On Apr 30, Brian Norris wrote:
> These defconfigs contain the CONFIG_M25P80 symbol, which is now
> dependent on the MTD_SPI_NOR symbol. Add CONFIG_MTD_SPI_NOR to satisfy
> the new dependency.
>
> At the same time, drop the now-nonexistent CONFIG_MTD_CHAR symbol.
>
> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Cc: linux-arm-kernel at lists.infradead.org
> Cc: linux-kernel at vger.kernel.org
> Acked-by: Jason Cooper <jason@lakedaemon.net>
Acked-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
And tested the SPI is now selected (and works on Armada XP GP)
using mvebu_v7_defconfig.
Thanks a lot for taking care of this,
--
Ezequiel Garc?a, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH v2 08/12] ARM: marvell: add MTD_SPI_NOR (new dependency for M25P80)
2014-05-01 6:26 ` [PATCH v2 08/12] ARM: marvell: " Brian Norris
2014-05-01 17:53 ` Ezequiel Garcia
@ 2014-05-05 1:03 ` Jason Cooper
1 sibling, 0 replies; 22+ messages in thread
From: Jason Cooper @ 2014-05-05 1:03 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Apr 30, 2014 at 11:26:43PM -0700, Brian Norris wrote:
> These defconfigs contain the CONFIG_M25P80 symbol, which is now
> dependent on the MTD_SPI_NOR symbol. Add CONFIG_MTD_SPI_NOR to satisfy
> the new dependency.
>
> At the same time, drop the now-nonexistent CONFIG_MTD_CHAR symbol.
>
> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Cc: linux-arm-kernel at lists.infradead.org
> Cc: linux-kernel at vger.kernel.org
> Acked-by: Jason Cooper <jason@lakedaemon.net>
> ---
> arch/arm/configs/dove_defconfig | 2 +-
> arch/arm/configs/kirkwood_defconfig | 1 +
> arch/arm/configs/mvebu_v5_defconfig | 1 +
> arch/arm/configs/mvebu_v7_defconfig | 1 +
> 4 files changed, 4 insertions(+), 1 deletion(-)
Applied to mvebu/defconfig with Ezequiel's Ack, and a reworded subject:
"ARM: mvebu: defconfig: add MTD_SPI_NOR (new dependency for M25P80)"
thx,
Jason.
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH v2 00/12] defconfigs: add MTD_SPI_NOR (new subsystem dependency for M25P80)
2014-05-01 6:26 [PATCH v2 00/12] defconfigs: add MTD_SPI_NOR (new subsystem dependency for M25P80) Brian Norris
` (7 preceding siblings ...)
2014-05-01 6:26 ` [PATCH v2 08/12] ARM: marvell: " Brian Norris
@ 2014-08-07 21:36 ` Geert Uytterhoeven
8 siblings, 0 replies; 22+ messages in thread
From: Geert Uytterhoeven @ 2014-08-07 21:36 UTC (permalink / raw)
To: linux-arm-kernel
Hi Brian,
On Thu, May 1, 2014 at 8:26 AM, Brian Norris
<computersforpeace@gmail.com> wrote:
> v1 --> v2: split ARM defconfig changes into their sub-architectures. No change
> in the overall diff.
>
> Hi all,
>
> We are introducing a new SPI-NOR subsystem/framework for MTD, to support
> various types of SPI-NOR flash controllers which require (or benefit from)
> intimate knowledge of the flash interface, rather than just the relatively dumb
> SPI interface. This framework borrows much of the m25p80 driver for its
> abstraction and moves this code into a spi-nor module.
>
> This means CONFIG_M25P80 now has a dependency on CONFIG_MTD_SPI_NOR, which
> should be added to the defconfigs. I expect that each (sub)architecture
> maintainer can merge these patches to their own tree.
>
> Note that without the new CONFIG_MTD_SPI_NOR symbol in your defconfig, Kconfig
> will automatically drop M25P80 for you.
>
> Please keep general comments to the cover letter, so all parties can see.
>
> This series is based on 3.15-rc1.
>
> The SPI-NOR development code (in -next, queued for 3.16) is here:
>
> git://git.infradead.org/l2-mtd.git +spinor
>
> This defconfig series is available in the same repo at:
>
> git://git.infradead.org/l2-mtd.git +defconfigs
>
> Thanks,
> Brian
>
> Brian Norris (12):
> ARM: imx/mxs defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
> ARM: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
> ARM: keystone: add MTD_SPI_NOR (new dependency for M25P80)
> ARM: tegra: add MTD_SPI_NOR (new dependency for M25P80)
> ARM: lpc32xx: add MTD_SPI_NOR (new dependency for M25P80)
> ARM: at91: add MTD_SPI_NOR (new dependency for M25P80)
> ARM: shmobile: add MTD_SPI_NOR (new dependency for M25P80)
> ARM: marvell: add MTD_SPI_NOR (new dependency for M25P80)
> blackfin: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
> mips: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
> powerpc: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
> sh: defconfig: add MTD_SPI_NOR (new dependency for M25P80)
>
> arch/arm/configs/bockw_defconfig | 2 +-
> arch/arm/configs/dove_defconfig | 2 +-
> arch/arm/configs/imx_v6_v7_defconfig | 1 +
> arch/arm/configs/keystone_defconfig | 1 +
> arch/arm/configs/kirkwood_defconfig | 1 +
> arch/arm/configs/koelsch_defconfig | 1 +
> arch/arm/configs/lager_defconfig | 1 +
> arch/arm/configs/lpc32xx_defconfig | 2 +-
> arch/arm/configs/multi_v5_defconfig | 1 +
> arch/arm/configs/multi_v7_defconfig | 1 +
> arch/arm/configs/mvebu_v5_defconfig | 1 +
> arch/arm/configs/mvebu_v7_defconfig | 1 +
> arch/arm/configs/mxs_defconfig | 1 +
> arch/arm/configs/sama5_defconfig | 2 +-
> arch/arm/configs/shmobile_defconfig | 1 +
> arch/arm/configs/tegra_defconfig | 1 +
> arch/blackfin/configs/BF526-EZBRD_defconfig | 2 +-
> arch/blackfin/configs/BF527-EZKIT-V2_defconfig | 2 +-
> arch/blackfin/configs/BF527-EZKIT_defconfig | 2 +-
> arch/blackfin/configs/BF548-EZKIT_defconfig | 2 +-
> arch/blackfin/configs/BF609-EZKIT_defconfig | 2 +-
> arch/blackfin/configs/BlackStamp_defconfig | 3 +--
> arch/blackfin/configs/H8606_defconfig | 3 +--
> arch/mips/configs/ath79_defconfig | 3 +--
> arch/mips/configs/db1xxx_defconfig | 1 +
> arch/mips/configs/rt305x_defconfig | 2 +-
> arch/powerpc/configs/corenet32_smp_defconfig | 2 +-
> arch/powerpc/configs/corenet64_smp_defconfig | 2 +-
> arch/powerpc/configs/mpc85xx_defconfig | 2 +-
> arch/powerpc/configs/mpc85xx_smp_defconfig | 2 +-
> arch/sh/configs/sh7757lcr_defconfig | 2 +-
> 31 files changed, 31 insertions(+), 21 deletions(-)
FWIW, this change still hasn't propagated to the following defconfigs:
arch/arm/configs/axm55xx_defconfig
arch/arm/configs/bockw_defconfig
arch/arm/configs/koelsch_defconfig
arch/arm/configs/lager_defconfig
arch/arm/configs/lpc32xx_defconfig
arch/arm/configs/multi_v5_defconfig
arch/arm/configs/multi_v7_defconfig
arch/arm/configs/qcom_defconfig
arch/arm/configs/sama5_defconfig
arch/arm/configs/shmobile_defconfig
arch/powerpc/configs/85xx/kmp204x_defconfig
arch/powerpc/configs/corenet32_smp_defconfig
arch/powerpc/configs/corenet64_smp_defconfig
arch/powerpc/configs/mpc85xx_defconfig
arch/powerpc/configs/mpc85xx_smp_defconfig
arch/sh/configs/sh7757lcr_defconfig
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 22+ messages in thread