ARM: multi_v7: add mvebu and drivers to defconfig

boot farms testing is highlighting some errors in mvebu. Let's get some more coverage for multi_v7_defconfig kernels.

Signed-off-by Jason Cooper <[email protected]>

---
Kevin,

This is against tonight's master. Feel free to take it directly.

arch/arm/configs/multi_v7_defconfig +9 -4

+CONFIG_PCI=y
+CONFIG_PCI_MSI=y
+CONFIG_PCI_MVEBU=y
 CONFIG_HIGHPTE=y
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y

@@ -69,12 +70,14 @@ CONFIG_SATA_MV=y
 CONFIG_NETDEVICES=y
 CONFIG_SUN4I_EMAC=y
 CONFIG_NET_CALXEDA_XGMAC=y
+CONFIG_MVNETA=y
 CONFIG_KS8851=y
 CONFIG_SMSC911X=y
 CONFIG_STMMAC_ETH=y
-CONFIG_ICPLUS_PHY=y
-CONFIG_MDIO_SUN4I=y
 CONFIG_TI_CPSW=y
+CONFIG_MARVELL_PHY=y
+CONFIG_ICPLUS_PHY=y
+CONFIG_KEYBOARD_GPIO=y
 CONFIG_KEYBOARD_SPEAR=y
 CONFIG_SERIO_AMBAKMI=y
 CONFIG_SERIAL_8250=y

@@ -99,25 +102,27 @@ CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
 CONFIG_SERIAL_ST_ASC=y
 CONFIG_SERIAL_ST_ASC_CONSOLE=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
+CONFIG_I2C_MV64XXX=y
 CONFIG_I2C_SIRF=y
 CONFIG_I2C_TEGRA=y
 CONFIG_SPI=y
 CONFIG_SPI_OMAP24XX=y
+CONFIG_SPI_ORION=y
 CONFIG_SPI_PL022=y
 CONFIG_SPI_SIRF=y
 CONFIG_SPI_TEGRA114=y
 CONFIG_SPI_TEGRA20_SLINK=y
-CONFIG_PINCTRL_SINGLE=y
 CONFIG_GPIO_GENERIC_PLATFORM=y
 CONFIG_GPIO_TWL4030=y
-CONFIG_REGULATOR_GPIO=y

arch/arm/configs/multi_v7_defconfig +5 -2

 CONFIG_OMAP_USB3=y
 CONFIG_SAMSUNG_USB2PHY=y
 CONFIG_SAMSUNG_USB3PHY=y

@@ -144,13 +147,13 @@ CONFIG_MMC=y
 CONFIG_MMC_BLOCK_MINORS=16
 CONFIG_MMC_ARMMMCI=y
 CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_ESDHC_IMX=y
 CONFIG_MMC_SDHCI_TEGRA=y
 CONFIG_MMC_SDHCI_SPEAR=y
 CONFIG_MMC_SDHCI_BCM_KONA=y
 CONFIG_MMC_OMAP=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_MMC_MVSDIO=y
 CONFIG_EDAC=y
 CONFIG_EDAC_MM_EDAC=y
 CONFIG_EDAC_HIGHBANK_MC=y

@@ -159,20 +162,23 @@ CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_TWL4030=y
 CONFIG_RTC_DRV_PL031=y
 CONFIG_RTC_DRV_VT8500=y
+CONFIG_RTC_DRV_MV=y
 CONFIG_RTC_DRV_TEGRA=y
 CONFIG_DMADEVICES=y
 CONFIG_DW_DMAC=y
+CONFIG_MV_XOR=y
 CONFIG_TEGRA20_APB_DMA=y
 CONFIG_STE_DMA40=y
 CONFIG_SIRF_DMA=y
-CONFIG_TI_EDMA=y
 CONFIG_PL330_DMA=y
 CONFIG_IMX_SDMA=y
 CONFIG_IMX_DMA=y
 CONFIG_MXS_DMA=y
 CONFIG_DMA_OMAP=y
+CONFIG_MEMORY=y
 CONFIG_PWM=y
 CONFIG_PWM_VT8500=y
