ARM: defconfig: update TX6UL config

diff --git a/arch/arm/configs/tx6ul_defconfig b/arch/arm/configs/tx6ul_defconfig
index 456de8b8bdb832046a454d7d612b99c97eaa731c..4c3c054c439e1f684756c5f3439c8908c7afa446 100644 (file)
--- a/arch/arm/configs/tx6ul_defconfig
+++ b/arch/arm/configs/tx6ul_defconfig
@@ -16,7 +16,6 @@ CONFIG_EMBEDDED=y
 # CONFIG_VM_EVENT_COUNTERS is not set
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_VM_EVENT_COUNTERS is not set
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_COMPAT_BRK is not set

-# CONFIG_SLUB_CPU_PARTIAL is not set

 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODVERSIONS=y


@@ -33,7 +32,7 @@ CONFIG_ARM_ERRATA_754327=y
 CONFIG_ARM_ERRATA_764369=y
 CONFIG_SMP=y
 CONFIG_VMSPLIT_2G=y
 CONFIG_ARM_ERRATA_764369=y
 CONFIG_SMP=y
 CONFIG_VMSPLIT_2G=y

-CONFIG_PREEMPT=y
+CONFIG_PREEMPT_VOLUNTARY=y

 CONFIG_AEABI=y
 CONFIG_HIGHMEM=y
 # CONFIG_BOUNCE is not set
 CONFIG_AEABI=y
 CONFIG_HIGHMEM=y
 # CONFIG_BOUNCE is not set


@@ -56,6 +55,7 @@ CONFIG_VFP=y
 CONFIG_NEON=y
 CONFIG_PM_AUTOSLEEP=y
 CONFIG_PM_WAKELOCKS=y
 CONFIG_NEON=y
 CONFIG_PM_AUTOSLEEP=y
 CONFIG_PM_WAKELOCKS=y

+CONFIG_PM_WAKELOCKS_LIMIT=0

 CONFIG_APM_EMULATION=y
 CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
 CONFIG_NET=y
 CONFIG_APM_EMULATION=y
 CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
 CONFIG_NET=y


@@ -82,8 +82,6 @@ CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
 CONFIG_DMA_CMA=y
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
 CONFIG_DMA_CMA=y

-CONFIG_CMA_SIZE_MBYTES=320
-CONFIG_IMX_WEIM=y

 CONFIG_CONNECTOR=y
 CONFIG_MTD=y
 CONFIG_MTD_TESTS=m
 CONFIG_CONNECTOR=y
 CONFIG_MTD=y
 CONFIG_MTD_TESTS=m


@@ -99,7 +97,6 @@ CONFIG_OF_OVERLAY=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=65536
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=65536

-CONFIG_EEPROM_AT24=y

 CONFIG_BLK_DEV_SD=y
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_LOGGING=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_LOGGING=y


@@ -223,7 +220,6 @@ CONFIG_SND=y
 CONFIG_SND_HRTIMER=y
 CONFIG_SND_DYNAMIC_MINORS=y
 # CONFIG_SND_SUPPORT_OLD_API is not set
 CONFIG_SND_HRTIMER=y
 CONFIG_SND_DYNAMIC_MINORS=y
 # CONFIG_SND_SUPPORT_OLD_API is not set

-CONFIG_SND_VERBOSE_PRINTK=y

 CONFIG_SND_DEBUG=y
 CONFIG_SND_PCM_XRUN_DEBUG=y
 # CONFIG_SND_DRIVERS is not set
 CONFIG_SND_DEBUG=y
 CONFIG_SND_PCM_XRUN_DEBUG=y
 # CONFIG_SND_DRIVERS is not set


@@ -319,7 +315,6 @@ CONFIG_UBIFS_FS=y
 CONFIG_UBIFS_FS_ADVANCED_COMPR=y
 CONFIG_CRAMFS=y
 CONFIG_NFS_FS=y
 CONFIG_UBIFS_FS_ADVANCED_COMPR=y
 CONFIG_CRAMFS=y
 CONFIG_NFS_FS=y

-CONFIG_NFS_V3_ACL=y

 CONFIG_NFS_V4=y
 CONFIG_ROOT_NFS=y
 CONFIG_NLS_DEFAULT="cp437"
 CONFIG_NFS_V4=y
 CONFIG_ROOT_NFS=y
 CONFIG_NLS_DEFAULT="cp437"


@@ -335,9 +330,9 @@ CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_SHIRQ=y
 CONFIG_PANIC_ON_OOPS=y
 # CONFIG_SCHED_DEBUG is not set
 CONFIG_DEBUG_SHIRQ=y
 CONFIG_PANIC_ON_OOPS=y
 # CONFIG_SCHED_DEBUG is not set

-# CONFIG_DEBUG_PREEMPT is not set

 CONFIG_DEBUG_BLOCK_EXT_DEVT=y
 # CONFIG_FTRACE is not set
 CONFIG_DEBUG_BLOCK_EXT_DEVT=y
 # CONFIG_FTRACE is not set

+CONFIG_DMA_API_DEBUG=y

 CONFIG_DEBUG_USER=y
 CONFIG_DEBUG_LL=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_DEBUG_USER=y
 CONFIG_DEBUG_LL=y
 CONFIG_EARLY_PRINTK=y