diff mbox

ARM: multi_v7: copy most options from tegra_defconfig

Message ID 1387569848-16563-1-git-send-email-swarren@wwwdotorg.org (mailing list archive)
State New, archived
Headers show

Commit Message

Stephen Warren Dec. 20, 2013, 8:04 p.m. UTC 
From: Stephen Warren <swarren@nvidia.com>

multi_v7_defconfig was missing a large number of options that were in
tegra_defconfig. This patch adds them. The changes fall into the
following categories:

* Enable more Tegra SoC options/drivers.
* Enable more drivers for Tegra boards.
* Enable more options that are useful for running distros.

The patch removes a few lines as well, simply because those options are
now selected by something else, and "make savedefconfig" removes them. I
verified that the options appear in .config after
"make multi_v7_defconfig".

Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
 arch/arm/configs/multi_v7_defconfig | 163 +++++++++++++++++++++++++++++++++---
 1 file changed, 150 insertions(+), 13 deletions(-)

Comments

Olof Johansson Dec. 20, 2013, 8:16 p.m. UTC | #1 
On Fri, Dec 20, 2013 at 12:04 PM, Stephen Warren <swarren@wwwdotorg.org> wrote:

> @@ -165,21 +276,47 @@ CONFIG_DW_DMAC=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_STAGING=y
> +CONFIG_SENSORS_ISL29018=y
> +CONFIG_SENSORS_ISL29028=y
> +CONFIG_MFD_NVEC=y
> +CONFIG_KEYBOARD_NVEC=y
> +CONFIG_SERIO_NVEC_PS2=y
> +CONFIG_NVEC_POWER=y
> +CONFIG_NVEC_PAZ00=y
> +CONFIG_TEGRA_IOMMU_GART=y
> +CONFIG_TEGRA_IOMMU_SMMU=y
> +CONFIG_MEMORY=y
> +CONFIG_IIO=y
> +CONFIG_AK8975=y
>  CONFIG_PWM=y
> +CONFIG_PWM_TEGRA=y
>  CONFIG_PWM_VT8500=y
> +CONFIG_OMAP_USB2=y
> +CONFIG_EXT2_FS=y
> +CONFIG_EXT2_FS_XATTR=y
> +CONFIG_EXT2_FS_POSIX_ACL=y
> +CONFIG_EXT2_FS_SECURITY=y
> +CONFIG_EXT3_FS=y
> +CONFIG_EXT3_FS_POSIX_ACL=y
> +CONFIG_EXT3_FS_SECURITY=y

I think it makes sense to just enable EXT4_USE_FOR_EXT23 instead.

>  CONFIG_EXT4_FS=y
> +CONFIG_VFAT_FS=y
>  CONFIG_TMPFS=y
> +CONFIG_SQUASHFS=y
> +CONFIG_SQUASHFS_LZO=y
> +CONFIG_SQUASHFS_XZ=y
>  CONFIG_NFS_FS=y
>  CONFIG_NFS_V3_ACL=y
>  CONFIG_NFS_V4=y
>  CONFIG_ROOT_NFS=y
>  CONFIG_PRINTK_TIME=y
>  CONFIG_DEBUG_FS=y
> -CONFIG_DEBUG_KERNEL=y

Why are you disabling DEBUG_KERNEL?


-Olof
Stephen Warren Dec. 20, 2013, 8:26 p.m. UTC | #2 
On 12/20/2013 01:16 PM, Olof Johansson wrote:
> On Fri, Dec 20, 2013 at 12:04 PM, Stephen Warren <swarren@wwwdotorg.org> wrote:

>> +CONFIG_EXT2_FS=y
>> +CONFIG_EXT2_FS_XATTR=y
>> +CONFIG_EXT2_FS_POSIX_ACL=y
>> +CONFIG_EXT2_FS_SECURITY=y
>> +CONFIG_EXT3_FS=y
>> +CONFIG_EXT3_FS_POSIX_ACL=y
>> +CONFIG_EXT3_FS_SECURITY=y
> 
> I think it makes sense to just enable EXT4_USE_FOR_EXT23 instead.