+CONFIG_OMAP_USB2=y
 CONFIG_EXT4_FS=y
 CONFIG_TMPFS=y
 CONFIG_NFS_FS=y

Quoted 9 lines · Jason Cooper

boot farms testing is highlighting some errors in mvebu. Let's get some more coverage for multi_v7_defconfig kernels.

Signed-off-by Jason Cooper <[email protected]>

---
Kevin,

This is against tonight's master. Feel free to take it directly.

OK, but this one doesn't currently fix any known errors, right? (the pull request you sent yesterday fixes the boot regressions, IIUC.) The goal here is just to get more mvebu coverage in multi_v7_defconfig, correct?

That being said, have a closer look at the Kconfig entries that are removed by the patch below, many of which will have an impact on other platforms.

Kevin

arch/arm/configs/multi_v7_defconfig CONFIG_ARCH_TEGRA=y · line 41

Quoted 12 lines

 arch/arm/configs/multi_v7_defconfig | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

arch/arm/configs/multi_v7_defconfig +0 -1

index 687e4e811b2a..13e7d649230b 100644
@@ -38,7 +38,6 @@ CONFIG_ARCH_TEGRA=y
 CONFIG_ARCH_TEGRA_2x_SOC=y
 CONFIG_ARCH_TEGRA_3x_SOC=y
 CONFIG_ARCH_TEGRA_114_SOC=y
-CONFIG_TEGRA_PCI=y

huh?

arch/arm/configs/multi_v7_defconfig CONFIG_ARCH_VEXPRESS_CA9X4=y · line 52

Quoted 8 lines

arch/arm/configs/multi_v7_defconfig +0 -1

 CONFIG_TEGRA_EMC_SCALING_ENABLE=y
 CONFIG_ARCH_U8500=y
 CONFIG_MACH_HREFV60=y

@@ -49,7 +48,9 @@ CONFIG_ARCH_VEXPRESS_CA9X4=y
 CONFIG_ARCH_VIRT=y
 CONFIG_ARCH_WM8850=y
 CONFIG_ARCH_ZYNQ=y
-CONFIG_SMP=y

huh?

Quoted 41 lines

arch/arm/configs/multi_v7_defconfig +9 -4

+CONFIG_PCI=y
+CONFIG_PCI_MSI=y
+CONFIG_PCI_MVEBU=y
 CONFIG_HIGHPTE=y
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y

@@ -69,12 +70,14 @@ CONFIG_SATA_MV=y
 CONFIG_NETDEVICES=y
 CONFIG_SUN4I_EMAC=y
 CONFIG_NET_CALXEDA_XGMAC=y
+CONFIG_MVNETA=y
 CONFIG_KS8851=y
 CONFIG_SMSC911X=y
 CONFIG_STMMAC_ETH=y
-CONFIG_ICPLUS_PHY=y
-CONFIG_MDIO_SUN4I=y
 CONFIG_TI_CPSW=y
+CONFIG_MARVELL_PHY=y
+CONFIG_ICPLUS_PHY=y
+CONFIG_KEYBOARD_GPIO=y
 CONFIG_KEYBOARD_SPEAR=y
 CONFIG_SERIO_AMBAKMI=y
 CONFIG_SERIAL_8250=y

@@ -99,25 +102,27 @@ CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
 CONFIG_SERIAL_ST_ASC=y
 CONFIG_SERIAL_ST_ASC_CONSOLE=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
+CONFIG_I2C_MV64XXX=y
 CONFIG_I2C_SIRF=y
 CONFIG_I2C_TEGRA=y
 CONFIG_SPI=y
 CONFIG_SPI_OMAP24XX=y
+CONFIG_SPI_ORION=y
 CONFIG_SPI_PL022=y
 CONFIG_SPI_SIRF=y
 CONFIG_SPI_TEGRA114=y
 CONFIG_SPI_TEGRA20_SLINK=y
-CONFIG_PINCTRL_SINGLE=y
 CONFIG_GPIO_GENERIC_PLATFORM=y
 CONFIG_GPIO_TWL4030=y
-CONFIG_REGULATOR_GPIO=y

