linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/5] multi and mvebu v5 defconfig updates
@ 2015-12-01 23:33 Andrew Lunn
  2015-12-01 23:33 ` [PATCH 1/5] ARM: config: Regenerate multi_v5_defconfig Andrew Lunn
                   ` (5 more replies)
  0 siblings, 6 replies; 17+ messages in thread
From: Andrew Lunn @ 2015-12-01 23:33 UTC (permalink / raw)
  To: linux-arm-kernel

This patchset updates both multi_v5_defconfig and mvebu_v5_defconfig.
It adds support for Orion5x, now that it is multi-arch, and adds back
DSA and its drivers, which now depends on switchdev.

Andrew Lunn (5):
  ARM: config: Regenerate multi_v5_defconfig
  ARM: config: Reenable DSA in multi_v5_defconfig
  ARM: config: Add orion5x to multi_v5_defconfig
  ARM: mvebu: Reenable DSA in mvebu_v5_defconfig
  ARM: mvebu: update v5 defconfig for Orion5x machines

 arch/arm/configs/multi_v5_defconfig | 43 +++++++++++++++++++++++++++----------
 arch/arm/configs/mvebu_v5_defconfig | 31 +++++++++++++++++++++++++-
 2 files changed, 62 insertions(+), 12 deletions(-)

-- 
2.6.2

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [PATCH 1/5] ARM: config: Regenerate multi_v5_defconfig
  2015-12-01 23:33 [PATCH 0/5] multi and mvebu v5 defconfig updates Andrew Lunn
@ 2015-12-01 23:33 ` Andrew Lunn
  2015-12-02 13:44   ` Arnd Bergmann
  2015-12-01 23:33 ` [PATCH 2/5] ARM: config: Reenable DSA in multi_v5_defconfig Andrew Lunn
                   ` (4 subsequent siblings)
  5 siblings, 1 reply; 17+ messages in thread
From: Andrew Lunn @ 2015-12-01 23:33 UTC (permalink / raw)
  To: linux-arm-kernel

Dues the Kconfig changes, multi_v5_defconfig needs regenerating.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
 arch/arm/configs/multi_v5_defconfig | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig
index f69a459f4f92..f98d4b8b54c5 100644
--- a/arch/arm/configs/multi_v5_defconfig
+++ b/arch/arm/configs/multi_v5_defconfig
@@ -11,10 +11,9 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_ARCH_MULTI_V7 is not set
 CONFIG_ARCH_MVEBU=y
 CONFIG_MACH_KIRKWOOD=y
-CONFIG_MACH_NETXBIG=y
 CONFIG_ARCH_MXC=y
-CONFIG_SOC_IMX25=y
 CONFIG_MACH_IMX27_DT=y
+CONFIG_SOC_IMX25=y
 CONFIG_ARCH_U300=y
 CONFIG_PCI_MVEBU=y
 CONFIG_PREEMPT=y
@@ -53,7 +52,6 @@ CONFIG_MTD_CFI_GEOMETRY=y
 CONFIG_MTD_CFI_INTELEXT=y
 CONFIG_MTD_CFI_STAA=y
 CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_M25P80=y
 CONFIG_MTD_NAND=y
 CONFIG_MTD_NAND_ORION=y
 CONFIG_BLK_DEV_LOOP=y
@@ -66,8 +64,6 @@ CONFIG_ATA=y
 CONFIG_SATA_AHCI=y
 CONFIG_SATA_MV=y
 CONFIG_NETDEVICES=y
-CONFIG_NET_DSA_MV88E6123_61_65=y
-CONFIG_NET_DSA_MV88E6171=y
 CONFIG_MV643XX_ETH=y
 CONFIG_R8169=y
 CONFIG_MARVELL_PHY=y
@@ -92,7 +88,6 @@ CONFIG_I2C_NOMADIK=y
 CONFIG_SPI=y
 CONFIG_SPI_ORION=y
 CONFIG_GPIO_SYSFS=y
-CONFIG_POWER_SUPPLY=y
 CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_POWER_RESET_QNAP=y
@@ -105,17 +100,16 @@ CONFIG_THERMAL=y
 CONFIG_KIRKWOOD_THERMAL=y
 CONFIG_WATCHDOG=y
 CONFIG_ORION_WATCHDOG=y
+# CONFIG_ABX500_CORE is not set
+CONFIG_REGULATOR=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_FB=y
 CONFIG_SOUND=y
 CONFIG_SND=y
 CONFIG_SND_SOC=y
 CONFIG_SND_KIRKWOOD_SOC=y
-CONFIG_SND_KIRKWOOD_SOC_T5325=y
 CONFIG_SND_SOC_ALC5623=y
 CONFIG_SND_SIMPLE_CARD=y
-# CONFIG_ABX500_CORE is not set
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_HID_DRAGONRISE=y
 CONFIG_HID_GYRATION=y
 CONFIG_HID_TWINHAN=y
@@ -162,8 +156,6 @@ CONFIG_STAGING=y
 CONFIG_FB_XGI=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