It looks like that's the default if EXT2_FS/EXT3_FS aren't enabled. I'll
go test that out.

>>  CONFIG_EXT4_FS=y
>> +CONFIG_VFAT_FS=y
>>  CONFIG_TMPFS=y
>> +CONFIG_SQUASHFS=y
>> +CONFIG_SQUASHFS_LZO=y
>> +CONFIG_SQUASHFS_XZ=y
>>  CONFIG_NFS_FS=y
>>  CONFIG_NFS_V3_ACL=y
>>  CONFIG_NFS_V4=y
>>  CONFIG_ROOT_NFS=y
>>  CONFIG_PRINTK_TIME=y
>>  CONFIG_DEBUG_FS=y
>> -CONFIG_DEBUG_KERNEL=y
> 
> Why are you disabling DEBUG_KERNEL?

It's not disabled, it ends up getting selected by something else, so
doesn't appear in the defconfig.
Olof Johansson Dec. 22, 2013, 8:05 p.m. UTC | #3 
On Fri, Dec 20, 2013 at 01:26:17PM -0700, Stephen Warren wrote:
> On 12/20/2013 01:16 PM, Olof Johansson wrote:
> > On Fri, Dec 20, 2013 at 12:04 PM, Stephen Warren <swarren@wwwdotorg.org> wrote:
> 
> >> +CONFIG_EXT2_FS=y
> >> +CONFIG_EXT2_FS_XATTR=y
> >> +CONFIG_EXT2_FS_POSIX_ACL=y
> >> +CONFIG_EXT2_FS_SECURITY=y
> >> +CONFIG_EXT3_FS=y
> >> +CONFIG_EXT3_FS_POSIX_ACL=y
> >> +CONFIG_EXT3_FS_SECURITY=y
> > 
> > I think it makes sense to just enable EXT4_USE_FOR_EXT23 instead.
> 
> It looks like that's the default if EXT2_FS/EXT3_FS aren't enabled. I'll
> go test that out.
> 
> >>  CONFIG_EXT4_FS=y
> >> +CONFIG_VFAT_FS=y
> >>  CONFIG_TMPFS=y
> >> +CONFIG_SQUASHFS=y
> >> +CONFIG_SQUASHFS_LZO=y
> >> +CONFIG_SQUASHFS_XZ=y
> >>  CONFIG_NFS_FS=y
> >>  CONFIG_NFS_V3_ACL=y
> >>  CONFIG_NFS_V4=y
> >>  CONFIG_ROOT_NFS=y
> >>  CONFIG_PRINTK_TIME=y
> >>  CONFIG_DEBUG_FS=y
> >> -CONFIG_DEBUG_KERNEL=y
> > 
> > Why are you disabling DEBUG_KERNEL?
> 
> It's not disabled, it ends up getting selected by something else, so
> doesn't appear in the defconfig.

Ok, fair enough. Applied.


