tci6614: cleanup defconfigs

Re-align for the 50th time with savedefconfig.  Jeez!

2 files changed, 14 insertions, 13 deletions

diff --git a/arch/arm/configs/tci6614_evm_defconfig b/arch/arm/configs/tci6614_evm_defconfig
index 2aff1636d3d049..51bb2f38c49d0d 100644
--- a/arch/arm/configs/tci6614_evm_defconfig
+++ b/arch/arm/configs/tci6614_evm_defconfig
@@ -1,6 +1,7 @@
 CONFIG_EXPERIMENTAL=y
 # CONFIG_SWAP is not set
 CONFIG_POSIX_MQUEUE=y
+CONFIG_HIGH_RES_TIMERS=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
@@ -23,7 +24,6 @@ CONFIG_ARCH_DAVINCI_TCI6614=y
 CONFIG_MACH_TCI6614_EVM=y
 CONFIG_RAPIDIO=y
 # CONFIG_DAVINCI_MUX is not set
-CONFIG_HIGH_RES_TIMERS=y
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
 CONFIG_FPE_NWFPE=y
@@ -92,7 +92,6 @@ CONFIG_IP_NF_MATCH_ECN=y
 CONFIG_IP_NF_MATCH_TTL=y
 CONFIG_IP_NF_FILTER=y
 CONFIG_IP_NF_TARGET_REJECT=y
-CONFIG_IP_NF_TARGET_LOG=y
 CONFIG_IP_NF_TARGET_ULOG=y
 CONFIG_NF_NAT=y
 CONFIG_IP_NF_TARGET_MASQUERADE=y
@@ -128,7 +127,6 @@ CONFIG_RIONET=y
 CONFIG_RIONET_TX_SIZE=32
 CONFIG_RIONET_RX_SIZE=32
 CONFIG_TI_DAVINCI_MDIO=y
-CONFIG_PHYLIB=y
 CONFIG_MARVELL_PHY=y
 # CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_KEYBOARD is not set
@@ -151,11 +149,8 @@ CONFIG_GPIO_SYSFS=y
 # CONFIG_HWMON is not set
 CONFIG_WATCHDOG=y
 CONFIG_DAVINCI_WATCHDOG=y
-# CONFIG_HID_SUPPORT is not set
 # CONFIG_USB_SUPPORT is not set
 CONFIG_DMADEVICES=y
-CONFIG_KEYSTONE_UDMA=y
-CONFIG_COMMON_CLK_DEBUG=y
 CONFIG_TI_KEYSTONE_RAPIDIO=y
 CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS=y
 CONFIG_TMPFS=y
@@ -164,7 +159,6 @@ CONFIG_JFFS2_FS_WBUF_VERIFY=y
 CONFIG_UBIFS_FS=y
 CONFIG_CRAMFS=y
 CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
 CONFIG_NFS_V3_ACL=y
 CONFIG_ROOT_NFS=y
 CONFIG_NFSD=y
diff --git a/arch/arm/configs/tci6614_evm_nocache_defconfig b/arch/arm/configs/tci6614_evm_nocache_defconfig
index fd0366fdf40d6c..3739489daf8c4c 100644
--- a/arch/arm/configs/tci6614_evm_nocache_defconfig
+++ b/arch/arm/configs/tci6614_evm_nocache_defconfig
@@ -1,6 +1,9 @@
 CONFIG_EXPERIMENTAL=y
 # CONFIG_SWAP is not set
 CONFIG_POSIX_MQUEUE=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_SYSCTL_SYSCALL=y
@@ -19,6 +22,7 @@ CONFIG_MODVERSIONS=y
 CONFIG_ARCH_DAVINCI=y
 CONFIG_ARCH_DAVINCI_TCI6614=y
 CONFIG_MACH_TCI6614_EVM=y
+CONFIG_RAPIDIO=y
 # CONFIG_DAVINCI_MUX is not set
 CONFIG_CPU_ICACHE_DISABLE=y
 CONFIG_CPU_DCACHE_DISABLE=y
@@ -53,7 +57,6 @@ CONFIG_IP_MROUTE=y
 CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
 CONFIG_IP_PIMSM_V2=y
 CONFIG_INET_AH=y
-CONFIG_INET_ESP=y
 CONFIG_INET_IPCOMP=y
 CONFIG_IPV6=y
 CONFIG_INET6_XFRM_MODE_TRANSPORT=m
@@ -91,7 +94,6 @@ CONFIG_IP_NF_MATCH_ECN=y
 CONFIG_IP_NF_MATCH_TTL=y
 CONFIG_IP_NF_FILTER=y
 CONFIG_IP_NF_TARGET_REJECT=y
-CONFIG_IP_NF_TARGET_LOG=y
 CONFIG_IP_NF_TARGET_ULOG=y
 CONFIG_NF_NAT=y
 CONFIG_IP_NF_TARGET_MASQUERADE=y
@@ -123,8 +125,10 @@ CONFIG_PROC_DEVICETREE=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_EEPROM_AT24=y
 CONFIG_NETDEVICES=y
+CONFIG_RIONET=y
+CONFIG_RIONET_TX_SIZE=32
+CONFIG_RIONET_RX_SIZE=32
 CONFIG_TI_DAVINCI_MDIO=y
-CONFIG_PHYLIB=y
 CONFIG_MARVELL_PHY=y
 # CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_KEYBOARD is not set
@@ -138,6 +142,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=3
 # CONFIG_HW_RANDOM is not set
 CONFIG_I2C=y
 # CONFIG_I2C_COMPAT is not set
+CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_DAVINCI=y
 CONFIG_SPI=y
 CONFIG_SPI_DAVINCI=y
@@ -146,17 +151,16 @@ CONFIG_GPIO_SYSFS=y
 # CONFIG_HWMON is not set
 CONFIG_WATCHDOG=y
 CONFIG_DAVINCI_WATCHDOG=y
-# CONFIG_HID_SUPPORT is not set
 # CONFIG_USB_SUPPORT is not set
 CONFIG_DMADEVICES=y
-CONFIG_KEYSTONE_UDMA=y
+CONFIG_TI_KEYSTONE_RAPIDIO=y
+CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS=y
 CONFIG_TMPFS=y
 CONFIG_JFFS2_FS=y
 CONFIG_JFFS2_FS_WBUF_VERIFY=y
 CONFIG_UBIFS_FS=y
 CONFIG_CRAMFS=y
 CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
 CONFIG_NFS_V3_ACL=y
 CONFIG_ROOT_NFS=y
 CONFIG_NFSD=y
@@ -166,8 +170,11 @@ CONFIG_DEBUG_SHIRQ=y
 CONFIG_DEBUG_INFO=y
 CONFIG_CRYPTO_USER=y
 CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_AUTHENC=y
+CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_XCBC=y
+CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_ANSI_CPRNG=y
 CONFIG_CRYPTO_USER_API_HASH=y
 CONFIG_CRYPTO_USER_API_SKCIPHER=y