-# CONFIG_EXT3_FS_XATTR is not set
-CONFIG_EXT4_FS=y
 CONFIG_ISO9660_FS=m
 CONFIG_JOLIET=y
 CONFIG_UDF_FS=m
@@ -189,7 +181,6 @@ CONFIG_DEBUG_KERNEL=y
 CONFIG_DEBUG_USER=y
 CONFIG_CRYPTO_CBC=m
 CONFIG_CRYPTO_PCBC=m
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
 CONFIG_CRYPTO_DEV_MV_CESA=y
 CONFIG_CRC_CCITT=y
 CONFIG_LIBCRC32C=y
-- 
2.6.2

^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [PATCH 2/5] ARM: config: Reenable DSA in multi_v5_defconfig
  2015-12-01 23:33 [PATCH 0/5] multi and mvebu v5 defconfig updates Andrew Lunn
  2015-12-01 23:33 ` [PATCH 1/5] ARM: config: Regenerate multi_v5_defconfig Andrew Lunn
@ 2015-12-01 23:33 ` Andrew Lunn
  2015-12-02 13:44   ` Arnd Bergmann
  2015-12-01 23:33 ` [PATCH 3/5] ARM: config: Add orion5x to multi_v5_defconfig Andrew Lunn
                   ` (3 subsequent siblings)
  5 siblings, 1 reply; 17+ messages in thread
From: Andrew Lunn @ 2015-12-01 23:33 UTC (permalink / raw)
  To: linux-arm-kernel

DSA now depends on switchdev. Enable it, and re-enable DSA and its
drivers, which were removed when multi_v5_defconfig was regenerated.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
 arch/arm/configs/multi_v5_defconfig | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig
index f98d4b8b54c5..920db77916b1 100644
--- a/arch/arm/configs/multi_v5_defconfig
+++ b/arch/arm/configs/multi_v5_defconfig
@@ -37,6 +37,8 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 # CONFIG_IPV6 is not set
+CONFIG_NET_DSA=y
+CONFIG_NET_SWITCHDEV=y
 CONFIG_NET_PKTGEN=m
 CONFIG_CFG80211=y
 CONFIG_MAC80211=y
@@ -64,6 +66,11 @@ CONFIG_ATA=y
 CONFIG_SATA_AHCI=y
 CONFIG_SATA_MV=y
 CONFIG_NETDEVICES=y
+CONFIG_NET_DSA_MV88E6060=y
+CONFIG_NET_DSA_MV88E6131=y
+CONFIG_NET_DSA_MV88E6123_61_65=y
+CONFIG_NET_DSA_MV88E6171=y
+CONFIG_NET_DSA_MV88E6352=y
 CONFIG_MV643XX_ETH=y
 CONFIG_R8169=y
 CONFIG_MARVELL_PHY=y
-- 
2.6.2

^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [PATCH 3/5] ARM: config: Add orion5x to multi_v5_defconfig
  2015-12-01 23:33 [PATCH 0/5] multi and mvebu v5 defconfig updates Andrew Lunn
  2015-12-01 23:33 ` [PATCH 1/5] ARM: config: Regenerate multi_v5_defconfig Andrew Lunn
  2015-12-01 23:33 ` [PATCH 2/5] ARM: config: Reenable DSA in multi_v5_defconfig Andrew Lunn
@ 2015-12-01 23:33 ` Andrew Lunn
  2015-12-01 23:33 ` [PATCH 4/5] ARM: mvebu: Reenable DSA in mvebu_v5_defconfig Andrew Lunn
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 17+ messages in thread
From: Andrew Lunn @ 2015-12-01 23:33 UTC (permalink / raw)
  To: linux-arm-kernel

Now that Orion5x is part of the v5 multiarch kernel enable it in the
multi_v5_defconfig.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
 arch/arm/configs/multi_v5_defconfig | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig
index 920db77916b1..1f9ca4737ef6 100644
--- a/arch/arm/configs/multi_v5_defconfig
+++ b/arch/arm/configs/multi_v5_defconfig
@@ -14,6 +14,29 @@ CONFIG_MACH_KIRKWOOD=y
 CONFIG_ARCH_MXC=y
 CONFIG_MACH_IMX27_DT=y
 CONFIG_SOC_IMX25=y
+CONFIG_ARCH_ORION5X=y
+CONFIG_MACH_DB88F5281=y
+CONFIG_MACH_RD88F5182=y
+CONFIG_MACH_RD88F5182_DT=y
+CONFIG_MACH_KUROBOX_PRO=y
+CONFIG_MACH_DNS323=y
+CONFIG_MACH_TS209=y
+CONFIG_MACH_TERASTATION_PRO2=y
+CONFIG_MACH_LINKSTATION_PRO=y
+CONFIG_MACH_LINKSTATION_LSCHL=y
+CONFIG_MACH_LINKSTATION_MINI=y
+CONFIG_MACH_LINKSTATION_LS_HGL=y
+CONFIG_MACH_TS409=y
+CONFIG_MACH_WRT350N_V2=y
+CONFIG_MACH_TS78XX=y
+CONFIG_MACH_MV2120=y
+CONFIG_MACH_D2NET_DT=y
+CONFIG_MACH_NET2BIG=y
+CONFIG_MACH_MSS2_DT=y
+CONFIG_MACH_WNR854T=y
+CONFIG_MACH_RD88F5181L_GE=y
+CONFIG_MACH_RD88F5181L_FXO=y
+CONFIG_MACH_RD88F6183AP_GE=y
 CONFIG_ARCH_U300=y
 CONFIG_PCI_MVEBU=y
 CONFIG_PREEMPT=y
-- 
2.6.2

^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [PATCH 4/5] ARM: mvebu: Reenable DSA in mvebu_v5_defconfig
  2015-12-01 23:33 [PATCH 0/5] multi and mvebu v5 defconfig updates Andrew Lunn
                   ` (2 preceding siblings ...)
  2015-12-01 23:33 ` [PATCH 3/5] ARM: config: Add orion5x to multi_v5_defconfig Andrew Lunn
@ 2015-12-01 23:33 ` Andrew Lunn
  2015-12-07 17:02   ` Gregory CLEMENT
  2015-12-01 23:33 ` [PATCH 5/5] ARM: mvebu: update v5 defconfig for Orion5x machines Andrew Lunn
  2015-12-07 17:06 ` [PATCH 0/5] multi and mvebu v5 defconfig updates Gregory CLEMENT
  5 siblings, 1 reply; 17+ messages in thread
From: Andrew Lunn @ 2015-12-01 23:33 UTC (permalink / raw)
  To: linux-arm-kernel

DSA now depends on switchdev. Enable it, and re-enable DSA and its
drivers, which were removed when mvebu_v5_defconfig was regenerated.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
 arch/arm/configs/mvebu_v5_defconfig | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/arm/configs/mvebu_v5_defconfig b/arch/arm/configs/mvebu_v5_defconfig
index aa9079c84024..d7c17864a1eb 100644
--- a/arch/arm/configs/mvebu_v5_defconfig
+++ b/arch/arm/configs/mvebu_v5_defconfig
@@ -35,6 +35,8 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 # CONFIG_IPV6 is not set
+CONFIG_NET_DSA=y
+CONFIG_NET_SWITCHDEV=y
 CONFIG_NET_PKTGEN=m
 CONFIG_CFG80211=y
 CONFIG_MAC80211=y
@@ -66,6 +68,11 @@ CONFIG_ATA=y
 CONFIG_SATA_AHCI=y
 CONFIG_SATA_MV=y
 CONFIG_NETDEVICES=y
+CONFIG_NET_DSA_MV88E6060=y
+CONFIG_NET_DSA_MV88E6131=y
+CONFIG_NET_DSA_MV88E6123_61_65=y
+CONFIG_NET_DSA_MV88E6171=y
+CONFIG_NET_DSA_MV88E6352=y
 CONFIG_MV643XX_ETH=y
 CONFIG_R8169=y
 CONFIG_MARVELL_PHY=y
-- 
2.6.2

^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [PATCH 5/5] ARM: mvebu: update v5 defconfig for Orion5x machines
  2015-12-01 23:33 [PATCH 0/5] multi and mvebu v5 defconfig updates Andrew Lunn
                   ` (3 preceding siblings ...)
  2015-12-01 23:33 ` [PATCH 4/5] ARM: mvebu: Reenable DSA in mvebu_v5_defconfig Andrew Lunn
@ 2015-12-01 23:33 ` Andrew Lunn
  2015-12-07 17:03   ` Gregory CLEMENT
  2015-12-07 17:06 ` [PATCH 0/5] multi and mvebu v5 defconfig updates Gregory CLEMENT
  5 siblings, 1 reply; 17+ messages in thread
