aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@linaro.org>2011-07-07 13:28:33 +0200
committerPhilippe Langlais <philippe.langlais@linaro.org>2011-07-22 15:52:35 +0200
commit42e0bea3e6450a0d3e5063203a8599a2397aa7fe (patch)
treefcc83db4e6efa3987092225381dd1e9c20ae13ff
parent8a257c0f9d42fa2d7beb836c24a760c7468bcbed (diff)
downloadlinux-3.0-lt-ux500-42e0bea3e6450a0d3e5063203a8599a2397aa7fe.tar.gz
ux500: config: Align u8500_defconfig with u5500+u8500 default configs
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
-rw-r--r--arch/arm/configs/u8500_defconfig21
1 files changed, 13 insertions, 8 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index eb22af7..fe64036 100644
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -27,6 +27,7 @@ CONFIG_MACH_SNOWBALL=y
CONFIG_MACH_U5500=y
CONFIG_UX500_PRCMU_TIMER=y
CONFIG_DB8500_MLOADER=y
+CONFIG_U5500_MLOADER=y
CONFIG_MCDE_DISPLAY_PRIMARY_32BPP=y
CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_VSYNC=y
CONFIG_DISPLAY_AV8100_TERTIARY=y
@@ -34,8 +35,6 @@ CONFIG_DISPLAY_AV8100_TRIPPLE_BUFFER=y
CONFIG_UX500_SUSPEND=y
CONFIG_UX500_SUSPEND_STANDBY=y
CONFIG_UX500_SUSPEND_MEM=y
-CONFIG_MODEM=y
-CONFIG_MODEM_U8500=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
CONFIG_SMP=y
@@ -104,9 +103,8 @@ CONFIG_MISC_DEVICES=y
CONFIG_AB8500_PWM=y
CONFIG_SENSORS_BH1780=y
CONFIG_STE_TRACE_MODEM=y
+CONFIG_U8500_SIM_DETECT=y
CONFIG_STM_TRACE=y
-CONFIG_U8500_SHRM=y
-CONFIG_U8500_SHRM_MODEM_SILENT_RESET=y
# CONFIG_STE_AUDIO_IO_DEV is not set
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y
@@ -119,7 +117,9 @@ CONFIG_TUN=y
CONFIG_SMSC_PHY=y
CONFIG_NET_ETHERNET=y
CONFIG_SMSC911X=y
-CONFIG_CAIF_SHM=y
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_WLAN is not set
# CONFIG_INPUT_MOUSEDEV is not set
CONFIG_INPUT_EVDEV=y
# CONFIG_KEYBOARD_ATKBD is not set
@@ -148,6 +148,7 @@ CONFIG_SPI=y
# CONFIG_STM_MSP_SPI is not set
CONFIG_SPI_PL022=y
CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_STMPE=y
CONFIG_GPIO_TC3589X=y
CONFIG_AB8500_GPIO=y
CONFIG_POWER_SUPPLY=y
@@ -160,8 +161,6 @@ CONFIG_SENSORS_DB8500=y
CONFIG_SENSORS_LSM303DLH=y
CONFIG_SENSORS_L3G4200D=y
CONFIG_WATCHDOG=y
-CONFIG_UX500_WATCHDOG=y
-CONFIG_UX500_WATCHDOG_DEBUG=y
CONFIG_MFD_STMPE=y
CONFIG_MFD_TC3589X=y
CONFIG_AB5500_CORE=y
@@ -226,6 +225,7 @@ CONFIG_RTC_DRV_AB8500=y
CONFIG_DMADEVICES=y
CONFIG_STE_DMA40=y
CONFIG_STAGING=y
+CONFIG_AB5500_SIM=y
CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=y
CONFIG_CG2900=y
CONFIG_CG2900_CHIP=y
@@ -235,8 +235,13 @@ CONFIG_CG2900_AUDIO=y
CONFIG_CG2900_TEST=y
CONFIG_BT_CG2900=y
CONFIG_U8500_MMIO=y
+CONFIG_U5500_MMIO=y
CONFIG_U8500_CM=y
CONFIG_U8500_FLASH=y
+CONFIG_MODEM=y
+CONFIG_MODEM_U8500=y
+CONFIG_U8500_SHRM=y
+CONFIG_U8500_SHRM_MODEM_SILENT_RESET=y
CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
@@ -287,7 +292,7 @@ CONFIG_TIMER_STATS=y
CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
CONFIG_SYSCTL_SYSCALL_CHECK=y
-# CONFIG_FTRACE is not set
+CONFIG_FUNCTION_TRACER=y
CONFIG_DEBUG_USER=y
CONFIG_KEYS=y
CONFIG_CRYPTO_ECB=y