diff --git a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/m3_fw.b00 b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/m3_fw.b00
index 95bb119a2..5b4dc0728 100755
Binary files a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/m3_fw.b00 and b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/m3_fw.b00 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/m3_fw.b01 b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/m3_fw.b01
index 81ccb5774..88dd1e43c 100755
Binary files a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/m3_fw.b01 and b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/m3_fw.b01 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/m3_fw.flist b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/m3_fw.flist
index 428a089e6..94807ccc4 100755
--- a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/m3_fw.flist
+++ b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/m3_fw.flist
@@ -1,3 +1,3 @@
-build/ms/bin/5018.wlanfw2.map_spruce_eval/PIL_IMAGES/m3_fw.b00
-build/ms/bin/5018.wlanfw2.map_spruce_eval/PIL_IMAGES/m3_fw.b01
-build/ms/bin/5018.wlanfw2.map_spruce_eval/PIL_IMAGES/m3_fw.b02
+build/ms/bin/5018.wlanfw2.map_spr_spr_eval_cs/PIL_IMAGES/m3_fw.b00
+build/ms/bin/5018.wlanfw2.map_spr_spr_eval_cs/PIL_IMAGES/m3_fw.b01
+build/ms/bin/5018.wlanfw2.map_spr_spr_eval_cs/PIL_IMAGES/m3_fw.b02
diff --git a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/m3_fw.mdt b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/m3_fw.mdt
index 475e10b9d..f3b983417 100755
Binary files a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/m3_fw.mdt and b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/m3_fw.mdt differ
diff --git a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b00 b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b00
index c36ea9b34..f587d9e6f 100755
Binary files a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b00 and b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b00 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b01 b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b01
index 0edba79dc..b0c100f5a 100755
Binary files a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b01 and b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b01 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b02 b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b02
index f7a6f04d8..c90467788 100755
Binary files a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b02 and b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b02 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b03 b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b03
index e2edd1141..23f4cac2f 100755
Binary files a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b03 and b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b03 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b04 b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b04
index 944950aa0..9c4eeafa8 100755
Binary files a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b04 and b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b04 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b05 b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b05
index a6dee4ea4..8231387ad 100755
Binary files a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b05 and b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b05 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b07 b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b07
index 9f3f29723..29349317f 100755
Binary files a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b07 and b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b07 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b08 b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b08
index 143ed5b56..96e2e3f76 100755
Binary files a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b08 and b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b08 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b09 b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b09
index 15c52e2a0..67ddba142 100755
Binary files a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b09 and b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b09 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b10 b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b10
index a33cdba01..04e4e4ff0 100755
Binary files a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b10 and b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b10 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b11 b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b11
index e1ce7eaa6..3e44e91a4 100755
Binary files a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b11 and b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b11 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b13 b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b13
index 8a4ba9a9c..a91a70f56 100755
Binary files a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b13 and b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b13 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b15 b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b15
index 6a72dc388..2e8e4231c 100755
Binary files a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b15 and b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b15 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b16 b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b16
index e376c8b15..e65bc21f0 100755
Binary files a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b16 and b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b16 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b17 b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b17
index 530a51ee9..d45b14b62 100755
Binary files a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b17 and b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b17 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b18 b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b18
index 52ce9bae0..717f6bb65 100755
Binary files a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b18 and b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b18 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b20 b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b20
index 4563653d1..843e611ca 100755
Binary files a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b20 and b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.b20 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.flist b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.flist
index faae67dcc..288922c09 100755
--- a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.flist
+++ b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.flist
@@ -1,19 +1,23 @@
-build/ms/bin/5018.wlanfw2.map_spruce_eval/PIL_IMAGES/q6_fw.b00
-build/ms/bin/5018.wlanfw2.map_spruce_eval/PIL_IMAGES/q6_fw.b01
-build/ms/bin/5018.wlanfw2.map_spruce_eval/PIL_IMAGES/q6_fw.b02
-build/ms/bin/5018.wlanfw2.map_spruce_eval/PIL_IMAGES/q6_fw.b03
-build/ms/bin/5018.wlanfw2.map_spruce_eval/PIL_IMAGES/q6_fw.b04
-build/ms/bin/5018.wlanfw2.map_spruce_eval/PIL_IMAGES/q6_fw.b05
-build/ms/bin/5018.wlanfw2.map_spruce_eval/PIL_IMAGES/q6_fw.b07
-build/ms/bin/5018.wlanfw2.map_spruce_eval/PIL_IMAGES/q6_fw.b08
-build/ms/bin/5018.wlanfw2.map_spruce_eval/PIL_IMAGES/q6_fw.b09
-build/ms/bin/5018.wlanfw2.map_spruce_eval/PIL_IMAGES/q6_fw.b10
-build/ms/bin/5018.wlanfw2.map_spruce_eval/PIL_IMAGES/q6_fw.b11
-build/ms/bin/5018.wlanfw2.map_spruce_eval/PIL_IMAGES/q6_fw.b13
-build/ms/bin/5018.wlanfw2.map_spruce_eval/PIL_IMAGES/q6_fw.b14
-build/ms/bin/5018.wlanfw2.map_spruce_eval/PIL_IMAGES/q6_fw.b15
-build/ms/bin/5018.wlanfw2.map_spruce_eval/PIL_IMAGES/q6_fw.b16
-build/ms/bin/5018.wlanfw2.map_spruce_eval/PIL_IMAGES/q6_fw.b17
-build/ms/bin/5018.wlanfw2.map_spruce_eval/PIL_IMAGES/q6_fw.b18
-build/ms/bin/5018.wlanfw2.map_spruce_eval/PIL_IMAGES/q6_fw.b20
-build/ms/bin/5018.wlanfw2.map_spruce_eval/PIL_IMAGES/q6_fw.b21
+build/ms/bin/5018.wlanfw2.map_spr_spr_eval_cs/PIL_IMAGES/q6_fw.b00
+build/ms/bin/5018.wlanfw2.map_spr_spr_eval_cs/PIL_IMAGES/q6_fw.b01
+build/ms/bin/5018.wlanfw2.map_spr_spr_eval_cs/PIL_IMAGES/q6_fw.b02
+build/ms/bin/5018.wlanfw2.map_spr_spr_eval_cs/PIL_IMAGES/q6_fw.b03
+build/ms/bin/5018.wlanfw2.map_spr_spr_eval_cs/PIL_IMAGES/q6_fw.b04
+build/ms/bin/5018.wlanfw2.map_spr_spr_eval_cs/PIL_IMAGES/q6_fw.b05
+build/ms/bin/5018.wlanfw2.map_spr_spr_eval_cs/PIL_IMAGES/q6_fw.b07
+build/ms/bin/5018.wlanfw2.map_spr_spr_eval_cs/PIL_IMAGES/q6_fw.b08
+build/ms/bin/5018.wlanfw2.map_spr_spr_eval_cs/PIL_IMAGES/q6_fw.b09
+build/ms/bin/5018.wlanfw2.map_spr_spr_eval_cs/PIL_IMAGES/q6_fw.b10
+build/ms/bin/5018.wlanfw2.map_spr_spr_eval_cs/PIL_IMAGES/q6_fw.b11
+build/ms/bin/5018.wlanfw2.map_spr_spr_eval_cs/PIL_IMAGES/q6_fw.b13
+build/ms/bin/5018.wlanfw2.map_spr_spr_eval_cs/PIL_IMAGES/q6_fw.b14
+build/ms/bin/5018.wlanfw2.map_spr_spr_eval_cs/PIL_IMAGES/q6_fw.b15
+build/ms/bin/5018.wlanfw2.map_spr_spr_eval_cs/PIL_IMAGES/q6_fw.b16
+build/ms/bin/5018.wlanfw2.map_spr_spr_eval_cs/PIL_IMAGES/q6_fw.b17
+build/ms/bin/5018.wlanfw2.map_spr_spr_eval_cs/PIL_IMAGES/q6_fw.b18
+build/ms/bin/5018.wlanfw2.map_spr_spr_eval_cs/PIL_IMAGES/q6_fw.b20
+build/ms/bin/5018.wlanfw2.map_spr_spr_eval_cs/PIL_IMAGES/q6_fw.b21
+build/ms/bin/5018.wlanfw2.map_spr_spr_eval_cs/PIL_IMAGES/q6_fw.b22
+build/ms/bin/5018.wlanfw2.map_spr_spr_eval_cs/PIL_IMAGES/q6_fw.b23
+build/ms/bin/5018.wlanfw2.map_spr_spr_eval_cs/PIL_IMAGES/q6_fw.b25
+build/ms/bin/5018.wlanfw2.map_spr_spr_eval_cs/PIL_IMAGES/q6_fw.b26
diff --git a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.mdt b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.mdt
index 965467890..0e2c2e88c 100755
Binary files a/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.mdt and b/feeds/ipq807x_v5.4/ath11k-firmware/files/IPQ5018_spruce/q6_fw.mdt differ
diff --git a/feeds/ipq807x_v5.4/ath11k-firmware/files/QCN6122/m3_fw.b00 b/feeds/ipq807x_v5.4/ath11k-firmware/files/QCN6122/m3_fw.b00
index c8a07bedc..6b45772e9 100755
Binary files a/feeds/ipq807x_v5.4/ath11k-firmware/files/QCN6122/m3_fw.b00 and b/feeds/ipq807x_v5.4/ath11k-firmware/files/QCN6122/m3_fw.b00 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-firmware/files/QCN6122/m3_fw.b01 b/feeds/ipq807x_v5.4/ath11k-firmware/files/QCN6122/m3_fw.b01
index d24d6d38b..c5be34b64 100755
Binary files a/feeds/ipq807x_v5.4/ath11k-firmware/files/QCN6122/m3_fw.b01 and b/feeds/ipq807x_v5.4/ath11k-firmware/files/QCN6122/m3_fw.b01 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-firmware/files/QCN6122/m3_fw.flist b/feeds/ipq807x_v5.4/ath11k-firmware/files/QCN6122/m3_fw.flist
index b4b395ba4..be3c989af 100755
--- a/feeds/ipq807x_v5.4/ath11k-firmware/files/QCN6122/m3_fw.flist
+++ b/feeds/ipq807x_v5.4/ath11k-firmware/files/QCN6122/m3_fw.flist
@@ -1,3 +1,3 @@
-build/ms/bin/5018.wlanfw2.map_spruce_eval/PIL_IMAGES/qcn6122/m3_fw.b00
-build/ms/bin/5018.wlanfw2.map_spruce_eval/PIL_IMAGES/qcn6122/m3_fw.b01
-build/ms/bin/5018.wlanfw2.map_spruce_eval/PIL_IMAGES/qcn6122/m3_fw.b02
+build/ms/bin/5018.wlanfw2.map_spr_spr_eval_cs/PIL_IMAGES/qcn6122/m3_fw.b00
+build/ms/bin/5018.wlanfw2.map_spr_spr_eval_cs/PIL_IMAGES/qcn6122/m3_fw.b01
+build/ms/bin/5018.wlanfw2.map_spr_spr_eval_cs/PIL_IMAGES/qcn6122/m3_fw.b02
diff --git a/feeds/ipq807x_v5.4/ath11k-firmware/files/QCN6122/m3_fw.mdt b/feeds/ipq807x_v5.4/ath11k-firmware/files/QCN6122/m3_fw.mdt
index 55531d0b8..359d37080 100755
Binary files a/feeds/ipq807x_v5.4/ath11k-firmware/files/QCN6122/m3_fw.mdt and b/feeds/ipq807x_v5.4/ath11k-firmware/files/QCN6122/m3_fw.mdt differ
diff --git a/feeds/ipq807x_v5.4/ath11k-wifi/Makefile b/feeds/ipq807x_v5.4/ath11k-wifi/Makefile
index ed4f9701a..d10c967c9 100644
--- a/feeds/ipq807x_v5.4/ath11k-wifi/Makefile
+++ b/feeds/ipq807x_v5.4/ath11k-wifi/Makefile
@@ -127,6 +127,11 @@ $(call Package/ath11k-wifi-default)
     TITLE:=meshpp-s618 bdf
 endef
 
