config: Align u8500_defconfig and withdraw u5500 compilation

FIXME: U5500 doesn't compile due to function redefinitions in PRCMU

Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>

1 files changed, 11 insertions, 14 deletions

diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index e18179633df..9c4bed4f4a8 100644
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -20,20 +20,16 @@ CONFIG_MODULE_SRCVERSION_ALL=y
 # CONFIG_BLK_DEV_BSG is not set
 CONFIG_DEFAULT_DEADLINE=y
 CONFIG_ARCH_U8500=y
-CONFIG_UX500_SOC_DB5500=y
 CONFIG_UX500_SOC_DB8500=y
-CONFIG_SND_SOC_UX500_AB5500=y
-CONFIG_SND_SOC_UX500_AB8500=y
-CONFIG_SND_SOC_UX500_AV8100=y
-CONFIG_SND_SOC_UX500_CG29XX=y
 CONFIG_MACH_HREFV60=y
 CONFIG_MACH_SNOWBALL=y
-CONFIG_MACH_U5500=y
+CONFIG_UX500_PRCMU_TIMER=y
 CONFIG_DB8500_MLOADER=y
 CONFIG_UX500_DEBUG_HWREG=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_UX500_SUSPEND=y
 CONFIG_UX500_SUSPEND_STANDBY=y
 CONFIG_UX500_SUSPEND_MEM=y
@@ -85,7 +81,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=y
 CONFIG_PHONET=y
 CONFIG_PHONET_PIPECTRLR=y
 CONFIG_NET_SCHED=y
-CONFIG_BT=y
 CONFIG_BT_L2CAP=y
 CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=y
@@ -94,8 +89,6 @@ CONFIG_BT_BNEP=y
 CONFIG_BT_BNEP_MC_FILTER=y
 CONFIG_BT_BNEP_PROTO_FILTER=y
 CONFIG_BT_HIDP=y
-CONFIG_CFG80211_WEXT=y
-CONFIG_BT_HCIUART=y
 CONFIG_MAC80211_LEDS=y
 CONFIG_RFKILL=y
 CONFIG_RFKILL_INPUT=y
@@ -116,6 +109,10 @@ CONFIG_U8500_SHRM_MODEM_SILENT_RESET=y
 # CONFIG_STE_AUDIO_IO_DEV is not set
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
+CONFIG_MD=y
+CONFIG_BLK_DEV_DM=y
+CONFIG_DM_CRYPT=y
+CONFIG_DM_UEVENT=y
 CONFIG_NETDEVICES=y
 CONFIG_TUN=y
 CONFIG_SMSC_PHY=y
@@ -124,7 +121,6 @@ CONFIG_SMSC911X=y
 # CONFIG_INPUT_MOUSEDEV is not set
 CONFIG_INPUT_EVDEV=y
 # CONFIG_KEYBOARD_ATKBD is not set
-CONFIG_KEYBOARD_DB5500=y
 CONFIG_KEYBOARD_GPIO=y
 CONFIG_KEYBOARD_NOMADIK_SKE=y
 CONFIG_KEYBOARD_STMPE=y
@@ -168,7 +164,6 @@ CONFIG_AB8500_CORE=y
 CONFIG_REGULATOR_DEBUG=y
 CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
 CONFIG_REGULATOR_AB8500=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
 # CONFIG_MEDIA_TUNER_CUSTOMISE is not set
@@ -177,14 +172,16 @@ CONFIG_FB=y
 CONFIG_FB_MCDE=y
 CONFIG_FB_B2R2=y
 CONFIG_B2R2_PLUG_CONF=y
-# CONFIG_AV8100_HWTRIG_DSI_TE is not set
 CONFIG_AV8100_HWTRIG_I2SDAT3=y
 CONFIG_SOUND=y
 CONFIG_SND=y
 CONFIG_SND_USB_AUDIO=y
 CONFIG_SND_SOC=y
 CONFIG_SND_SOC_UX500=y
+CONFIG_SND_SOC_UX500_AB5500=y
 CONFIG_SND_SOC_UX500_AB8500=y
+CONFIG_SND_SOC_UX500_CG29XX=y
+CONFIG_SND_SOC_UX500_AV8100=y
 CONFIG_USB=y
 # CONFIG_USB_DEVICE_CLASS is not set
 CONFIG_USB_SUSPEND=y
@@ -208,6 +205,7 @@ CONFIG_USB_G_MULTI=m
 CONFIG_AB8500_USB=y
 CONFIG_MMC=y
 CONFIG_MMC_UNSAFE_RESUME=y
+# CONFIG_MMC_BLOCK_BOUNCE is not set
 CONFIG_MMC_ARMMMCI=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
@@ -217,7 +215,6 @@ CONFIG_LEDS_PWM=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_AB=y
 CONFIG_RTC_DRV_AB8500=y
-# CONFIG_RTC_DRV_PL031 is not set
 CONFIG_DMADEVICES=y
 CONFIG_STE_DMA40=y
 CONFIG_STAGING=y
@@ -293,11 +290,11 @@ CONFIG_DEBUG_USER=y
 CONFIG_DEBUG_ERRORS=y
 CONFIG_KEYS=y
 CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_HMAC=m
 CONFIG_CRYPTO_MD5=m
 CONFIG_CRYPTO_SHA1=m
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ARC4=y
+CONFIG_CRYPTO_TWOFISH=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 CONFIG_CRYPTO_DEV_UX500=y
 CONFIG_CRYPTO_DEV_UX500_CRYP=y