summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Calianu <adrian.calianu@enea.com>2021-05-11 10:37:47 +0200
committerMatei Valeanu <Matei.Valeanu@enea.com>2021-05-14 14:29:42 +0200
commit3bab2dec65f9bf7b644ac17276f8b9db270512b4 (patch)
treed328100abaa05f355b3a352e2dd1f403a492af99
parent32a892dd19938e060431a5918b6af31853ff94fe (diff)
downloadenea-kernel-cache-3bab2dec65f9bf7b644ac17276f8b9db270512b4.tar.gz
update kernel configs to 5.10 Linux kernel version
Current changes followed few issues: - configs removed starting with 4.14(rocko kernel) - configs renamed starting with 4.14 - new configs - not touched - should be covered my main configuration - in case a subconfig is required kernel build it will select it utomatically Change-Id: I13360ebe556630ccd23aee3b82557ac4a2cdf359 Signed-off-by: Adrian Calianu <adrian.calianu@enea.com>
-rw-r--r--cfg/net/ip_nf_y.cfg2
-rw-r--r--features/accelerometers/accelerometers_n.cfg1
-rw-r--r--features/acp/acp_n.cfg1
-rw-r--r--features/backlight/backlight_n.cfg6
-rw-r--r--features/cdrom/cdrom_m.cfg3
-rw-r--r--features/ftrace/ftrace_n.cfg7
-rw-r--r--features/hid/keyboard_m.cfg3
-rw-r--r--features/kvm/guest_kvm_y.cfg2
-rw-r--r--features/kvm/guest_n.cfg2
-rw-r--r--features/kvm/qemu-kvm_m.cfg2
-rw-r--r--features/lxc/lxc_m.cfg40
-rw-r--r--features/lxc/lxc_m.scc4
-rw-r--r--features/lxc/lxc_y.cfg12
-rw-r--r--features/media/media_n.cfg9
-rw-r--r--features/memorydbg/memorydbg_n.cfg1
-rw-r--r--features/memorydbg/memorydbg_y.cfg2
-rw-r--r--features/mmc/mmc_n.cfg1
-rw-r--r--features/mmc/mmc_sd_m.cfg4
-rw-r--r--features/mmc/mmc_sd_y.cfg4
-rw-r--r--features/mtd/mtd_y.cfg2
-rw-r--r--features/netdevices/netdevices_n.cfg11
-rw-r--r--features/netfilter/netfilter_n.cfg7
-rw-r--r--features/netfilter/netfilter_y.cfg3
-rw-r--r--features/nvme/nvme.cfg8
-rw-r--r--features/pcimodules/pcimodules_n.cfg1
-rw-r--r--features/rcu/rcu_nocb_y.cfg1
-rw-r--r--features/rcudbg/rcudbg_n.cfg2
-rw-r--r--features/rcudbg/rcudbg_y.cfg2
-rw-r--r--features/scsi/scsi_m.cfg3
-rw-r--r--features/sound/sound_n.cfg11
-rw-r--r--features/udev/udev.cfg1
-rw-r--r--features/udev/udev_opt.cfg4
-rw-r--r--features/usbGadget/usbgadget_m.cfg2
-rw-r--r--features/usbnet/usbnet_m.cfg1
-rw-r--r--features/usbsupport/usbsupport_m.cfg8
-rw-r--r--features/usbsupport/usbsupport_n.cfg6
-rw-r--r--features/vfio/vfio_m.cfg8
-rw-r--r--features/wireless/wireless_n.cfg1
-rw-r--r--features/wlan/wlan_n.cfg1
39 files changed, 83 insertions, 106 deletions
diff --git a/cfg/net/ip_nf_y.cfg b/cfg/net/ip_nf_y.cfg
index 33ea2bf..36578fb 100644
--- a/cfg/net/ip_nf_y.cfg
+++ b/cfg/net/ip_nf_y.cfg
@@ -1,4 +1,4 @@
1CONFIG_NF_NAT_IPV4=y 1CONFIG_NF_NAT=y
2CONFIG_IP_NF_IPTABLES=y 2CONFIG_IP_NF_IPTABLES=y
3CONFIG_IP_NF_NAT=y 3CONFIG_IP_NF_NAT=y
4CONFIG_IP_NF_TARGET_MASQUERADE=y 4CONFIG_IP_NF_TARGET_MASQUERADE=y
diff --git a/features/accelerometers/accelerometers_n.cfg b/features/accelerometers/accelerometers_n.cfg
index ed8fb8a..73ba988 100644
--- a/features/accelerometers/accelerometers_n.cfg
+++ b/features/accelerometers/accelerometers_n.cfg
@@ -1,6 +1,7 @@
1# 1#
2# Accelerometers 2# Accelerometers
3# 3#
4CONFIG_IIO=n
4CONFIG_BMA180=n 5CONFIG_BMA180=n
5# CONFIG_BMA220 is not set 6# CONFIG_BMA220 is not set
6CONFIG_BMC150_ACCEL=n 7CONFIG_BMC150_ACCEL=n
diff --git a/features/acp/acp_n.cfg b/features/acp/acp_n.cfg
index 2310724..058ef10 100644
--- a/features/acp/acp_n.cfg
+++ b/features/acp/acp_n.cfg
@@ -3,7 +3,6 @@
3# 3#
4# CONFIG_DRM_NOUVEAU is not set 4# CONFIG_DRM_NOUVEAU is not set
5CONFIG_DRM_I915=n 5CONFIG_DRM_I915=n
6# CONFIG_DRM_I915_ALPHA_SUPPORT is not set
7CONFIG_DRM_I915_CAPTURE_ERROR=n 6CONFIG_DRM_I915_CAPTURE_ERROR=n
8CONFIG_DRM_I915_COMPRESS_ERROR=n 7CONFIG_DRM_I915_COMPRESS_ERROR=n
9CONFIG_DRM_I915_USERPTR=n 8CONFIG_DRM_I915_USERPTR=n
diff --git a/features/backlight/backlight_n.cfg b/features/backlight/backlight_n.cfg
index 0358efe..ba91356 100644
--- a/features/backlight/backlight_n.cfg
+++ b/features/backlight/backlight_n.cfg
@@ -1,4 +1,3 @@
1CONFIG_BACKLIGHT_LCD_SUPPORT=n
2CONFIG_LCD_CLASS_DEVICE=n 1CONFIG_LCD_CLASS_DEVICE=n
3# CONFIG_LCD_L4F00242T03 is not set 2# CONFIG_LCD_L4F00242T03 is not set
4# CONFIG_LCD_LMS283GF05 is not set 3# CONFIG_LCD_LMS283GF05 is not set
@@ -8,16 +7,13 @@ CONFIG_LCD_CLASS_DEVICE=n
8# CONFIG_LCD_TDO24M is not set 7# CONFIG_LCD_TDO24M is not set
9# CONFIG_LCD_VGG2432A4 is not set 8# CONFIG_LCD_VGG2432A4 is not set
10# CONFIG_LCD_PLATFORM is not set 9# CONFIG_LCD_PLATFORM is not set
11# CONFIG_LCD_S6E63M0 is not set
12# CONFIG_LCD_LD9040 is not set
13# CONFIG_LCD_AMS369FG06 is not set 10# CONFIG_LCD_AMS369FG06 is not set
14# CONFIG_LCD_LMS501KF03 is not set 11# CONFIG_LCD_LMS501KF03 is not set
15# CONFIG_LCD_HX8357 is not set 12# CONFIG_LCD_HX8357 is not set
16CONFIG_BACKLIGHT_CLASS_DEVICE=n 13CONFIG_BACKLIGHT_CLASS_DEVICE=n
17CONFIG_BACKLIGHT_GENERIC=n
18# CONFIG_BACKLIGHT_PWM is not set 14# CONFIG_BACKLIGHT_PWM is not set
19# CONFIG_BACKLIGHT_APPLE is not set 15# CONFIG_BACKLIGHT_APPLE is not set
20# CONFIG_BACKLIGHT_PM8941_WLED is not set 16# CONFIG_BACKLIGHT_QCOM_WLED is not set
21# CONFIG_BACKLIGHT_SAHARA is not set 17# CONFIG_BACKLIGHT_SAHARA is not set
22# CONFIG_BACKLIGHT_ADP8860 is not set 18# CONFIG_BACKLIGHT_ADP8860 is not set
23# CONFIG_BACKLIGHT_ADP8870 is not set 19# CONFIG_BACKLIGHT_ADP8870 is not set
diff --git a/features/cdrom/cdrom_m.cfg b/features/cdrom/cdrom_m.cfg
index ed950ce..fff43e8 100644
--- a/features/cdrom/cdrom_m.cfg
+++ b/features/cdrom/cdrom_m.cfg
@@ -1,4 +1 @@
1CONFIG_BLK_DEV_SR=m CONFIG_BLK_DEV_SR=m
2
3# Automatically set to =y by CONFIG_BLK_DEV_SR
4CONFIG_BLK_DEV_SR_VENDOR=y
diff --git a/features/ftrace/ftrace_n.cfg b/features/ftrace/ftrace_n.cfg
index 4df86f2..f47a8e0 100644
--- a/features/ftrace/ftrace_n.cfg
+++ b/features/ftrace/ftrace_n.cfg
@@ -12,8 +12,8 @@ CONFIG_BRANCH_PROFILE_NONE=n
12# CONFIG_PROFILE_ALL_BRANCHES is not set 12# CONFIG_PROFILE_ALL_BRANCHES is not set
13# CONFIG_STACK_TRACER is not set 13# CONFIG_STACK_TRACER is not set
14CONFIG_BLK_DEV_IO_TRACE=n 14CONFIG_BLK_DEV_IO_TRACE=n
15CONFIG_KPROBE_EVENT=n 15CONFIG_KPROBE_EVENTS=n
16CONFIG_UPROBE_EVENT=n 16CONFIG_UPROBE_EVENTS=n
17CONFIG_PROBE_EVENTS=n 17CONFIG_PROBE_EVENTS=n
18CONFIG_DYNAMIC_FTRACE=n 18CONFIG_DYNAMIC_FTRACE=n
19CONFIG_DYNAMIC_FTRACE_WITH_REGS=n 19CONFIG_DYNAMIC_FTRACE_WITH_REGS=n
@@ -25,5 +25,4 @@ CONFIG_FTRACE_MCOUNT_RECORD=n
25# CONFIG_TRACEPOINT_BENCHMARK is not set 25# CONFIG_TRACEPOINT_BENCHMARK is not set
26# CONFIG_RING_BUFFER_BENCHMARK is not set 26# CONFIG_RING_BUFFER_BENCHMARK is not set
27# CONFIG_RING_BUFFER_STARTUP_TEST is not set 27# CONFIG_RING_BUFFER_STARTUP_TEST is not set
28# CONFIG_TRACE_ENUM_MAP_FILE is not set 28# CONFIG_TRACE_EVAL_MAP_FILE is not set
29CONFIG_TRACING_EVENTS_GPIO=n
diff --git a/features/hid/keyboard_m.cfg b/features/hid/keyboard_m.cfg
index 8f2104c..d52cb7e 100644
--- a/features/hid/keyboard_m.cfg
+++ b/features/hid/keyboard_m.cfg
@@ -27,11 +27,8 @@ CONFIG_INPUT_MISC=y
27# CONFIG_INPUT_BMA150 is not set 27# CONFIG_INPUT_BMA150 is not set
28# CONFIG_INPUT_E3X0_BUTTON is not set 28# CONFIG_INPUT_E3X0_BUTTON is not set
29# CONFIG_INPUT_MMA8450 is not set 29# CONFIG_INPUT_MMA8450 is not set
30# CONFIG_INPUT_MPU3050 is not set
31# CONFIG_INPUT_APANEL is not set 30# CONFIG_INPUT_APANEL is not set
32# CONFIG_INPUT_GP2A is not set
33# CONFIG_INPUT_GPIO_BEEPER is not set 31# CONFIG_INPUT_GPIO_BEEPER is not set
34# CONFIG_INPUT_GPIO_TILT_POLLED is not set
35# CONFIG_INPUT_GPIO_DECODER is not set 32# CONFIG_INPUT_GPIO_DECODER is not set
36# CONFIG_INPUT_ATLAS_BTNS is not set 33# CONFIG_INPUT_ATLAS_BTNS is not set
37# CONFIG_INPUT_ATI_REMOTE2 is not set 34# CONFIG_INPUT_ATI_REMOTE2 is not set
diff --git a/features/kvm/guest_kvm_y.cfg b/features/kvm/guest_kvm_y.cfg
index 95dfb75..9dc397c 100644
--- a/features/kvm/guest_kvm_y.cfg
+++ b/features/kvm/guest_kvm_y.cfg
@@ -1,4 +1,4 @@
1HYPERVISOR_GUEST=y 1CONFIG_HYPERVISOR_GUEST=y
2CONFIG_KVM_GUEST=y 2CONFIG_KVM_GUEST=y
3CONFIG_KVM_DEBUG_FS=n 3CONFIG_KVM_DEBUG_FS=n
4CONFIG_PARAVIRT_TIME_ACCOUNTING=y 4CONFIG_PARAVIRT_TIME_ACCOUNTING=y
diff --git a/features/kvm/guest_n.cfg b/features/kvm/guest_n.cfg
index 2a046f8..4aecd1e 100644
--- a/features/kvm/guest_n.cfg
+++ b/features/kvm/guest_n.cfg
@@ -1,4 +1,4 @@
1HYPERVISOR_GUEST=n 1CONFIG_HYPERVISOR_GUEST=n
2CONFIG_PARAVIRT=n 2CONFIG_PARAVIRT=n
3CONFIG_KVM_GUEST=n 3CONFIG_KVM_GUEST=n
4CONFIG_VIRTIO=n 4CONFIG_VIRTIO=n
diff --git a/features/kvm/qemu-kvm_m.cfg b/features/kvm/qemu-kvm_m.cfg
index 14e6582..e9eb5bc 100644
--- a/features/kvm/qemu-kvm_m.cfg
+++ b/features/kvm/qemu-kvm_m.cfg
@@ -3,7 +3,6 @@ CONFIG_HAVE_KVM=y
3CONFIG_VIRTUALIZATION=y 3CONFIG_VIRTUALIZATION=y
4CONFIG_PREEMPT_NOTIFIERS=y 4CONFIG_PREEMPT_NOTIFIERS=y
5CONFIG_MMU_NOTIFIER=y 5CONFIG_MMU_NOTIFIER=y
6CONFIG_ANON_INODES=y
7CONFIG_HAVE_KVM_IRQCHIP=y 6CONFIG_HAVE_KVM_IRQCHIP=y
8CONFIG_HAVE_KVM_IRQFD=y 7CONFIG_HAVE_KVM_IRQFD=y
9CONFIG_IRQ_BYPASS_MANAGER=y 8CONFIG_IRQ_BYPASS_MANAGER=y
@@ -26,5 +25,4 @@ CONFIG_KVM=m
26CONFIG_KVM_INTEL=m 25CONFIG_KVM_INTEL=m
27CONFIG_KVM_AMD=m 26CONFIG_KVM_AMD=m
28CONFIG_KVM_MMU_AUDIT=n 27CONFIG_KVM_MMU_AUDIT=n
29CONFIG_KVM_DEVICE_ASSIGNMENT=n
30 28
diff --git a/features/lxc/lxc_m.cfg b/features/lxc/lxc_m.cfg
new file mode 100644
index 0000000..74e72bb
--- /dev/null
+++ b/features/lxc/lxc_m.cfg
@@ -0,0 +1,40 @@
1CONFIG_NAMESPACES=y
2CONFIG_UTS_NS=y
3CONFIG_IPC_NS=y
4CONFIG_PID_NS=y
5CONFIG_USER_NS=y
6CONFIG_NET_NS=y
7
8CONFIG_CGROUPS=y
9CONFIG_CGROUP_DEVICE=y
10CONFIG_CGROUP_SCHED=y
11CONFIG_CGROUP_CPUACCT=y
12CONFIG_CGROUP_RDMA=y
13CONFIG_CGROUP_HUGETLB=y
14CONFIG_CPUSETS=y
15
16CONFIG_VETH=y
17CONFIG_MACVLAN=y
18CONFIG_VLAN_8021Q=m
19CONFIG_BRIDGE=m
20CONFIG_NETFILTER_ADVANCED=y
21CONFIG_NF_NAT=y
22CONFIG_IP_NF_TARGET_MASQUERADE=y
23CONFIG_NF_DEFRAG_IPV6=y
24CONFIG_NF_CONNTRACK=y
25CONFIG_NF_NAT_MASQUERADE=y
26CONFIG_IP6_NF_IPTABLES=y
27CONFIG_IP6_NF_NAT=y
28CONFIG_IP6_NF_TARGET_MASQUERADE=y
29# CONFIG_IP6_NF_TARGET_NPT is not set
30CONFIG_NETFILTER_XT_TARGET_CHECKSUM=y
31CONFIG_FUSE_FS=y
32
33CONFIG_CHECKPOINT_RESTORE=y
34CONFIG_FHANDLE=y
35CONFIG_EVENTFD=y
36CONFIG_EPOLL=y
37CONFIG_UNIX_DIAG=m
38CONFIG_INET_DIAG=m
39CONFIG_PACKET_DIAG=m
40CONFIG_NETLINK_DIAG=m
diff --git a/features/lxc/lxc_m.scc b/features/lxc/lxc_m.scc
new file mode 100644
index 0000000..13a711c
--- /dev/null
+++ b/features/lxc/lxc_m.scc
@@ -0,0 +1,4 @@
1define KFEATURE_DESCRIPTION "Enable LXC support as required by lxc-checkconfig"
2define KFEATURE_COMPATIBILITY all
3
4kconf non-hardware lxc_m.cfg
diff --git a/features/lxc/lxc_y.cfg b/features/lxc/lxc_y.cfg
index 8710044..0f5b0b1 100644
--- a/features/lxc/lxc_y.cfg
+++ b/features/lxc/lxc_y.cfg
@@ -4,14 +4,13 @@ CONFIG_IPC_NS=y
4CONFIG_PID_NS=y 4CONFIG_PID_NS=y
5CONFIG_USER_NS=y 5CONFIG_USER_NS=y
6CONFIG_NET_NS=y 6CONFIG_NET_NS=y
7DEVPTS_MULTIPLE_INSTANCES=y
8 7
9CONFIG_CGROUPS=y 8CONFIG_CGROUPS=y
10CONFIG_CGROUP_NS=y
11CONFIG_CGROUP_DEVICE=y 9CONFIG_CGROUP_DEVICE=y
12CONFIG_CGROUP_SCHED=y 10CONFIG_CGROUP_SCHED=y
13CONFIG_CGROUP_CPUACCT=y 11CONFIG_CGROUP_CPUACCT=y
14CONFIG_CGROUP_MEM_RES_CTLR=y 12CONFIG_CGROUP_RDMA=y
13CONFIG_CGROUP_HUGETLB=y
15CONFIG_CPUSETS=y 14CONFIG_CPUSETS=y
16 15
17CONFIG_VETH=y 16CONFIG_VETH=y
@@ -19,12 +18,11 @@ CONFIG_MACVLAN=y
19CONFIG_VLAN_8021Q=y 18CONFIG_VLAN_8021Q=y
20CONFIG_BRIDGE=y 19CONFIG_BRIDGE=y
21CONFIG_NETFILTER_ADVANCED=y 20CONFIG_NETFILTER_ADVANCED=y
22CONFIG_NF_NAT_IPV4=y 21CONFIG_NF_NAT=y
23CONFIG_IP_NF_TARGET_MASQUERADE=y 22CONFIG_IP_NF_TARGET_MASQUERADE=y
24CONFIG_NF_DEFRAG_IPV6=y 23CONFIG_NF_DEFRAG_IPV6=y
25CONFIG_NF_CONNTRACK_IPV6=y 24CONFIG_NF_CONNTRACK=y
26CONFIG_NF_NAT_IPV6=y 25CONFIG_NF_NAT_MASQUERADE=y
27CONFIG_NF_NAT_MASQUERADE_IPV6=y
28CONFIG_IP6_NF_IPTABLES=y 26CONFIG_IP6_NF_IPTABLES=y
29CONFIG_IP6_NF_NAT=y 27CONFIG_IP6_NF_NAT=y
30CONFIG_IP6_NF_TARGET_MASQUERADE=y 28CONFIG_IP6_NF_TARGET_MASQUERADE=y
diff --git a/features/media/media_n.cfg b/features/media/media_n.cfg
index b84e11e..d2db66b 100644
--- a/features/media/media_n.cfg
+++ b/features/media/media_n.cfg
@@ -9,7 +9,7 @@ CONFIG_MEDIA_ANALOG_TV_SUPPORT=n
9CONFIG_MEDIA_DIGITAL_TV_SUPPORT=n 9CONFIG_MEDIA_DIGITAL_TV_SUPPORT=n
10CONFIG_MEDIA_RADIO_SUPPORT=n 10CONFIG_MEDIA_RADIO_SUPPORT=n
11# CONFIG_MEDIA_SDR_SUPPORT is not set 11# CONFIG_MEDIA_SDR_SUPPORT is not set
12CONFIG_MEDIA_RC_SUPPORT=n 12CONFIG_RC_CORE=n
13CONFIG_MEDIA_CONTROLLER=n 13CONFIG_MEDIA_CONTROLLER=n
14# CONFIG_MEDIA_CONTROLLER_DVB is not set 14# CONFIG_MEDIA_CONTROLLER_DVB is not set
15CONFIG_VIDEO_DEV=n 15CONFIG_VIDEO_DEV=n
@@ -23,7 +23,6 @@ CONFIG_V4L2_MEM2MEM_DEV=n
23CONFIG_VIDEOBUF_GEN=n 23CONFIG_VIDEOBUF_GEN=n
24CONFIG_VIDEOBUF_DMA_SG=n 24CONFIG_VIDEOBUF_DMA_SG=n
25CONFIG_VIDEOBUF_VMALLOC=n 25CONFIG_VIDEOBUF_VMALLOC=n
26CONFIG_VIDEOBUF_DVB=n
27CONFIG_VIDEOBUF2_CORE=n 26CONFIG_VIDEOBUF2_CORE=n
28CONFIG_VIDEOBUF2_MEMOPS=n 27CONFIG_VIDEOBUF2_MEMOPS=n
29CONFIG_VIDEOBUF2_DMA_CONTIG=n 28CONFIG_VIDEOBUF2_DMA_CONTIG=n
@@ -38,11 +37,9 @@ CONFIG_DVB_DYNAMIC_MINORS=n
38 37
39# Media drivers 38# Media drivers
40# 39#
41CONFIG_RC_CORE=n
42CONFIG_RC_MAP=n 40CONFIG_RC_MAP=n
43CONFIG_RC_DECODERS=n 41CONFIG_RC_DECODERS=n
44CONFIG_LIRC=n 42CONFIG_LIRC=n
45CONFIG_IR_LIRC_CODEC=n
46CONFIG_IR_NEC_DECODER=n 43CONFIG_IR_NEC_DECODER=n
47CONFIG_IR_RC5_DECODER=n 44CONFIG_IR_RC5_DECODER=n
48CONFIG_IR_RC6_DECODER=n 45CONFIG_IR_RC6_DECODER=n
@@ -127,9 +124,7 @@ CONFIG_VIDEO_PVRUSB2_SYSFS=n
127CONFIG_VIDEO_PVRUSB2_DVB=n 124CONFIG_VIDEO_PVRUSB2_DVB=n
128# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set 125# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
129CONFIG_VIDEO_HDPVR=n 126CONFIG_VIDEO_HDPVR=n
130CONFIG_VIDEO_USBVISION=n
131CONFIG_VIDEO_STK1160_COMMON=n 127CONFIG_VIDEO_STK1160_COMMON=n
132# CONFIG_VIDEO_STK1160_AC97 is not set
133CONFIG_VIDEO_STK1160=n 128CONFIG_VIDEO_STK1160=n
134# CONFIG_VIDEO_GO7007 is not set 129# CONFIG_VIDEO_GO7007 is not set
135 130
@@ -175,7 +170,6 @@ CONFIG_DVB_USB_PCTV452E=n
175CONFIG_DVB_USB_DW2102=n 170CONFIG_DVB_USB_DW2102=n
176CONFIG_DVB_USB_CINERGY_T2=n 171CONFIG_DVB_USB_CINERGY_T2=n
177CONFIG_DVB_USB_DTV5100=n 172CONFIG_DVB_USB_DTV5100=n
178CONFIG_DVB_USB_FRIIO=n
179CONFIG_DVB_USB_AZ6027=n 173CONFIG_DVB_USB_AZ6027=n
180CONFIG_DVB_USB_TECHNISAT_USB2=n 174CONFIG_DVB_USB_TECHNISAT_USB2=n
181CONFIG_DVB_USB_V2=n 175CONFIG_DVB_USB_V2=n
@@ -285,7 +279,6 @@ CONFIG_DVB_DDBRIDGE=n
285# CONFIG_V4L_PLATFORM_DRIVERS is not set 279# CONFIG_V4L_PLATFORM_DRIVERS is not set
286CONFIG_V4L_MEM2MEM_DRIVERS=n 280CONFIG_V4L_MEM2MEM_DRIVERS=n
287CONFIG_VIDEO_MEM2MEM_DEINTERLACE=n 281CONFIG_VIDEO_MEM2MEM_DEINTERLACE=n
288# CONFIG_VIDEO_SH_VEU is not set
289# CONFIG_V4L_TEST_DRIVERS is not set 282# CONFIG_V4L_TEST_DRIVERS is not set
290# CONFIG_DVB_PLATFORM_DRIVERS is not set 283# CONFIG_DVB_PLATFORM_DRIVERS is not set
291 284
diff --git a/features/memorydbg/memorydbg_n.cfg b/features/memorydbg/memorydbg_n.cfg
index fb92cde..43e73fa 100644
--- a/features/memorydbg/memorydbg_n.cfg
+++ b/features/memorydbg/memorydbg_n.cfg
@@ -5,4 +5,3 @@ CONFIG_DEBUG_VIRTUAL=n
5CONFIG_DEBUG_MEMORY_INIT=n 5CONFIG_DEBUG_MEMORY_INIT=n
6CONFIG_DEBUG_PER_CPU_MAPS=n 6CONFIG_DEBUG_PER_CPU_MAPS=n
7CONFIG_DEBUG_STACKOVERFLOW=n 7CONFIG_DEBUG_STACKOVERFLOW=n
8CONFIG_KMEMCHECK=n
diff --git a/features/memorydbg/memorydbg_y.cfg b/features/memorydbg/memorydbg_y.cfg
index b92e7d4..b609203 100644
--- a/features/memorydbg/memorydbg_y.cfg
+++ b/features/memorydbg/memorydbg_y.cfg
@@ -5,5 +5,3 @@ CONFIG_DEBUG_VIRTUAL=y
5CONFIG_DEBUG_MEMORY_INIT=y 5CONFIG_DEBUG_MEMORY_INIT=y
6CONFIG_DEBUG_PER_CPU_MAPS=y 6CONFIG_DEBUG_PER_CPU_MAPS=y
7CONFIG_DEBUG_STACKOVERFLOW=y 7CONFIG_DEBUG_STACKOVERFLOW=y
8CONFIG_KMEMCHECK=y
9
diff --git a/features/mmc/mmc_n.cfg b/features/mmc/mmc_n.cfg
index 552d5f8..2cd7bfb 100644
--- a/features/mmc/mmc_n.cfg
+++ b/features/mmc/mmc_n.cfg
@@ -4,7 +4,6 @@ CONFIG_MMC=n
4# 4#
5CONFIG_MMC_BLOCK=n 5CONFIG_MMC_BLOCK=n
6CONFIG_MMC_BLOCK_MINORS=8 6CONFIG_MMC_BLOCK_MINORS=8
7CONFIG_MMC_BLOCK_BOUNCE=n
8# CONFIG_SDIO_UART is not set 7# CONFIG_SDIO_UART is not set
9# CONFIG_MMC_TEST is not set 8# CONFIG_MMC_TEST is not set
10 9
diff --git a/features/mmc/mmc_sd_m.cfg b/features/mmc/mmc_sd_m.cfg
index 706c2ad..1e4a158 100644
--- a/features/mmc/mmc_sd_m.cfg
+++ b/features/mmc/mmc_sd_m.cfg
@@ -60,7 +60,7 @@ CONFIG_MTD_CFI_I2=y
60# Disk-On-Chip Device Drivers 60# Disk-On-Chip Device Drivers
61# 61#
62# CONFIG_MTD_DOCG3 is not set 62# CONFIG_MTD_DOCG3 is not set
63# CONFIG_MTD_NAND is not set 63# CONFIG_MTD_RAW_NAND is not set
64# CONFIG_MTD_ONENAND is not set 64# CONFIG_MTD_ONENAND is not set
65 65
66# 66#
@@ -74,7 +74,6 @@ CONFIG_TIFM_7XX1=m
74CONFIG_CB710_CORE=m 74CONFIG_CB710_CORE=m
75# CONFIG_CB710_DEBUG is not set 75# CONFIG_CB710_DEBUG is not set
76CONFIG_CB710_DEBUG_ASSUMPTIONS=y 76CONFIG_CB710_DEBUG_ASSUMPTIONS=y
77# CONFIG_INTEL_MEI_SPD is not set
78CONFIG_RPMB=m 77CONFIG_RPMB=m
79# CONFIG_RPMB_INTF_DEV is not set 78# CONFIG_RPMB_INTF_DEV is not set
80CONFIG_MMC=m 79CONFIG_MMC=m
@@ -85,7 +84,6 @@ CONFIG_MMC=m
85# 84#
86CONFIG_MMC_BLOCK=m 85CONFIG_MMC_BLOCK=m
87CONFIG_MMC_BLOCK_MINORS=8 86CONFIG_MMC_BLOCK_MINORS=8
88CONFIG_MMC_BLOCK_BOUNCE=y
89CONFIG_SDIO_UART=m 87CONFIG_SDIO_UART=m
90# CONFIG_MMC_TEST is not set 88# CONFIG_MMC_TEST is not set
91 89
diff --git a/features/mmc/mmc_sd_y.cfg b/features/mmc/mmc_sd_y.cfg
index 79bb712..575c713 100644
--- a/features/mmc/mmc_sd_y.cfg
+++ b/features/mmc/mmc_sd_y.cfg
@@ -60,7 +60,7 @@ CONFIG_MTD_CFI_I2=y
60# Disk-On-Chip Device Drivers 60# Disk-On-Chip Device Drivers
61# 61#
62# CONFIG_MTD_DOCG3 is not set 62# CONFIG_MTD_DOCG3 is not set
63# CONFIG_MTD_NAND is not set 63# CONFIG_MTD_RAW_NAND is not set
64# CONFIG_MTD_ONENAND is not set 64# CONFIG_MTD_ONENAND is not set
65 65
66# 66#
@@ -74,7 +74,6 @@ CONFIG_TIFM_7XX1=y
74CONFIG_CB710_CORE=y 74CONFIG_CB710_CORE=y
75# CONFIG_CB710_DEBUG is not set 75# CONFIG_CB710_DEBUG is not set
76CONFIG_CB710_DEBUG_ASSUMPTIONS=y 76CONFIG_CB710_DEBUG_ASSUMPTIONS=y
77# CONFIG_INTEL_MEI_SPD is not set
78CONFIG_RPMB=y 77CONFIG_RPMB=y
79# CONFIG_RPMB_INTF_DEV is not set 78# CONFIG_RPMB_INTF_DEV is not set
80CONFIG_MMC=y 79CONFIG_MMC=y
@@ -85,7 +84,6 @@ CONFIG_MMC=y
85# 84#
86CONFIG_MMC_BLOCK=y 85CONFIG_MMC_BLOCK=y
87CONFIG_MMC_BLOCK_MINORS=8 86CONFIG_MMC_BLOCK_MINORS=8
88CONFIG_MMC_BLOCK_BOUNCE=y
89CONFIG_SDIO_UART=y 87CONFIG_SDIO_UART=y
90# CONFIG_MMC_TEST is not set 88# CONFIG_MMC_TEST is not set
91 89
diff --git a/features/mtd/mtd_y.cfg b/features/mtd/mtd_y.cfg
index c817fb1..cb4a0c8 100644
--- a/features/mtd/mtd_y.cfg
+++ b/features/mtd/mtd_y.cfg
@@ -79,7 +79,7 @@ CONFIG_MTD_CFI_UTIL=y
79# CONFIG_MTD_DOCG3 is not set 79# CONFIG_MTD_DOCG3 is not set
80CONFIG_MTD_NAND_ECC=y 80CONFIG_MTD_NAND_ECC=y
81CONFIG_MTD_NAND_ECC_SMC=y 81CONFIG_MTD_NAND_ECC_SMC=y
82CONFIG_MTD_NAND=y 82CONFIG_MTD_RAW_NAND=y
83# CONFIG_MTD_NAND_ECC_BCH is not set 83# CONFIG_MTD_NAND_ECC_BCH is not set
84# CONFIG_MTD_SM_COMMON is not set 84# CONFIG_MTD_SM_COMMON is not set
85# CONFIG_MTD_NAND_DENALI_PCI is not set 85# CONFIG_MTD_NAND_DENALI_PCI is not set
diff --git a/features/netdevices/netdevices_n.cfg b/features/netdevices/netdevices_n.cfg
index 9413d2a..78c7859 100644
--- a/features/netdevices/netdevices_n.cfg
+++ b/features/netdevices/netdevices_n.cfg
@@ -19,7 +19,7 @@ CONFIG_ATL1=n
19CONFIG_ATL1E=n 19CONFIG_ATL1E=n
20CONFIG_ATL1C=n 20CONFIG_ATL1C=n
21CONFIG_ALX=n 21CONFIG_ALX=n
22CONFIG_NET_CADENCE=n 22CONFIG_NET_VENDOR_CADENCE=n
23# CONFIG_MACB is not set 23# CONFIG_MACB is not set
24CONFIG_NET_VENDOR_BROADCOM=n 24CONFIG_NET_VENDOR_BROADCOM=n
25# CONFIG_B44 is not set 25# CONFIG_B44 is not set
@@ -54,11 +54,9 @@ CONFIG_DL2K=n
54CONFIG_NET_VENDOR_EMULEX=n 54CONFIG_NET_VENDOR_EMULEX=n
55# CONFIG_BE2NET is not set 55# CONFIG_BE2NET is not set
56CONFIG_NET_VENDOR_EZCHIP=n 56CONFIG_NET_VENDOR_EZCHIP=n
57CONFIG_NET_VENDOR_EXAR=n 57CONFIG_NET_VENDOR_NETERION=n
58# CONFIG_S2IO is not set 58# CONFIG_S2IO is not set
59# CONFIG_VXGE is not set 59# CONFIG_VXGE is not set
60CONFIG_NET_VENDOR_HP=n
61# CONFIG_HP100 is not set
62CONFIG_NET_VENDOR_MARVELL=n 60CONFIG_NET_VENDOR_MARVELL=n
63# CONFIG_MVMDIO is not set 61# CONFIG_MVMDIO is not set
64# CONFIG_MVNETA_BM is not set 62# CONFIG_MVNETA_BM is not set
@@ -86,7 +84,7 @@ CONFIG_NET_VENDOR_NATSEMI=n
86# CONFIG_NATSEMI is not set 84# CONFIG_NATSEMI is not set
87# CONFIG_NS83820 is not set 85# CONFIG_NS83820 is not set
88CONFIG_NET_VENDOR_NETRONOME=n 86CONFIG_NET_VENDOR_NETRONOME=n
89# CONFIG_NFP_NETVF is not set 87# CONFIG_NFP is not set
90CONFIG_NET_VENDOR_8390=n 88CONFIG_NET_VENDOR_8390=n
91# CONFIG_NE2K_PCI is not set 89# CONFIG_NE2K_PCI is not set
92CONFIG_NET_VENDOR_NVIDIA=n 90CONFIG_NET_VENDOR_NVIDIA=n
@@ -132,12 +130,11 @@ CONFIG_NET_VENDOR_SUN=n
132# CONFIG_SUNGEM is not set 130# CONFIG_SUNGEM is not set
133# CONFIG_CASSINI is not set 131# CONFIG_CASSINI is not set
134# CONFIG_NIU is not set 132# CONFIG_NIU is not set
135CONFIG_NET_PACKET_ENGINE=n 133CONFIG_NET_VENDOR_PACKET_ENGINES=n
136CONFIG_NET_VENDOR_SYNOPSYS=n 134CONFIG_NET_VENDOR_SYNOPSYS=n
137CONFIG_NET_VENDOR_TEHUTI=n 135CONFIG_NET_VENDOR_TEHUTI=n
138# CONFIG_TEHUTI is not set 136# CONFIG_TEHUTI is not set
139CONFIG_NET_VENDOR_TI=n 137CONFIG_NET_VENDOR_TI=n
140# CONFIG_TI_CPSW_ALE is not set
141# CONFIG_TLAN is not set 138# CONFIG_TLAN is not set
142CONFIG_NET_VENDOR_VIA=n 139CONFIG_NET_VENDOR_VIA=n
143# CONFIG_VIA_RHINE is not set 140# CONFIG_VIA_RHINE is not set
diff --git a/features/netfilter/netfilter_n.cfg b/features/netfilter/netfilter_n.cfg
index aebe7a9..6ce8da0 100644
--- a/features/netfilter/netfilter_n.cfg
+++ b/features/netfilter/netfilter_n.cfg
@@ -137,13 +137,11 @@ CONFIG_NETFILTER_XT_MATCH_U32=n
137# IP: Netfilter Configuration 137# IP: Netfilter Configuration
138# 138#
139CONFIG_NF_DEFRAG_IPV4=n 139CONFIG_NF_DEFRAG_IPV4=n
140CONFIG_NF_CONNTRACK_IPV4=n
141# CONFIG_NF_DUP_IPV4 is not set 140# CONFIG_NF_DUP_IPV4 is not set
142# CONFIG_NF_LOG_ARP is not set 141# CONFIG_NF_LOG_ARP is not set
143# CONFIG_NF_LOG_IPV4 is not set 142# CONFIG_NF_LOG_IPV4 is not set
144CONFIG_NF_REJECT_IPV4=n 143CONFIG_NF_REJECT_IPV4=n
145CONFIG_NF_NAT_IPV4=n 144CONFIG_NF_NAT_MASQUERADE=n
146CONFIG_NF_NAT_MASQUERADE_IPV4=n
147CONFIG_NF_NAT_PROTO_GRE=n 145CONFIG_NF_NAT_PROTO_GRE=n
148CONFIG_NF_NAT_PPTP=n 146CONFIG_NF_NAT_PPTP=n
149CONFIG_NF_NAT_H323=n 147CONFIG_NF_NAT_H323=n
@@ -173,12 +171,9 @@ CONFIG_IP_NF_ARP_MANGLE=n
173# IPv6: Netfilter Configuration 171# IPv6: Netfilter Configuration
174# 172#
175CONFIG_NF_DEFRAG_IPV6=n 173CONFIG_NF_DEFRAG_IPV6=n
176CONFIG_NF_CONNTRACK_IPV6=n
177# CONFIG_NF_DUP_IPV6 is not set 174# CONFIG_NF_DUP_IPV6 is not set
178# CONFIG_NF_REJECT_IPV6 is not set 175# CONFIG_NF_REJECT_IPV6 is not set
179# CONFIG_NF_LOG_IPV6 is not set 176# CONFIG_NF_LOG_IPV6 is not set
180CONFIG_NF_NAT_IPV6=n
181CONFIG_NF_NAT_MASQUERADE_IPV6=n
182CONFIG_IP6_NF_IPTABLES=n 177CONFIG_IP6_NF_IPTABLES=n
183# CONFIG_IP6_NF_MATCH_AH is not set 178# CONFIG_IP6_NF_MATCH_AH is not set
184CONFIG_IP6_NF_MATCH_EUI64=n 179CONFIG_IP6_NF_MATCH_EUI64=n
diff --git a/features/netfilter/netfilter_y.cfg b/features/netfilter/netfilter_y.cfg
index b1c310e..1d84a71 100644
--- a/features/netfilter/netfilter_y.cfg
+++ b/features/netfilter/netfilter_y.cfg
@@ -1,10 +1,7 @@
1CONFIG_NF_CONNTRACK=y 1CONFIG_NF_CONNTRACK=y
2CONFIG_NF_CONNTRACK_IPV4=y
3CONFIG_NF_NAT=y 2CONFIG_NF_NAT=y
4CONFIG_NETFILTER_XTABLES=y 3CONFIG_NETFILTER_XTABLES=y
5CONFIG_NETFILTER_XT_NAT=y 4CONFIG_NETFILTER_XT_NAT=y
6CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y 5CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
7CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y 6CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
8CONFIG_NF_DEFRAG_IPV4=y 7CONFIG_NF_DEFRAG_IPV4=y
9CONFIG_NF_CONNTRACK_IPV4=y
10CONFIG_NF_NAT_IPV4=y
diff --git a/features/nvme/nvme.cfg b/features/nvme/nvme.cfg
index 4dca776..2082500 100644
--- a/features/nvme/nvme.cfg
+++ b/features/nvme/nvme.cfg
@@ -1,14 +1,10 @@
1CONFIG_NVME_CORE=y 1CONFIG_NVME_CORE=y
2CONFIG_BLK_DEV_NVME=y 2CONFIG_BLK_DEV_NVME=y
3# CONFIG_BLK_DEV_NVME_SCSI is not set
4
5
6 3
7CONFIG_PCI_CNB20LE_QUIRK=y 4CONFIG_PCI_CNB20LE_QUIRK=y
8CONFIG_HOTPLUG_PCI_PCIE=y 5CONFIG_HOTPLUG_PCI_PCIE=y
9CONFIG_PCIE_ECRC=y 6CONFIG_PCIE_ECRC=y
10CONFIG_PCIEAER_INJECT=y 7CONFIG_PCIEAER_INJECT=y
11CONFIG_PCIEASPM_DEBUG=y
12CONFIG_PCIE_DPC=y 8CONFIG_PCIE_DPC=y
13CONFIG_PCI_DEBUG=y 9CONFIG_PCI_DEBUG=y
14CONFIG_PCI_REALLOC_ENABLE_AUTO=y 10CONFIG_PCI_REALLOC_ENABLE_AUTO=y
@@ -25,6 +21,4 @@ CONFIG_BLK_DEV_PCIESSD_MTIP32XX=y
25CONFIG_SATA_AHCI_PLATFORM=y 21CONFIG_SATA_AHCI_PLATFORM=y
26CONFIG_SATA_ACARD_AHCI=y 22CONFIG_SATA_ACARD_AHCI=y
27CONFIG_NVM=y 23CONFIG_NVM=y
28CONFIG_NVM_DEBUG=y 24CONFIG_NVM_PBLK_DEBUG=y
29CONFIG_NVM_GENNVM=y
30CONFIG_NVM_RRPC=y
diff --git a/features/pcimodules/pcimodules_n.cfg b/features/pcimodules/pcimodules_n.cfg
index 48fa2a1..be42e4d 100644
--- a/features/pcimodules/pcimodules_n.cfg
+++ b/features/pcimodules/pcimodules_n.cfg
@@ -1,6 +1,5 @@
1CONFIG_PCI_CNB20LE_QUIRK=n 1CONFIG_PCI_CNB20LE_QUIRK=n
2CONFIG_HOTPLUG_PCI_PCIE=n 2CONFIG_HOTPLUG_PCI_PCIE=n
3CONFIG_PCIEASPM_DEBUG=n
4CONFIG_PCI_DEBUG=n 3CONFIG_PCI_DEBUG=n
5CONFIG_PCI_REALLOC_ENABLE_AUTO=n 4CONFIG_PCI_REALLOC_ENABLE_AUTO=n
6CONFIG_PCI_STUB=m 5CONFIG_PCI_STUB=m
diff --git a/features/rcu/rcu_nocb_y.cfg b/features/rcu/rcu_nocb_y.cfg
index 8a00738..30f75e3 100644
--- a/features/rcu/rcu_nocb_y.cfg
+++ b/features/rcu/rcu_nocb_y.cfg
@@ -1,3 +1,4 @@
1CONFIG_NO_HZ_FULL=y 1CONFIG_NO_HZ_FULL=y
2CONFIG_RCU_EXPERT=y 2CONFIG_RCU_EXPERT=y
3CONFIG_RCU_NOCB_CPU=y 3CONFIG_RCU_NOCB_CPU=y
4CONFIG_NO_HZ=n
diff --git a/features/rcudbg/rcudbg_n.cfg b/features/rcudbg/rcudbg_n.cfg
index 6d122fd..f5dbbdd 100644
--- a/features/rcudbg/rcudbg_n.cfg
+++ b/features/rcudbg/rcudbg_n.cfg
@@ -1,4 +1,4 @@
1CONFIG_RCU_PERF_TEST=n 1CONFIG_RCU_SCALE_TEST=n
2CONFIG_RCU_TORTURE_TEST=n 2CONFIG_RCU_TORTURE_TEST=n
3CONFIG_RCU_TRACE=n 3CONFIG_RCU_TRACE=n
4CONFIG_RCU_EQS_DEBUG=n 4CONFIG_RCU_EQS_DEBUG=n
diff --git a/features/rcudbg/rcudbg_y.cfg b/features/rcudbg/rcudbg_y.cfg
index 5a12884..2ccd243 100644
--- a/features/rcudbg/rcudbg_y.cfg
+++ b/features/rcudbg/rcudbg_y.cfg
@@ -1,4 +1,4 @@
1CONFIG_RCU_PERF_TEST=y 1CONFIG_RCU_SCALE_TEST=y
2CONFIG_RCU_TORTURE_TEST=y 2CONFIG_RCU_TORTURE_TEST=y
3CONFIG_RCU_TRACE=y 3CONFIG_RCU_TRACE=y
4CONFIG_RCU_EQS_DEBUG=y 4CONFIG_RCU_EQS_DEBUG=y
diff --git a/features/scsi/scsi_m.cfg b/features/scsi/scsi_m.cfg
index bb7a9a2..7da760a 100644
--- a/features/scsi/scsi_m.cfg
+++ b/features/scsi/scsi_m.cfg
@@ -1,5 +1,2 @@
1CONFIG_BLK_DEV_SD=m 1CONFIG_BLK_DEV_SD=m
2CONFIG_BLK_DEV_SR=m 2CONFIG_BLK_DEV_SR=m
3
4# Automatically set to =y by CONFIG_BLK_DEV_SR
5CONFIG_BLK_DEV_SR_VENDOR=y
diff --git a/features/sound/sound_n.cfg b/features/sound/sound_n.cfg
index 1b78ce9..6247759 100644
--- a/features/sound/sound_n.cfg
+++ b/features/sound/sound_n.cfg
@@ -26,7 +26,6 @@ CONFIG_SND_VERBOSE_PROCFS=n
26# CONFIG_SND_DEBUG is not set 26# CONFIG_SND_DEBUG is not set
27CONFIG_SND_VMASTER=n 27CONFIG_SND_VMASTER=n
28CONFIG_SND_DMA_SGBUF=n 28CONFIG_SND_DMA_SGBUF=n
29CONFIG_SND_RAWMIDI_SEQ=n
30CONFIG_SND_OPL3_LIB_SEQ=n 29CONFIG_SND_OPL3_LIB_SEQ=n
31# CONFIG_SND_OPL4_LIB_SEQ is not set 30# CONFIG_SND_OPL4_LIB_SEQ is not set
32# CONFIG_SND_SBAWE_SEQ is not set 31# CONFIG_SND_SBAWE_SEQ is not set
@@ -154,17 +153,12 @@ CONFIG_SND_SOC_AMD_ACP=n
154# CONFIG_SND_SOC_FSL_ESAI is not set 153# CONFIG_SND_SOC_FSL_ESAI is not set
155# CONFIG_SND_SOC_IMX_AUDMUX is not set 154# CONFIG_SND_SOC_IMX_AUDMUX is not set
156# CONFIG_SND_SOC_IMG is not set 155# CONFIG_SND_SOC_IMG is not set
157CONFIG_SND_SST_MFLD_PLATFORM=n 156CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=n
158CONFIG_SND_SST_IPC=n
159CONFIG_SND_SST_IPC_ACPI=n
160CONFIG_SND_SOC_INTEL_SST=n 157CONFIG_SND_SOC_INTEL_SST=n
161CONFIG_SND_SOC_INTEL_SST_FIRMWARE=n 158CONFIG_SND_SOC_ACPI_INTEL_MATCH=n
162CONFIG_SND_SOC_INTEL_SST_ACPI=n
163CONFIG_SND_SOC_INTEL_SST_MATCH=n
164CONFIG_SND_SOC_INTEL_HASWELL=n 159CONFIG_SND_SOC_INTEL_HASWELL=n
165CONFIG_SND_SOC_INTEL_HASWELL_MACH=n 160CONFIG_SND_SOC_INTEL_HASWELL_MACH=n
166CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=n 161CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=n
167# CONFIG_SND_SOC_INTEL_BXT_FLORIDA_MACH is not set
168CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=n 162CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=n
169# CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set 163# CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
170CONFIG_SND_SOC_INTEL_BROADWELL_MACH=n 164CONFIG_SND_SOC_INTEL_BROADWELL_MACH=n
@@ -286,6 +280,5 @@ CONFIG_SND_SOC_NAU8825=n
286CONFIG_SND_SOC_TPA6130A2=n 280CONFIG_SND_SOC_TPA6130A2=n
287CONFIG_SND_SIMPLE_CARD_UTILS=n 281CONFIG_SND_SIMPLE_CARD_UTILS=n
288CONFIG_SND_SIMPLE_CARD=n 282CONFIG_SND_SIMPLE_CARD=n
289# CONFIG_SOUND_PRIME is not set
290CONFIG_AC97_BUS=n 283CONFIG_AC97_BUS=n
291 284
diff --git a/features/udev/udev.cfg b/features/udev/udev.cfg
index 08dc3b0..00a1298 100644
--- a/features/udev/udev.cfg
+++ b/features/udev/udev.cfg
@@ -20,7 +20,6 @@ CONFIG_DMIID=y
20CONFIG_BLK_DEV_BSG=y 20CONFIG_BLK_DEV_BSG=y
21 21
22CONFIG_NET_NS=y 22CONFIG_NET_NS=y
23CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
24CONFIG_USER_NS=y 23CONFIG_USER_NS=y
25 24
26CONFIG_CGROUP_SCHED=y 25CONFIG_CGROUP_SCHED=y
diff --git a/features/udev/udev_opt.cfg b/features/udev/udev_opt.cfg
index d08e36a..7060461 100644
--- a/features/udev/udev_opt.cfg
+++ b/features/udev/udev_opt.cfg
@@ -2,8 +2,8 @@ CONFIG_IPV6=y
2CONFIG_AUTOFS4_FS=y 2CONFIG_AUTOFS4_FS=y
3CONFIG_TMPFS_XATTR=y 3CONFIG_TMPFS_XATTR=y
4CONFIG_TMPFS_POSIX_ACL=y 4CONFIG_TMPFS_POSIX_ACL=y
5CONFIG_EXT4_POSIX_ACL=y 5CONFIG_EXT4_FS_POSIX_ACL=y
6CONFIG_XFS_ACL=y 6CONFIG_XFS_POSIX_ACL=y
7CONFIG_BTRFS_FS_POSIX_ACL=y 7CONFIG_BTRFS_FS_POSIX_ACL=y
8CONFIG_SECCOMP=y 8CONFIG_SECCOMP=y
9CONFIG_SECCOMP_FILTER=y 9CONFIG_SECCOMP_FILTER=y
diff --git a/features/usbGadget/usbgadget_m.cfg b/features/usbGadget/usbgadget_m.cfg
index e84cda6..9d852d4 100644
--- a/features/usbGadget/usbgadget_m.cfg
+++ b/features/usbGadget/usbgadget_m.cfg
@@ -84,7 +84,7 @@ CONFIG_USB_LD=m
84CONFIG_USB_IOWARRIOR=m 84CONFIG_USB_IOWARRIOR=m
85CONFIG_USB_HSIC_USB3503=m 85CONFIG_USB_HSIC_USB3503=m
86CONFIG_USB_HSIC_USB4604=m 86CONFIG_USB_HSIC_USB4604=m
87CONFIG_UCSI=m 87CONFIG_UCSI_ACPI=m
88CONFIG_USB_GADGET=m 88CONFIG_USB_GADGET=m
89# CONFIG_USB_GADGET_DEBUG is not set 89# CONFIG_USB_GADGET_DEBUG is not set
90# CONFIG_USB_GADGET_DEBUG_FILES is not set 90# CONFIG_USB_GADGET_DEBUG_FILES is not set
diff --git a/features/usbnet/usbnet_m.cfg b/features/usbnet/usbnet_m.cfg
index a62deff..80dc571 100644
--- a/features/usbnet/usbnet_m.cfg
+++ b/features/usbnet/usbnet_m.cfg
@@ -1,7 +1,6 @@
1CONFIG_USB_USBNET=m 1CONFIG_USB_USBNET=m
2CONFIG_USB_NET_DRIVERS=m 2CONFIG_USB_NET_DRIVERS=m
3CONFIG_MICROCHIP_PHY=m 3CONFIG_MICROCHIP_PHY=m
4CONFIG_USB_CATC=m
5CONFIG_USB_KAWETH=m 4CONFIG_USB_KAWETH=m
6CONFIG_USB_PEGASUS=m 5CONFIG_USB_PEGASUS=m
7CONFIG_USB_RTL8150=m 6CONFIG_USB_RTL8150=m
diff --git a/features/usbsupport/usbsupport_m.cfg b/features/usbsupport/usbsupport_m.cfg
index 6a19564..43c77b3 100644
--- a/features/usbsupport/usbsupport_m.cfg
+++ b/features/usbsupport/usbsupport_m.cfg
@@ -10,11 +10,10 @@ CONFIG_USB=m
10CONFIG_USB_DEFAULT_PERSIST=y 10CONFIG_USB_DEFAULT_PERSIST=y
11# CONFIG_USB_DYNAMIC_MINORS is not set 11# CONFIG_USB_DYNAMIC_MINORS is not set
12# CONFIG_USB_OTG is not set 12# CONFIG_USB_OTG is not set
13# CONFIG_USB_OTG_WHITELIST is not set 13# CONFIG_USB_OTG_PRODUCTLIST is not set
14# CONFIG_USB_OTG_BLACKLIST_HUB is not set 14# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set
15# CONFIG_USB_LEDS_TRIGGER_USBPORT is not set 15# CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
16# CONFIG_USB_MON is not set 16# CONFIG_USB_MON is not set
17# CONFIG_USB_WUSB_CBAF is not set
18 17
19# 18#
20# USB Host Controller Drivers 19# USB Host Controller Drivers
@@ -168,7 +167,6 @@ CONFIG_USB_SERIAL_PL2303=n
168# CONFIG_USB_EMI26 is not set 167# CONFIG_USB_EMI26 is not set
169# CONFIG_USB_ADUTUX is not set 168# CONFIG_USB_ADUTUX is not set
170# CONFIG_USB_SEVSEG is not set 169# CONFIG_USB_SEVSEG is not set
171# CONFIG_USB_RIO500 is not set
172# CONFIG_USB_LEGOTOWER is not set 170# CONFIG_USB_LEGOTOWER is not set
173# CONFIG_USB_LCD is not set 171# CONFIG_USB_LCD is not set
174# CONFIG_USB_CYPRESS_CY7C63 is not set 172# CONFIG_USB_CYPRESS_CY7C63 is not set
@@ -189,7 +187,6 @@ CONFIG_USB_EZUSB_FX2=n
189# CONFIG_USB_HSIC_USB4604 is not set 187# CONFIG_USB_HSIC_USB4604 is not set
190# CONFIG_USB_LINK_LAYER_TEST is not set 188# CONFIG_USB_LINK_LAYER_TEST is not set
191# CONFIG_USB_CHAOSKEY is not set 189# CONFIG_USB_CHAOSKEY is not set
192# CONFIG_UCSI is not set
193 190
194# 191#
195# USB Physical Layer drivers 192# USB Physical Layer drivers
@@ -266,5 +263,4 @@ CONFIG_USB_G_DBGP_SERIAL=n
266# USB PD and Type-C drivers 263# USB PD and Type-C drivers
267# 264#
268CONFIG_TYPEC=n 265CONFIG_TYPEC=n
269CONFIG_USB_PD_SINK=n
270CONFIG_TYPEC_WCOVE=n 266CONFIG_TYPEC_WCOVE=n
diff --git a/features/usbsupport/usbsupport_n.cfg b/features/usbsupport/usbsupport_n.cfg
index 1324c55..6e32553 100644
--- a/features/usbsupport/usbsupport_n.cfg
+++ b/features/usbsupport/usbsupport_n.cfg
@@ -10,10 +10,9 @@ CONFIG_USB=n
10CONFIG_USB_DEFAULT_PERSIST=n 10CONFIG_USB_DEFAULT_PERSIST=n
11# CONFIG_USB_DYNAMIC_MINORS is not set 11# CONFIG_USB_DYNAMIC_MINORS is not set
12# CONFIG_USB_OTG is not set 12# CONFIG_USB_OTG is not set
13# CONFIG_USB_OTG_WHITELIST is not set 13# CONFIG_USB_OTG_PRODUCTLIST is not set
14# CONFIG_USB_LEDS_TRIGGER_USBPORT is not set 14# CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
15# CONFIG_USB_MON is not set 15# CONFIG_USB_MON is not set
16# CONFIG_USB_WUSB_CBAF is not set
17 16
18# 17#
19# USB Host Controller Drivers 18# USB Host Controller Drivers
@@ -167,7 +166,6 @@ CONFIG_USB_SERIAL_PL2303=n
167# CONFIG_USB_EMI26 is not set 166# CONFIG_USB_EMI26 is not set
168# CONFIG_USB_ADUTUX is not set 167# CONFIG_USB_ADUTUX is not set
169# CONFIG_USB_SEVSEG is not set 168# CONFIG_USB_SEVSEG is not set
170# CONFIG_USB_RIO500 is not set
171# CONFIG_USB_LEGOTOWER is not set 169# CONFIG_USB_LEGOTOWER is not set
172# CONFIG_USB_LCD is not set 170# CONFIG_USB_LCD is not set
173# CONFIG_USB_CYPRESS_CY7C63 is not set 171# CONFIG_USB_CYPRESS_CY7C63 is not set
@@ -188,7 +186,6 @@ CONFIG_USB_EZUSB_FX2=n
188# CONFIG_USB_HSIC_USB4604 is not set 186# CONFIG_USB_HSIC_USB4604 is not set
189# CONFIG_USB_LINK_LAYER_TEST is not set 187# CONFIG_USB_LINK_LAYER_TEST is not set
190# CONFIG_USB_CHAOSKEY is not set 188# CONFIG_USB_CHAOSKEY is not set
191# CONFIG_UCSI is not set
192 189
193# 190#
194# USB Physical Layer drivers 191# USB Physical Layer drivers
@@ -264,7 +261,6 @@ CONFIG_USB_G_DBGP_SERIAL=n
264# USB PD and Type-C drivers 261# USB PD and Type-C drivers
265# 262#
266CONFIG_TYPEC=n 263CONFIG_TYPEC=n
267CONFIG_USB_PD_SINK=n
268CONFIG_TYPEC_WCOVE=n 264CONFIG_TYPEC_WCOVE=n
269# CONFIG_USB_LED_TRIG is not set 265# CONFIG_USB_LED_TRIG is not set
270# CONFIG_USB_ULPI_BUS is not set 266# CONFIG_USB_ULPI_BUS is not set
diff --git a/features/vfio/vfio_m.cfg b/features/vfio/vfio_m.cfg
index f42b937..e10aa8c 100644
--- a/features/vfio/vfio_m.cfg
+++ b/features/vfio/vfio_m.cfg
@@ -1,11 +1,13 @@
1CONFIG_HAVE_INTEL_TXT=y 1CONFIG_HAVE_INTEL_TXT=y
2CONFIG_PCI_PASID=y 2CONFIG_PCI_PASID=y
3CONFIG_VFIO_IOMMU_TYPE1=y 3CONFIG_VFIO_IOMMU_TYPE1=m
4CONFIG_VFIO_VIRQFD=m 4CONFIG_VFIO_VIRQFD=m
5CONFIG_VFIO=y 5CONFIG_VFIO=m
6# CONFIG_VFIO_NOIOMMU is not set 6# CONFIG_VFIO_NOIOMMU is not set
7CONFIG_VFIO_PCI=m 7CONFIG_VFIO_PCI=m
8# CONFIG_VFIO_PCI_VGA is not set 8# CONFIG_VFIO_PCI_VGA is not set
9CONFIG_VFIO_MDEV=m
10CONFIG_VFIO_MDEV_DEVICE=m
9CONFIG_VFIO_PCI_MMAP=y 11CONFIG_VFIO_PCI_MMAP=y
10CONFIG_VFIO_PCI_INTX=y 12CONFIG_VFIO_PCI_INTX=y
11CONFIG_VFIO_PCI_IGD=y 13CONFIG_VFIO_PCI_IGD=y
@@ -14,7 +16,7 @@ CONFIG_IOMMU_IOVA=y
14CONFIG_DMAR_TABLE=y 16CONFIG_DMAR_TABLE=y
15CONFIG_INTEL_IOMMU=y 17CONFIG_INTEL_IOMMU=y
16CONFIG_INTEL_IOMMU_SVM=y 18CONFIG_INTEL_IOMMU_SVM=y
19CONFIG_IOMMU_DEFAULT_PASSTHROUGH=y
17CONFIG_INTEL_IOMMU_DEFAULT_ON=y 20CONFIG_INTEL_IOMMU_DEFAULT_ON=y
18CONFIG_INTEL_IOMMU_FLOPPY_WA=y 21CONFIG_INTEL_IOMMU_FLOPPY_WA=y
19# CONFIG_INTEL_TXT is not set 22# CONFIG_INTEL_TXT is not set
20# CONFIG_KVM_DEVICE_ASSIGNMENT is not set
diff --git a/features/wireless/wireless_n.cfg b/features/wireless/wireless_n.cfg
index c9c6944..3803aa3 100644
--- a/features/wireless/wireless_n.cfg
+++ b/features/wireless/wireless_n.cfg
@@ -7,6 +7,5 @@ CONFIG_CFG80211_WEXT=n
7CONFIG_MAC80211=n 7CONFIG_MAC80211=n
8CONFIG_MAC80211_HAS_RC=n 8CONFIG_MAC80211_HAS_RC=n
9CONFIG_MAC80211_RC_MINSTREL=n 9CONFIG_MAC80211_RC_MINSTREL=n
10CONFIG_MAC80211_RC_MINSTREL_HT=n
11CONFIG_MAC80211_RC_DEFAULT_MINSTREL=n 10CONFIG_MAC80211_RC_DEFAULT_MINSTREL=n
12CONFIG_MAC80211_LEDS=n 11CONFIG_MAC80211_LEDS=n
diff --git a/features/wlan/wlan_n.cfg b/features/wlan/wlan_n.cfg
index 59dd7d2..d29f869 100644
--- a/features/wlan/wlan_n.cfg
+++ b/features/wlan/wlan_n.cfg
@@ -58,7 +58,6 @@ CONFIG_RT2X00_LIB_CRYPTO=n
58CONFIG_RT2X00_LIB_LEDS=n 58CONFIG_RT2X00_LIB_LEDS=n
59CONFIG_WLAN_VENDOR_REALTEK=n 59CONFIG_WLAN_VENDOR_REALTEK=n
60CONFIG_RTL_CARDS=n 60CONFIG_RTL_CARDS=n
61CONFIG_RTL_CARDS=n
62CONFIG_WLAN_VENDOR_RSI=n 61CONFIG_WLAN_VENDOR_RSI=n
63CONFIG_WLAN_VENDOR_ST=n 62CONFIG_WLAN_VENDOR_ST=n
64CONFIG_WLAN_VENDOR_TI=n 63CONFIG_WLAN_VENDOR_TI=n