-Olof
Olof Johansson Dec. 23, 2013, 5:37 p.m. UTC | #4 
On Sun, Dec 22, 2013 at 12:05 PM, Olof Johansson <olof@lixom.net> wrote:
> On Fri, Dec 20, 2013 at 01:26:17PM -0700, Stephen Warren wrote:
>> On 12/20/2013 01:16 PM, Olof Johansson wrote:
>> > On Fri, Dec 20, 2013 at 12:04 PM, Stephen Warren <swarren@wwwdotorg.org> wrote:
>>
>> >> +CONFIG_EXT2_FS=y
>> >> +CONFIG_EXT2_FS_XATTR=y
>> >> +CONFIG_EXT2_FS_POSIX_ACL=y
>> >> +CONFIG_EXT2_FS_SECURITY=y
>> >> +CONFIG_EXT3_FS=y
>> >> +CONFIG_EXT3_FS_POSIX_ACL=y
>> >> +CONFIG_EXT3_FS_SECURITY=y
>> >
>> > I think it makes sense to just enable EXT4_USE_FOR_EXT23 instead.
>>
>> It looks like that's the default if EXT2_FS/EXT3_FS aren't enabled. I'll
>> go test that out.
>>
>> >>  CONFIG_EXT4_FS=y
>> >> +CONFIG_VFAT_FS=y
>> >>  CONFIG_TMPFS=y
>> >> +CONFIG_SQUASHFS=y
>> >> +CONFIG_SQUASHFS_LZO=y
>> >> +CONFIG_SQUASHFS_XZ=y
>> >>  CONFIG_NFS_FS=y
>> >>  CONFIG_NFS_V3_ACL=y
>> >>  CONFIG_NFS_V4=y
>> >>  CONFIG_ROOT_NFS=y
>> >>  CONFIG_PRINTK_TIME=y
>> >>  CONFIG_DEBUG_FS=y
>> >> -CONFIG_DEBUG_KERNEL=y
>> >
>> > Why are you disabling DEBUG_KERNEL?
>>
>> It's not disabled, it ends up getting selected by something else, so
>> doesn't appear in the defconfig.
>
> Ok, fair enough. Applied.

Actually, this one ended up getting messy. We've had
multi_v7_defconfig updates in several branches so this doesn't apply
cleanly anywhere.

I'll apply it on top of for-next where the various branches are
merged. It means we'll have to merge it late. Not a big deal, but
please help me remember it in case it for some reason gets lost in the
shuffle.


-Olof
Stephen Warren Jan. 24, 2014, 12:16 a.m. UTC | #5 
On 12/23/2013 10:37 AM, Olof Johansson wrote:
> On Sun, Dec 22, 2013 at 12:05 PM, Olof Johansson <olof@lixom.net> wrote:
>> On Fri, Dec 20, 2013 at 01:26:17PM -0700, Stephen Warren wrote:
>>> On 12/20/2013 01:16 PM, Olof Johansson wrote:
>>>> On Fri, Dec 20, 2013 at 12:04 PM, Stephen Warren <swarren@wwwdotorg.org> wrote:
>>>> multi_v7_defconfig was missing a large number of options that were in
>>>> tegra_defconfig. This patch adds them. The changes fall into the
>>>> following categories:
...
>> Ok, fair enough. Applied.
> 
> Actually, this one ended up getting messy. We've had
> multi_v7_defconfig updates in several branches so this doesn't apply
> cleanly anywhere.
> 
> I'll apply it on top of for-next where the various branches are
> merged. It means we'll have to merge it late. Not a big deal, but
> please help me remember it in case it for some reason gets lost in the
> shuffle.

