diff --git a/package/starfive/starfive-firmware/Config.in b/package/starfive/starfive-firmware/Config.in
index b412f945..c005e427 100644
--- a/package/starfive/starfive-firmware/Config.in
+++ b/package/starfive/starfive-firmware/Config.in
@@ -36,6 +36,11 @@ config BR2_PACKAGE_STARFIVE_FIRMWARE_ECR6600U_USB_WIFI
 	help
 	  Firmware files for the ECR6600U USB Wifi module.
 
+config BR2_PACKAGE_STARFIVE_FIRMWARE_AIC8800_USB_WIFI
+	bool "AIC8800 and AIC8800DC USB Wifi"
+	help
+	  Firmware files for the AIC8800 and AIC8800DC USB Wifi module.
+
 endmenu # WiFi
 
 endif # BR2_PACKAGE_STARFIVE_FIRMWARE
diff --git a/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/aic_userconfig.txt b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/aic_userconfig.txt
new file mode 100755
index 00000000..3346009e
--- /dev/null
+++ b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/aic_userconfig.txt
@@ -0,0 +1,30 @@
+# AIC USERCONFIG 2021/0911/2127
+
+# txpwr_idx
+enable=1
+dsss=9
+ofdmlowrate_2g4=10
+ofdm64qam_2g4=10
+ofdm256qam_2g4=9
+ofdm1024qam_2g4=8
+ofdmlowrate_5g=10
+ofdm64qam_5g=9
+ofdm256qam_5g=9
+ofdm1024qam_5g=8
+
+# txpwr_ofst
+ofst_enable=0
+ofst_chan_1_4=0
+ofst_chan_5_9=0
+ofst_chan_10_13=0
+ofst_chan_36_64=0
+ofst_chan_100_120=0
+ofst_chan_122_140=0
+ofst_chan_142_165=0
+
+# xtal cap
+xtal_enable=0
+xtal_cap=24
+xtal_cap_fine=31
+
+# END
\ No newline at end of file
diff --git a/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fmacfw.bin b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fmacfw.bin
new file mode 100755
index 00000000..d8f781d3
Binary files /dev/null and b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fmacfw.bin differ
diff --git a/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fmacfw_m2d.bin b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fmacfw_m2d.bin
new file mode 100755
index 00000000..45c3aa79
Binary files /dev/null and b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fmacfw_m2d.bin differ
diff --git a/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fmacfw_no_msg_ep.bin b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fmacfw_no_msg_ep.bin
new file mode 100755
index 00000000..ff06a222
Binary files /dev/null and b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fmacfw_no_msg_ep.bin differ
diff --git a/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fmacfw_no_msg_ep_rf.bin b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fmacfw_no_msg_ep_rf.bin
new file mode 100755
index 00000000..e4b2a998
Binary files /dev/null and b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fmacfw_no_msg_ep_rf.bin differ
diff --git a/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fmacfw_rf.bin b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fmacfw_rf.bin
new file mode 100755
index 00000000..fdf58bb8
Binary files /dev/null and b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fmacfw_rf.bin differ
diff --git a/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fw_adid.bin b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fw_adid.bin
new file mode 100755
index 00000000..8a9b7135
Binary files /dev/null and b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fw_adid.bin differ
diff --git a/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fw_adid_rf.bin b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fw_adid_rf.bin
new file mode 100755
index 00000000..8a9b7135
Binary files /dev/null and b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fw_adid_rf.bin differ
diff --git a/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fw_adid_u03.bin b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fw_adid_u03.bin
new file mode 100755
index 00000000..6e66b7fc
Binary files /dev/null and b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fw_adid_u03.bin differ
diff --git a/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fw_ble_scan.bin b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fw_ble_scan.bin
new file mode 100755
index 00000000..6759d4ee
Binary files /dev/null and b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fw_ble_scan.bin differ
diff --git a/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fw_patch.bin b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fw_patch.bin
new file mode 100755
index 00000000..c94d7fbc
Binary files /dev/null and b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fw_patch.bin differ
diff --git a/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fw_patch_rf.bin b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fw_patch_rf.bin
new file mode 100755
index 00000000..2207a140
Binary files /dev/null and b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fw_patch_rf.bin differ
diff --git a/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fw_patch_table.bin b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fw_patch_table.bin
new file mode 100755
index 00000000..17d38f7f
Binary files /dev/null and b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fw_patch_table.bin differ
diff --git a/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fw_patch_table_u03.bin b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fw_patch_table_u03.bin
new file mode 100755
index 00000000..14b2c0f0
Binary files /dev/null and b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fw_patch_table_u03.bin differ
diff --git a/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fw_patch_u03.bin b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fw_patch_u03.bin
new file mode 100755
index 00000000..f25cc34d
Binary files /dev/null and b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/fw_patch_u03.bin differ
diff --git a/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/m2d_ota.bin b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/m2d_ota.bin
new file mode 100755
index 00000000..3f2d6c6f
Binary files /dev/null and b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800/m2d_ota.bin differ
diff --git a/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/aic_userconfig_8800dc.txt b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/aic_userconfig_8800dc.txt
new file mode 100755
index 00000000..5f4febb6
--- /dev/null
+++ b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/aic_userconfig_8800dc.txt
@@ -0,0 +1,60 @@
+# AIC USERCONFIG 2022/0803/1707
+
+# txpwr_lvl
+enable=1
+lvl_11b_11ag_1m_2g4=20
+lvl_11b_11ag_2m_2g4=20
+lvl_11b_11ag_5m5_2g4=20
+lvl_11b_11ag_11m_2g4=20
+lvl_11b_11ag_6m_2g4=20
+lvl_11b_11ag_9m_2g4=20
+lvl_11b_11ag_12m_2g4=20
+lvl_11b_11ag_18m_2g4=20
+lvl_11b_11ag_24m_2g4=18
+lvl_11b_11ag_36m_2g4=18
+lvl_11b_11ag_48m_2g4=16
+lvl_11b_11ag_54m_2g4=16
+lvl_11n_11ac_mcs0_2g4=20
+lvl_11n_11ac_mcs1_2g4=20
+lvl_11n_11ac_mcs2_2g4=20
+lvl_11n_11ac_mcs3_2g4=20
+lvl_11n_11ac_mcs4_2g4=18
+lvl_11n_11ac_mcs5_2g4=18
+lvl_11n_11ac_mcs6_2g4=16
+lvl_11n_11ac_mcs7_2g4=16
+lvl_11n_11ac_mcs8_2g4=16
+lvl_11n_11ac_mcs9_2g4=16
+lvl_11ax_mcs0_2g4=20
+lvl_11ax_mcs1_2g4=20
+lvl_11ax_mcs2_2g4=20
+lvl_11ax_mcs3_2g4=20
+lvl_11ax_mcs4_2g4=18
+lvl_11ax_mcs5_2g4=18
+lvl_11ax_mcs6_2g4=16
+lvl_11ax_mcs7_2g4=16
+lvl_11ax_mcs8_2g4=16
+lvl_11ax_mcs9_2g4=16
+lvl_11ax_mcs10_2g4=15
+lvl_11ax_mcs11_2g4=15
+
+# txpwr_loss
+loss_enable=0
+loss_value=2
+
+# txpwr_ofst
+ofst_enable=0
+ofst_chan_1_4=0
+ofst_chan_5_9=0
+ofst_chan_10_13=0
+ofst_chan_36_64=0
+ofst_chan_100_120=0
+ofst_chan_122_140=0
+ofst_chan_142_165=0
+
+# xtal cap
+xtal_enable=0
+xtal_cap=24
+xtal_cap_fine=31
+
+
+
diff --git a/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/fmacfw_patch_8800dc.bin b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/fmacfw_patch_8800dc.bin
new file mode 100755
index 00000000..f8613c06
Binary files /dev/null and b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/fmacfw_patch_8800dc.bin differ
diff --git a/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/fmacfw_patch_8800dc_ipc.bin b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/fmacfw_patch_8800dc_ipc.bin
new file mode 100755
index 00000000..1fcc247d
Binary files /dev/null and b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/fmacfw_patch_8800dc_ipc.bin differ
diff --git a/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/fmacfw_patch_8800dc_ipc_u02.bin b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/fmacfw_patch_8800dc_ipc_u02.bin
new file mode 100755
index 00000000..fb9cdecd
Binary files /dev/null and b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/fmacfw_patch_8800dc_ipc_u02.bin differ
diff --git a/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/fmacfw_patch_8800dc_u02.bin b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/fmacfw_patch_8800dc_u02.bin
new file mode 100755
index 00000000..96889045
Binary files /dev/null and b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/fmacfw_patch_8800dc_u02.bin differ
diff --git a/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/fmacfw_patch_tbl_8800dc_ipc_u02.bin b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/fmacfw_patch_tbl_8800dc_ipc_u02.bin
new file mode 100755
index 00000000..3dcf219d
Binary files /dev/null and b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/fmacfw_patch_tbl_8800dc_ipc_u02.bin differ
diff --git a/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/fmacfw_patch_tbl_8800dc_u02.bin b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/fmacfw_patch_tbl_8800dc_u02.bin
new file mode 100755
index 00000000..6707bbe9
Binary files /dev/null and b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/fmacfw_patch_tbl_8800dc_u02.bin differ
diff --git a/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/fmacfw_rf_patch_8800dc.bin b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/fmacfw_rf_patch_8800dc.bin
new file mode 100755
index 00000000..28ad12f8
Binary files /dev/null and b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/fmacfw_rf_patch_8800dc.bin differ
diff --git a/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/fw_patch_8800dc.bin b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/fw_patch_8800dc.bin
new file mode 100755
index 00000000..5d0bf999
Binary files /dev/null and b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/fw_patch_8800dc.bin differ
diff --git a/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/fw_patch_8800dc_u02.bin b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/fw_patch_8800dc_u02.bin
new file mode 100755
index 00000000..50ee7ced
Binary files /dev/null and b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/fw_patch_8800dc_u02.bin differ
diff --git a/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/fw_patch_table_8800dc.bin b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/fw_patch_table_8800dc.bin
new file mode 100755
index 00000000..c4d2fd59
Binary files /dev/null and b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/fw_patch_table_8800dc.bin differ
diff --git a/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/fw_patch_table_8800dc_u02.bin b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/fw_patch_table_8800dc_u02.bin
new file mode 100755
index 00000000..83932800
Binary files /dev/null and b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/fw_patch_table_8800dc_u02.bin differ
diff --git a/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/lmacfw_rf_8800dc.bin b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/lmacfw_rf_8800dc.bin
new file mode 100755
index 00000000..30b6299a
Binary files /dev/null and b/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC/lmacfw_rf_8800dc.bin differ
diff --git a/package/starfive/starfive-firmware/starfive-firmware.mk b/package/starfive/starfive-firmware/starfive-firmware.mk
index 24011b56..93a9ec87 100644
--- a/package/starfive/starfive-firmware/starfive-firmware.mk
+++ b/package/starfive/starfive-firmware/starfive-firmware.mk
@@ -14,15 +14,6 @@ define STARFIVE_FIRMWARE_INSTALL_AP6256_BLUETOOTH
 endef
 endif
 
