Merge pull request #1200 from c-po/kernel-wwan

Kernel: T8938: consolidate build time options for amd64 and arm64 WWAN

Author: jestabro

scripts/package-build/linux-kernel/config/12-wwan.config

@@ -1,3 +1,14 @@
+#
+# Wireless WAN
+#
+CONFIG_WWAN=y
+CONFIG_WWAN_DEBUGFS=y
+CONFIG_WWAN_HWSIM=m
+CONFIG_IOSM=m
+CONFIG_MTK_T7XX=m
+# end of Wireless WAN
+
+CONFIG_USB_SERIAL_WWAN=y
 CONFIG_USB_NET_CDCETHER=y
 CONFIG_USB_NET_CDC_EEM=y
 CONFIG_USB_NET_CDC_NCM=y

scripts/package-build/linux-kernel/config/arm64/vyos_defconfig

@@ -2345,12 +2345,6 @@ CONFIG_WLAN_VENDOR_SILABS=y
 # CONFIG_VIRT_WIFI is not set
 # CONFIG_WAN is not set
 
-#
-# Wireless WAN
-#
-# CONFIG_WWAN is not set
-# end of Wireless WAN
-
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
@@ -4150,7 +4144,6 @@ CONFIG_USB_SERIAL_SIERRAWIRELESS=m
 # CONFIG_USB_SERIAL_SYMBOL is not set
 CONFIG_USB_SERIAL_TI=m
 # CONFIG_USB_SERIAL_CYBERJACK is not set
-CONFIG_USB_SERIAL_WWAN=m
 CONFIG_USB_SERIAL_OPTION=m
 # CONFIG_USB_SERIAL_OMNINET is not set
 # CONFIG_USB_SERIAL_OPTICON is not set
@@ -4961,7 +4954,6 @@ CONFIG_ARM_SMMU_QCOM=y
 CONFIG_ARM_SMMU_V3=y
 # CONFIG_ARM_SMMU_V3_SVA is not set
 CONFIG_QCOM_IOMMU=y
-# CONFIG_VIRTIO_IOMMU is not set
 
 #
 # Remoteproc drivers

scripts/package-build/linux-kernel/config/x86/vyos_defconfig

@@ -2193,16 +2193,6 @@ CONFIG_WLAN_VENDOR_SILABS=y
 # CONFIG_VIRT_WIFI is not set
 # CONFIG_WAN is not set
 
-#
-# Wireless WAN
-#
-CONFIG_WWAN=y
-CONFIG_WWAN_DEBUGFS=y
-CONFIG_WWAN_HWSIM=m
-CONFIG_IOSM=m
-CONFIG_MTK_T7XX=m
-# end of Wireless WAN
-
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
@@ -3689,7 +3679,6 @@ CONFIG_USB_SERIAL_SIERRAWIRELESS=y
 # CONFIG_USB_SERIAL_SYMBOL is not set
 CONFIG_USB_SERIAL_TI=m
 # CONFIG_USB_SERIAL_CYBERJACK is not set
-CONFIG_USB_SERIAL_WWAN=y
 CONFIG_USB_SERIAL_OPTION=m
 # CONFIG_USB_SERIAL_OMNINET is not set
 # CONFIG_USB_SERIAL_OPTICON is not set
@@ -4264,7 +4253,7 @@ CONFIG_INTEL_IOMMU_PERF_EVENTS=y
 # CONFIG_IOMMUFD is not set
 CONFIG_IRQ_REMAP=y
 CONFIG_HYPERV_IOMMU=y
-CONFIG_VIRTIO_IOMMU=y
+CONFIG_VIRTIO_IOMMU=m
 
 #
 # Remoteproc drivers