From: Andrew Lunn @ 2015-12-01 23:33 UTC (permalink / raw)
  To: linux-arm-kernel

Now that Orion5x is part of the multiarch kernel, add it to
mvebu_v5_defconfig.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
 arch/arm/configs/mvebu_v5_defconfig | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/arch/arm/configs/mvebu_v5_defconfig b/arch/arm/configs/mvebu_v5_defconfig
index d7c17864a1eb..af29780accdc 100644
--- a/arch/arm/configs/mvebu_v5_defconfig
+++ b/arch/arm/configs/mvebu_v5_defconfig
@@ -12,7 +12,29 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_ARCH_MULTI_V7 is not set
 CONFIG_ARCH_MVEBU=y
 CONFIG_MACH_KIRKWOOD=y
-# CONFIG_CPU_FEROCEON_OLD_ID is not set
+CONFIG_ARCH_ORION5X=y
+CONFIG_MACH_DB88F5281=y
+CONFIG_MACH_RD88F5182=y
+CONFIG_MACH_RD88F5182_DT=y
+CONFIG_MACH_KUROBOX_PRO=y
+CONFIG_MACH_DNS323=y
+CONFIG_MACH_TS209=y
+CONFIG_MACH_TERASTATION_PRO2=y
+CONFIG_MACH_LINKSTATION_PRO=y
+CONFIG_MACH_LINKSTATION_LSCHL=y
+CONFIG_MACH_LINKSTATION_MINI=y
+CONFIG_MACH_LINKSTATION_LS_HGL=y
+CONFIG_MACH_TS409=y
+CONFIG_MACH_WRT350N_V2=y
+CONFIG_MACH_TS78XX=y
+CONFIG_MACH_MV2120=y
+CONFIG_MACH_D2NET_DT=y
+CONFIG_MACH_NET2BIG=y
+CONFIG_MACH_MSS2_DT=y
+CONFIG_MACH_WNR854T=y
+CONFIG_MACH_RD88F5181L_GE=y
+CONFIG_MACH_RD88F5181L_FXO=y
+CONFIG_MACH_RD88F6183AP_GE=y
 CONFIG_PCI_MVEBU=y
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
-- 
2.6.2

