ath12k-wifi: use SDK BDF for rap7110c_341x

Use the SDK BDF for now until the ODM provides a fixed version.

Signed-off-by: John Crispin <john@phrozen.org>

feeds/qca-wifi-7/ath12k-firmware/Makefile

@@ -33,6 +33,15 @@ define Package/ath12k-firmware-ipq5332/description
 Standard ath12k firmware for IPQ5332 from QCA
 endef
 
+define Package/ath12k-firmware-ipq5332-peb
+$(Package/ath12k-firmware-default)
+  TITLE:=ath12k firmware for IPQ5332 + Pebble devices
+endef
+
+define Package/ath12k-firmware-ipq5332-peb/description
+Standard ath12k firmware for IPQ5332 + Pebble from QCA
+endef
+
 define Build/Compile
 
 endef
@@ -49,5 +58,12 @@ define Package/ath12k-firmware-ipq5332/install
 		$(1)/lib/firmware/IPQ5332/
 endef
 
+define Package/ath12k-firmware-ipq5332-peb/install
+	$(INSTALL_DIR) $(1)/lib/firmware/IPQ5332/
+	$(INSTALL_DATA) ./files/IPQ5332_peb/* \
+		$(1)/lib/firmware/IPQ5332/
+endef
+
 $(eval $(call BuildPackage,ath12k-firmware-qcn92xx))
 $(eval $(call BuildPackage,ath12k-firmware-ipq5332))
+$(eval $(call BuildPackage,ath12k-firmware-ipq5332-peb))

feeds/qca-wifi-7/ath12k-wifi/Makefile

@@ -43,6 +43,11 @@ $(call Package/ath12k-wifi-default)
     TITLE:=board-2.bin for RAP7710c_341x
 endef
 
+define Package/ath12k-wifi-sonicfi-rap750w-311a
+$(call Package/ath12k-wifi-default)
+    TITLE:=board-2.bin for RAP750W_311a
+endef
+
 define Package/ath12k-wifi-edgecore-eap105/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
@@ -57,5 +62,11 @@ define Package/ath12k-wifi-sonicfi-rap7110c-341x/install
 	$(INSTALL_DATA) ./board-2.bin.rap7110c_341x.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
 endef
 
+define Package/ath12k-wifi-sonicfi-rap750w-311a/install
+	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
+	$(INSTALL_DATA) ./ board-2.bin.rap750w_311a.IPQ5332$(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
+endef
+
 $(eval $(call BuildPackage,ath12k-wifi-edgecore-eap105))
 $(eval $(call BuildPackage,ath12k-wifi-sonicfi-rap7110c-341x))
+$(eval $(call BuildPackage,ath12k-wifi-sonicfi-rap750w-311a))

feeds/qca-wifi-7/ipq53xx/base-files/etc/board.d/02_network

@@ -14,7 +14,8 @@ ipq53xx_setup_interfaces()
 		;;
 	cig,wf189|\
 	edgecore,eap105|\
-	sercomm,ap72tip)
+	sercomm,ap72tip|\
+	sonicfi,rap750w-311a)
 		ucidef_set_interfaces_lan_wan "eth1" "eth0"
 		;;
 	sonicfi,rap7110c-341x)

feeds/qca-wifi-7/ipq53xx/base-files/etc/hotplug.d/firmware/10-ath12k-caldata

@@ -23,17 +23,6 @@ caldata_extract() {
                 caldata_die "failed to extract calibration data from $mtd"
 }
 
-ath12k_generate_macs_eap105() {
-	touch /lib/firmware/ath12k-macs
-	eth=$(cat /sys/class/net/eth0/address)
-	mac1=$(macaddr_add $eth 2)
-	mac2=$(macaddr_add $eth 3)
-	mac3=$(macaddr_add $eth 4)
-	echo -ne \\x${mac1//:/\\x} >> /lib/firmware/ath12k-macs
-	echo -ne \\x${mac2//:/\\x} >> /lib/firmware/ath12k-macs
-	echo -ne \\x${mac3//:/\\x} >> /lib/firmware/ath12k-macs
-}
-
 board=$(board_name)
 case "$FIRMWARE" in
 ath12k/IPQ5332/hw1.0/caldata.bin)
@@ -53,7 +42,6 @@ ath12k/QCN92XX/hw1.0/cal-pci-0001:01:00.0.bin)
 	case "$board" in
 	cig,wf189|\
 	edgecore,eap105|\
-	sonicfi,rap750w-311a|\
 	sercomm,ap72tip)
 		caldata_extract "0:ART" 0x58800 0x2d000
 		;;
@@ -62,13 +50,6 @@ ath12k/QCN92XX/hw1.0/cal-pci-0001:01:00.0.bin)
 		;;
 	esac
 	;;
-ath12k-macs)
-	case "$board" in
-	edgecore,eap105)
-		ath12k_generate_macs_eap105
-		;;
-	esac
-	;;
 *)
 	exit 1
 	;;

feeds/qca-wifi-7/ipq53xx/image/ipq53xx.mk

@@ -50,3 +50,17 @@ define Device/sonicfi_rap7110c_341x
   DEVICE_PACKAGES := ath12k-wifi-sonicfi-rap7110c-341x ath12k-firmware-qcn92xx ath12k-firmware-ipq5332
 endef
 TARGET_DEVICES += sonicfi_rap7110c_341x
+
+define Device/sonicfi_rap750w_311a
+  DEVICE_TITLE := SONICFI RAP750W-311A
+  DEVICE_DTS := ipq5332-rap750w-311a
+  DEVICE_DTS_DIR := ../dts
+  DEVICE_DTS_CONFIG := config@mi01.3-c2
+  SUPPORTED_DEVICES := sonicfi,rap7110c-341x
+  IMAGES := sysupgrade.tar nand-factory.bin nand-factory.ubi
+  IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
+  IMAGE/nand-factory.bin := append-ubi | qsdk-ipq-factory-nand
+  IMAGE/nand-factory.ubi := append-ubi
+  DEVICE_PACKAGES := ath12k-wifi-sonicfi-rap750w-311a ath12k-firmware-ipq5332-peb
+endef
+TARGET_DEVICES += sonicfi_rap750w_311a