+define Package/ath11k-wifi-edgecore-oap101
+$(call Package/ath11k-wifi-default)
+    TITLE:=edgecore oap101 bdf
+endef
+
 define ath11k-wifi-install-one-to
   $(INSTALL_DIR)  $(2)/lib/firmware/$(3)/
   $(INSTALL_DATA) $(1) $(2)/lib/firmware/$(3)/board.bin
@@ -248,6 +253,13 @@ define Package/ath11k-wifi-hfcl-ion4xi/install
 	$(INSTALL_DATA) ./board-hfcl-ion4xi.bin.IPQ6018 $(1)/lib/firmware/ath11k/IPQ6018/hw1.0/board-2.bin
 endef
 
+define Package/ath11k-wifi-edgecore-oap101/install
+	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/
+	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/qcn6122/hw1.0/
+	$(INSTALL_DATA) ./board-edgecore-oap101.bin.IPQ5018 $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/board.bin
+	$(INSTALL_DATA) ./board-2-edgecore-oap101.bin.QCN6122 $(1)/lib/firmware/ath11k/qcn6122/hw1.0/board-2.bin
+endef
+
 $(eval $(call generate-ath11k-wifi-package,cig-wf188,Cigtech WF188))
 $(eval $(call generate-ath11k-wifi-package,cig-wf188n,Cigtech WF188n))
 $(eval $(call generate-ath11k-wifi-package,cig-wf660a,Cigtech WF660a))