^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [PATCH 1/5] ARM: config: Regenerate multi_v5_defconfig
  2015-12-01 23:33 ` [PATCH 1/5] ARM: config: Regenerate multi_v5_defconfig Andrew Lunn
@ 2015-12-02 13:44   ` Arnd Bergmann
  2015-12-02 14:17     ` Andrew Lunn
  0 siblings, 1 reply; 17+ messages in thread
From: Arnd Bergmann @ 2015-12-02 13:44 UTC (permalink / raw)
  To: linux-arm-kernel

On Wednesday 02 December 2015 00:33:28 Andrew Lunn wrote:
> Dues the Kconfig changes, multi_v5_defconfig needs regenerating.
> 
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> ---
>  arch/arm/configs/multi_v5_defconfig | 17 ++++-------------
>  1 file changed, 4 insertions(+), 13 deletions(-)
> 
> diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig
> index f69a459f4f92..f98d4b8b54c5 100644
> --- a/arch/arm/configs/multi_v5_defconfig
> +++ b/arch/arm/configs/multi_v5_defconfig
> @@ -11,10 +11,9 @@ CONFIG_MODULE_UNLOAD=y
> @@ -53,7 +52,6 @@ CONFIG_MTD_CFI_GEOMETRY=y
>  CONFIG_MTD_CFI_INTELEXT=y
>  CONFIG_MTD_CFI_STAA=y
>  CONFIG_MTD_PHYSMAP=y
> -CONFIG_MTD_M25P80=y

I think we need to enable MTD_SPI_NOR_BASE now to get the driver
back, see 03e296f613af ("mtd: m25p80: use the SPI nor framework")

>  CONFIG_MTD_NAND=y
>  CONFIG_MTD_NAND_ORION=y
>  CONFIG_BLK_DEV_LOOP=y
> @@ -66,8 +64,6 @@ CONFIG_ATA=y
>  CONFIG_SATA_AHCI=y
>  CONFIG_SATA_MV=y
>  CONFIG_NETDEVICES=y
> -CONFIG_NET_DSA_MV88E6123_61_65=y
> -CONFIG_NET_DSA_MV88E6171=y
>  CONFIG_MV643XX_ETH=y
>  CONFIG_R8169=y
>  CONFIG_MARVELL_PHY=y

Same for NET_SWITCHDEV, it used to be 'select'ed by NET_DSA, but is
now a dpeendency.

> @@ -162,8 +156,6 @@ CONFIG_STAGING=y
>  CONFIG_FB_XGI=y
>  CONFIG_EXT2_FS=y
>  CONFIG_EXT3_FS=y
> -# CONFIG_EXT3_FS_XATTR is not set
> -CONFIG_EXT4_FS=y
>  CONFIG_ISO9660_FS=m
>  CONFIG_JOLIET=y
>  CONFIG_UDF_FS=m

We can drop CONFIG_EXT3_FS now and just select CONFIG_EXT4_FS.
Let's also drop EXT2.

	Arnd

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [PATCH 2/5] ARM: config: Reenable DSA in multi_v5_defconfig
  2015-12-01 23:33 ` [PATCH 2/5] ARM: config: Reenable DSA in multi_v5_defconfig Andrew Lunn
@ 2015-12-02 13:44   ` Arnd Bergmann
  0 siblings, 0 replies; 17+ messages in thread
From: Arnd Bergmann @ 2015-12-02 13:44 UTC (permalink / raw)
  To: linux-arm-kernel

On Wednesday 02 December 2015 00:33:29 Andrew Lunn wrote:
> DSA now depends on switchdev. Enable it, and re-enable DSA and its
> drivers, which were removed when multi_v5_defconfig was regenerated.
> 
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> 

Ok, you already had that. The rest of the series looks good too.

	Arnd

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [PATCH 1/5] ARM: config: Regenerate multi_v5_defconfig
  2015-12-02 13:44   ` Arnd Bergmann
