scottk/wlan-ap
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-ap.git synced 2025-11-02 11:27:48 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

ipq807x: unify US/CA image for CIG WF196

Browse Source 
Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin
2024-01-08 06:39:53 +01:00
parent 367415663f
commit 2826c6d487
6 changed files with 56 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
feeds/ipq807x_v5.4/ath11k-wifi/Makefile
View File

@@ -29,8 +29,6 @@ ALLWIFIBOARDS:= \
cig-wf660a \ cig-wf660a \
cig-wf194c \ cig-wf194c \
cig-wf194c4 \ cig-wf194c4 \
cig-wf196-ca \
cig-wf196-us \
cybertan-eww622-a1 \ cybertan-eww622-a1 \
edgecore-eap101 \ edgecore-eap101 \
gl-ax1800 \ gl-ax1800 \
@@ -89,14 +87,9 @@ $(call Package/ath11k-wifi-default)
TITLE:=board-2.bin for QCOM IPQ6122 eval kits TITLE:=board-2.bin for QCOM IPQ6122 eval kits
endef endef
define Package/ath11k-wifi-cig-wf196_6g-ca define Package/ath11k-wifi-cig-wf196
$(call Package/ath11k-wifi-default) $(call Package/ath11k-wifi-default)
TITLE:=cig-wf196 6G bdf CA TITLE:=cig-wf196 bdf
endef
define Package/ath11k-wifi-cig-wf196_6g-us
$(call Package/ath11k-wifi-default)
TITLE:=cig-wf196 6G bdf US
endef endef
define Package/ath11k-wifi-gl-ax1800 define Package/ath11k-wifi-gl-ax1800
@@ -257,16 +250,12 @@ define Package/ath11k-wifi-qcom-qcn9000/install
$(INSTALL_DATA) ./board-2.bin.QCN9000 $(1)/lib/firmware/ath11k/QCN9074/hw1.0/board-2.bin $(INSTALL_DATA) ./board-2.bin.QCN9000 $(1)/lib/firmware/ath11k/QCN9074/hw1.0/board-2.bin
endef endef
define Package/ath11k-wifi-cig-wf196_6g-ca/install define Package/ath11k-wifi-cig-wf196/install
$(INSTALL_DIR) $(1)/lib/firmware/ath11k/QCN9074/hw1.0/ $(INSTALL_DIR) $(1)/lib/firmware/ath11k/QCN9074/hw1.0/ $(1)/lib/firmware/ath11k/IPQ8074/hw2.0/
$(INSTALL_DATA) ./board-cig-wf196_6g-ca.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.CA
echo -n 'CA' > $(1)/lib/firmware/country $(INSTALL_DATA) ./board-cig-wf196_6g-us.bin.QCN9074 $(1)/lib/firmware/ath11k/QCN9074/hw1.0/board.bin.US
endef $(INSTALL_DATA) ./board-cig-wf196-ca.bin.IPQ8074 $(1)/lib/firmware/ath11k/IPQ8074/hw2.0/board.bin.CA
$(INSTALL_DATA) ./board-cig-wf196-us.bin.IPQ8074 $(1)/lib/firmware/ath11k/IPQ8074/hw2.0/board.bin.US
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 endef
define Package/ath11k-wifi-optimcloud-d50/install define Package/ath11k-wifi-optimcloud-d50/install
@@ -364,7 +353,6 @@ define Package/ath11k-wifi-cig-wf188n/install
$(INSTALL_DIR) $(1)/lib/firmware/ath11k/IPQ6018/hw1.0/ $(INSTALL_DIR) $(1)/lib/firmware/ath11k/IPQ6018/hw1.0/
$(INSTALL_DATA) ./board-cig-wf188n-ca.bin.IPQ6018 $(1)/lib/firmware/ath11k/IPQ6018/hw1.0/board.bin.CA $(INSTALL_DATA) ./board-cig-wf188n-ca.bin.IPQ6018 $(1)/lib/firmware/ath11k/IPQ6018/hw1.0/board.bin.CA
$(INSTALL_DATA) ./board-cig-wf188n-us.bin.IPQ6018 $(1)/lib/firmware/ath11k/IPQ6018/hw1.0/board.bin.US $(INSTALL_DATA) ./board-cig-wf188n-us.bin.IPQ6018 $(1)/lib/firmware/ath11k/IPQ6018/hw1.0/board.bin.US
$(LN) /lib/firmware/ath11k/IPQ6018/hw1.0/board.bin.US $(1)/lib/firmware/ath11k/IPQ6018/hw1.0/board.bin
endef endef
$(eval $(call generate-ath11k-wifi-package,cig-wf186w,Cigtech WF186w)) $(eval $(call generate-ath11k-wifi-package,cig-wf186w,Cigtech WF186w))
@@ -372,8 +360,6 @@ $(eval $(call generate-ath11k-wifi-package,cig-wf186h,Cigtech WF186h))
$(eval $(call generate-ath11k-wifi-package,cig-wf660a,Cigtech WF660a)) $(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-wf194c,Cigtech WF194c))
$(eval $(call generate-ath11k-wifi-package,cig-wf194c4,Cigtech WF194c4)) $(eval $(call generate-ath11k-wifi-package,cig-wf194c4,Cigtech WF194c4))
$(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,cybertan-eww622-a1,CyberTan EWW622 A1))
$(eval $(call generate-ath11k-wifi-package,sercomm-wallaby,Sercomm Kiwi)) $(eval $(call generate-ath11k-wifi-package,sercomm-wallaby,Sercomm Kiwi))
$(eval $(call generate-ath11k-wifi-package,wallys-dr6018,Wallys DR6018)) $(eval $(call generate-ath11k-wifi-package,wallys-dr6018,Wallys DR6018))
@@ -400,8 +386,7 @@ $(eval $(call BuildPackage,ath11k-wifi-qcom-ipq6122))
$(eval $(call BuildPackage,ath11k-wifi-qcom-ipq8074)) $(eval $(call BuildPackage,ath11k-wifi-qcom-ipq8074))
$(eval $(call BuildPackage,ath11k-wifi-qcom-ipq6018)) $(eval $(call BuildPackage,ath11k-wifi-qcom-ipq6018))
$(eval $(call BuildPackage,ath11k-wifi-qcom-qcn9000)) $(eval $(call BuildPackage,ath11k-wifi-qcom-qcn9000))
$(eval $(call BuildPackage,ath11k-wifi-cig-wf196_6g-ca)) $(eval $(call BuildPackage,ath11k-wifi-cig-wf196))
$(eval $(call BuildPackage,ath11k-wifi-cig-wf196_6g-us))
$(eval $(call BuildPackage,ath11k-wifi-motorola-q14)) $(eval $(call BuildPackage,ath11k-wifi-motorola-q14))
$(eval $(call BuildPackage,ath11k-wifi-optimcloud-d50)) $(eval $(call BuildPackage,ath11k-wifi-optimcloud-d50))
$(eval $(call BuildPackage,ath11k-wifi-optimcloud-d60)) $(eval $(call BuildPackage,ath11k-wifi-optimcloud-d60))