I guess this is the correct time to remind you about this? That said,
the patch is in linux-next, so perhaps that counts as not having been
lost:-)
Olof Johansson Jan. 24, 2014, 12:20 a.m. UTC | #6 
On Thu, Jan 23, 2014 at 4:16 PM, Stephen Warren <swarren@wwwdotorg.org> wrote:
> On 12/23/2013 10:37 AM, Olof Johansson wrote:
>> On Sun, Dec 22, 2013 at 12:05 PM, Olof Johansson <olof@lixom.net> wrote:
>>> On Fri, Dec 20, 2013 at 01:26:17PM -0700, Stephen Warren wrote:
>>>> On 12/20/2013 01:16 PM, Olof Johansson wrote:
>>>>> On Fri, Dec 20, 2013 at 12:04 PM, Stephen Warren <swarren@wwwdotorg.org> wrote:
>>>>> multi_v7_defconfig was missing a large number of options that were in
>>>>> tegra_defconfig. This patch adds them. The changes fall into the
>>>>> following categories:
> ...
>>> Ok, fair enough. Applied.
>>
>> Actually, this one ended up getting messy. We've had
>> multi_v7_defconfig updates in several branches so this doesn't apply
>> cleanly anywhere.
>>
>> I'll apply it on top of for-next where the various branches are
>> merged. It means we'll have to merge it late. Not a big deal, but
>> please help me remember it in case it for some reason gets lost in the
>> shuffle.
>
> I guess this is the correct time to remind you about this? That said,
> the patch is in linux-next, so perhaps that counts as not having been
> lost:-)
Olof Johansson Jan. 24, 2014, 12:21 a.m. UTC | #7 
On Thu, Jan 23, 2014 at 4:20 PM, Olof Johansson <olof@lixom.net> wrote:
> On Thu, Jan 23, 2014 at 4:16 PM, Stephen Warren <swarren@wwwdotorg.org> wrote:
>> On 12/23/2013 10:37 AM, Olof Johansson wrote:
>>> On Sun, Dec 22, 2013 at 12:05 PM, Olof Johansson <olof@lixom.net> wrote:
>>>> On Fri, Dec 20, 2013 at 01:26:17PM -0700, Stephen Warren wrote:
>>>>> On 12/20/2013 01:16 PM, Olof Johansson wrote:
>>>>>> On Fri, Dec 20, 2013 at 12:04 PM, Stephen Warren <swarren@wwwdotorg.org> wrote:
>>>>>> multi_v7_defconfig was missing a large number of options that were in
>>>>>> tegra_defconfig. This patch adds them. The changes fall into the
>>>>>> following categories:
>> ...
>>>> Ok, fair enough. Applied.
>>>
>>> Actually, this one ended up getting messy. We've had
>>> multi_v7_defconfig updates in several branches so this doesn't apply
>>> cleanly anywhere.
>>>
>>> I'll apply it on top of for-next where the various branches are
>>> merged. It means we'll have to merge it late. Not a big deal, but
>>> please help me remember it in case it for some reason gets lost in the
>>> shuffle.
>>
>> I guess this is the correct time to remind you about this? That said,
>> the patch is in linux-next, so perhaps that counts as not having been
>> lost:-)

(Gah, fumbled the send button).