@ 2015-12-02 14:17     ` Andrew Lunn
  2015-12-02 14:57       ` Arnd Bergmann
  0 siblings, 1 reply; 17+ messages in thread
From: Andrew Lunn @ 2015-12-02 14:17 UTC (permalink / raw)
  To: linux-arm-kernel

On Wed, Dec 02, 2015 at 02:44:00PM +0100, Arnd Bergmann wrote:
> On Wednesday 02 December 2015 00:33:28 Andrew Lunn wrote:
> > Dues the Kconfig changes, multi_v5_defconfig needs regenerating.
> > 
> > Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> > ---
> >  arch/arm/configs/multi_v5_defconfig | 17 ++++-------------
> >  1 file changed, 4 insertions(+), 13 deletions(-)
> > 
> > diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig
> > index f69a459f4f92..f98d4b8b54c5 100644
> > --- a/arch/arm/configs/multi_v5_defconfig
> > +++ b/arch/arm/configs/multi_v5_defconfig
> > @@ -11,10 +11,9 @@ CONFIG_MODULE_UNLOAD=y
> > @@ -53,7 +52,6 @@ CONFIG_MTD_CFI_GEOMETRY=y
> >  CONFIG_MTD_CFI_INTELEXT=y
> >  CONFIG_MTD_CFI_STAA=y
> >  CONFIG_MTD_PHYSMAP=y
> > -CONFIG_MTD_M25P80=y
> 
> I think we need to enable MTD_SPI_NOR_BASE now to get the driver
> back, see 03e296f613af ("mtd: m25p80: use the SPI nor framework")

As you noticed, this is a pure regenerate.

I will send a few more followups with the MTD_SPI_NOR_BASE, and
dropping EXT[23].

	 Andrew

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [PATCH 1/5] ARM: config: Regenerate multi_v5_defconfig
  2015-12-02 14:17     ` Andrew Lunn
@ 2015-12-02 14:57       ` Arnd Bergmann
  2015-12-02 15:08         ` Andrew Lunn
  0 siblings, 1 reply; 17+ messages in thread
From: Arnd Bergmann @ 2015-12-02 14:57 UTC (permalink / raw)
  To: linux-arm-kernel

On Wednesday 02 December 2015 15:17:56 Andrew Lunn wrote:
> On Wed, Dec 02, 2015 at 02:44:00PM +0100, Arnd Bergmann wrote:
> > On Wednesday 02 December 2015 00:33:28 Andrew Lunn wrote:
> > > Dues the Kconfig changes, multi_v5_defconfig needs regenerating.
> > > 
> > > Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> > > ---
> > >  arch/arm/configs/multi_v5_defconfig | 17 ++++-------------
> > >  1 file changed, 4 insertions(+), 13 deletions(-)
> > > 
> > > diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig
> > > index f69a459f4f92..f98d4b8b54c5 100644
> > > --- a/arch/arm/configs/multi_v5_defconfig
> > > +++ b/arch/arm/configs/multi_v5_defconfig
> > > @@ -11,10 +11,9 @@ CONFIG_MODULE_UNLOAD=y
> > > @@ -53,7 +52,6 @@ CONFIG_MTD_CFI_GEOMETRY=y
> > >  CONFIG_MTD_CFI_INTELEXT=y
> > >  CONFIG_MTD_CFI_STAA=y
> > >  CONFIG_MTD_PHYSMAP=y
> > > -CONFIG_MTD_M25P80=y
> > 
> > I think we need to enable MTD_SPI_NOR_BASE now to get the driver
> > back, see 03e296f613af ("mtd: m25p80: use the SPI nor framework")
> 
> As you noticed, this is a pure regenerate.
> 
> I will send a few more followups with the MTD_SPI_NOR_BASE, and
> dropping EXT[23].

Maybe you can do those changes first and regenerate afterwards?

That makes it more obvious what's going on than removing a symbol
first and then putting it back.

Sorry for not having a better answer, I realize this is causing extra
work.

	Arnd

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [PATCH 1/5] ARM: config: Regenerate multi_v5_defconfig
  2015-12-02 14:57       ` Arnd Bergmann
@ 2015-12-02 15:08         ` Andrew Lunn
  2015-12-02 15:10           ` Arnd Bergmann
  0 siblings, 1 reply; 17+ messages in thread
From: Andrew Lunn @ 2015-12-02 15:08 UTC (permalink / raw)
  To: linux-arm-kernel