13
feeds/ipq807x_v5.4/ipq60xx/base-files/etc/hotplug.d/firmware/10-ath11k-caldata
View File

@@ -1,5 +1,4 @@
#!/bin/sh #!/bin/sh
[ -e /lib/firmware/$FIRMWARE ] && exit 0 [ -e /lib/firmware/$FIRMWARE ] && exit 0
. /lib/functions.sh . /lib/functions.sh
@@ -98,6 +97,18 @@ ath11k-macs)
;; ;;
esac esac
;; ;;
ath11k/IPQ6018/hw1.0/board.bin)
case "$board" in
cig,wf188n)
country=`cat /etc/ucentral/country`
if [ "$country" == "CA" ]; then
ln -s /lib/firmware/ath11k/IPQ6018/hw1.0/board.bin.CA /lib/firmware/ath11k/IPQ6018/hw1.0/board.bin
else
ln -s /lib/firmware/ath11k/IPQ6018/hw1.0/board.bin.US /lib/firmware/ath11k/IPQ6018/hw1.0/board.bin
fi
;;
esac
;;
*) *)
exit 1 exit 1
;; ;;

24
feeds/ipq807x_v5.4/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata
View File

@@ -97,6 +97,30 @@ ath11k-macs)
;; ;;
esac esac
;; ;;
ath11k/IPQ8074/hw2.0/board.bin)
case "$board" in
cig,wf196)
country=`cat /etc/ucentral/country`
if [ "$country" == "CA" ]; then
ln -s /lib/firmware/ath11k/IPQ8074/hw2.0/board.bin.CA /lib/firmware/ath11k/IPQ8074/hw2.0/board.bin
else
ln -s /lib/firmware/ath11k/IPQ8074/hw2.0/board.bin.US /lib/firmware/ath11k/IPQ8074/hw2.0/board.bin
fi
;;
esac
;;
ath11k/QCN9074/hw1.0/board.bin)
case "$board" in
cig,wf196)
country=`cat /etc/ucentral/country`
if [ "$country" == "CA" ]; then
ln -s /lib/firmware/ath11k/QCN9074/hw1.0/board.bin.CA /lib/firmware/ath11k/QCN9074/hw1.0/board.bin
else
ln -s /lib/firmware/ath11k/QCN9074/hw1.0/board.bin.US /lib/firmware/ath11k/QCN9074/hw1.0/board.bin
fi
;;
esac
;;
*) *)
exit 1 exit 1
;; ;;