arch/arm/configs/multi_v7_defconfig CONFIG_SERIAL_FSL_LPUART_CONSOLE=y · line 120

Quoted 10 lines

arch/arm/configs/multi_v7_defconfig +3 -1

+CONFIG_THERMAL=y
+CONFIG_ARMADA_THERMAL=y
 CONFIG_REGULATOR_AB8500=y
+CONFIG_REGULATOR_GPIO=y
 CONFIG_REGULATOR_TPS51632=y
 CONFIG_REGULATOR_TPS62360=y
 CONFIG_REGULATOR_TWL4030=y
 CONFIG_REGULATOR_VEXPRESS=y
 CONFIG_DRM=y
-CONFIG_TEGRA_HOST1X=y

huh?

arch/arm/configs/multi_v7_defconfig CONFIG_USB_STORAGE=y · line 136

Quoted 9 lines

arch/arm/configs/multi_v7_defconfig +0 -2

 CONFIG_DRM_TEGRA=y
 CONFIG_FB_ARMCLCD=y
 CONFIG_FB_WM8505=y

@@ -132,8 +137,6 @@ CONFIG_USB_STORAGE=y
 CONFIG_USB_CHIPIDEA=y
 CONFIG_USB_CHIPIDEA_HOST=y
 CONFIG_AB8500_USB=y
-CONFIG_NOP_USB_XCEIV=y
-CONFIG_OMAP_USB2=y

huh?

Quoted 43 lines

arch/arm/configs/multi_v7_defconfig +5 -2

 CONFIG_OMAP_USB3=y
 CONFIG_SAMSUNG_USB2PHY=y
 CONFIG_SAMSUNG_USB3PHY=y

@@ -144,13 +147,13 @@ CONFIG_MMC=y
 CONFIG_MMC_BLOCK_MINORS=16
 CONFIG_MMC_ARMMMCI=y
 CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_ESDHC_IMX=y
 CONFIG_MMC_SDHCI_TEGRA=y
 CONFIG_MMC_SDHCI_SPEAR=y
 CONFIG_MMC_SDHCI_BCM_KONA=y
 CONFIG_MMC_OMAP=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_MMC_MVSDIO=y
 CONFIG_EDAC=y
 CONFIG_EDAC_MM_EDAC=y
 CONFIG_EDAC_HIGHBANK_MC=y

@@ -159,20 +162,23 @@ CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_TWL4030=y
 CONFIG_RTC_DRV_PL031=y
 CONFIG_RTC_DRV_VT8500=y
+CONFIG_RTC_DRV_MV=y
 CONFIG_RTC_DRV_TEGRA=y
 CONFIG_DMADEVICES=y
 CONFIG_DW_DMAC=y
+CONFIG_MV_XOR=y
 CONFIG_TEGRA20_APB_DMA=y
 CONFIG_STE_DMA40=y
 CONFIG_SIRF_DMA=y
-CONFIG_TI_EDMA=y
 CONFIG_PL330_DMA=y
 CONFIG_IMX_SDMA=y
 CONFIG_IMX_DMA=y
 CONFIG_MXS_DMA=y
 CONFIG_DMA_OMAP=y
+CONFIG_MEMORY=y
 CONFIG_PWM=y
 CONFIG_PWM_VT8500=y
+CONFIG_OMAP_USB2=y
 CONFIG_EXT4_FS=y
 CONFIG_TMPFS=y
 CONFIG_NFS_FS=y

Quoted 12 lines · Kevin Hilman

Quoted 9 lines · Jason Cooper

boot farms testing is highlighting some errors in mvebu. Let's get some more coverage for multi_v7_defconfig kernels.

Signed-off-by Jason Cooper <[email protected]>

---
Kevin,

This is against tonight's master. Feel free to take it directly.

Quoted 8 lines

OK, but this one doesn't currently fix any known errors, right? (the pull request you sent yesterday fixes the boot regressions, IIUC.) The goal here is just to get more mvebu coverage in multi_v7_defconfig, correct?

That being said, have a closer look at the Kconfig entries that are removed by the patch below, many of which will have an impact on other platforms.

Hi Kevin,