Yeah, i'm aware of this one, we'll include it with the late/* branches
once Linus merges our initial set of stuff.


-Olof
diff mbox

Patch

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 687e4e811b2a..d7142065576a 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -1,7 +1,12 @@ 
+CONFIG_SYSVIPC=y
 CONFIG_IRQ_DOMAIN_DEBUG=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_BLK_DEV_INITRD=y
+CONFIG_EMBEDDED=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_PARTITION_ADVANCED=y
 CONFIG_ARCH_MVEBU=y
 CONFIG_MACH_ARMADA_370=y
 CONFIG_MACH_ARMADA_XP=y
@@ -11,8 +16,8 @@  CONFIG_ARCH_BERLIN=y
 CONFIG_MACH_BERLIN_BG2=y
 CONFIG_MACH_BERLIN_BG2CD=y
 CONFIG_GPIO_PCA953X=y
-CONFIG_ARCH_HIGHBANK=y
 CONFIG_ARCH_HI3xxx=y
+CONFIG_ARCH_HIGHBANK=y
 CONFIG_ARCH_KEYSTONE=y
 CONFIG_ARCH_MXC=y
 CONFIG_MACH_IMX51_DT=y
@@ -38,7 +43,7 @@  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_ARCH_TEGRA_124_SOC=y
 CONFIG_TEGRA_EMC_SCALING_ENABLE=y
 CONFIG_ARCH_U8500=y
 CONFIG_MACH_HREFV60=y
@@ -49,19 +54,53 @@  CONFIG_ARCH_VEXPRESS_CA9X4=y
 CONFIG_ARCH_VIRT=y
 CONFIG_ARCH_WM8850=y
 CONFIG_ARCH_ZYNQ=y
-CONFIG_SMP=y
+CONFIG_TRUSTED_FOUNDATIONS=y
+CONFIG_PCI=y
+CONFIG_PCI_MSI=y
+CONFIG_PCI_TEGRA=y
 CONFIG_HIGHPTE=y
+CONFIG_CMA=y
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
+CONFIG_KEXEC=y
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+CONFIG_CPU_IDLE=y
 CONFIG_NET=y
+CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_CFG80211=m
+CONFIG_MAC80211=m
+CONFIG_RFKILL=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_GPIO=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_DMA_CMA=y
 CONFIG_OMAP_OCP2SCP=y
+CONFIG_MTD=y
+CONFIG_MTD_M25P80=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_ICS932S401=y
+CONFIG_APDS9802ALS=y
+CONFIG_ISL29003=y
 CONFIG_BLK_DEV_SD=y
+CONFIG_BLK_DEV_SR=y
+CONFIG_SCSI_MULTI_LUN=y
 CONFIG_ATA=y
 CONFIG_SATA_AHCI_PLATFORM=y
 CONFIG_SATA_HIGHBANK=y
@@ -70,12 +109,26 @@  CONFIG_NETDEVICES=y
 CONFIG_SUN4I_EMAC=y
 CONFIG_NET_CALXEDA_XGMAC=y
 CONFIG_KS8851=y
+CONFIG_R8169=y
 CONFIG_SMSC911X=y
 CONFIG_STMMAC_ETH=y
-CONFIG_ICPLUS_PHY=y
-CONFIG_MDIO_SUN4I=y
 CONFIG_TI_CPSW=y
+CONFIG_ICPLUS_PHY=y
+CONFIG_USB_PEGASUS=y
+CONFIG_USB_USBNET=y
+CONFIG_USB_NET_SMSC75XX=y
+CONFIG_USB_NET_SMSC95XX=y
+CONFIG_BRCMFMAC=m
+CONFIG_RT2X00=m
+CONFIG_RT2800USB=m
+CONFIG_INPUT_EVDEV=y
+CONFIG_KEYBOARD_GPIO=y
+CONFIG_KEYBOARD_TEGRA=y
 CONFIG_KEYBOARD_SPEAR=y
+CONFIG_KEYBOARD_CROS_EC=y
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_MPU3050=y
 CONFIG_SERIO_AMBAKMI=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
@@ -98,6 +151,9 @@  CONFIG_SERIAL_FSL_LPUART=y
 CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
 CONFIG_SERIAL_ST_ASC=y
 CONFIG_SERIAL_ST_ASC_CONSOLE=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_MUX=y
+CONFIG_I2C_MUX_PINCTRL=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_SIRF=y
 CONFIG_I2C_TEGRA=y
@@ -106,22 +162,66 @@  CONFIG_SPI_OMAP24XX=y
 CONFIG_SPI_PL022=y
 CONFIG_SPI_SIRF=y
 CONFIG_SPI_TEGRA114=y
+CONFIG_SPI_TEGRA20_SFLASH=y
 CONFIG_SPI_TEGRA20_SLINK=y
-CONFIG_PINCTRL_SINGLE=y
+CONFIG_PINCTRL_AS3722=y
+CONFIG_PINCTRL_PALMAS=y
+CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_GENERIC_PLATFORM=y
+CONFIG_GPIO_PCA953X_IRQ=y
 CONFIG_GPIO_TWL4030=y
-CONFIG_REGULATOR_GPIO=y
+CONFIG_GPIO_PALMAS=y
+CONFIG_GPIO_TPS6586X=y
+CONFIG_GPIO_TPS65910=y
+CONFIG_BATTERY_SBS=y
+CONFIG_CHARGER_TPS65090=y
+CONFIG_POWER_RESET_AS3722=y
+CONFIG_POWER_RESET_GPIO=y
+CONFIG_SENSORS_LM90=y
+CONFIG_MFD_AS3722=y
+CONFIG_MFD_CROS_EC=y
+CONFIG_MFD_CROS_EC_SPI=y
+CONFIG_MFD_MAX8907=y
+CONFIG_MFD_PALMAS=y
+CONFIG_MFD_TPS65090=y
+CONFIG_MFD_TPS6586X=y
+CONFIG_MFD_TPS65910=y
+CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
 CONFIG_REGULATOR_AB8500=y
+CONFIG_REGULATOR_AS3722=y
+CONFIG_REGULATOR_GPIO=y
+CONFIG_REGULATOR_MAX8907=y
+CONFIG_REGULATOR_PALMAS=y
 CONFIG_REGULATOR_TPS51632=y
 CONFIG_REGULATOR_TPS62360=y
+CONFIG_REGULATOR_TPS65090=y
+CONFIG_REGULATOR_TPS6586X=y
+CONFIG_REGULATOR_TPS65910=y
 CONFIG_REGULATOR_TWL4030=y
 CONFIG_REGULATOR_VEXPRESS=y
+CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_USB_SUPPORT=y
 CONFIG_DRM=y
-CONFIG_TEGRA_HOST1X=y
 CONFIG_DRM_TEGRA=y
+CONFIG_DRM_PANEL_SIMPLE=y
 CONFIG_FB_ARMCLCD=y
 CONFIG_FB_WM8505=y
 CONFIG_FB_SIMPLE=y
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_PWM=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_SOC=y
+CONFIG_SND_SOC_TEGRA=y
+CONFIG_SND_SOC_TEGRA_RT5640=y
+CONFIG_SND_SOC_TEGRA_WM8753=y
+CONFIG_SND_SOC_TEGRA_WM8903=y
+CONFIG_SND_SOC_TEGRA_TRIMSLICE=y
+CONFIG_SND_SOC_TEGRA_ALC5632=y
+CONFIG_SND_SOC_TEGRA_MAX98090=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_EHCI_HCD=y
@@ -132,8 +232,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,19 +242,32 @@  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_LEDS_GPIO=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_ONESHOT=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_GPIO=y
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+CONFIG_LEDS_TRIGGER_TRANSIENT=y
+CONFIG_LEDS_TRIGGER_CAMERA=y
 CONFIG_EDAC=y
 CONFIG_EDAC_MM_EDAC=y
 CONFIG_EDAC_HIGHBANK_MC=y
 CONFIG_EDAC_HIGHBANK_L2=y
 CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_AS3722=y
+CONFIG_RTC_DRV_MAX8907=y
+CONFIG_RTC_DRV_PALMAS=y
 CONFIG_RTC_DRV_TWL4030=y
+CONFIG_RTC_DRV_TPS6586X=y
+CONFIG_RTC_DRV_TPS65910=y
+CONFIG_RTC_DRV_EM3027=y
 CONFIG_RTC_DRV_PL031=y
 CONFIG_RTC_DRV_VT8500=y
 CONFIG_RTC_DRV_TEGRA=y
@@ -165,21 +276,47 @@  CONFIG_DW_DMAC=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_STAGING=y
+CONFIG_SENSORS_ISL29018=y
+CONFIG_SENSORS_ISL29028=y
+CONFIG_MFD_NVEC=y
+CONFIG_KEYBOARD_NVEC=y
+CONFIG_SERIO_NVEC_PS2=y
+CONFIG_NVEC_POWER=y
+CONFIG_NVEC_PAZ00=y
+CONFIG_TEGRA_IOMMU_GART=y
+CONFIG_TEGRA_IOMMU_SMMU=y
+CONFIG_MEMORY=y
+CONFIG_IIO=y
+CONFIG_AK8975=y
 CONFIG_PWM=y
+CONFIG_PWM_TEGRA=y
 CONFIG_PWM_VT8500=y
+CONFIG_OMAP_USB2=y
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
 CONFIG_EXT4_FS=y
+CONFIG_VFAT_FS=y
 CONFIG_TMPFS=y
+CONFIG_SQUASHFS=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
 CONFIG_ROOT_NFS=y
 CONFIG_PRINTK_TIME=y
 CONFIG_DEBUG_FS=y
-CONFIG_DEBUG_KERNEL=y
+CONFIG_MAGIC_SYSRQ=y
 CONFIG_LOCKUP_DETECTOR=y
+CONFIG_CRYPTO_DEV_TEGRA_AES=y