diff options
author | Ricardo Perez Olivares <x0081762@ti.com> | 2010-07-10 04:10:21 -0500 |
---|---|---|
committer | Ricardo Perez Olivares <x0081762@ti.com> | 2010-07-10 04:10:21 -0500 |
commit | efbea5203681b8330455a031af4b8eae4e6c5bd3 (patch) | |
tree | 42e665f4199438f4c43db3f19e7e828202f8827d /arch/arm | |
parent | 32d769719d9b8b4f3556688595e89d412a1e9f29 (diff) |
OMAP4: omap_4430sdp_defconfig: Aligning .config and defconfig
This patch align the .config file and omap_4430sdp_defconfig
Signed-off-by: Ricardo Perez Olivares <x0081762@ti.com>
Diffstat (limited to 'arch/arm')
-rwxr-xr-x | arch/arm/configs/omap_4430sdp_defconfig | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/arch/arm/configs/omap_4430sdp_defconfig b/arch/arm/configs/omap_4430sdp_defconfig index b9452ba3d1a6..6f8f7a90c87c 100755 --- a/arch/arm/configs/omap_4430sdp_defconfig +++ b/arch/arm/configs/omap_4430sdp_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.34 -# Wed Jul 7 19:56:18 2010 +# Sat Jul 10 04:10:02 2010 # CONFIG_ARM=y CONFIG_HAVE_PWM=y @@ -249,12 +249,10 @@ CONFIG_ARCH_OMAP4=y # CONFIG_OMAP_RESET_CLOCKS is not set # CONFIG_OMAP_MUX is not set CONFIG_OMAP_MCBSP=y - - - - CONFIG_OMAP_MBOX_FWK=y - +CONFIG_OMAP_REMOTE_PROC=y +CONFIG_OMAP_RPROC_MEMPOOL_SIZE=0x600000 +CONFIG_OMAP_IOMMU=y # CONFIG_OMAP_MPU_TIMER is not set CONFIG_OMAP_32K_TIMER=y CONFIG_OMAP_32K_TIMER_HZ=128 @@ -265,6 +263,8 @@ CONFIG_OMAP_PM_NOOP=y # # OMAP Board Type # +# CONFIG_WIFI_CONTROL_FUNC is not set +# CONFIG_TIWLAN_SDIO is not set # CONFIG_OMAP4_ES1 is not set CONFIG_MACH_OMAP_4430SDP=y # CONFIG_ERRATA_OMAP4_AXI2OCP is not set @@ -307,7 +307,7 @@ CONFIG_CPU_HAS_PMU=y # CONFIG_PL310_ERRATA_588369 is not set CONFIG_ARM_GIC=y CONFIG_COMMON_CLKDEV=y -CONFIG_UNOFFICIAL_USER_DMA_API=y + # # Bus support # @@ -357,6 +357,7 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_LEDS is not set CONFIG_ALIGNMENT_TRAP=y # CONFIG_UACCESS_WITH_MEMCPY is not set +CONFIG_UNOFFICIAL_USER_DMA_API=y # # Boot options @@ -1004,9 +1005,9 @@ CONFIG_MEDIA_TUNER_XC2028=y CONFIG_MEDIA_TUNER_XC5000=y CONFIG_MEDIA_TUNER_MC44S803=y CONFIG_VIDEO_V4L2=y +CONFIG_VIDEO_V4L1=y CONFIG_VIDEOBUF_GEN=y CONFIG_VIDEOBUF_DMA_SG=y -CONFIG_VIDEO_V4L1=y CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_ADV_DEBUG is not set # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set @@ -1100,6 +1101,7 @@ CONFIG_LCD_CLASS_DEVICE=y # CONFIG_LCD_PLATFORM is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_GENERIC=y +# CONFIG_BACKLIGHT_PWM is not set # # Display device support @@ -1392,6 +1394,16 @@ CONFIG_SENSORS_HMC5843=y # CONFIG_RAMZSWAP is not set # CONFIG_BATMAN_ADV is not set # CONFIG_STRIP is not set +# CONFIG_FB_SM7XX 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_MPU_SYSLINK_PLATFORM=y +CONFIG_MPU_SYSLINK_IPC=y +CONFIG_SYSLINK_USE_SYSMGR=y +CONFIG_OMAP_IOMMU_DEBUG_MODULE=y # # File systems |