arm: defconfig: android: Configure according to savedefconfig

android_omap_defconfig is inherited from omap2plus_defconfig.

As the options are enabled by domain owners,it has been not
taken into consideration to enable them correctly thru menuconfig
and use savedefconfig to save it properly

This patch fixes all existing issues with default config.

Below noteworthy changes are enabled properly when dependencies
from Kconfig are met.Hence, not needed to enable again in defconfig.

SCSI device support:
CONFIG_SCSI=y

Multifunction device driver
(Support for the TI Palmas series chips):
CONFIG_MFD_PALMAS=y

USB OTG and Related Infrastructure:
CONFIG_TWL4030_USB=m
CONFIG_TWL6030_USB=m
CONFIG_NOP_USB_XCEIV=y

Android:
CONFIG_ANDROID_TIMED_OUTPUT=y
CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>

diff --git a/arch/arm/configs/android_omap_defconfig b/arch/arm/configs/android_omap_defconfig
index 764f3cfc93f94a5d553aee0023310eeaf0342705..04e721a9714e6f67fbcc8c2c8fa73ea87d966967 100644 (file)
--- a/arch/arm/configs/android_omap_defconfig
+++ b/arch/arm/configs/android_omap_defconfig
@@ -83,12 +83,11 @@ CONFIG_MTD_UBI=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=16384
-CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
-CONFIG_ATA=y
-CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_SCSI_MULTI_LUN=y
 CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_ATA=y
+CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_MD=y
 CONFIG_NETDEVICES=y
 CONFIG_KS8851=y
@@ -135,21 +134,20 @@ CONFIG_GPIO_TWL4030=y
 CONFIG_W1=y
 CONFIG_POWER_SUPPLY=y
 CONFIG_WATCHDOG=y
+CONFIG_PALMAS_WATCHDOG=y
 CONFIG_OMAP_WATCHDOG=y
 CONFIG_TWL4030_WATCHDOG=y
-CONFIG_PALMAS_WATCHDOG=y
 CONFIG_MFD_TPS65217=y
-CONFIG_REGULATOR_TWL4030=y
-CONFIG_MFD_PALMAS=y
+CONFIG_MFD_TPS65910=y
 CONFIG_MFD_PALMAS_GPADC=y
 CONFIG_MFD_PALMAS_PWM=y
 CONFIG_MFD_PALMAS_RESOURCE=y
 CONFIG_REGULATOR_PALMAS=y
-CONFIG_MFD_TPS65910=y
 CONFIG_REGULATOR_TPS65023=y
 CONFIG_REGULATOR_TPS6507X=y
 CONFIG_REGULATOR_TPS65217=y
 CONFIG_REGULATOR_TPS65910=y
+CONFIG_REGULATOR_TWL4030=y
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_MODE_HELPERS=y
@@ -189,35 +187,32 @@ CONFIG_USB=y
 CONFIG_USB_DEBUG=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_SUSPEND=y
-CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_DWC3=m
 CONFIG_USB_DWC3_DEBUG=y
 CONFIG_USB_DWC3_VERBOSE=y
+CONFIG_USB_MON=y
+CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_HDRC=m
 CONFIG_USB_MUSB_OMAP2PLUS=m
 CONFIG_USB_MUSB_AM35X=m
 CONFIG_USB_MUSB_DSPS=m
 CONFIG_MUSB_PIO_ONLY=y
-CONFIG_USB_MON=y
 CONFIG_USB_WDM=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_TEST=y
+CONFIG_OMAP_USB2=m
+CONFIG_OMAP_USB3=m
+CONFIG_OMAP_CONTROL_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DEBUG=y
 CONFIG_USB_GADGET_DEBUG_FILES=y
 CONFIG_USB_GADGET_DEBUG_FS=y
 CONFIG_USB_ZERO=m
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_EEM=y
 CONFIG_USB_MASS_STORAGE=m
 CONFIG_USB_G_MULTI=m
 CONFIG_USB_G_MULTI_CDC=y
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_EEM=y
-CONFIG_OMAP_USB2=m
-CONFIG_OMAP_USB3=m
-CONFIG_OMAP_CONTROL_USB=y
-CONFIG_TWL4030_USB=m
-CONFIG_TWL6030_USB=m
-CONFIG_NOP_USB_XCEIV=y
 CONFIG_PALMAS_USB=m
 CONFIG_MMC=y
 CONFIG_MMC_UNSAFE_RESUME=y
@@ -231,23 +226,14 @@ CONFIG_RTC_DRV_PALMAS=y
 CONFIG_DMADEVICES=y
 CONFIG_TI_EDMA=y
 CONFIG_DMA_OMAP=y
-#
-# Android
-#
 CONFIG_STAGING=y
 CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_ASHMEM=y
 CONFIG_ANDROID_LOGGER=y
-CONFIG_ANDROID_TIMED_OUTPUT=y
 CONFIG_ANDROID_TIMED_GPIO=y
 CONFIG_ANDROID_LOW_MEMORY_KILLER=y
-CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y
 CONFIG_ANDROID_INTF_ALARM_DEV=y
-#
-#
-#
-
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_FS_XATTR is not set