Merge main into bluetooth: apply KDIR fix and remove aic_btusb

- Apply PR #34 KDIR fix to dkms.conf for correct kernel header usage
- Remove remaining aic_btusb references from Makefile (standard btusb is used)
This commit is contained in:
Shen Mintao
2026-03-23 22:17:53 +08:00
-6
View File
@@ -1,16 +1,13 @@
CONFIG_AIC_LOADFW_SUPPORT := m CONFIG_AIC_LOADFW_SUPPORT := m
CONFIG_AIC8800_WLAN_SUPPORT := m CONFIG_AIC8800_WLAN_SUPPORT := m
CONFIG_AIC8800_BTUSB_SUPPORT := m
obj-$(CONFIG_AIC_LOADFW_SUPPORT) += aic_load_fw/ obj-$(CONFIG_AIC_LOADFW_SUPPORT) += aic_load_fw/
obj-$(CONFIG_AIC8800_WLAN_SUPPORT) += aic8800_fdrv/ obj-$(CONFIG_AIC8800_WLAN_SUPPORT) += aic8800_fdrv/
obj-$(CONFIG_AIC8800_BTUSB_SUPPORT) += aic_btusb/
########## config option ########## ########## config option ##########
export CONFIG_USE_FW_REQUEST = n export CONFIG_USE_FW_REQUEST = n
export CONFIG_PREALLOC_RX_SKB = y export CONFIG_PREALLOC_RX_SKB = y
export CONFIG_PREALLOC_TXQ = y export CONFIG_PREALLOC_TXQ = y
export CONFIG_AIC8800_BTUSB_SUPPORT
################################### ###################################
########## platform support list ########## ########## platform support list ##########
@@ -70,17 +67,14 @@ install:
mkdir -p $(MODDESTDIR) mkdir -p $(MODDESTDIR)
install -p -m 644 aic_load_fw/aic_load_fw.ko $(MODDESTDIR)/ install -p -m 644 aic_load_fw/aic_load_fw.ko $(MODDESTDIR)/
install -p -m 644 aic8800_fdrv/aic8800_fdrv.ko $(MODDESTDIR)/ install -p -m 644 aic8800_fdrv/aic8800_fdrv.ko $(MODDESTDIR)/
install -p -m 644 aic_btusb/aic_btusb.ko $(MODDESTDIR)/
/sbin/depmod -a ${KVER} /sbin/depmod -a ${KVER}
uninstall: uninstall:
rm -rfv $(MODDESTDIR)/aic_load_fw.ko rm -rfv $(MODDESTDIR)/aic_load_fw.ko
rm -rfv $(MODDESTDIR)/aic8800_fdrv.ko rm -rfv $(MODDESTDIR)/aic8800_fdrv.ko
rm -rfv $(MODDESTDIR)/aic_btusb.ko
/sbin/depmod -a ${KVER} /sbin/depmod -a ${KVER}
clean: clean:
cd aic_load_fw/;make clean;cd .. cd aic_load_fw/;make clean;cd ..
cd aic8800_fdrv/;make clean;cd .. cd aic8800_fdrv/;make clean;cd ..
cd aic_btusb/;make clean;cd ..
rm -rf modules.order Module.symvers .modules.order.cmd .Module.symvers.cmd .tmp_versions/ rm -rf modules.order Module.symvers .modules.order.cmd .Module.symvers.cmd .tmp_versions/