From c9631643fa1cb8429366c0fcce6705123387d1a2 Mon Sep 17 00:00:00 2001 From: Philippe Langlais Date: Fri, 6 Apr 2012 10:36:11 +0200 Subject: ux500: configs: u8500 defconfigs cleanup and alignment Signed-off-by: Philippe Langlais --- arch/arm/configs/u8500_android_defconfig | 30 ++++++++++++++++++-------- arch/arm/configs/u8500_defconfig | 37 ++++++++++++++------------------ 2 files changed, 37 insertions(+), 30 deletions(-) diff --git a/arch/arm/configs/u8500_android_defconfig b/arch/arm/configs/u8500_android_defconfig index 71cb1932811..ff7f2289e1c 100644 --- a/arch/arm/configs/u8500_android_defconfig +++ b/arch/arm/configs/u8500_android_defconfig @@ -30,8 +30,12 @@ CONFIG_DEFAULT_DEADLINE=y CONFIG_ARCH_U8500=y CONFIG_UX500_SOC_DB8500=y CONFIG_MACH_HREFV60=y +CONFIG_MACH_U8520=y CONFIG_MACH_SNOWBALL=y +CONFIG_MACH_U9540=y +CONFIG_UX500_GPIO_KEYS=y CONFIG_DBX500_PRCMU_DEBUG=y +CONFIG_DB8500_PWR_TEST=y # CONFIG_UX500_USECASE_GOVERNOR is not set CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_VSYNC=y CONFIG_DB8500_MLOADER=y @@ -78,12 +82,16 @@ CONFIG_IPV6=y # CONFIG_INET6_XFRM_MODE_TUNNEL is not set # CONFIG_INET6_XFRM_MODE_BEET is not set # CONFIG_IPV6_SIT is not set +CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_NETFILTER=y CONFIG_NETFILTER_NETLINK_QUEUE=y CONFIG_NETFILTER_NETLINK_LOG=y CONFIG_NF_CONNTRACK=y +CONFIG_NF_CONNTRACK_FTP=y CONFIG_NF_CT_NETLINK=y +CONFIG_NETFILTER_TPROXY=y CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y +CONFIG_NETFILTER_XT_MATCH_SOCKET=y CONFIG_NETFILTER_XT_MATCH_STATE=y CONFIG_NF_CONNTRACK_IPV4=y CONFIG_IP_NF_IPTABLES=y @@ -91,17 +99,16 @@ CONFIG_IP_NF_FILTER=y CONFIG_IP_NF_TARGET_ULOG=y CONFIG_NF_NAT=y CONFIG_IP_NF_TARGET_MASQUERADE=y +CONFIG_IP_NF_MANGLE=y +CONFIG_IP6_NF_IPTABLES=y CONFIG_PHONET=y CONFIG_NET_SCHED=y -CONFIG_BT_L2CAP=y -CONFIG_BT_SCO=y CONFIG_BT_RFCOMM=y CONFIG_BT_RFCOMM_TTY=y CONFIG_BT_BNEP=y CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y CONFIG_BT_HIDP=y -CONFIG_BT_HCIUART=y CONFIG_CFG80211=y CONFIG_NL80211_TESTMODE=y CONFIG_CFG80211_REG_DEBUG=y @@ -124,6 +131,7 @@ CONFIG_STE_TRACE_MODEM=y CONFIG_DISPDEV=y CONFIG_U8500_SIM_DETECT=y CONFIG_STM_TRACE=y +CONFIG_STM_DEFAULT_MASTERS_MODES=0x20 CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y CONFIG_MD=y @@ -144,11 +152,10 @@ CONFIG_PPP_ASYNC=y CONFIG_INPUT_EVDEV=y # CONFIG_KEYBOARD_ATKBD is not set CONFIG_KEYBOARD_GPIO=y -CONFIG_KEYBOARD_STMPE=y +CONFIG_KEYBOARD_NOMADIK_SKE=y CONFIG_KEYBOARD_TC3589X=y # CONFIG_INPUT_MOUSE is not set CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_BU21013=y CONFIG_TOUCHSCREEN_CYTTSP_CORE=y CONFIG_TOUCHSCREEN_CYTTSP_SPI=y CONFIG_INPUT_MISC=y @@ -174,19 +181,20 @@ CONFIG_GPIO_AB8500=y CONFIG_POWER_SUPPLY=y CONFIG_AB8500_BM=y CONFIG_SENSORS_AB8500=y +CONFIG_SENSORS_DBX500=y CONFIG_SENSORS_LSM303DLH=y CONFIG_SENSORS_LSM303DLHC=y CONFIG_SENSORS_L3G4200D=y CONFIG_THERMAL=y CONFIG_WATCHDOG=y -CONFIG_U8500_WATCHDOG_DEBUG=y -CONFIG_TPS6105X=y -CONFIG_MFD_STMPE=y +CONFIG_UX500_WATCHDOG_DEBUG=y CONFIG_MFD_TC3589X=y CONFIG_AB5500_CORE=y CONFIG_AB8500_CORE=y CONFIG_MFD_DB8500_PRCMU=y +CONFIG_REGULATOR=y CONFIG_REGULATOR_DEBUG=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_VIRTUAL_CONSUMER=y CONFIG_REGULATOR_AB8500=y CONFIG_REGULATOR_DB8500_PRCMU=y @@ -217,6 +225,7 @@ 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_HIDRAW=y CONFIG_USB=y # CONFIG_USB_DEVICE_CLASS is not set CONFIG_USB_SUSPEND=y @@ -233,7 +242,7 @@ CONFIG_USB_G_ANDROID=y CONFIG_AB8500_USB=y CONFIG_MMC=y CONFIG_MMC_UNSAFE_RESUME=y -CONFIG_MMC_CLKGATE=y +CONFIG_MMC_BLOCK_MINORS=32 # CONFIG_MMC_BLOCK_BOUNCE is not set CONFIG_MMC_ARMMMCI=y CONFIG_NEW_LEDS=y @@ -273,6 +282,7 @@ CONFIG_CW1200_DEBUGFS=y CONFIG_U8500_MMIO=y CONFIG_U8500_CM=y CONFIG_U8500_FLASH=y +CONFIG_HSEM_U8500=y CONFIG_MODEM_U8500=y CONFIG_U8500_SHRM=y CONFIG_U8500_SHRM_MODEM_SILENT_RESET=y @@ -310,6 +320,8 @@ CONFIG_NLS_ISO8859_1=y CONFIG_PRINTK_TIME=y CONFIG_MAGIC_SYSRQ=y CONFIG_UNUSED_SYMBOLS=y +CONFIG_LOCKUP_DETECTOR=y +CONFIG_HARDLOCKUP_DETECTOR=y CONFIG_DETECT_HUNG_TASK=y CONFIG_SCHEDSTATS=y CONFIG_TIMER_STATS=y diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig index 43567ace3e9..359619d3ac0 100644 --- a/arch/arm/configs/u8500_defconfig +++ b/arch/arm/configs/u8500_defconfig @@ -18,6 +18,14 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y # CONFIG_BLK_DEV_BSG is not set +CONFIG_PARTITION_ADVANCED=y +CONFIG_BLKDEV_PARTITION=y +CONFIG_BSD_DISKLABEL=y +CONFIG_MINIX_SUBPARTITION=y +CONFIG_SOLARIS_X86_PARTITION=y +CONFIG_UNIXWARE_DISKLABEL=y +CONFIG_SGI_PARTITION=y +CONFIG_SUN_PARTITION=y CONFIG_DEFAULT_DEADLINE=y CONFIG_ARCH_U8500=y CONFIG_UX500_SOC_DB8500=y @@ -27,10 +35,12 @@ CONFIG_MACH_SNOWBALL=y CONFIG_MACH_U9540=y CONFIG_UX500_GPIO_KEYS=y CONFIG_DBX500_PRCMU_DEBUG=y +CONFIG_DB8500_PWR_TEST=y CONFIG_DB8500_MLOADER=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_SMP=y +CONFIG_SCHED_MC=y CONFIG_NR_CPUS=2 CONFIG_PREEMPT=y CONFIG_AEABI=y @@ -40,7 +50,6 @@ CONFIG_CMDLINE="root=/dev/ram0 init=init rw console=ttyAMA2,115200n8 mem=256M in CONFIG_KEXEC=y CONFIG_CRASH_SWRESET=y CONFIG_CRASH_DUMP=y -CONFIG_DB8500_PWR_TEST=y CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_STAT_DETAILS=y CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y @@ -63,8 +72,6 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y # CONFIG_INET_LRO is not set CONFIG_IPV6=y -CONFIG_IP_NF_MANGLE=y -CONFIG_IP6_NF_IPTABLES=y # CONFIG_INET6_XFRM_MODE_TRANSPORT is not set # CONFIG_INET6_XFRM_MODE_TUNNEL is not set # CONFIG_INET6_XFRM_MODE_BEET is not set @@ -76,21 +83,20 @@ CONFIG_NETFILTER_NETLINK_LOG=y CONFIG_NF_CONNTRACK=y CONFIG_NF_CONNTRACK_FTP=y CONFIG_NF_CT_NETLINK=y +CONFIG_NETFILTER_TPROXY=y CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y -CONFIG_NETFILTER_XT_MATCH_STATE=y -CONFIG_NETFILTER_XT_MATCH_QTAGUID=y CONFIG_NETFILTER_XT_MATCH_SOCKET=y -CONFIG_NETFILTER_TPROXY=y +CONFIG_NETFILTER_XT_MATCH_STATE=y CONFIG_NF_CONNTRACK_IPV4=y CONFIG_IP_NF_IPTABLES=y CONFIG_IP_NF_FILTER=y CONFIG_IP_NF_TARGET_ULOG=y CONFIG_NF_NAT=y CONFIG_IP_NF_TARGET_MASQUERADE=y +CONFIG_IP_NF_MANGLE=y +CONFIG_IP6_NF_IPTABLES=y CONFIG_PHONET=y CONFIG_NET_SCHED=y -CONFIG_BT_L2CAP=y -CONFIG_BT_SCO=y CONFIG_BT_RFCOMM=y CONFIG_BT_RFCOMM_TTY=y CONFIG_BT_BNEP=y @@ -109,7 +115,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=73728 -CONFIG_MISC_DEVICES=y CONFIG_AB8500_PWM=y CONFIG_SENSORS_BH1780=y CONFIG_STE_TRACE_MODEM=y @@ -158,7 +163,6 @@ CONFIG_HW_RANDOM_NOMADIK=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_NOMADIK=y CONFIG_SPI=y -CONFIG_STM_MSP_SPI=y CONFIG_SPI_PL022=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_TC3589X=y @@ -170,6 +174,7 @@ CONFIG_SENSORS_DBX500=y CONFIG_SENSORS_LSM303DLH=y CONFIG_SENSORS_LSM303DLHC=y CONFIG_SENSORS_L3G4200D=y +CONFIG_THERMAL=y CONFIG_WATCHDOG=y CONFIG_UX500_WATCHDOG_DEBUG=y CONFIG_MFD_TC3589X=y @@ -208,6 +213,7 @@ 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_HIDRAW=y CONFIG_USB=y # CONFIG_USB_DEVICE_CLASS is not set CONFIG_USB_SUSPEND=y @@ -286,20 +292,11 @@ CONFIG_VFAT_FS=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_9P_FS=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_BLKDEV_PARTITION=y -CONFIG_BSD_DISKLABEL=y -CONFIG_MINIX_SUBPARTITION=y -CONFIG_SOLARIS_X86_PARTITION=y -CONFIG_UNIXWARE_DISKLABEL=y -CONFIG_SGI_PARTITION=y -CONFIG_SUN_PARTITION=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y CONFIG_PRINTK_TIME=y CONFIG_MAGIC_SYSRQ=y CONFIG_UNUSED_SYMBOLS=y -CONFIG_DEBUG_KERNEL=y CONFIG_LOCKUP_DETECTOR=y CONFIG_HARDLOCKUP_DETECTOR=y CONFIG_DETECT_HUNG_TASK=y @@ -318,5 +315,3 @@ CONFIG_CRYPTO_TWOFISH=y CONFIG_CRYPTO_DEV_UX500=y CONFIG_CRYPTO_DEV_UX500_HASH=y CONFIG_CRC7=y -CONFIG_HIDRAW=y -CONFIG_UID_STAT=y -- cgit v1.2.3