-# RTL8852BU Bluetooth
-ifeq ($(BR2_PACKAGE_STARFIVE_FIRMWARE_RTL8852BU_BLUETOOTH),y)
-define STARFIVE_FIRMWARE_INSTALL_RTL8852BU
-	@echo "install RTL8852BU bluetooth firmware ..."
-	$(INSTALL) -m 0755 -D $(STARFIVE_FIRMWARE_PKGDIR)/rtl8852bu-bluetooth/rtl8852bu_config $(TARGET_DIR)/lib/firmware/
-	$(INSTALL) -m 0755 -D $(STARFIVE_FIRMWARE_PKGDIR)/rtl8852bu-bluetooth/rtl8852bu_fw $(TARGET_DIR)/lib/firmware/
-endef
-endif
-
 # AP6256 SDIO Wifi
 ifeq ($(BR2_PACKAGE_STARFIVE_FIRMWARE_AP6256_SDIO_WIFI),y)
 define STARFIVE_FIRMWARE_INSTALL_AP6256_SDIO_WIFI
@@ -32,6 +23,15 @@ define STARFIVE_FIRMWARE_INSTALL_AP6256_SDIO_WIFI
 endef
 endif
 
+# RTL8852BU Bluetooth
+ifeq ($(BR2_PACKAGE_STARFIVE_FIRMWARE_RTL8852BU_BLUETOOTH),y)
+define STARFIVE_FIRMWARE_INSTALL_RTL8852BU
+	@echo "install RTL8852BU bluetooth firmware ..."
+	$(INSTALL) -m 0755 -D $(STARFIVE_FIRMWARE_PKGDIR)/rtl8852bu-bluetooth/rtl8852bu_config $(TARGET_DIR)/lib/firmware/
+	$(INSTALL) -m 0755 -D $(STARFIVE_FIRMWARE_PKGDIR)/rtl8852bu-bluetooth/rtl8852bu_fw $(TARGET_DIR)/lib/firmware/
+endef
+endif
+
 # ECR6600U USB Wifi
 ifeq ($(BR2_PACKAGE_STARFIVE_FIRMWARE_ECR6600U_USB_WIFI),y)
 define STARFIVE_FIRMWARE_INSTALL_ECR6600U
