diff options
| author | Andy Green <andy.green@linaro.org> | 2011-04-07 08:44:27 +0100 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-04-07 08:44:27 +0100 |
| commit | fc00f31f298cc7b59a70a06adf09accf41aff313 (patch) | |
| tree | 6dee3c2acfa43e1314d232e74fd6dda3a5e756a9 | |
| parent | d8325d53db2978a5b4253f171e38791adaf9d694 (diff) | |
uplevel config post 2.6.38.2
Signed-off-by: Andy Green <andy.green@linaro.org>
| -rw-r--r-- | arch/arm/configs/omap4_defconfig | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/arch/arm/configs/omap4_defconfig b/arch/arm/configs/omap4_defconfig index 85952c4185a..efd1836e0a7 100644 --- a/arch/arm/configs/omap4_defconfig +++ b/arch/arm/configs/omap4_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/arm 2.6.38.2 Kernel Configuration -# Tue Apr 5 14:43:22 2011 +# Wed Apr 6 13:08:43 2011 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -295,6 +295,10 @@ CONFIG_OMAP_MUX_WARNINGS=y CONFIG_OMAP_MCBSP=y CONFIG_OMAP_MBOX_FWK=y CONFIG_OMAP_MBOX_KFIFO_SIZE=256 +CONFIG_OMAP_REMOTE_PROC=y +CONFIG_OMAP_IOMMU=y +CONFIG_OMAP_USER_DMM=y +# CONFIG_OMAP_IOMMU_DEBUG is not set CONFIG_OMAP_32K_TIMER=y # CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set CONFIG_OMAP_32K_TIMER_HZ=128 @@ -1147,7 +1151,7 @@ CONFIG_TOUCHSCREEN_ADS7846=y # CONFIG_TOUCHSCREEN_TSC2007 is not set # CONFIG_TOUCHSCREEN_W90X900 is not set # CONFIG_TOUCHSCREEN_ST1232 is not set -CONFIG_TOUCHSCREEN_SYNTM12XX=y +# CONFIG_TOUCHSCREEN_SYNTM12XX is not set # CONFIG_TOUCHSCREEN_TPS6507X is not set CONFIG_INPUT_MISC=y # CONFIG_INPUT_AD714X is not set @@ -1799,7 +1803,7 @@ CONFIG_OMAP2_DSS_DEBUG_SUPPORT=y CONFIG_OMAP2_DSS_DPI=y # CONFIG_OMAP2_DSS_RFBI is not set # CONFIG_OMAP2_DSS_VENC is not set -# CONFIG_OMAP4_DSS_HDMI is not set +CONFIG_OMAP4_DSS_HDMI=y # CONFIG_OMAP2_DSS_SDI is not set CONFIG_OMAP2_DSS_DSI=y # CONFIG_OMAP2_DSS_USE_DSI_PLL is not set @@ -2281,6 +2285,20 @@ CONFIG_MACH_OMAP3_WESTBRIDGE_AST_PNAND_HAL=y CONFIG_CLKDEV_LOOKUP=y CONFIG_HWSPINLOCK=y # CONFIG_HWSPINLOCK_OMAP is not set +CONFIG_Sys_Link=y +CONFIG_SYSLINK_PROC=y +CONFIG_SYSLINK_PROC4430=y +CONFIG_DUCATI_BASEIMAGE_PHYS_ADDR=0x9CF00000 +CONFIG_SYSLINK_DUCATI_PM=y +# CONFIG_SYSLINK_IPU_SELF_HIBERNATION is not set +# CONFIG_SYSLINK_IPU_PM_TRACES is not set +CONFIG_OMAP_DEVICE_HANDLER=y +CONFIG_MPU_SYSLINK_PLATFORM=y +CONFIG_MPU_SYSLINK_IPC=y +CONFIG_SYSLINK_USE_SYSMGR=y +CONFIG_SYSLINK_IOMMU_ENABLE=y +CONFIG_SYSLINK_RECOVERY=y +# CONFIG_DMM_DMA_API is not set # # File systems @@ -2721,6 +2739,7 @@ CONFIG_LZO_DECOMPRESS=y # CONFIG_XZ_DEC is not set # CONFIG_XZ_DEC_BCJ is not set CONFIG_DECOMPRESS_GZIP=y +CONFIG_GENERIC_ALLOCATOR=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y |