aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Marklund <robert.marklund@stericsson.com>2011-10-17 17:19:39 +0200
committerRobert Marklund <robert.marklund@stericsson.com>2011-10-27 16:09:09 +0200
commitbf6662861c7665046e95c790fd285fd788f7cab6 (patch)
treed501bdfa5b48a5edb18ce878d086a8639806dbe2
parent09e093f2f05cc4e373b3ef0ec9a06e6cfbace188 (diff)
downloadlinux-3.0-ux500-bf6662861c7665046e95c790fd285fd788f7cab6.tar.gz
config: minimize the defconfig again
Change-Id: If872084fce0c37126f9196a70c0f76db1c4cf37c Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
-rwxr-xr-xarch/arm/configs/u8500_defconfig78
1 files changed, 5 insertions, 73 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index 8f7f7241eeb..62f632cd74e 100755
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -24,38 +24,17 @@ CONFIG_UX500_SOC_DB8500=y
CONFIG_MACH_HREFV60=y
CONFIG_MACH_SNOWBALL=y
CONFIG_DBX500_PRCMU_DEBUG=y
-CONFIG_U8500_REGULATOR_DEBUG=y
CONFIG_DB8500_MLOADER=y
-CONFIG_DISPLAY_GENERIC_PRIMARY=y
-CONFIG_DISPLAY_GENERIC_DSI_PRIMARY=y
-CONFIG_DISPLAY_SONY_ACX424AKP_DSI_PRIMARY=y
CONFIG_MCDE_DISPLAY_PRIMARY_32BPP=y
CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_VSYNC=y
-CONFIG_DISPLAY_AV8100_TERTIARY=y
-CONFIG_DISPLAY_AV8100_TRIPPLE_BUFFER=y
-CONFIG_DBX500_PRCMU_QOS_POWER=y
-CONFIG_DBX500_PRCMU_DEBUG=y
-CONFIG_CPU_IDLE=y
-CONFIG_UX500_CPUIDLE=y
-# CONFIG_UX500_DEBUG_NO_LAUTERBACH is not set
-CONFIG_U8500_CPUIDLE_DEEPEST_STATE=2
-CONFIG_UX500_CPUIDLE_DEBUG=y
-CONFIG_MCDE_DISPLAY_PRIMARY_32BPP=y
CONFIG_DISPLAY_SONY_ACX424AKP_DSI_PRIMARY=y
CONFIG_DISPLAY_AV8100_TERTIARY=y
CONFIG_DISPLAY_AV8100_TRIPPLE_BUFFER=y
CONFIG_UX500_SUSPEND=y
-CONFIG_UX500_SUSPEND_DBG=y
-CONFIG_UX500_SUSPEND_DBG_WAKE_ON_UART=y
CONFIG_UX500_SUSPEND_STANDBY=y
CONFIG_UX500_SUSPEND_MEM=y
-CONFIG_UX500_CONTEXT=y
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_UX500_SUSPEND_DBG=y
+CONFIG_UX500_SUSPEND_DBG_WAKE_ON_UART=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
CONFIG_SMP=y
@@ -85,16 +64,10 @@ CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
CONFIG_NET_KEY=y
-# CONFIG_NET_KEY_MIGRATE is not set
CONFIG_INET=y
CONFIG_IP_MULTICAST=y
-# CONFIG_IP_MROUTE is not set
CONFIG_IP_ADVANCED_ROUTER=y
CONFIG_IP_MULTIPLE_TABLES=y
-# CONFIG_IP_FIB_TRIE_STATS is not set
-CONFIG_IP_MULTIPLE_TABLES=y
-# CONFIG_IP_ROUTE_MULTIPATH is not set
-# CONFIG_IP_ROUTE_VERBOSE is not set
CONFIG_IP_PNP=y
CONFIG_IP_PNP_DHCP=y
# CONFIG_INET_LRO is not set
@@ -104,7 +77,6 @@ CONFIG_IPV6=y
# CONFIG_INET6_XFRM_MODE_BEET is not set
# CONFIG_IPV6_SIT is not set
CONFIG_NETFILTER=y
-CONFIG_NETFILTER_NETLINK=y
CONFIG_NETFILTER_NETLINK_QUEUE=y
CONFIG_NETFILTER_NETLINK_LOG=y
CONFIG_NF_CONNTRACK=y
@@ -127,18 +99,7 @@ CONFIG_BT_BNEP=y
CONFIG_BT_BNEP_MC_FILTER=y
CONFIG_BT_BNEP_PROTO_FILTER=y
CONFIG_BT_HIDP=y
-
-CONFIG_AVERAGE=y
-
-#WIRELESS
-CONFIG_FIB_RULES=y
-CONFIG_WIRELESS=y
-CONFIG_COMPAT_WIRELESS=y
-CONFIG_COMPAT_WIRELESS_MODULES=y
CONFIG_CFG80211=y
-CONFIG_COMPAT_MAC80211_RC_DEFAULT="minstrel_ht"
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_COMPAT_RFKILL=y
CONFIG_NL80211_TESTMODE=y
CONFIG_CFG80211_REG_DEBUG=y
CONFIG_RFKILL=y
@@ -154,9 +115,9 @@ CONFIG_MISC_DEVICES=y
CONFIG_AB8500_PWM=y
CONFIG_SENSORS_BH1780=y
CONFIG_STE_TRACE_MODEM=y
+CONFIG_DISPDEV=y
CONFIG_U8500_SIM_DETECT=y
CONFIG_STM_TRACE=y
-CONFIG_DISPDEV=y
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y
CONFIG_MD=y
@@ -171,24 +132,11 @@ CONFIG_SMSC911X=y
# CONFIG_NETDEV_1000 is not set
# CONFIG_NETDEV_10000 is not set
# CONFIG_WLAN is not set
-CONFIG_PPP=y
-CONFIG_PPP_ASYNC=y
-CONFIG_PPP_MPPE=y
CONFIG_CAIF_TTY=m
-# CONFIG_CAIF_SPI_SLAVE is not set
CONFIG_CAIF_HSI=m
CONFIG_PPP=y
-# CONFIG_PPP_MULTILINK is not set
-# CONFIG_PPP_FILTER is not set
CONFIG_PPP_ASYNC=y
-# CONFIG_PPP_SYNC_TTY is not set
-# CONFIG_PPP_DEFLATE is not set
-# CONFIG_PPP_BSDCOMP is not set
CONFIG_PPP_MPPE=y
-# CONFIG_PPPOE is not set
-CONFIG_PPPOLAC=y
-CONFIG_PPPOPNS=y
-CONFIG_SLHC=y
# CONFIG_INPUT_MOUSEDEV is not set
CONFIG_INPUT_EVDEV=y
# CONFIG_KEYBOARD_ATKBD is not set
@@ -229,42 +177,29 @@ CONFIG_SENSORS_L3G4200D=y
CONFIG_WATCHDOG=y
CONFIG_U8500_WATCHDOG_DEBUG=y
CONFIG_TPS6105X=y
-CONFIG_WATCHDOG_CORE=y
-CONFIG_U8500_WATCHDOG_DEBUG=y
CONFIG_MFD_STMPE=y
CONFIG_MFD_TC3589X=y
-CONFIG_MFD_DB8500_PRCMU=y
-CONFIG_TPS6105X=y
CONFIG_AB5500_CORE=y
CONFIG_AB8500_CORE=y
CONFIG_MFD_DB8500_PRCMU=y
CONFIG_REGULATOR_DEBUG=y
CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
CONFIG_REGULATOR_AB8500=y
-CONFIG_REGULATOR_AB8500_EXT=y
-CONFIG_REGULATOR_AB8500_DEBUG=y
CONFIG_REGULATOR_DB8500_PRCMU=y
+CONFIG_REGULATOR_AB8500_DEBUG=y
CONFIG_MEDIA_SUPPORT=y
CONFIG_VIDEO_DEV=y
# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
# CONFIG_VIDEO_CAPTURE_DRIVERS is not set
CONFIG_RADIO_CG2900=y
CONFIG_DRM=y
-CONFIG_SND_SOC_UX500_CG29XX=y
-CONFIG_SND_SOC_CG29XX=y
CONFIG_GPU_MALI=y
CONFIG_FB=y
CONFIG_FB_MCDE=y
CONFIG_MCDE_FB_AVOID_REALLOC=y
-CONFIG_MCDE_DISPLAY_DSI=y
-CONFIG_MCDE_DISPLAY_AV8100=y
-# CONFIG_MCDE_DISPLAY_HDMI_FB_AUTO_CREATE is not set
-CONFIG_AV8100=y
-CONFIG_AV8100_HWTRIG_I2SDAT3=y
CONFIG_MCDE_DISPLAY_SAMSUNG_S6D16D0=y
-CONFIG_MCDE_DISPLAY_GENERIC_DSI=y
-CONFIG_MCDE_DISPLAY_AV8100=y
# CONFIG_MCDE_DISPLAY_HDMI_FB_AUTO_CREATE is not set
+CONFIG_AV8100_HWTRIG_I2SDAT3=y
CONFIG_FB_B2R2=y
CONFIG_B2R2_PLUG_CONF=y
CONFIG_SOUND=y
@@ -398,6 +333,3 @@ CONFIG_CRYPTO_DEV_UX500=y
CONFIG_CRYPTO_DEV_UX500_HASH=y
CONFIG_CRC7=y
CONFIG_LIBCRC32C=m
-CONFIG_SYS_SOC=y
-CONFIG_SND_SOC_UX500_AV8100=y
-CONFIG_SND_SOC_AV8100=y