diff --git a/configs/aarch64_defconfig b/configs/aarch64_defconfig index cda0e2e6..54667d3e 100644 --- a/configs/aarch64_defconfig +++ b/configs/aarch64_defconfig @@ -149,7 +149,8 @@ BR2_PACKAGE_MARVELL_CN9130_CRB=y BR2_PACKAGE_MARVELL_ESPRESSOBIN=y BR2_PACKAGE_RASPBERRYPI_RPI64=y BR2_PACKAGE_STYX_DCP_SC_28P=y -BR2_PACKAGE_FEATURE_WIFI_DONGLE_REALTEK=y +BR2_PACKAGE_FEATURE_WIFI_MEDIATEK=y +BR2_PACKAGE_FEATURE_WIFI_REALTEK=y BR2_PACKAGE_CONFD=y BR2_PACKAGE_CONFD_TEST_MODE=y BR2_PACKAGE_CURIOS_HTTPD=y diff --git a/package/feature-wifi/Config.in b/package/feature-wifi/Config.in index bbf293f3..d0a72aa8 100644 --- a/package/feature-wifi/Config.in +++ b/package/feature-wifi/Config.in @@ -14,12 +14,25 @@ config BR2_PACKAGE_FEATURE_WIFI help Enables WiFi in Infix. Enables all requried applications. -config BR2_PACKAGE_FEATURE_WIFI_DONGLE_REALTEK - bool "Realtek USB WiFi Dongles" +config BR2_PACKAGE_FEATURE_WIFI_MEDIATEK + bool "Mediatek WiFi Devices" + depends on BR2_PACKAGE_FEATURE_WIFI + select BR2_PACKAGE_LINUX_FIRMWARE + select BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U + select BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7610E + select BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT76X2E + select BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7921 + select BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7922 + select BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7925 + help + Enables support for various Mediatek WiFi devices. + +config BR2_PACKAGE_FEATURE_WIFI_REALTEK + bool "Realtek WiFi Devices" depends on BR2_PACKAGE_FEATURE_WIFI select BR2_PACKAGE_LINUX_FIRMWARE select BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX select BR2_PACKAGE_LINUX_FIRMWARE_RTL_RTW88 select BR2_PACKAGE_LINUX_FIRMWARE_RTL_RTW89 help - Enables Support for RTW88 and RTW89 USB dongles. + Enables support for RTL81xx, RTW88, and RTW89 WiFi devices. diff --git a/package/feature-wifi/feature-wifi.mk b/package/feature-wifi/feature-wifi.mk index 07e665f4..b7c2d3b9 100644 --- a/package/feature-wifi/feature-wifi.mk +++ b/package/feature-wifi/feature-wifi.mk @@ -13,7 +13,24 @@ define FEATURE_WIFI_LINUX_CONFIG_FIXUPS $(call KCONFIG_SET_OPT,CONFIG_MAC80211,m) $(call KCONFIG_SET_OPT,CONFIG_CFG80211,m) - $(if $(filter y,$(BR2_PACKAGE_FEATURE_WIFI_DONGLE_REALTEK)), + $(if $(filter y,$(BR2_PACKAGE_FEATURE_WIFI_MEDIATEK)), + $(call KCONFIG_ENABLE_OPT,CONFIG_MT7601U) + $(call KCONFIG_ENABLE_OPT,CONFIG_MT76x0U) + $(call KCONFIG_ENABLE_OPT,CONFIG_MT76x0E) + $(call KCONFIG_ENABLE_OPT,CONFIG_MT76x2E) + $(call KCONFIG_ENABLE_OPT,CONFIG_MT76x2U) + $(call KCONFIG_ENABLE_OPT,CONFIG_MT7603E) + $(call KCONFIG_ENABLE_OPT,CONFIG_MT7615E) + $(call KCONFIG_ENABLE_OPT,CONFIG_MT7663U) + $(call KCONFIG_ENABLE_OPT,CONFIG_MT7915E) + $(call KCONFIG_ENABLE_OPT,CONFIG_MT798X_WMAC) + $(call KCONFIG_ENABLE_OPT,CONFIG_MT7921E) + $(call KCONFIG_ENABLE_OPT,CONFIG_MT7921U) + $(call KCONFIG_ENABLE_OPT,CONFIG_MT7996E) + $(call KCONFIG_ENABLE_OPT,CONFIG_MT7925E) + $(call KCONFIG_ENABLE_OPT,CONFIG_MT7925U) + ) + $(if $(filter y,$(BR2_PACKAGE_FEATURE_WIFI_REALTEK)), $(call KCONFIG_ENABLE_OPT,CONFIG_WLAN_VENDOR_REALTEK) $(call KCONFIG_ENABLE_OPT,CONFIG_RTL8XXXU) $(call KCONFIG_ENABLE_OPT,CONFIG_RTL8XXXU_UNTESTED) @@ -47,5 +64,4 @@ define FEATURE_WIFI_LINUX_CONFIG_FIXUPS ) endef - $(eval $(generic-package))