@@ -283,3 +295,4 @@ $(eval $(call BuildPackage,ath11k-wifi-cig-wf196_6g-ca))
 $(eval $(call BuildPackage,ath11k-wifi-cig-wf196_6g-us))
 $(eval $(call BuildPackage,ath11k-wifi-motorola-q14))
 $(eval $(call BuildPackage,ath11k-wifi-hfcl-ion4xi))
+$(eval $(call BuildPackage,ath11k-wifi-edgecore-oap101))
diff --git a/feeds/ipq807x_v5.4/ath11k-wifi/board-2-edgecore-oap101.bin.QCN6122 b/feeds/ipq807x_v5.4/ath11k-wifi/board-2-edgecore-oap101.bin.QCN6122
new file mode 100644
index 000000000..f1048f854
Binary files /dev/null and b/feeds/ipq807x_v5.4/ath11k-wifi/board-2-edgecore-oap101.bin.QCN6122 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-wifi/board-edgecore-oap101.bin.IPQ5018 b/feeds/ipq807x_v5.4/ath11k-wifi/board-edgecore-oap101.bin.IPQ5018
new file mode 100644
index 000000000..c6c9f15ff
Binary files /dev/null and b/feeds/ipq807x_v5.4/ath11k-wifi/board-edgecore-oap101.bin.IPQ5018 differ