diff --git a/feeds/ipq95xx/ath12k-wifi/Makefile b/feeds/ipq95xx/ath12k-wifi/Makefile index ce4127ef1..b1f2f0aed 100644 --- a/feeds/ipq95xx/ath12k-wifi/Makefile +++ b/feeds/ipq95xx/ath12k-wifi/Makefile @@ -33,9 +33,9 @@ define Package/ath12k-wifi-qcom-qcn9274/install $(INSTALL_DATA) ./board-2.bin.QCN9274 $(1)/lib/firmware/ath12k/QCN9274/hw1.0/board-2.bin endef -define Package/ath12k-wifi-cig-wf198 +define Package/ath12k-wifi-cig-wf189 $(call Package/ath12k-wifi-default) - TITLE:=board.bin for CIG WF198 + TITLE:=board.bin for CIG WF189 endef define Package/ath12k-wifi-sercomm-ap72tip @@ -43,12 +43,12 @@ $(call Package/ath12k-wifi-default) TITLE:=board.bin for Sercomm WIFI-7 endef -define Package/ath12k-wifi-cig-wf198/install +define Package/ath12k-wifi-cig-wf189/install $(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN92XX/hw1.0 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0 $(INSTALL_DATA) ./regdb.bin $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/ - $(INSTALL_DATA) ./board-cig-wf198.bin.qcn9224 $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/board.bin + $(INSTALL_DATA) ./board-cig-wf189.bin.qcn9224 $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/board.bin $(INSTALL_DATA) ./regdb.bin $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/ - $(INSTALL_DATA) ./board-cig-wf198.bin.ipq53xx $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board.bin + $(INSTALL_DATA) ./board-cig-wf189.bin.ipq53xx $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board.bin endef define Package/ath12k-wifi-sercomm-ap72tip/install @@ -60,5 +60,5 @@ define Package/ath12k-wifi-sercomm-ap72tip/install endef $(eval $(call BuildPackage,ath12k-wifi-qcom-qcn9274)) -$(eval $(call BuildPackage,ath12k-wifi-cig-wf198)) +$(eval $(call BuildPackage,ath12k-wifi-cig-wf189)) $(eval $(call BuildPackage,ath12k-wifi-sercomm-ap72tip)) diff --git a/feeds/ipq95xx/ath12k-wifi/board-cig-wf198.bin.ipq53xx b/feeds/ipq95xx/ath12k-wifi/board-cig-wf189.bin.ipq53xx similarity index 100% rename from feeds/ipq95xx/ath12k-wifi/board-cig-wf198.bin.ipq53xx rename to feeds/ipq95xx/ath12k-wifi/board-cig-wf189.bin.ipq53xx diff --git a/feeds/ipq95xx/ath12k-wifi/board-cig-wf198.bin.qcn9224 b/feeds/ipq95xx/ath12k-wifi/board-cig-wf189.bin.qcn9224 similarity index 100% rename from feeds/ipq95xx/ath12k-wifi/board-cig-wf198.bin.qcn9224 rename to feeds/ipq95xx/ath12k-wifi/board-cig-wf189.bin.qcn9224 diff --git a/feeds/ipq95xx/ipq53xx/base-files/etc/hotplug.d/firmware/10-ath12k-caldata b/feeds/ipq95xx/ipq53xx/base-files/etc/hotplug.d/firmware/10-ath12k-caldata index e703e1395..776ae9436 100755 --- a/feeds/ipq95xx/ipq53xx/base-files/etc/hotplug.d/firmware/10-ath12k-caldata +++ b/feeds/ipq95xx/ipq53xx/base-files/etc/hotplug.d/firmware/10-ath12k-caldata @@ -30,7 +30,7 @@ board=$(board_name) case "$FIRMWARE" in ath12k/IPQ5332/hw1.0/caldata.bin) case "$board" in - cig,wf198|\ + cig,wf189|\ sercomm,ap72tip) caldata_extract "0:ART" 0x1000 0x20000 ;; @@ -38,7 +38,7 @@ ath12k/IPQ5332/hw1.0/caldata.bin) ;; ath12k/QCN92XX/hw1.0/cal-pci-0001:01:00.0.bin) case "$board" in - cig,wf198) + cig,wf189) caldata_extract "0:ART" 0x58800 0x2d000 ;; sercomm,ap72tip) diff --git a/feeds/ipq95xx/ipq53xx/base-files/lib/upgrade/platform.sh b/feeds/ipq95xx/ipq53xx/base-files/lib/upgrade/platform.sh index 5b4a4b7c0..a8e8388b8 100644 --- a/feeds/ipq95xx/ipq53xx/base-files/lib/upgrade/platform.sh +++ b/feeds/ipq95xx/ipq53xx/base-files/lib/upgrade/platform.sh @@ -16,7 +16,7 @@ platform_do_upgrade() { board=$(board_name) case $board in - cig,wf198|\ + cig,wf189|\ sercomm,ap72tip|\ qcom,ipq9574-ap-al02-c4|\ qcom,ipq9574-ap-al02-c15) diff --git a/feeds/ipq95xx/ipq53xx/files/arch/arm64/boot/dts/qcom/ipq5332-cig-wf198.dts b/feeds/ipq95xx/ipq53xx/files/arch/arm64/boot/dts/qcom/ipq5332-cig-wf189.dts similarity index 99% rename from feeds/ipq95xx/ipq53xx/files/arch/arm64/boot/dts/qcom/ipq5332-cig-wf198.dts rename to feeds/ipq95xx/ipq53xx/files/arch/arm64/boot/dts/qcom/ipq5332-cig-wf189.dts index 8503de51b..f9c8e53de 100644 --- a/feeds/ipq95xx/ipq53xx/files/arch/arm64/boot/dts/qcom/ipq5332-cig-wf198.dts +++ b/feeds/ipq95xx/ipq53xx/files/arch/arm64/boot/dts/qcom/ipq5332-cig-wf189.dts @@ -19,8 +19,8 @@ / { #address-cells = <0x2>; #size-cells = <0x2>; - model = "CIG WF198"; - compatible = "cig,wf198", "qcom,ipq5332-ap-mi01.6", "qcom,ipq5332"; + model = "CIG WF189"; + compatible = "cig,wf189", "qcom,ipq5332-ap-mi01.6", "qcom,ipq5332"; interrupt-parent = <&intc>; aliases { diff --git a/feeds/ipq95xx/ipq53xx/image/ipq53xx.mk b/feeds/ipq95xx/ipq53xx/image/ipq53xx.mk index 9f275b02c..3d693c0c7 100644 --- a/feeds/ipq95xx/ipq53xx/image/ipq53xx.mk +++ b/feeds/ipq95xx/ipq53xx/image/ipq53xx.mk @@ -1,16 +1,16 @@ KERNEL_LOADADDR := 0x40080000 -define Device/cig_wf198 - DEVICE_TITLE := CIG WF198 - DEVICE_DTS := ipq5332-cig-wf198 +define Device/cig_wf189 + DEVICE_TITLE := CIG WF189 + DEVICE_DTS := ipq5332-cig-wf189 DEVICE_DTS_CONFIG := config@mi01.6 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-cig-wf198 ath12k-firmware-qcn92xx-split-phy ath12k-firmware-ipq53xx + DEVICE_PACKAGES := ath12k-wifi-cig-wf189 ath12k-firmware-qcn92xx-split-phy ath12k-firmware-ipq53xx endef -TARGET_DEVICES += cig_wf198 +TARGET_DEVICES += cig_wf189 define Device/sercomm_ap72tip DEVICE_TITLE := Sercomm AP72 TIP diff --git a/profiles/cig_wf198.yml b/profiles/cig_wf189.yml similarity index 62% rename from profiles/cig_wf198.yml rename to profiles/cig_wf189.yml index b9d20892d..430d87da3 100644 --- a/profiles/cig_wf198.yml +++ b/profiles/cig_wf189.yml @@ -1,9 +1,9 @@ --- -profile: cig_wf198 +profile: cig_wf189 target: ipq53xx subtarget: generic -description: Build image for the CIG WF198 -image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-cig_wf198-squashfs-sysupgrade.tar +description: Build image for the CIG WF189 +image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-cig_wf189-squashfs-sysupgrade.tar feeds: - name: ipq95xx path: ../../feeds/ipq95xx