From: Chukun Pan <amadeus@jmu.edu.cn>
Date: Mon, 13 Nov 2023 14:18:06 +0000 (+0800)
Subject: mac80211: realtek: fix rtw88 driver dependencies
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=16cff054f108f7c7747a0bf9da1d3fb9211012b8;p=openwrt%2Fstaging%2Frobimarko.git

mac80211: realtek: fix rtw88 driver dependencies

The RTW88 PCI/USB driver uses the same firmware,
so add firmware dependencies.

Also CI report that:
  Package kmod-rtw88-usb is missing dependencies for the following libraries:
  usbcore.ko
This commit fixes it.

Fixes: 3538a19 ("mac80211: split rtw88 configuration for each supported chip")
Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
---

diff --git a/package/kernel/mac80211/realtek.mk b/package/kernel/mac80211/realtek.mk
index 48109b94b2..0fc9fb0e6d 100644
--- a/package/kernel/mac80211/realtek.mk
+++ b/package/kernel/mac80211/realtek.mk
@@ -196,7 +196,7 @@ endef
 define KernelPackage/rtw88-usb
   $(call KernelPackage/mac80211/Default)
   TITLE:=Realtek RTW88 USB chips support
-  DEPENDS+= @USB_SUPPORT +kmod-rtw88
+  DEPENDS+= @USB_SUPPORT +kmod-rtw88 +kmod-usb-core
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_usb.ko
   AUTOLOAD:=$(call AutoProbe,rtw88_usb)
   HIDDEN:=1
@@ -205,7 +205,7 @@ endef
 define KernelPackage/rtw88-8822b
   $(call KernelPackage/mac80211/Default)
   TITLE:=Realtek RTL8822B family support
-  DEPENDS+= +kmod-rtw88 +@DRIVER_11AC_SUPPORT
+  DEPENDS+= +kmod-rtw88 +rtl8822be-firmware +@DRIVER_11AC_SUPPORT
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_8822b.ko
   AUTOLOAD:=$(call AutoProbe,rtw88_8822b)
   HIDDEN:=1
@@ -214,7 +214,7 @@ endef
 define KernelPackage/rtw88-8822c
   $(call KernelPackage/mac80211/Default)
   TITLE:=Realtek RTL8822C family support
-  DEPENDS+= +kmod-rtw88 +@DRIVER_11AC_SUPPORT
+  DEPENDS+= +kmod-rtw88 +rtl8822ce-firmware +@DRIVER_11AC_SUPPORT
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_8822c.ko
   AUTOLOAD:=$(call AutoProbe,rtw88_8822c)
   HIDDEN:=1
@@ -223,7 +223,7 @@ endef
 define KernelPackage/rtw88-8723d
   $(call KernelPackage/mac80211/Default)
   TITLE:=Realtek RTL8723D family support
-  DEPENDS+= +kmod-rtw88
+  DEPENDS+= +kmod-rtw88 +rtl8723de-firmware
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_8723d.ko
   AUTOLOAD:=$(call AutoProbe,rtw88_8723d)
   HIDDEN:=1
@@ -240,7 +240,7 @@ endef
 define KernelPackage/rtw88-8822bu
   $(call KernelPackage/mac80211/Default)
   TITLE:=Realtek RTL8822BU support
-  DEPENDS+= +kmod-rtw88-usb +rtl8822be-firmware +kmod-rtw88-8822b
+  DEPENDS+= +kmod-rtw88-usb +kmod-rtw88-8822b
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_8822bu.ko
   AUTOLOAD:=$(call AutoProbe,rtw88_8822bu)
 endef