| Message ID | 1449012812-9779-2-git-send-email-andrew@lunn.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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
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
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
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
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
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
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(-)