OMAP4: DEFCONFIG: Updating / aligning defconfigL24.6-pre-release

After merge feature branches:
* Baseport
* Tiler
* Display
* Syslink
* Audio
* BT & FM

Several changes were made to omap_4430sdp_defconfig file.

This patch align such changes

Signed-off-by: Ricardo Perez Olivares <x0081762@ti.com>

1 files changed, 42 insertions, 28 deletions

diff --git a/arch/arm/configs/omap_4430sdp_defconfig b/arch/arm/configs/omap_4430sdp_defconfig
index 476d2feec06e..ceba18dfc7ed 100644
--- 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.33.2
-# Fri Apr 30 01:13:12 2010
+# Fri Apr 30 21:52:23 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -241,12 +241,8 @@ 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_IOMMU=y
 # CONFIG_OMAP_MPU_TIMER is not set
 CONFIG_OMAP_32K_TIMER=y
 CONFIG_OMAP_32K_TIMER_HZ=128
@@ -300,7 +296,7 @@ CONFIG_ARCH_HAS_BARRIERS=y
 CONFIG_PL310_ERRATA_588369=y
 CONFIG_ARM_GIC=y
 CONFIG_COMMON_CLKDEV=y
-CONFIG_UNOFFICIAL_USER_DMA_API=y
+
 #
 # Bus support
 #
@@ -350,6 +346,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
@@ -670,6 +667,17 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_W90X900 is not set
 CONFIG_TOUCHSCREEN_SYNTM12XX=y
 CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
+# CONFIG_INPUT_CM109 is not set
+# CONFIG_INPUT_TWL4030_PWRBUTTON is not set
+# CONFIG_INPUT_UINPUT is not set
+# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
+CONFIG_SENSORS_SFH7741=y
+CONFIG_INPUT_CMA3000_I2C=y
 
 #
 # Hardware I/O ports
@@ -911,22 +919,21 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
+CONFIG_VIDEO_IR_I2C=y
 # CONFIG_VIDEO_VIVI is not set
 # CONFIG_VIDEO_SAA5246A is not set
 # CONFIG_VIDEO_SAA5249 is not set
-CONFIG_VIDEO_OMAP3=y
-CONFIG_VIDEO_OMAP_VIDEOLIB=y
-CONFIG_VIDEO_OMAP_VIDEOOUT=y
-CONFIG_NTSC_M=y
-# CONFIG_PAL_BDGHI is not set
+CONFIG_VIDEO_OMAP3_OUT=y
 # CONFIG_SOC_CAMERA is not set
 CONFIG_RADIO_ADAPTERS=y
+# CONFIG_I2C_SI4713 is not set
+# CONFIG_RADIO_SI4713 is not set
+# CONFIG_RADIO_SI470X is not set
 # CONFIG_RADIO_TEA5764 is not set
+# CONFIG_RADIO_TEF6862 is not set
 # CONFIG_DAB is not set
-
-# CONFIG_VIDEO_CAPTURE_DRIVERS is not set
-# CONFIG_RADIO_ADAPTERS is not set
-# CONFIG_DAB is not set
+CONFIG_DMM_OMAP=y
+CONFIG_TILER_OMAP=y
 
 #
 # Graphics support
@@ -965,6 +972,7 @@ CONFIG_OMAP2_VRAM=y
 CONFIG_OMAP2_DSS=y
 CONFIG_OMAP2_VRAM_SIZE=0
 CONFIG_OMAP2_DSS_DEBUG_SUPPORT=y
+# CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS is not set
 # CONFIG_OMAP2_DSS_RFBI is not set
 # CONFIG_OMAP2_DSS_VENC is not set
 CONFIG_OMAP2_DSS_HDMI=y
@@ -998,6 +1006,9 @@ CONFIG_BACKLIGHT_GENERIC=y
 #
 # Display device support
 #
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
 # Console display driver support
 #
 # CONFIG_VGA_CONSOLE is not set
@@ -1020,15 +1031,12 @@ CONFIG_LOGO=y
 CONFIG_LOGO_LINUX_MONO=y
 CONFIG_LOGO_LINUX_VGA16=y
 CONFIG_LOGO_LINUX_CLUT224=y
-# CONFIG_SOUND is not set
 CONFIG_SOUND=y
 # CONFIG_SOUND_OSS_CORE is not set
 CONFIG_SND=y
 CONFIG_SND_TIMER=y
 CONFIG_SND_PCM=y
 CONFIG_SND_JACK=y
-CONFIG_SOUND=y
-# CONFIG_SOUND_OSS_CORE is not set
 # CONFIG_SND_SEQUENCER is not set
 # CONFIG_SND_MIXER_OSS is not set
 # CONFIG_SND_PCM_OSS is not set
@@ -1051,13 +1059,15 @@ CONFIG_SND_ARM=y
 CONFIG_SND_SPI=y
 CONFIG_SND_SOC=y
 CONFIG_SND_OMAP_SOC=y
-CONFIG_SND_OMAP_SOC_MCPDM=y
+CONFIG_SND_OMAP_SOC_MCBSP=y
+CONFIG_OMAP_MCPDM=y
+CONFIG_SND_OMAP_SOC_ABE=y
 CONFIG_SND_OMAP_SOC_SDP4430=y
 CONFIG_SND_OMAP_SOC_HDMI=y
+# CONFIG_SND_OMAP_VOICE_TEST is not set
 CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_ALL_CODECS is not set
-CONFIG_SND_SOC_TWL6040=y
-# CONFIG_SND_SOC is not set
+CONFIG_SND_SOC_ABE_TWL6040=y
 # CONFIG_SOUND_PRIME is not set
 # CONFIG_HID_SUPPORT is not set
 CONFIG_USB_SUPPORT=y
@@ -1230,8 +1240,16 @@ CONFIG_RTC_DRV_TWL4030=y
 # TI VLYNQ
 #
 # CONFIG_STAGING is not set
-CONFIG_dmm_tiler=y
-CONFIG_DMM_TILER=y
+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_BRIDGE_NOTIFY=y
+CONFIG_NOTIFY_DUCATI=y
+CONFIG_MPU_SYSLINK_IPC=y
+CONFIG_SYSLINK_USE_SYSMGR=y
+CONFIG_OMAP_IOMMU_DEBUG_MODULE=y
 
 #
 # File systems
@@ -1581,10 +1599,6 @@ CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_BINARY_PRINTF is not set
 
-#Sensors
-CONFIG_SENSORS_SFH7741=y
-CONFIG_INPUT_CMA3000_I2C=y
-
 #
 # Library routines
 #