v5.5: cleanups

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Ricardo Salveti <ricardo@foundries.io>

4 files changed, 23 insertions, 23 deletions

diff --git a/cfg/net/ipsec6.cfg b/cfg/net/ipsec6.cfg
index f55b568..1d09ee4 100644
--- a/cfg/net/ipsec6.cfg
+++ b/cfg/net/ipsec6.cfg
@@ -9,6 +9,6 @@ CONFIG_INET6_ESP=y
 CONFIG_INET6_IPCOMP=m
 # crypto needed by ipsec-self of IPv6 Conformance Test
 CONFIG_CRYPTO_SEQIV=m
-CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_CAMELLIA=m
diff --git a/ktypes/base/base.cfg b/ktypes/base/base.cfg
index 376730c..32961b8 100644
--- a/ktypes/base/base.cfg
+++ b/ktypes/base/base.cfg
@@ -28,7 +28,6 @@ CONFIG_BLOCK=y
 CONFIG_PREEMPT_VOLUNTARY=y
 
 # Executable file formats / Emulations
-# CONFIG_BINFMT_AOUT is not set
 CONFIG_BINFMT_ELF=y
 
 # Networking
@@ -131,3 +130,6 @@ CONFIG_MAGIC_SYSRQ=y
 
 # Cryptographic options
 CONFIG_CRYPTO=y
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_ARC4=y
+CONFIG_CRYPTO_LIB_ARC4=y
diff --git a/ktypes/preempt-rt/preempt-rt.cfg b/ktypes/preempt-rt/preempt-rt.cfg
index 5207edb..c971219 100644
--- a/ktypes/preempt-rt/preempt-rt.cfg
+++ b/ktypes/preempt-rt/preempt-rt.cfg
@@ -106,7 +106,7 @@ CONFIG_NET_IPIP=m
 CONFIG_NET_IPGRE_DEMUX=m
 CONFIG_NET_IPGRE=m
 CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_INET_TUNNEL=m
+CONFIG_INET_TUNNEL=y
 
 #
 # IP: Virtual Server Configuration
@@ -903,8 +903,6 @@ CONFIG_SOFT_WATCHDOG=m
 #
 # CONFIG_REISERFS_FS is not set
 # CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
 # CONFIG_REISERFS_FS_SECURITY is not set
 # CONFIG_JFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
@@ -1079,27 +1077,27 @@ CONFIG_SECURITY=y
 # Cryptographic options
 #
 CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_MD4=y
 CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_KHAZAD=m
 CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_TEST=m
 
 #
@@ -1118,4 +1116,4 @@ CONFIG_CRYPTO_CTR=y
 # Library routines
 #
 CONFIG_LIBCRC32C=m
-CONFIG_ZLIB_DEFLATE=m
+CONFIG_ZLIB_DEFLATE=y
diff --git a/ktypes/standard/standard.cfg b/ktypes/standard/standard.cfg
index be5e713..13a6a5e 100644
--- a/ktypes/standard/standard.cfg
+++ b/ktypes/standard/standard.cfg
@@ -16,7 +16,7 @@ CONFIG_NET_IPIP=m
 CONFIG_NET_IPGRE_DEMUX=m
 CONFIG_NET_IPGRE=m
 CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_INET_TUNNEL=m
+CONFIG_INET_TUNNEL=y
 
 # Core Netfilter Configuration
 CONFIG_NETFILTER=y
@@ -138,8 +138,8 @@ CONFIG_SECURITY=y
 
 # Cryptographic options
 CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_MD4=y
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=y
@@ -149,23 +149,23 @@ CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_ARC4=y
 CONFIG_CRYPTO_KHAZAD=m
 CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_CRC32=m
 CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_CCM=y
+CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_PCRYPT=m
 
 # Library routines
-CONFIG_LIBCRC32C=m
+CONFIG_LIBCRC32C=y
 CONFIG_ZLIB_DEFLATE=y
 
 CONFIG_SHMEM=y