I may be wrong but I suspect this config file was generated with make savedefconfig. this rule only generate the CONFIG that are not implied by other CONFIG, so I wonder if all this changes are just due to of modificatino in the Kconfig themselves.

Quoted 24 lines · Gregory CLEMENT

Quoted 12 lines · Kevin Hilman

Quoted 9 lines · Jason Cooper

boot farms testing is highlighting some errors in mvebu. Let's get some more coverage for multi_v7_defconfig kernels.

Signed-off-by Jason Cooper <[email protected]>

---
Kevin,

This is against tonight's master. Feel free to take it directly.

Quoted 8 lines

OK, but this one doesn't currently fix any known errors, right? (the pull request you sent yesterday fixes the boot regressions, IIUC.) The goal here is just to get more mvebu coverage in multi_v7_defconfig, correct?

That being said, have a closer look at the Kconfig entries that are removed by the patch below, many of which will have an impact on other platforms.

Hi Kevin,

Quoted 4 lines

I may be wrong but I suspect this config file was generated with make savedefconfig. this rule only generate the CONFIG that are not implied by other CONFIG, so I wonder if all this changes are just due to of modificatino in the Kconfig themselves.

Yes, I suspect that as well, which means the changelog needs to have a bit more detail justifying those removals that look suspicious when just looking through the diff.

Just the output of:

make ARCH=arm multi_v7_defconfig
make savedefconfig
mv defconfig arch/arm/configs/multi_v7_defconfig

Signed-off-by Jason Cooper <[email protected]>

Quoted 6 lines · Jason Cooper

Just the output of:

make ARCH=arm multi_v7_defconfig
make savedefconfig
mv defconfig arch/arm/configs/multi_v7_defconfig

Quoted 1 line

Signed-off-by Jason Cooper <[email protected]>

Do you mean 3.14-rc1? If so, this will likely have conflicts with the multi_v7_defconfig that we still have in our for-next branch (should be queued in a regular branch now that all the contents has been merged in by Linus).

Recent boot farm testing has highlighted some issues with mvebu and multiplatform kernels. Increase the test coverage so we can discover these issues earlier.

Signed-off-by Jason Cooper <[email protected]>

---
v2 -> v3:
- rebase onto arm-soc/for-next so arm-soc can apply directly for v3.14-rcX

v1 -> v2:
- split into two patches, update and +mvebu

 arch/arm/configs/multi_v7_defconfig | 10 ++++++++++
 1 file changed, 10 insertions(+)

Quoted 9 lines · Jason Cooper

Recent boot farm testing has highlighted some issues with mvebu and multiplatform kernels. Increase the test coverage so we can discover these issues earlier.

Signed-off-by Jason Cooper <[email protected]>

---
v2 -> v3:
- rebase onto arm-soc/for-next so arm-soc can apply directly for v3.14-rcX

Quoted 5 lines

v1 -> v2:
- split into two patches, update and +mvebu

 arch/arm/configs/multi_v7_defconfig | 10 ++++++++++
 1 file changed, 10 insertions(+)

Applied. I ended up redoing the 1/2 patch myself but this one is applied as-is with minor fixup.

Quoted 10 lines · Olof Johansson

Quoted 9 lines · Jason Cooper

Recent boot farm testing has highlighted some issues with mvebu and multiplatform kernels. Increase the test coverage so we can discover these issues earlier.

Signed-off-by Jason Cooper <[email protected]>

---
v2 -> v3:
- rebase onto arm-soc/for-next so arm-soc can apply directly for v3.14-rcX

Quoted 8 lines

Quoted 5 lines

v1 -> v2:
- split into two patches, update and +mvebu

 arch/arm/configs/multi_v7_defconfig | 10 ++++++++++
 1 file changed, 10 insertions(+)

Applied. I ended up redoing the 1/2 patch myself but this one is applied as-is with minor fixup.

It looks like Kevin applied this yesterday:

1c53e04e8050 ARM: multi_v7_defconfig: add mvebu drivers 64a5cb10bdc5 ARM: multi_v7_defconfig: update for v3.14-rc1

It's in arm-soc/for_3.14/fixes which was pulled into arm-soc/to-build yesterday...

confused?