@@ -40,12 +40,24 @@ define STARFIVE_FIRMWARE_INSTALL_ECR6600U
 endef
 endif
 
+# AIC8800 or AIC8800DC USB Wifi
+ifeq ($(BR2_PACKAGE_STARFIVE_FIRMWARE_AIC8800_USB_WIFI),y)
+define STARFIVE_FIRMWARE_INSTALL_AIC8800
+	@echo "install AIC8800 firmware ..."
+	$(INSTALL) -m 0755 -d $(TARGET_DIR)/lib/firmware/aic8800
+	$(INSTALL) -m 0644 -t $(TARGET_DIR)/lib/firmware/aic8800 $(STARFIVE_FIRMWARE_PKGDIR)/aic8800-usb-wifi/aic8800/*
+	$(INSTALL) -m 0755 -d $(TARGET_DIR)/lib/firmware/aic8800DC
+	$(INSTALL) -m 0644 -t $(TARGET_DIR)/lib/firmware/aic8800DC $(STARFIVE_FIRMWARE_PKGDIR)/aic8800-usb-wifi/aic8800DC/*
+endef
+endif
+
+# install more firmware here
 define STARFIVE_FIRMWARE_INSTALL_TARGET_CMDS
 	$(STARFIVE_FIRMWARE_INSTALL_AP6256_BLUETOOTH)
-	$(STARFIVE_FIRMWARE_INSTALL_RTL8852BU)
 	$(STARFIVE_FIRMWARE_INSTALL_AP6256_SDIO_WIFI)
+	$(STARFIVE_FIRMWARE_INSTALL_RTL8852BU)
 	$(STARFIVE_FIRMWARE_INSTALL_ECR6600U)
-
+	$(STARFIVE_FIRMWARE_INSTALL_AIC8800)
 endef
 
 $(eval $(generic-package))