ipq807x: add CIG WF196 BDF

split the image into 2 SKUs for CA/US.

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

.github/workflows/build-dev.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: ['actiontec_web7200', 'cig_wf188n', 'cig_wf194c4', 'cig_wf196', 'cig_wf610d', 'cig_wf808', 'cybertan_eww622-a1', 'edgecore_eap101', 'edgecore_eap102', 'edgecore_eap104', 'liteon_wpx8324', 'edgecore_ecs4100-12ph', 'edgecore_ecw5211', 'edgecore_ecw5410', 'edgecore_oap100', 'edgecore_ssw2ac2600', 'edgecore_spw2ac1200', 'edgecore_spw2ac1200-lan-poe', 'hfcl_ion4', 'hfcl_ion4xe', 'hfcl_ion4xi', 'hfcl_ion4x', 'hfcl_ion4x_2', 'indio_um-305ac', 'indio_um-305ax', 'indio_um-325ac', 'indio_um-510ac-v3', 'indio_um-550ac', 'indio_um-310ax-v1', 'indio_um-510axp-v1', 'indio_um-510axm-v1', 'linksys_ea6350-v4', 'linksys_e8450-ubi', 'linksys_ea8300', 'meshpp_s618_cp03', 'meshpp_s618_cp01', 'udaya_a5-id2', 'wallys_dr40x9', 'wallys_dr6018', 'wallys_dr6018_v4', 'x64_vm', 'yuncore_ax840', 'yuncore_fap640', 'yuncore_fap650' ]
+        target: ['actiontec_web7200', 'cig_wf188n', 'cig_wf194c4', 'cig_wf196-us', 'cig_wf196-ca', 'cig_wf610d', 'cig_wf808', 'cybertan_eww622-a1', 'edgecore_eap101', 'edgecore_eap102', 'edgecore_eap104', 'liteon_wpx8324', 'edgecore_ecs4100-12ph', 'edgecore_ecw5211', 'edgecore_ecw5410', 'edgecore_oap100', 'edgecore_ssw2ac2600', 'edgecore_spw2ac1200', 'edgecore_spw2ac1200-lan-poe', 'hfcl_ion4', 'hfcl_ion4xe', 'hfcl_ion4xi', 'hfcl_ion4x', 'hfcl_ion4x_2', 'indio_um-305ac', 'indio_um-305ax', 'indio_um-325ac', 'indio_um-510ac-v3', 'indio_um-550ac', 'indio_um-310ax-v1', 'indio_um-510axp-v1', 'indio_um-510axm-v1', 'linksys_ea6350-v4', 'linksys_e8450-ubi', 'linksys_ea8300', 'meshpp_s618_cp03', 'meshpp_s618_cp01', 'udaya_a5-id2', 'wallys_dr40x9', 'wallys_dr6018', 'wallys_dr6018_v4', 'x64_vm', 'yuncore_ax840', 'yuncore_fap640', 'yuncore_fap650' ]
 
     steps:
     - uses: actions/checkout@v3

feeds/ipq807x/ipq807x/image/ipq807x.mk

@@ -36,18 +36,31 @@ define Device/cig_wf194c4
 endef
 TARGET_DEVICES += cig_wf194c4
 
-define Device/cig_wf196
-  DEVICE_TITLE := CIG WF196
+define Device/cig_wf196_us
+  DEVICE_TITLE := CIG WF196 (US)
   DEVICE_DTS := qcom-ipq807x-wf196
   DEVICE_DTS_CONFIG=config@hk14
   SUPPORTED_DEVICES := cig,wf196
   BLOCKSIZE := 256k
   PAGESIZE := 4096
-  DEVICE_PACKAGES := ath11k-wifi-cig-wf196 aq-fw-download uboot-envtools kmod-usb3 kmod-usb2 \
-	ath11k-firmware-qcn9000 ath11k-wifi-cig-wf196_6g \
+  DEVICE_PACKAGES := ath11k-wifi-cig-wf196-us aq-fw-download uboot-envtools kmod-usb3 kmod-usb2 \
+	ath11k-firmware-qcn9000 ath11k-wifi-cig-wf196_6g-us \
 	zephyr-v3.3.x-hci_uart-cig_wf196_nrf52833
 endef
-TARGET_DEVICES += cig_wf196
+TARGET_DEVICES += cig_wf196_us
+
+define Device/cig_wf196_ca
+  DEVICE_TITLE := CIG WF196 (CA)
+  DEVICE_DTS := qcom-ipq807x-wf196
+  DEVICE_DTS_CONFIG=config@hk14
+  SUPPORTED_DEVICES := cig,wf196
+  BLOCKSIZE := 256k
+  PAGESIZE := 4096
+  DEVICE_PACKAGES := ath11k-wifi-cig-wf196-ca aq-fw-download uboot-envtools kmod-usb3 kmod-usb2 \
+	ath11k-firmware-qcn9000 ath11k-wifi-cig-wf196_6g-ca \
+	zephyr-v3.3.x-hci_uart-cig_wf196_nrf52833
+endef
+TARGET_DEVICES += cig_wf196_ca
 
 define Device/edgecore_eap102
   DEVICE_TITLE := Edgecore EAP102

feeds/ucentral/ucentral-schema/files/etc/board.d/04-regdm

@@ -12,10 +12,12 @@ cig,wf194c4|\
 cig,wf194c|\
 cig,wf610d|\
 cig,wf808|\
-cig,wf660a|\
-cig,wf196)
+cig,wf660a)
 	ucidef_set_wifi_country 'US'
 	;;