On Wed, Dec 02, 2015 at 03:57:01PM +0100, Arnd Bergmann wrote:
> On Wednesday 02 December 2015 15:17:56 Andrew Lunn wrote:
> > On Wed, Dec 02, 2015 at 02:44:00PM +0100, Arnd Bergmann wrote:
> > > On Wednesday 02 December 2015 00:33:28 Andrew Lunn wrote:
> > > > Dues the Kconfig changes, multi_v5_defconfig needs regenerating.
> > > > 
> > > > Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> > > > ---
> > > >  arch/arm/configs/multi_v5_defconfig | 17 ++++-------------
> > > >  1 file changed, 4 insertions(+), 13 deletions(-)
> > > > 
> > > > diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig
> > > > index f69a459f4f92..f98d4b8b54c5 100644
> > > > --- a/arch/arm/configs/multi_v5_defconfig
> > > > +++ b/arch/arm/configs/multi_v5_defconfig
> > > > @@ -11,10 +11,9 @@ CONFIG_MODULE_UNLOAD=y
> > > > @@ -53,7 +52,6 @@ CONFIG_MTD_CFI_GEOMETRY=y
> > > >  CONFIG_MTD_CFI_INTELEXT=y
> > > >  CONFIG_MTD_CFI_STAA=y
> > > >  CONFIG_MTD_PHYSMAP=y
> > > > -CONFIG_MTD_M25P80=y
> > > 
> > > I think we need to enable MTD_SPI_NOR_BASE now to get the driver
> > > back, see 03e296f613af ("mtd: m25p80: use the SPI nor framework")
> > 
> > As you noticed, this is a pure regenerate.
> > 
> > I will send a few more followups with the MTD_SPI_NOR_BASE, and
> > dropping EXT[23].
> 
> Maybe you can do those changes first and regenerate afterwards?
> 
> That makes it more obvious what's going on than removing a symbol
> first and then putting it back.

The flip side is that the regenerate makes it reflect reality. Those
options actually are disabled in todays kernel.

Also, doing it the other way around is quite a bit of work, since you
have to manually edit the _defconfig and figure out manually where the
option needs to be placed in the file.

Humm, i wounder if 0-day could be of use here. How about at the end of
each patch series, it regenerates the _defconfig files. If there are
any changes, issue a warning. That will help keep them in sync with
reality.

	Andrew

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [PATCH 1/5] ARM: config: Regenerate multi_v5_defconfig
  2015-12-02 15:08         ` Andrew Lunn
@ 2015-12-02 15:10           ` Arnd Bergmann
  0 siblings, 0 replies; 17+ messages in thread
From: Arnd Bergmann @ 2015-12-02 15:10 UTC (permalink / raw)
  To: linux-arm-kernel

On Wednesday 02 December 2015 16:08:01 Andrew Lunn wrote:
> 
> Humm, i wounder if 0-day could be of use here. How about at the end of
> each patch series, it regenerates the _defconfig files. If there are
> any changes, issue a warning. That will help keep them in sync with
> reality.

Sounds like a good idea, but it will have to regenerate the defconfig files
before and after and see if there are additional changes.

	Arnd

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [PATCH 4/5] ARM: mvebu: Reenable DSA in mvebu_v5_defconfig
  2015-12-01 23:33 ` [PATCH 4/5] ARM: mvebu: Reenable DSA in mvebu_v5_defconfig Andrew Lunn
@ 2015-12-07 17:02   ` Gregory CLEMENT
  0 siblings, 0 replies; 17+ messages in thread
From: Gregory CLEMENT @ 2015-12-07 17:02 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Andrew,
 
 On mer., d?c. 02 2015, Andrew Lunn <andrew@lunn.ch> wrote:

> DSA now depends on switchdev. Enable it, and re-enable DSA and its
> drivers, which were removed when mvebu_v5_defconfig was regenerated.
>

Applied on mvebu/defconfig

Thanks,

Gregory

> Signed-Off-by: Andrew Lunn <andrew@lunn.ch>
> ---
>  arch/arm/configs/mvebu_v5_defconfig | 7 +++++++
>  1 file changed, 7 insertions(+)
>
> diff --git a/arch/arm/configs/mvebu_v5_defconfig b/arch/arm/configs/mvebu_v5_defconfig
> index aa9079c84024..d7c17864a1eb 100644
> --- a/arch/arm/configs/mvebu_v5_defconfig
> +++ b/arch/arm/configs/mvebu_v5_defconfig
> @@ -35,6 +35,8 @@ CONFIG_IP_PNP=y
>  CONFIG_IP_PNP_DHCP=y
>  CONFIG_IP_PNP_BOOTP=y
>  # CONFIG_IPV6 is not set
> +CONFIG_NET_DSA=y
> +CONFIG_NET_SWITCHDEV=y
>  CONFIG_NET_PKTGEN=m
>  CONFIG_CFG80211=y
>  CONFIG_MAC80211=y
> @@ -66,6 +68,11 @@ CONFIG_ATA=y
>  CONFIG_SATA_AHCI=y
>  CONFIG_SATA_MV=y
>  CONFIG_NETDEVICES=y
> +CONFIG_NET_DSA_MV88E6060=y
> +CONFIG_NET_DSA_MV88E6131=y
> +CONFIG_NET_DSA_MV88E6123_61_65=y
> +CONFIG_NET_DSA_MV88E6171=y
> +CONFIG_NET_DSA_MV88E6352=y
>  CONFIG_MV643XX_ETH=y
>  CONFIG_R8169=y
>  CONFIG_MARVELL_PHY=y
> -- 
> 2.6.2
>