20
feeds/ipq807x_v5.4/ipq807x/image/ipq807x.mk
View File

@@ -9,29 +9,17 @@ define Device/cig_wf194c4
endef endef
TARGET_DEVICES += cig_wf194c4 TARGET_DEVICES += cig_wf194c4
define Device/cig_wf196_us define Device/cig_wf196
DEVICE_TITLE := CIG WF196 DEVICE_TITLE := CIG WF196
DEVICE_DTS := qcom-ipq807x-wf196 DEVICE_DTS := qcom-ipq807x-wf196
DEVICE_DTS_CONFIG=config@hk14 DEVICE_DTS_CONFIG=config@hk14
SUPPORTED_DEVICES := cig,wf196 SUPPORTED_DEVICES := cig,wf196
BLOCKSIZE := 256k BLOCKSIZE := 256k
PAGESIZE := 4096 PAGESIZE := 4096
DEVICE_PACKAGES := ath11k-wifi-cig-wf196-us aq-fw-download uboot-envtools kmod-usb3 kmod-usb2 \ DEVICE_PACKAGES := ath11k-wifi-cig-wf196 aq-fw-download uboot-envtools kmod-usb3 kmod-usb2 \
ath11k-firmware-qcn9000 ath11k-wifi-cig-wf196_6g-us ath11k-firmware-qcn9000
endef endef
TARGET_DEVICES += cig_wf196_us TARGET_DEVICES += cig_wf196
define Device/cig_wf196_ca
DEVICE_TITLE := CIG WF196
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
endef
TARGET_DEVICES += cig_wf196_ca
define Device/edgecore_eap102 define Device/edgecore_eap102
DEVICE_TITLE := Edgecore EAP102 DEVICE_TITLE := Edgecore EAP102

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

@@ -16,9 +16,11 @@ cig,wf808|\
cig,wf660a) cig,wf660a)
ucidef_set_wifi_country 'US' ucidef_set_wifi_country 'US'
;; ;;
cig,wf188n|\ cig,wf188n)
cig,wf196)
ucidef_set_wifi_country "US CA MY DE" ucidef_set_wifi_country "US CA MY DE"
;;
cig,wf196)
ucidef_set_wifi_country "US CA"
;; ;;
esac esac

6
profiles/cig_wf196.yml
View File

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