[linux-yocto] [PATCH 03/19] meta: remove obselete/invalid options

[Saul Wold]

From: Bruce Ashfield <bruce.ashfield at windriver.com>

Signed-off-by: Bruce Ashfield <bruce.ashfield at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
 meta/cfg/kernel-cache/bsp/common-pc/common-pc-wifi.cfg | 1 -
 meta/cfg/kernel-cache/features/net_sched/net_sched.cfg | 1 -
 meta/cfg/kernel-cache/ktypes/base/base.cfg             | 5 +----
 meta/cfg/kernel-cache/ktypes/preempt-rt/preempt-rt.cfg | 6 +-----
 meta/cfg/kernel-cache/ktypes/standard/standard.cfg     | 6 +-----
 5 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/meta/cfg/kernel-cache/bsp/common-pc/common-pc-wifi.cfg b/meta/cfg/kernel-cache/bsp/common-pc/common-pc-wifi.cfg
index 6a8ce6a..272f912 100644
--- a/meta/cfg/kernel-cache/bsp/common-pc/common-pc-wifi.cfg
+++ b/meta/cfg/kernel-cache/bsp/common-pc/common-pc-wifi.cfg
@@ -1,7 +1,6 @@
 # Common Wifi
 CONFIG_NET=y
 CONFIG_WIRELESS=y
-CONFIG_WIRELESS_EXT=y
 CONFIG_PCI=y
 CONFIG_NETDEVICES=y
 CONFIG_WLAN=y
diff --git a/meta/cfg/kernel-cache/features/net_sched/net_sched.cfg b/meta/cfg/kernel-cache/features/net_sched/net_sched.cfg
index 6da990f..49cd7d7 100644
--- a/meta/cfg/kernel-cache/features/net_sched/net_sched.cfg
+++ b/meta/cfg/kernel-cache/features/net_sched/net_sched.cfg
@@ -9,7 +9,6 @@ CONFIG_NET_SCHED=y
 CONFIG_NET_SCH_CBQ=m
 CONFIG_NET_SCH_HTB=m
 CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_ATM=m
 CONFIG_NET_SCH_PRIO=m
 CONFIG_NET_SCH_RED=m
 CONFIG_NET_SCH_SFQ=m
diff --git a/meta/cfg/kernel-cache/ktypes/base/base.cfg b/meta/cfg/kernel-cache/ktypes/base/base.cfg
index 965b5bd..79c45fc 100644
--- a/meta/cfg/kernel-cache/ktypes/base/base.cfg
+++ b/meta/cfg/kernel-cache/ktypes/base/base.cfg
@@ -951,13 +951,10 @@ CONFIG_TMPFS=y
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
-# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-# CONFIG_JFFS2_RUBIN is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS_WRITE is not set
 
 #
 # Network File Systems
@@ -965,12 +962,12 @@ CONFIG_TMPFS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
 CONFIG_NFS_V4=y
-CONFIG_NFSD_V3=y
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=y
+CONFIG_CRYPTO_CTS=y
 CONFIG_RPCSEC_GSS_KRB5=y
 
 #
diff --git a/meta/cfg/kernel-cache/ktypes/preempt-rt/preempt-rt.cfg b/meta/cfg/kernel-cache/ktypes/preempt-rt/preempt-rt.cfg
index ded68c2..5f79b34 100644
--- a/meta/cfg/kernel-cache/ktypes/preempt-rt/preempt-rt.cfg
+++ b/meta/cfg/kernel-cache/ktypes/preempt-rt/preempt-rt.cfg
@@ -103,6 +103,7 @@ CONFIG_BINFMT_MISC=m
 CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
 CONFIG_NET_IPGRE=m
 CONFIG_NET_IPGRE_BROADCAST=y
 CONFIG_INET_TUNNEL=m
@@ -466,7 +467,6 @@ CONFIG_PPP_SYNC_TTY=m
 CONFIG_PPP_DEFLATE=m
 CONFIG_PPP_BSDCOMP=m
 CONFIG_PPPOE=m
-CONFIG_PPPOATM=m
 CONFIG_SLIP=m
 CONFIG_SLIP_COMPRESSED=y
 CONFIG_SLIP_SMART=y
@@ -911,7 +911,6 @@ CONFIG_REISERFS_FS_POSIX_ACL=y
 # CONFIG_REISERFS_FS_SECURITY is not set
 # CONFIG_JFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
-# CONFIG_XFS_RT is not set
 # CONFIG_OCFS2_FS is not set
 CONFIG_MINIX_FS=m
 CONFIG_ROMFS_FS=m
@@ -926,8 +925,6 @@ CONFIG_AUTOFS4_FS=y
 # DOS/FAT/NT Filesystems
 #
 CONFIG_FAT_FS=m
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_RW is not set
 
 #
 # Pseudo filesystems
@@ -1083,7 +1080,6 @@ CONFIG_NLS_UTF8=m
 #
 CONFIG_SECURITY=y
 # CONFIG_SECURITY_NETWORK is not set
-# CONFIG_SECURITY_SELINUX is not set
 
 #
 # Cryptographic options
diff --git a/meta/cfg/kernel-cache/ktypes/standard/standard.cfg b/meta/cfg/kernel-cache/ktypes/standard/standard.cfg
index a67adb5..077078d 100644
--- a/meta/cfg/kernel-cache/ktypes/standard/standard.cfg
+++ b/meta/cfg/kernel-cache/ktypes/standard/standard.cfg
@@ -97,6 +97,7 @@ CONFIG_BINFMT_MISC=m
 CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
 CONFIG_NET_IPGRE=m
 CONFIG_NET_IPGRE_BROADCAST=y
 CONFIG_INET_TUNNEL=m
@@ -459,7 +460,6 @@ CONFIG_PPP_SYNC_TTY=m
 CONFIG_PPP_DEFLATE=m
 CONFIG_PPP_BSDCOMP=m
 CONFIG_PPPOE=m
-CONFIG_PPPOATM=m
 CONFIG_SLIP=m
 CONFIG_SLIP_COMPRESSED=y
 CONFIG_SLIP_SMART=y
@@ -904,7 +904,6 @@ CONFIG_REISERFS_FS_POSIX_ACL=y
 # CONFIG_REISERFS_FS_SECURITY is not set
 # CONFIG_JFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
-# CONFIG_XFS_RT is not set
 # CONFIG_OCFS2_FS is not set
 CONFIG_MINIX_FS=m
 CONFIG_ROMFS_FS=m
@@ -919,8 +918,6 @@ CONFIG_AUTOFS4_FS=y
 # DOS/FAT/NT Filesystems
 #
 CONFIG_FAT_FS=m
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_RW is not set
 
 #
 # Pseudo filesystems
@@ -1073,7 +1070,6 @@ CONFIG_NLS_UTF8=m
 #
 CONFIG_SECURITY=y
 # CONFIG_SECURITY_NETWORK is not set
-# CONFIG_SECURITY_SELINUX is not set
 
 #
 # Cryptographic options
-- 
2.1.0