diff options
| author | John Estabrook <jestabro@vyos.io> | 2026-05-28 15:16:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-28 15:16:53 -0500 |
| commit | e02e72c5ddffcffa3b8ec5e6d2e48f9eeea00ad2 (patch) | |
| tree | 3ac88e28c2f4c4ef4a3e11faa453b4f6d833d2c7 | |
| parent | 4c0a57920573ffe1c5d9bfbf5a01bd847a4b8e0b (diff) | |
| parent | 40b8f6fc6d9ed7fc45f350f4cebce2f6d1bcbd76 (diff) | |
| download | vyos-build-e02e72c5ddffcffa3b8ec5e6d2e48f9eeea00ad2.tar.gz vyos-build-e02e72c5ddffcffa3b8ec5e6d2e48f9eeea00ad2.zip | |
Merge pull request #1200 from c-po/kernel-wwan
Kernel: T8938: consolidate build time options for amd64 and arm64 WWAN
3 files changed, 12 insertions, 20 deletions
diff --git a/scripts/package-build/linux-kernel/config/12-wwan.config b/scripts/package-build/linux-kernel/config/12-wwan.config index 1d184e95..c989376b 100644 --- a/scripts/package-build/linux-kernel/config/12-wwan.config +++ b/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 diff --git a/scripts/package-build/linux-kernel/config/arm64/vyos_defconfig b/scripts/package-build/linux-kernel/config/arm64/vyos_defconfig index 7dbb5d81..5036c070 100644 --- a/scripts/package-build/linux-kernel/config/arm64/vyos_defconfig +++ b/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 diff --git a/scripts/package-build/linux-kernel/config/x86/vyos_defconfig b/scripts/package-build/linux-kernel/config/x86/vyos_defconfig index 03b92814..3ce5b449 100644 --- a/scripts/package-build/linux-kernel/config/x86/vyos_defconfig +++ b/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 |