-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [PATCH 5/5] ARM: mvebu: update v5 defconfig for Orion5x machines
  2015-12-01 23:33 ` [PATCH 5/5] ARM: mvebu: update v5 defconfig for Orion5x machines Andrew Lunn
@ 2015-12-07 17:03   ` Gregory CLEMENT
  0 siblings, 0 replies; 17+ messages in thread
From: Gregory CLEMENT @ 2015-12-07 17:03 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Andrew,
 
 On mer., d?c. 02 2015, Andrew Lunn <andrew@lunn.ch> wrote:

> Now that Orion5x is part of the multiarch kernel, add it to
> mvebu_v5_defconfig.
>
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>

Applied on mvebu/defconfig

Thanks,

Gregory
> ---
>  arch/arm/configs/mvebu_v5_defconfig | 24 +++++++++++++++++++++++-
>  1 file changed, 23 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/configs/mvebu_v5_defconfig b/arch/arm/configs/mvebu_v5_defconfig
> index d7c17864a1eb..af29780accdc 100644
> --- a/arch/arm/configs/mvebu_v5_defconfig
> +++ b/arch/arm/configs/mvebu_v5_defconfig
> @@ -12,7 +12,29 @@ CONFIG_MODULE_UNLOAD=y
>  # CONFIG_ARCH_MULTI_V7 is not set
>  CONFIG_ARCH_MVEBU=y
>  CONFIG_MACH_KIRKWOOD=y
> -# CONFIG_CPU_FEROCEON_OLD_ID is not set
> +CONFIG_ARCH_ORION5X=y
> +CONFIG_MACH_DB88F5281=y
> +CONFIG_MACH_RD88F5182=y
> +CONFIG_MACH_RD88F5182_DT=y
> +CONFIG_MACH_KUROBOX_PRO=y
> +CONFIG_MACH_DNS323=y
> +CONFIG_MACH_TS209=y
> +CONFIG_MACH_TERASTATION_PRO2=y
> +CONFIG_MACH_LINKSTATION_PRO=y
> +CONFIG_MACH_LINKSTATION_LSCHL=y
> +CONFIG_MACH_LINKSTATION_MINI=y
> +CONFIG_MACH_LINKSTATION_LS_HGL=y
> +CONFIG_MACH_TS409=y
> +CONFIG_MACH_WRT350N_V2=y
> +CONFIG_MACH_TS78XX=y
> +CONFIG_MACH_MV2120=y
> +CONFIG_MACH_D2NET_DT=y
> +CONFIG_MACH_NET2BIG=y
> +CONFIG_MACH_MSS2_DT=y
> +CONFIG_MACH_WNR854T=y
> +CONFIG_MACH_RD88F5181L_GE=y
> +CONFIG_MACH_RD88F5181L_FXO=y
> +CONFIG_MACH_RD88F6183AP_GE=y
>  CONFIG_PCI_MVEBU=y
>  CONFIG_PREEMPT=y
>  CONFIG_AEABI=y
> -- 
> 2.6.2
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [PATCH 0/5] multi and mvebu v5 defconfig updates
  2015-12-01 23:33 [PATCH 0/5] multi and mvebu v5 defconfig updates Andrew Lunn
                   ` (4 preceding siblings ...)
  2015-12-01 23:33 ` [PATCH 5/5] ARM: mvebu: update v5 defconfig for Orion5x machines Andrew Lunn
@ 2015-12-07 17:06 ` Gregory CLEMENT
  2015-12-07 22:57   ` Arnd Bergmann
  5 siblings, 1 reply; 17+ messages in thread
From: Gregory CLEMENT @ 2015-12-07 17:06 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Arnd
 
 On mer., d?c. 02 2015, Andrew Lunn <andrew@lunn.ch> wrote:

> This patchset updates both multi_v5_defconfig and mvebu_v5_defconfig.
> It adds support for Orion5x, now that it is multi-arch, and adds back
> DSA and its drivers, which now depends on switchdev.
>
> Andrew Lunn (5):
>   ARM: config: Regenerate multi_v5_defconfig
>   ARM: config: Reenable DSA in multi_v5_defconfig
>   ARM: config: Add orion5x to multi_v5_defconfig

>   ARM: mvebu: Reenable DSA in mvebu_v5_defconfig
>   ARM: mvebu: update v5 defconfig for Orion5x machines

To be sure there won't be a leftover, I applied the last 2 patches, but
not the 3 first ones, as for my understanding it is better that it is
managed by arm-soc directly.

Gregory

>
>  arch/arm/configs/multi_v5_defconfig | 43 +++++++++++++++++++++++++++----------
>  arch/arm/configs/mvebu_v5_defconfig | 31 +++++++++++++++++++++++++-
>  2 files changed, 62 insertions(+), 12 deletions(-)
>
> -- 
> 2.6.2
>

