diff mbox

ARM: multi_v7: add mvebu and drivers to defconfig

Message ID 1390871129-4838-1-git-send-email-jason@lakedaemon.net (mailing list archive)
State New, archived
Headers show

Commit Message

Jason Cooper Jan. 28, 2014, 1:05 a.m. UTC
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 <jason@lakedaemon.net>
---
Kevin,

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

thx,

Jason.

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

Comments

Kevin Hilman Jan. 28, 2014, 3:17 p.m. UTC | #1
Jason Cooper <jason@lakedaemon.net> writes:

> 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 <jason@lakedaemon.net>
> ---
> 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 | 28 +++++++++++++++++-----------
>  1 file changed, 17 insertions(+), 11 deletions(-)
>
> diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
> index 687e4e811b2a..13e7d649230b 100644
> --- a/arch/arm/configs/multi_v7_defconfig
> +++ b/arch/arm/configs/multi_v7_defconfig
> @@ -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?

>  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?

> +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
> +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?

>  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?

>  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
Gregory CLEMENT Jan. 28, 2014, 3:39 p.m. UTC | #2
On 28/01/2014 16:17, Kevin Hilman wrote:
> Jason Cooper <jason@lakedaemon.net> writes:
> 
>> 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 <jason@lakedaemon.net>
>> ---
>> 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.

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.

For example the config symbol TEGRA_PCI have been removed since v3.12.

Gregory






> 
> Kevin
> 
>>  arch/arm/configs/multi_v7_defconfig | 28 +++++++++++++++++-----------
>>  1 file changed, 17 insertions(+), 11 deletions(-)
>>
>> diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
>> index 687e4e811b2a..13e7d649230b 100644
>> --- a/arch/arm/configs/multi_v7_defconfig
>> +++ b/arch/arm/configs/multi_v7_defconfig
>> @@ -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?
> 
>>  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?
> 
>> +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
>> +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?
> 
>>  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?
> 
>>  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
Kevin Hilman Jan. 28, 2014, 3:59 p.m. UTC | #3
On Tue, Jan 28, 2014 at 7:39 AM, Gregory CLEMENT
<gregory.clement@free-electrons.com> wrote:
> On 28/01/2014 16:17, Kevin Hilman wrote:
>> Jason Cooper <jason@lakedaemon.net> writes:
>>
>>> 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 <jason@lakedaemon.net>
>>> ---
>>> 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.
>
> 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.

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.

Kevin
Jason Cooper Jan. 28, 2014, 5:49 p.m. UTC | #4
On Tue, Jan 28, 2014 at 07:59:47AM -0800, Kevin Hilman wrote:
> On Tue, Jan 28, 2014 at 7:39 AM, Gregory CLEMENT
> <gregory.clement@free-electrons.com> wrote:
> > On 28/01/2014 16:17, Kevin Hilman wrote:
> >> Jason Cooper <jason@lakedaemon.net> writes:
> >>
> >>> 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 <jason@lakedaemon.net>
> >>> ---
> >>> 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.
> >
> > 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.
> 
> 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.

Agreed.  I was debating doing two patches, but thought it would be
overkill.  I'll resend a v2 as two patches.  I'm also going to put it on
mvebu/defconfig branch so that I can also build and test against it
throughout the merge window.

thx,

Jason.
diff mbox

Patch

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 687e4e811b2a..13e7d649230b 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -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
 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
+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
+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
 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
 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