defconfigs: add MTD_SPI_NOR (new subsystem dependency for M25P80)
Subsystems (10)
v2 cover defconfigs: add MTD_SPI_NOR (new subsystem dependency for M25P80)
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(-)
Signature · 1 line
1.8.3.2
PATCH v2 1/12 ARM: imx/mxs defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
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.
--- arch/arm/configs/imx_v6_v7_defconfig | 1 + arch/arm/configs/mxs_defconfig | 1 + 2 files changed, 2 insertions(+)
arch/arm/configs/imx_v6_v7_defconfig +1 -0
@@ -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
arch/arm/configs/mxs_defconfig +1 -0
@@ -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
Signature · 1 line
1.8.3.2
Re: [PATCH v2 01/12] ARM: imx/mxs defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
Quoted 1 line · Brian Norris
These defconfigs contain the
CONFIG_M25P80symbol, 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).
Quoted 9 lines
dependent on the
MTD_SPI_NORsymbol. AddCONFIG_MTD_SPI_NORto satisfy the new dependency.Signed-off-by Brian Norris <[email protected]>Cc Shawn Guo <[email protected]>Cc Sascha Hauer <[email protected]>Cc linux-arm-kernel at lists.infradead.orgCc linux-kernel at vger.kernel.orgReviewed-by Marek Vasut <[email protected]>
Paul Bolle
Shawn Guo
AppliedRe: [PATCH v2 01/12] ARM: imx/mxs defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
In reply to Brian NorrisQuoted 10 lines · Brian Norris
These defconfigs contain the
CONFIG_M25P80symbol, which is now dependent on theMTD_SPI_NORsymbol. AddCONFIG_MTD_SPI_NORto satisfy the new dependency.Signed-off-by Brian Norris <[email protected]>Cc Shawn Guo <[email protected]>Cc Sascha Hauer <[email protected]>Cc linux-arm-kernel at lists.infradead.orgCc linux-kernel at vger.kernel.orgReviewed-by Marek Vasut <[email protected]>
Applied, thanks.
PATCH v2 2/12 ARM: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
In reply to Brian NorrisThese 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.
---
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(-)
arch/arm/configs/bockw_defconfig +1 -1
@@ -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
arch/arm/configs/koelsch_defconfig +1 -0
@@ -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
arch/arm/configs/lager_defconfig +1 -0
@@ -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
arch/arm/configs/multi_v5_defconfig +1 -0
@@ -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
arch/arm/configs/multi_v7_defconfig +1 -0
@@ -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
Signature · 1 line
1.8.3.2
Re: [PATCH v2 02/12] ARM: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
[ CC linux-sh and Magnus Damm (shmobile co-maintainer) ]
Quoted 12 lines · Brian Norris
These defconfigs contain the
CONFIG_M25P80symbol, which is now dependent on theMTD_SPI_NORsymbol. AddCONFIG_MTD_SPI_NORto satisfy the new dependency.At the same time, drop the now-nonexistent
CONFIG_MTD_CHARsymbol.Signed-off-by Brian Norris <[email protected]>Cc Russell King <[email protected]>Cc Arnd Bergmann <[email protected]>Cc Olof Johansson <[email protected]>Cc linux-arm-kernel at lists.infradead.orgCc linux-kernel at vger.kernel.org
Quoted 7 lines
---
This patch catches all the configs I couldn't find a sub-arch for, plus the ARM multiplatform defconfigsarch/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/bockw_defconfig CONFIG_DEVTMPFS_MOUNT=y · line 53
Quoted 13 lines
arch/arm/configs/multi_v5_defconfig | 1 + arch/arm/configs/multi_v7_defconfig | 1 + 5 files changed, 5 insertions(+), 1 deletion(-)arch/arm/configs/bockw_defconfig +0
-1@@ -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.
Quoted 65 lines
arch/arm/configs/bockw_defconfig +1
-0CONFIG_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=yarch/arm/configs/koelsch_defconfig +1
-0@@ -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 setarch/arm/configs/lager_defconfig +1
-0@@ -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=yarch/arm/configs/multi_v5_defconfig +1
-0@@ -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 setarch/arm/configs/multi_v7_defconfig +1
-0@@ -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=ySignature · 7 lines
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
Re: [PATCH v2 02/12] ARM: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
Quoted 19 lines · Simon Horman
[ CC linux-sh and Magnus Damm (shmobile co-maintainer) ]
Quoted 16 lines · Brian Norris
These defconfigs contain the
CONFIG_M25P80symbol, which is now dependent on theMTD_SPI_NORsymbol. AddCONFIG_MTD_SPI_NORto satisfy the new dependency.At the same time, drop the now-nonexistent
CONFIG_MTD_CHARsymbol.Signed-off-by Brian Norris <[email protected]>Cc Russell King <[email protected]>Cc Arnd Bergmann <[email protected]>Cc Olof Johansson <[email protected]>Cc linux-arm-kernel at lists.infradead.orgCc 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
Quoted 7 lines
Quoted 3 lines
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.
Quoted 6 lines
With regards to updating shmobile configuration options, we have recently moved towards using
Kconfigrather than defconfig in cases where selecting A means we really ought to select B too. Something along the lines of:select
CONFIG_MTD_SPI_NORifCONFIG_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-*?
Quoted 2 lines
Do you consider that
CONFIG_MTD_SPI_NORshould always be selected ifCONFIG_MTD_M25P80if 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".
Quoted 3 lines
If so, perhaps it would be best to update the
CONFIG_MTD_M25P80Kconfignode to selectCONFIG_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?
Quoted 3 lines
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.
Quoted 16 lines
arch/arm/configs/bockw_defconfig CONFIG_DEVTMPFS_MOUNT=y · line 53
Quoted 13 lines
arch/arm/configs/multi_v5_defconfig | 1 + arch/arm/configs/multi_v7_defconfig | 1 + 5 files changed, 5 insertions(+), 1 deletion(-)arch/arm/configs/bockw_defconfig +0
-1@@ -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=yThe above change seems unrelated to the subject of the patch.
Quoted 1 line
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
Re: [PATCH v2 02/12] ARM: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
Quoted 24 lines · Brian Norris
Quoted 23 lines · Simon Horman
[ CC linux-sh and Magnus Damm (shmobile co-maintainer) ]
Quoted 19 lines · Brian Norris
These defconfigs contain the
CONFIG_M25P80symbol, which is now dependent on theMTD_SPI_NORsymbol. AddCONFIG_MTD_SPI_NORto satisfy the new dependency.At the same time, drop the now-nonexistent
CONFIG_MTD_CHARsymbol.Signed-off-by Brian Norris <[email protected]>Cc Russell King <[email protected]>Cc Arnd Bergmann <[email protected]>Cc Olof Johansson <[email protected]>Cc linux-arm-kernel at lists.infradead.orgCc linux-kernel at vger.kernel.org---
This patch catches all the configs I couldn't find a sub-arch for, plus the ARM multiplatform defconfigsarch/arm/configs/bockw_defconfig | 2 +- arch/arm/configs/koelsch_defconfig | 1 + arch/arm/configs/lager_defconfig | 1 +
Quoted 8 lines
Quoted 3 lines
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 yourMAINTAINERSentries? 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.
Quoted 11 lines
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.
Quoted 5 lines
With regards to updating shmobile configuration options, we have recently moved towards using
Kconfigrather than defconfig in cases where selecting A means we really ought to select B too. Something along the lines of:
Quoted 6 lines
Quoted 1 line
select
CONFIG_MTD_SPI_NORifCONFIG_MTD_M25P80That 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.
Quoted 4 lines
Quoted 2 lines
Do you consider that
CONFIG_MTD_SPI_NORshould always be selected ifCONFIG_MTD_M25P80if 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.
Quoted 9 lines
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".
Quoted 3 lines
If so, perhaps it would be best to update the
CONFIG_MTD_M25P80Kconfignode to selectCONFIG_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".
Quoted 22 lines
Quoted 3 lines
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.
Quoted 16 lines
arch/arm/configs/bockw_defconfig CONFIG_DEVTMPFS_MOUNT=y · line 53
Quoted 13 lines
arch/arm/configs/multi_v5_defconfig | 1 + arch/arm/configs/multi_v7_defconfig | 1 + 5 files changed, 5 insertions(+), 1 deletion(-)arch/arm/configs/bockw_defconfig +0
-1@@ -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=yThe above change seems unrelated to the subject of the patch.
Quoted 4 lines
Quoted 1 line
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.
PATCH v2 3/12 ARM: keystone: add MTD_SPI_NOR (new dependency for M25P80)
In reply to Brian NorrisThis 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.
--- arch/arm/configs/keystone_defconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm/configs/keystone_defconfig +1 -0
@@ -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
Signature · 1 line
1.8.3.2
Re: [PATCH v2 03/12] ARM: keystone: add MTD_SPI_NOR (new dependency for M25P80)
Quoted 9 lines · Brian Norris
This defconfig contains the
CONFIG_M25P80symbol, which is now dependent on theMTD_SPI_NORsymbol. AddCONFIG_MTD_SPI_NORto satisfy the new dependency.Signed-off-by Brian Norris <[email protected]>Cc Santosh Shilimkar <[email protected]>Cc linux-arm-kernel at lists.infradead.orgCc linux-kernel at vger.kernel.org---
I will pick this up for 3.16.
Quoted 16 lines
arch/arm/configs/keystone_defconfig | 1 + 1 file changed, 1 insertion(+)arch/arm/configs/keystone_defconfig +1
-0@@ -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
PATCH v2 4/12 ARM: tegra: add MTD_SPI_NOR (new dependency for M25P80)
In reply to Brian NorrisThis 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.
--- arch/arm/configs/tegra_defconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm/configs/tegra_defconfig +1 -0
@@ -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
Signature · 1 line
1.8.3.2
Re: [PATCH v2 04/12] ARM: tegra: add MTD_SPI_NOR (new dependency for M25P80)
Quoted 3 lines · Brian Norris
This defconfig contains the
CONFIG_M25P80symbol, which is now dependent on theMTD_SPI_NORsymbol. AddCONFIG_MTD_SPI_NORto satisfy the new dependency.
Squashed into Tegra's for-3.16/defconfig branch.
PATCH v2 5/12 ARM: lpc32xx: add MTD_SPI_NOR (new dependency for M25P80)
In reply to Brian NorrisThis 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.
--- arch/arm/configs/lpc32xx_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/configs/lpc32xx_defconfig +1 -1
@@ -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
Signature · 1 line
1.8.3.2
Re: [PATCH v2 05/12] ARM: lpc32xx: add MTD_SPI_NOR (new dependency for M25P80)
Quoted 3 lines · Brian Norris
This defconfig contains the
CONFIG_M25P80symbol, which is now dependent on theMTD_SPI_NORsymbol. AddCONFIG_MTD_SPI_NORto 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?
Quoted 30 lines
At the same time, drop the now-nonexistent
CONFIG_MTD_CHARsymbol.Signed-off-by Brian Norris <[email protected]>Cc Roland Stigge <[email protected]>Cc linux-arm-kernel at lists.infradead.orgCc linux-kernel at vger.kernel.org--- arch/arm/configs/lpc32xx_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/arm/configs/lpc32xx_defconfig +1
-1@@ -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
Re: [PATCH v2 05/12] ARM: lpc32xx: add MTD_SPI_NOR (new dependency for M25P80)
Quoted 7 lines · Roland Stigge
Quoted 3 lines · Brian Norris
This defconfig contains the
CONFIG_M25P80symbol, which is now dependent on theMTD_SPI_NORsymbol. AddCONFIG_MTD_SPI_NORto satisfy the new dependency.Can't the
CONFIG_M25P80declare its dependency onCONFIG_MTD_SPI_NORitself, or putCONFIG_M25P80etc. into a submenu underCONFIG_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
PATCH v2 6/12 ARM: at91: add MTD_SPI_NOR (new dependency for M25P80)
In reply to Brian NorrisThis 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.
--- arch/arm/configs/sama5_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/configs/sama5_defconfig +1 -1
@@ -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
Signature · 1 line
1.8.3.2
Re: [PATCH v2 06/12] ARM: at91: add MTD_SPI_NOR (new dependency for M25P80)
On 01/05/2014 08:26, Brian Norris :
Quoted 9 lines
This defconfig contains the
CONFIG_M25P80symbol, which is now dependent on theMTD_SPI_NORsymbol. AddCONFIG_MTD_SPI_NORto satisfy the new dependency.At the same time, drop the now-nonexistent
CONFIG_MTD_CHARsymbol.Signed-off-by Brian Norris <[email protected]>Cc Andrew Victor <[email protected]>Cc Nicolas Ferre <[email protected]>
Okay, now taken in at91-3.18-defconfig, thanks:
Quoted 26 lines
Cc Jean-Christophe Plagniol-Villard <[email protected]>Cc linux-arm-kernel at lists.infradead.orgCc linux-kernel at vger.kernel.org--- arch/arm/configs/sama5_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/arm/configs/sama5_defconfig +1
-1@@ -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
Signature · 1 line
Nicolas Ferre
PATCH v2 7/12 ARM: shmobile: add MTD_SPI_NOR (new dependency for M25P80)
In reply to Brian NorrisThis 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.
--- arch/arm/configs/shmobile_defconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm/configs/shmobile_defconfig +1 -0
@@ -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
Signature · 1 line
1.8.3.2
PATCH v2 8/12 ARM: marvell: add MTD_SPI_NOR (new dependency for M25P80)
In reply to Brian NorrisThese 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.
--- 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(-)
arch/arm/configs/dove_defconfig +1 -1
@@ -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
arch/arm/configs/kirkwood_defconfig +1 -0
@@ -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
arch/arm/configs/mvebu_v5_defconfig +1 -0
@@ -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
arch/arm/configs/mvebu_v7_defconfig +1 -0
@@ -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
Signature · 1 line
1.8.3.2
Re: [PATCH v2 08/12] ARM: marvell: add MTD_SPI_NOR (new dependency for M25P80)
Quoted 6 lines · Brian Norris
These defconfigs contain the
CONFIG_M25P80symbol, which is now dependent on theMTD_SPI_NORsymbol. AddCONFIG_MTD_SPI_NORto satisfy the new dependency.At the same time, drop the now-nonexistent
CONFIG_MTD_CHARsymbol.
Quoted 7 lines
Signed-off-by Brian Norris <[email protected]>Cc Jason Cooper <[email protected]>Cc Andrew Lunn <[email protected]>Cc Sebastian Hesselbarth <[email protected]>Cc linux-arm-kernel at lists.infradead.orgCc linux-kernel at vger.kernel.orgAcked-by Jason Cooper <[email protected]>
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,
Signature · 3 lines
Ezequiel Garc?a, Free Electrons Embedded Linux, Kernel and Android Engineering http://free-electrons.com
Jason Cooper
AppliedRe: [PATCH v2 08/12] ARM: marvell: add MTD_SPI_NOR (new dependency for M25P80)
In reply to Brian NorrisQuoted 13 lines · Brian Norris
These defconfigs contain the
CONFIG_M25P80symbol, which is now dependent on theMTD_SPI_NORsymbol. AddCONFIG_MTD_SPI_NORto satisfy the new dependency.At the same time, drop the now-nonexistent
CONFIG_MTD_CHARsymbol.Signed-off-by Brian Norris <[email protected]>Cc Jason Cooper <[email protected]>Cc Andrew Lunn <[email protected]>Cc Sebastian Hesselbarth <[email protected]>Cc linux-arm-kernel at lists.infradead.orgCc linux-kernel at vger.kernel.orgAcked-by Jason Cooper <[email protected]>
Quoted 6 lines
--- 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.
PATCH v2 9/12 blackfin: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
In reply to Brian NorrisThese 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.
--- 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 +-- 7 files changed, 7 insertions(+), 9 deletions(-)
arch/blackfin/configs/BF526-EZBRD_defconfig +1 -1
@@ -53,7 +53,6 @@ CONFIG_IP_PNP=y CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" # CONFIG_FW_LOADER is not set CONFIG_MTD=y -CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y CONFIG_MTD_CFI=y CONFIG_MTD_CFI_INTELEXT=y
@@ -63,6 +62,7 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y CONFIG_MTD_PHYSMAP=y CONFIG_MTD_M25P80=y CONFIG_MTD_NAND=m +CONFIG_MTD_SPI_NOR=y CONFIG_BLK_DEV_RAM=y CONFIG_SCSI=y # CONFIG_SCSI_PROC_FS is not set
arch/blackfin/configs/BF527-EZKIT-V2_defconfig +1 -1
@@ -58,7 +58,6 @@ CONFIG_BFIN_SIR0=y CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" # CONFIG_FW_LOADER is not set CONFIG_MTD=y -CONFIG_MTD_CHAR=m CONFIG_MTD_BLOCK=y CONFIG_MTD_JEDECPROBE=m CONFIG_MTD_RAM=y
@@ -66,6 +65,7 @@ CONFIG_MTD_ROM=m CONFIG_MTD_COMPLEX_MAPPINGS=y CONFIG_MTD_M25P80=y CONFIG_MTD_NAND=m +CONFIG_MTD_SPI_NOR=y CONFIG_BLK_DEV_RAM=y CONFIG_SCSI=y # CONFIG_SCSI_PROC_FS is not set
arch/blackfin/configs/BF527-EZKIT_defconfig +1 -1
@@ -57,7 +57,6 @@ CONFIG_BFIN_SIR0=y CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" # CONFIG_FW_LOADER is not set CONFIG_MTD=y -CONFIG_MTD_CHAR=m CONFIG_MTD_BLOCK=y CONFIG_MTD_JEDECPROBE=m CONFIG_MTD_RAM=y
@@ -65,6 +64,7 @@ CONFIG_MTD_ROM=m CONFIG_MTD_COMPLEX_MAPPINGS=y CONFIG_MTD_M25P80=y CONFIG_MTD_NAND=m +CONFIG_MTD_SPI_NOR=y CONFIG_BLK_DEV_RAM=y CONFIG_SCSI=y # CONFIG_SCSI_PROC_FS is not set
arch/blackfin/configs/BF548-EZKIT_defconfig +1 -1
@@ -64,7 +64,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_FW_LOADER=m CONFIG_MTD=y CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y CONFIG_MTD_CFI=y CONFIG_MTD_CFI_INTELEXT=y
@@ -75,6 +74,7 @@ CONFIG_MTD_M25P80=y CONFIG_MTD_NAND=y CONFIG_MTD_NAND_BF5XX=y # CONFIG_MTD_NAND_BF5XX_HWECC is not set +CONFIG_MTD_SPI_NOR=y CONFIG_BLK_DEV_RAM=y # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=y
arch/blackfin/configs/BF609-EZKIT_defconfig +1 -1
@@ -57,7 +57,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_FW_LOADER=m CONFIG_MTD=y CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y CONFIG_MTD_CFI=y CONFIG_MTD_CFI_INTELEXT=y
@@ -65,6 +64,7 @@ CONFIG_MTD_CFI_STAA=y CONFIG_MTD_COMPLEX_MAPPINGS=y CONFIG_MTD_PHYSMAP=y CONFIG_MTD_M25P80=y +CONFIG_MTD_SPI_NOR=y CONFIG_MTD_UBI=m CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y
arch/blackfin/configs/BlackStamp_defconfig +1 -2
@@ -45,7 +45,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" # CONFIG_FW_LOADER is not set CONFIG_MTD=y CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=m CONFIG_MTD_BLOCK=y CONFIG_MTD_CFI=m CONFIG_MTD_CFI_AMDSTD=m
@@ -53,7 +52,7 @@ CONFIG_MTD_RAM=y CONFIG_MTD_ROM=m CONFIG_MTD_COMPLEX_MAPPINGS=y CONFIG_MTD_M25P80=y -# CONFIG_M25PXX_USE_FAST_READ is not set +CONFIG_MTD_SPI_NOR=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_NBD=y CONFIG_BLK_DEV_RAM=y
arch/blackfin/configs/H8606_defconfig +1 -2
@@ -36,13 +36,12 @@ CONFIG_IRTTY_SIR=m # CONFIG_WIRELESS is not set # CONFIG_FW_LOADER is not set CONFIG_MTD=y -CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y CONFIG_MTD_RAM=y CONFIG_MTD_ROM=y CONFIG_MTD_COMPLEX_MAPPINGS=y CONFIG_MTD_M25P80=y -# CONFIG_M25PXX_USE_FAST_READ is not set +CONFIG_MTD_SPI_NOR=y CONFIG_BLK_DEV_RAM=y CONFIG_MISC_DEVICES=y CONFIG_EEPROM_AT25=y
Signature · 1 line
1.8.3.2
Steven Miao
AppliedRe: [PATCH v2 09/12] blackfin: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
Applied to 3.16. Thanks.
Quoted 163 lines · Brian Norris
These defconfigs contain the
CONFIG_M25P80symbol, which is now dependent on theMTD_SPI_NORsymbol. AddCONFIG_MTD_SPI_NORto satisfy the new dependency.At the same time, drop the now-nonexistent
CONFIG_MTD_CHARsymbol.Signed-off-by Brian Norris <[email protected]>Cc Steven Miao <[email protected]>--- 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 +-- 7 files changed, 7 insertions(+), 9 deletions(-)arch/blackfin/configs/BF526-EZBRD_defconfig +1
-1@@ -53,7 +53,6 @@ CONFIG_IP_PNP=y CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" # CONFIG_FW_LOADER is not set CONFIG_MTD=y -CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y CONFIG_MTD_CFI=y CONFIG_MTD_CFI_INTELEXT=y@@ -63,6 +62,7 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y CONFIG_MTD_PHYSMAP=y CONFIG_MTD_M25P80=y CONFIG_MTD_NAND=m +CONFIG_MTD_SPI_NOR=y CONFIG_BLK_DEV_RAM=y CONFIG_SCSI=y # CONFIG_SCSI_PROC_FS is not setarch/blackfin/configs/BF527-EZKIT-V2_defconfig +1
-1@@ -58,7 +58,6 @@ CONFIG_BFIN_SIR0=y CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" # CONFIG_FW_LOADER is not set CONFIG_MTD=y -CONFIG_MTD_CHAR=m CONFIG_MTD_BLOCK=y CONFIG_MTD_JEDECPROBE=m CONFIG_MTD_RAM=y@@ -66,6 +65,7 @@ CONFIG_MTD_ROM=m CONFIG_MTD_COMPLEX_MAPPINGS=y CONFIG_MTD_M25P80=y CONFIG_MTD_NAND=m +CONFIG_MTD_SPI_NOR=y CONFIG_BLK_DEV_RAM=y CONFIG_SCSI=y # CONFIG_SCSI_PROC_FS is not setarch/blackfin/configs/BF527-EZKIT_defconfig +1
-1@@ -57,7 +57,6 @@ CONFIG_BFIN_SIR0=y CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" # CONFIG_FW_LOADER is not set CONFIG_MTD=y -CONFIG_MTD_CHAR=m CONFIG_MTD_BLOCK=y CONFIG_MTD_JEDECPROBE=m CONFIG_MTD_RAM=y@@ -65,6 +64,7 @@ CONFIG_MTD_ROM=m CONFIG_MTD_COMPLEX_MAPPINGS=y CONFIG_MTD_M25P80=y CONFIG_MTD_NAND=m +CONFIG_MTD_SPI_NOR=y CONFIG_BLK_DEV_RAM=y CONFIG_SCSI=y # CONFIG_SCSI_PROC_FS is not setarch/blackfin/configs/BF548-EZKIT_defconfig +1
-1@@ -64,7 +64,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_FW_LOADER=m CONFIG_MTD=y CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y CONFIG_MTD_CFI=y CONFIG_MTD_CFI_INTELEXT=y@@ -75,6 +74,7 @@ CONFIG_MTD_M25P80=y CONFIG_MTD_NAND=y CONFIG_MTD_NAND_BF5XX=y # CONFIG_MTD_NAND_BF5XX_HWECC is not set +CONFIG_MTD_SPI_NOR=y CONFIG_BLK_DEV_RAM=y # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=yarch/blackfin/configs/BF609-EZKIT_defconfig +1
-1@@ -57,7 +57,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_FW_LOADER=m CONFIG_MTD=y CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y CONFIG_MTD_CFI=y CONFIG_MTD_CFI_INTELEXT=y@@ -65,6 +64,7 @@ CONFIG_MTD_CFI_STAA=y CONFIG_MTD_COMPLEX_MAPPINGS=y CONFIG_MTD_PHYSMAP=y CONFIG_MTD_M25P80=y +CONFIG_MTD_SPI_NOR=y CONFIG_MTD_UBI=m CONFIG_SCSI=y CONFIG_BLK_DEV_SD=yarch/blackfin/configs/BlackStamp_defconfig +1
-2@@ -45,7 +45,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" # CONFIG_FW_LOADER is not set CONFIG_MTD=y CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=m CONFIG_MTD_BLOCK=y CONFIG_MTD_CFI=m CONFIG_MTD_CFI_AMDSTD=m@@ -53,7 +52,7 @@ CONFIG_MTD_RAM=y CONFIG_MTD_ROM=m CONFIG_MTD_COMPLEX_MAPPINGS=y CONFIG_MTD_M25P80=y -# CONFIG_M25PXX_USE_FAST_READ is not set +CONFIG_MTD_SPI_NOR=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_NBD=y CONFIG_BLK_DEV_RAM=yarch/blackfin/configs/H8606_defconfig +1
-3@@ -36,13 +36,12 @@ CONFIG_IRTTY_SIR=m # CONFIG_WIRELESS is not set # CONFIG_FW_LOADER is not set CONFIG_MTD=y -CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y CONFIG_MTD_RAM=y CONFIG_MTD_ROM=y CONFIG_MTD_COMPLEX_MAPPINGS=y CONFIG_MTD_M25P80=y -# CONFIG_M25PXX_USE_FAST_READ is not set +CONFIG_MTD_SPI_NOR=y CONFIG_BLK_DEV_RAM=y CONFIG_MISC_DEVICES=y CONFIG_EEPROM_AT25=y --1.8.3.2
PATCH v2 10/12 mips: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
In reply to Brian NorrisThese 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.
--- arch/mips/configs/ath79_defconfig | 3 +-- arch/mips/configs/db1xxx_defconfig | 1 + arch/mips/configs/rt305x_defconfig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/mips/configs/ath79_defconfig +1 -2
@@ -46,7 +46,6 @@ CONFIG_MTD=y CONFIG_MTD_REDBOOT_PARTS=y CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2 CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y CONFIG_MTD_CFI=y CONFIG_MTD_JEDECPROBE=y
@@ -54,7 +53,7 @@ CONFIG_MTD_CFI_AMDSTD=y CONFIG_MTD_COMPLEX_MAPPINGS=y CONFIG_MTD_PHYSMAP=y CONFIG_MTD_M25P80=y -# CONFIG_M25PXX_USE_FAST_READ is not set +CONFIG_MTD_SPI_NOR=y CONFIG_NETDEVICES=y # CONFIG_NET_PACKET_ENGINE is not set CONFIG_ATH_COMMON=m
arch/mips/configs/db1xxx_defconfig +1 -0
@@ -113,6 +113,7 @@ CONFIG_MTD_NAND=y CONFIG_MTD_NAND_ECC_BCH=y CONFIG_MTD_NAND_AU1550=y CONFIG_MTD_NAND_PLATFORM=y +CONFIG_MTD_SPI_NOR=y CONFIG_EEPROM_AT24=y CONFIG_EEPROM_AT25=y CONFIG_SCSI_TGT=y
arch/mips/configs/rt305x_defconfig +1 -1
@@ -81,7 +81,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" # CONFIG_FIRMWARE_IN_KERNEL 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_CFI_AMDSTD=y
@@ -89,6 +88,7 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y CONFIG_MTD_PHYSMAP=y CONFIG_MTD_PHYSMAP_OF=y CONFIG_MTD_M25P80=y +CONFIG_MTD_SPI_NOR=y CONFIG_EEPROM_93CX6=m CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y
Signature · 1 line
1.8.3.2
PATCH v2 11/12 powerpc: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
In reply to Brian NorrisThese 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.
--- 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 +- 4 files changed, 4 insertions(+), 4 deletions(-)
arch/powerpc/configs/corenet32_smp_defconfig +1 -1
@@ -69,7 +69,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_CFI_AMDSTD=y
@@ -78,6 +77,7 @@ CONFIG_MTD_M25P80=y CONFIG_MTD_NAND=y CONFIG_MTD_NAND_FSL_ELBC=y CONFIG_MTD_NAND_FSL_IFC=y +CONFIG_MTD_SPI_NOR=y CONFIG_PROC_DEVICETREE=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y
arch/powerpc/configs/corenet64_smp_defconfig +1 -1
@@ -61,7 +61,6 @@ CONFIG_DEVTMPFS_MOUNT=y CONFIG_MTD=y CONFIG_MTD_OF_PARTS=y CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y CONFIG_MTD_BLKDEVS=y CONFIG_MTD_BLOCK=y CONFIG_FTL=y
@@ -82,6 +81,7 @@ CONFIG_MTD_NAND=y CONFIG_MTD_NAND_IDS=y CONFIG_MTD_NAND_FSL_ELBC=y CONFIG_MTD_NAND_FSL_IFC=y +CONFIG_MTD_SPI_NOR=y CONFIG_MTD_UBI=y CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MTD_UBI_BEB_RESERVE=1
arch/powerpc/configs/mpc85xx_defconfig +1 -1
@@ -83,7 +83,6 @@ CONFIG_DEVTMPFS_MOUNT=y CONFIG_MTD=y CONFIG_MTD_OF_PARTS=y CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y CONFIG_MTD_BLKDEVS=y CONFIG_MTD_BLOCK=y CONFIG_FTL=y
@@ -104,6 +103,7 @@ CONFIG_MTD_NAND=y CONFIG_MTD_NAND_IDS=y CONFIG_MTD_NAND_FSL_ELBC=y CONFIG_MTD_NAND_FSL_IFC=y +CONFIG_MTD_SPI_NOR=y CONFIG_MTD_UBI=y CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MTD_UBI_BEB_RESERVE=1
arch/powerpc/configs/mpc85xx_smp_defconfig +1 -1
@@ -86,7 +86,6 @@ CONFIG_DEVTMPFS_MOUNT=y CONFIG_MTD=y CONFIG_MTD_OF_PARTS=y CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y CONFIG_MTD_BLKDEVS=y CONFIG_MTD_BLOCK=y CONFIG_FTL=y
@@ -107,6 +106,7 @@ CONFIG_MTD_NAND=y CONFIG_MTD_NAND_IDS=y CONFIG_MTD_NAND_FSL_ELBC=y CONFIG_MTD_NAND_FSL_IFC=y +CONFIG_MTD_SPI_NOR=y CONFIG_MTD_UBI=y CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MTD_UBI_BEB_RESERVE=1
Signature · 1 line
1.8.3.2
PATCH v2 12/12 sh: defconfig: add MTD_SPI_NOR (new dependency for M25P80)
In reply to Brian NorrisThis 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.
--- arch/sh/configs/sh7757lcr_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/sh/configs/sh7757lcr_defconfig +1 -1
@@ -38,9 +38,9 @@ CONFIG_IPV6=y CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" # CONFIG_FW_LOADER is not set CONFIG_MTD=y -CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y CONFIG_MTD_M25P80=y +CONFIG_MTD_SPI_NOR=y CONFIG_BLK_DEV_RAM=y CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y
Signature · 1 line
1.8.3.2
v2 cover defconfigs: add MTD_SPI_NOR (new subsystem dependency for M25P80)
In reply to Brian NorrisHi Brian,
Quoted 71 lines · Brian Norris
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_M25P80now has a dependency onCONFIG_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_NORsymbol in your defconfig,Kconfigwill 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+spinorThis defconfig series is available in the same repo at:
git://git.infradead.org/l2-mtd.git+defconfigsThanks,
BrianBrian Norris (12):
ARM: imx/mxs defconfigs: addMTD_SPI_NOR(new dependency for M25P80)
ARM: defconfigs: addMTD_SPI_NOR(new dependency for M25P80)
ARM: keystone: addMTD_SPI_NOR(new dependency for M25P80)
ARM: tegra: addMTD_SPI_NOR(new dependency for M25P80)
ARM: lpc32xx: addMTD_SPI_NOR(new dependency for M25P80)
ARM: at91: addMTD_SPI_NOR(new dependency for M25P80)
ARM: shmobile: addMTD_SPI_NOR(new dependency for M25P80)
ARM: marvell: addMTD_SPI_NOR(new dependency for M25P80)
blackfin: defconfigs: addMTD_SPI_NOR(new dependency for M25P80)
mips: defconfigs: addMTD_SPI_NOR(new dependency for M25P80)
powerpc: defconfigs: addMTD_SPI_NOR(new dependency for M25P80)
sh: defconfig: addMTD_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 +--
Quoted 8 lines
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_defconfigarch/arm/configs/bockw_defconfigarch/arm/configs/koelsch_defconfigarch/arm/configs/lager_defconfigarch/arm/configs/lpc32xx_defconfigarch/arm/configs/multi_v5_defconfigarch/arm/configs/multi_v7_defconfigarch/arm/configs/qcom_defconfigarch/arm/configs/sama5_defconfigarch/arm/configs/shmobile_defconfigarch/powerpc/configs/85xx/kmp204x_defconfigarch/powerpc/configs/corenet32_smp_defconfigarch/powerpc/configs/corenet64_smp_defconfigarch/powerpc/configs/mpc85xx_defconfigarch/powerpc/configs/mpc85xx_smp_defconfigarch/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