-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [PATCH 0/5] multi and mvebu v5 defconfig updates
  2015-12-07 17:06 ` [PATCH 0/5] multi and mvebu v5 defconfig updates Gregory CLEMENT
@ 2015-12-07 22:57   ` Arnd Bergmann
  2015-12-08  9:55     ` Gregory CLEMENT
  0 siblings, 1 reply; 17+ messages in thread
From: Arnd Bergmann @ 2015-12-07 22:57 UTC (permalink / raw)
  To: linux-arm-kernel

On Monday 07 December 2015 18:06:07 Gregory CLEMENT wrote:
> Hi Arnd
>  
>  On mer., d?c. 02 2015, Andrew Lunn <andrew@lunn.ch> wrote:
> 
> > This patchset updates both multi_v5_defconfig and mvebu_v5_defconfig.
> > It adds support for Orion5x, now that it is multi-arch, and adds back
> > DSA and its drivers, which now depends on switchdev.
> >
> > Andrew Lunn (5):
> >   ARM: config: Regenerate multi_v5_defconfig
> >   ARM: config: Reenable DSA in multi_v5_defconfig
> >   ARM: config: Add orion5x to multi_v5_defconfig
> 
> >   ARM: mvebu: Reenable DSA in mvebu_v5_defconfig
> >   ARM: mvebu: update v5 defconfig for Orion5x machines
> 
> To be sure there won't be a leftover, I applied the last 2 patches, but
> not the 3 first ones, as for my understanding it is better that it is
> managed by arm-soc directly.
> 
> 

Actually, I'd prefer you to put them in the same branch as the other
patches. I can easily sort out any merge conflicts when merging the
branch.

	Arnd

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [PATCH 0/5] multi and mvebu v5 defconfig updates
  2015-12-07 22:57   ` Arnd Bergmann
@ 2015-12-08  9:55     ` Gregory CLEMENT
  0 siblings, 0 replies; 17+ messages in thread
From: Gregory CLEMENT @ 2015-12-08  9:55 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Arnd,
 
 On lun., d?c. 07 2015, Arnd Bergmann <arnd@arndb.de> wrote:

> On Monday 07 December 2015 18:06:07 Gregory CLEMENT wrote:
>> Hi Arnd
>>  
>>  On mer., d?c. 02 2015, Andrew Lunn <andrew@lunn.ch> wrote:
>> 
>> > This patchset updates both multi_v5_defconfig and mvebu_v5_defconfig.
>> > It adds support for Orion5x, now that it is multi-arch, and adds back
>> > DSA and its drivers, which now depends on switchdev.
>> >
>> > Andrew Lunn (5):
>> >   ARM: config: Regenerate multi_v5_defconfig
>> >   ARM: config: Reenable DSA in multi_v5_defconfig
>> >   ARM: config: Add orion5x to multi_v5_defconfig
>> 
>> >   ARM: mvebu: Reenable DSA in mvebu_v5_defconfig
>> >   ARM: mvebu: update v5 defconfig for Orion5x machines
>> 
>> To be sure there won't be a leftover, I applied the last 2 patches, but
>> not the 3 first ones, as for my understanding it is better that it is
>> managed by arm-soc directly.
>> 
>> 
>
> Actually, I'd prefer you to put them in the same branch as the other
> patches. I can easily sort out any merge conflicts when merging the
> branch.

Ok. so I applied the whole series on mvebu/defconfig

Thanks,

Gregory

-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

^ permalink raw reply	[flat|nested] 17+ messages in thread
end of thread, other threads:[~2015-12-08  9:55 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-01 23:33 [PATCH 0/5] multi and mvebu v5 defconfig updates Andrew Lunn
2015-12-01 23:33 ` [PATCH 1/5] ARM: config: Regenerate multi_v5_defconfig Andrew Lunn
2015-12-02 13:44   ` Arnd Bergmann
2015-12-02 14:17     ` Andrew Lunn
2015-12-02 14:57       ` Arnd Bergmann
2015-12-02 15:08         ` Andrew Lunn
2015-12-02 15:10           ` Arnd Bergmann
2015-12-01 23:33 ` [PATCH 2/5] ARM: config: Reenable DSA in multi_v5_defconfig Andrew Lunn
2015-12-02 13:44   ` Arnd Bergmann
2015-12-01 23:33 ` [PATCH 3/5] ARM: config: Add orion5x to multi_v5_defconfig Andrew Lunn
2015-12-01 23:33 ` [PATCH 4/5] ARM: mvebu: Reenable DSA in mvebu_v5_defconfig Andrew Lunn
2015-12-07 17:02   ` Gregory CLEMENT
2015-12-01 23:33 ` [PATCH 5/5] ARM: mvebu: update v5 defconfig for Orion5x machines Andrew Lunn
2015-12-07 17:03   ` Gregory CLEMENT
2015-12-07 17:06 ` [PATCH 0/5] multi and mvebu v5 defconfig updates Gregory CLEMENT
2015-12-07 22:57   ` Arnd Bergmann
2015-12-08  9:55     ` Gregory CLEMENT

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).