+cig,wf196)
+	ucidef_set_wifi_country "$(cat /lib/firmware/country)"
+	;;
 esac
 
 board_config_flush

feeds/wifi-ax/ath11k-wifi/Makefile

@@ -29,7 +29,8 @@ ALLWIFIBOARDS:= \
 	cig-wf660a \
 	cig-wf194c \
 	cig-wf194c4 \
-	cig-wf196 \
+	cig-wf196-ca \
+	cig-wf196-us \
 	cybertan-eww622-a1 \
 	edgecore-eap101 \
 	gl-ax1800 \
@@ -86,9 +87,14 @@ $(call Package/ath11k-wifi-default)
     TITLE:=board-2.bin for QCOM IPQ6122 eval kits
 endef
 
-define Package/ath11k-wifi-cig-wf196_6g
+define Package/ath11k-wifi-cig-wf196_6g-ca
 $(call Package/ath11k-wifi-default)
-    TITLE:=cig-wf196 6G bdf
+    TITLE:=cig-wf196 6G bdf CA
+endef
+
+define Package/ath11k-wifi-cig-wf196_6g-us
+$(call Package/ath11k-wifi-default)
+    TITLE:=cig-wf196 6G bdf US
 endef
 
 define Package/ath11k-wifi-gl-ax1800
@@ -198,9 +204,16 @@ define Package/ath11k-wifi-qcom-qcn9000/install
 	$(INSTALL_DATA) ./board-2.bin.QCN9000 $(1)/lib/firmware/ath11k/QCN9074/hw1.0/board-2.bin
 endef
 
-define Package/ath11k-wifi-cig-wf196_6g/install
+define Package/ath11k-wifi-cig-wf196_6g-ca/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/QCN9074/hw1.0/
-	$(INSTALL_DATA) ./board-cig-wf196_6g.bin.QCN9074 $(1)/lib/firmware/ath11k/QCN9074/hw1.0/board.bin
+	$(INSTALL_DATA) ./board-cig-wf196_6g-ca.bin.QCN9074 $(1)/lib/firmware/ath11k/QCN9074/hw1.0/board.bin
+	echo -n 'CA' > $(1)/lib/firmware/country
+endef
+
+define Package/ath11k-wifi-cig-wf196_6g-us/install
+	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/QCN9074/hw1.0/
+	$(INSTALL_DATA) ./board-cig-wf196_6g-us.bin.QCN9074 $(1)/lib/firmware/ath11k/QCN9074/hw1.0/board.bin
+	echo -n 'US' > $(1)/lib/firmware/country
 endef
 
 define Package/ath11k-wifi-gl-ax1800/install
@@ -240,7 +253,8 @@ $(eval $(call generate-ath11k-wifi-package,cig-wf188n,Cigtech WF188n))
 $(eval $(call generate-ath11k-wifi-package,cig-wf660a,Cigtech WF660a))
 $(eval $(call generate-ath11k-wifi-package,cig-wf194c,Cigtech WF194c))
 $(eval $(call generate-ath11k-wifi-package,cig-wf194c4,Cigtech WF194c4))
-$(eval $(call generate-ath11k-wifi-package,cig-wf196,Cigtech WF196))
+$(eval $(call generate-ath11k-wifi-package,cig-wf196-ca,Cigtech WF196 CA))
+$(eval $(call generate-ath11k-wifi-package,cig-wf196-us,Cigtech WF196 US))
 $(eval $(call generate-ath11k-wifi-package,cybertan-eww622-a1,CyberTan EWW622 A1))
 $(eval $(call generate-ath11k-wifi-package,sercomm-wallaby,Sercomm Kiwi))
 $(eval $(call generate-ath11k-wifi-package,wallys-dr6018,Wallys DR6018))
@@ -265,6 +279,7 @@ $(eval $(call BuildPackage,ath11k-wifi-qcom-ipq6122))
 $(eval $(call BuildPackage,ath11k-wifi-qcom-ipq8074))
 $(eval $(call BuildPackage,ath11k-wifi-qcom-ipq6018))
 $(eval $(call BuildPackage,ath11k-wifi-qcom-qcn9000))
-$(eval $(call BuildPackage,ath11k-wifi-cig-wf196_6g))
+$(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))

profiles/cig_wf196-ca.yml

@@ -1,9 +1,9 @@
 ---
-profile: cig_wf196
+profile: cig_wf196_ca
 target: ipq807x
 subtarget: ipq807x
-description: Build image for the CIG WF196
-image: bin/targets/ipq807x/ipq807x/openwrt-ipq807x-cig_wf196-squashfs-sysupgrade.tar
+description: Build image for the CIG WF196 (CA)
+image: bin/targets/ipq807x/ipq807x/openwrt-ipq807x-cig_wf196_ca-squashfs-sysupgrade.tar
 feeds:
   - name: ipq807x
     path: ../../feeds/ipq807x

profiles/cig_wf196-us.yml

@@ -0,0 +1,17 @@
+---
+profile: cig_wf196_us
+target: ipq807x
+subtarget: ipq807x
+description: Build image for the CIG WF196 (US)
+image: bin/targets/ipq807x/ipq807x/openwrt-ipq807x-cig_wf196_us-squashfs-sysupgrade.tar
+feeds:
+  - name: ipq807x
+    path: ../../feeds/ipq807x
+include:
+  - wifi-ax
+  - ucentral-ap
+packages:
+  - ath11k-fwtest
+  - ftm
+diffconfig: |
+  CONFIG_KERNEL_IPQ_MEM_PROFILE=0