ipq807x: remove all Xu related and add OptimCloud support

Signed-off-by: OutBack Dingo <outbackdingo@gmail.com>

feeds/ipq807x/ipq807x/base-files/etc/board.d/02_network

@@ -102,6 +102,13 @@ qcom_setup_interfaces()
 		ucidef_add_switch "switch1" \
 			"6@eth1" "1:lan" "2:lan" "3:lan" "4:lan"
 		;;	
+	optimcloud,d60|\
+ 	optimcloud,d60-5g|\
+ 	optimcloud,d50|\
+ 	optimcloud,d50-5g)
+        ucidef_set_interface_wan "eth0"
+        ucidef_set_interface_lan "eth1"
+        ;;        
 	qcom,ipq5018-mp03.1)
 		ucidef_set_interface_lan "eth1"
 		ucidef_set_interface_wan "eth0"

feeds/ipq807x/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata

@@ -208,6 +208,10 @@ ath11k/IPQ5018/hw1.0/caldata.bin)
 	liteon,wpx8324|\
 	motorola,q14|\
 	muxi,ap3220l|\
+	optimcloud,d60|\
+ 	optimcloud,d60-5g|\
+ 	optimcloud,d50|\
+ 	optimcloud,d50-5g|\    
 	qcom,ipq5018-mp03.1)
 		caldata_extract "0:ART" 0x1000 0x20000
 		;;
@@ -249,6 +253,10 @@ ath11k/QCN9074/hw1.0/caldata_1.bin)
 	cig,wf196|\
 	wallys,dr6018-v4|\
 	cybertan,eww622-a1|\
+   	optimcloud,d60|\
+ 	optimcloud,d60-5g|\
+ 	optimcloud,d50|\
+ 	optimcloud,d50-5g|\
 	qcom,ipq5018-mp03.1|\
 	qcom,ipq807x-hk14)
 		caldata_extract "0:ART" 0x26800 0x20000
@@ -287,6 +295,10 @@ ath11k-macs)
 	indio,um-310ax-v1|\
 	indio,um-510axp-v1|\
 	indio,um-510axm-v1|\
+	optimcloud,d60|\
+ 	optimcloud,d60-5g|\
+ 	optimcloud,d50|\
+ 	optimcloud,d50-5g|\    
 	cig,wf188n)
 		ath11k_generate_macs
 		;;

feeds/ipq807x/ipq807x/base-files/lib/upgrade/platform.sh

@@ -38,7 +38,7 @@ do_flash_emmc() {
 	local emmcblock=$(find_mmc_part $2)
 	local board_dir=$3
 	local part=$4
-	
+
 	[ -b "$emmcblock" ] || emmcblock=$(find_mmc_part $2)
 
 	[ -z "$emmcblock" ] && {
@@ -162,6 +162,10 @@ platform_check_image() {
 	qcom,ipq6018-cp01|\
 	qcom,ipq807x-hk01|\
 	qcom,ipq807x-hk14|\
+   	optimcloud,d60|\
+ 	optimcloud,d60-5g|\
+ 	optimcloud,d50|\
+ 	optimcloud,d50-5g|\
 	qcom,ipq5018-mp03.3)
 		[ "$magic_long" = "73797375" ] && return 0
 		;;
@@ -200,6 +204,10 @@ platform_do_upgrade() {
 	qcom,ipq6018-cp01|\
 	qcom,ipq807x-hk01|\
 	qcom,ipq807x-hk14|\
+	optimcloud,d60|\
+ 	optimcloud,d60-5g|\
+ 	optimcloud,d50|\
+ 	optimcloud,d50-5g|\
 	qcom,ipq5018-mp03.3|\
 	wallys,dr5018|\
 	wallys,dr6018|\

feeds/ipq807x/ipq807x/image/ipq50xx.mk

@@ -165,3 +165,56 @@ define Device/yuncore_fap655
 endef
 TARGET_DEVICES += yuncore_fap655
 
+define Device/optimcloud_d50-5g
+   DEVICE_TITLE := OptimCloud D50-5G
+   DEVICE_DTS := qcom-ipq5018-optimcloud-d50-5g
+   SUPPORTED_DEVICES := optimcloud,d50-5g
+   DEVICE_PACKAGES := ath11k-wifi-optimcloud-d50 ath11k-firmware-ipq50xx ath11k-firmware-qcn9000 
+   DEVICE_DTS_CONFIG := config@mp03.1
+   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
+endef
+TARGET_DEVICES += optimcloud_d50-5g
+ 
+define Device/optimcloud_d50
+   DEVICE_TITLE := OptimCloud D50
+   DEVICE_DTS := qcom-ipq5018-optimcloud-d50
+   SUPPORTED_DEVICES := optimcloud,d50
+   DEVICE_PACKAGES := ath11k-wifi-optimcloud-d50 ath11k-firmware-ipq50xx ath11k-firmware-qcn9000 ath11k-firmware-qcn6122
+   DEVICE_DTS_CONFIG := config@mp03.1
+   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/factory.ubi := append-ubi | qsdk-ipq-factory-nand
+   IMAGE/nand-factory.ubi := append-ubi | qsdk-ipq-factory-nand
+endef
+TARGET_DEVICES += optimcloud_d50
+ 
+define Device/optimcloud_d60-5g
+   DEVICE_TITLE := OptimCloud D60-5G
+   DEVICE_DTS := qcom-ipq5018-optimcloud-d60-5g
+   SUPPORTED_DEVICES := optimcloud,d60-5g
+   DEVICE_PACKAGES := ath11k-wifi-optimcloud-d60 ath11k-firmware-ipq50xx ath11k-firmware-qcn9000
+   DEVICE_DTS_CONFIG := config@mp03.1
+   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
+endef
+TARGET_DEVICES += optimcloud_d60-5g
+ 
+define Device/optimcloud_d60
+   DEVICE_TITLE := OptimCloud D60
+   DEVICE_DTS := qcom-ipq5018-optimcloud-d60
+   SUPPORTED_DEVICES := optimcloud,d60
+   DEVICE_PACKAGES := ath11k-wifi-optimcloud-d60 ath11k-firmware-ipq50xx ath11k-firmware-qcn9000 ath11k-firmware-qcn6122
+   DEVICE_DTS_CONFIG := config@mp03.1
+   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/factory.ubi := append-ubi | qsdk-ipq-factory-nand
+   IMAGE/nand-factory.ubi := append-ubi | qsdk-ipq-factory-nand
+ endef
+ TARGET_DEVICES += optimcloud_d60

feeds/wifi-ax/ath11k-wifi/Makefile

@@ -128,6 +128,16 @@ $(call Package/ath11k-wifi-default)
     TITLE:=motorola q14 bdf
 endef
 
+define Package/ath11k-wifi-optimcloud-d50
+$(call Package/ath11k-wifi-default)
+    TITLE:=optimcloud d50 bdf
+endef
+
+define Package/ath11k-wifi-optimcloud-d60
+$(call Package/ath11k-wifi-default)
+    TITLE:=optimcloud d60 bdf
+endef
+
 define Package/ath11k-wifi-plasmacloud-pax1800
 $(call Package/ath11k-wifi-default)
     TITLE:=plasmacloud-pax1800(-v2) bdf
@@ -274,6 +284,20 @@ define Package/ath11k-wifi-cig-wf196_6g-us/install
 	echo -n 'US' > $(1)/lib/firmware/country
 endef
 
+define Package/ath11k-wifi-optimcloud-d50/install
+	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/
+	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/QCN9074/hw1.0/
+	$(INSTALL_DATA) ./board-optimcloud-d50.bin.IPQ5018 $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/board.bin
+	$(INSTALL_DATA) ./board-optimcloud-d50.bin.QCN9074 $(1)/lib/firmware/ath11k/QCN9074/hw1.0/board.bin
+endef
+
+define Package/ath11k-wifi-optimcloud-d60/install
+	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/
+	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/QCN9074/hw1.0/
+	$(INSTALL_DATA) ./board-optimcloud-d60.bin.QCN9074 $(1)/lib/firmware/ath11k/QCN9074/hw1.0/board.bin
+	$(INSTALL_DATA) ./board-optimcloud-d60.bin.QCN9074 $(1)/lib/firmware/ath11k/QCN9074/hw1.0/board.bin
+endef
+
 define Package/ath11k-wifi-gl-ax1800/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/IPQ6018/hw1.0/
 	$(INSTALL_DATA) ./board-gl-ax1800.bin.IPQ6018 $(1)/lib/firmware/ath11k/IPQ6018/hw1.0/board-2.bin
@@ -388,6 +412,8 @@ $(eval $(call BuildPackage,ath11k-wifi-cig-wf188n-us))
 $(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-optimcloud-d50))
+$(eval $(call BuildPackage,ath11k-wifi-optimcloud-d60))
 $(eval $(call BuildPackage,ath11k-wifi-hfcl-ion4xi))
 $(eval $(call BuildPackage,ath11k-wifi-hfcl-ion4xi_wp))
 $(eval $(call BuildPackage,ath11k-wifi-hfcl-ion4xi_w))

profiles/optimcloud_d50-5g.yml

@@ -1,15 +1,20 @@
 profile: optimcloud_d50-5g
-target: ipq50xx
-subtarget: generic
+target: ipq807x
+subtarget: ipq50xx
 description: Build image for the OptimCloud D50-5G
-image: bin/targets/ipq50xx/generic/openwrt-ipq50xx-optimcloud_d50-5g-squashfs-sysupgrade.tar
+image: bin/targets/ipq807x/ipq50xx/openwrt-ipq807x-optimcloud_d50-5g-squashfs-sysupgrade.tar
 feeds:
   - name: ipq807x
-    path: ../../feeds/ipq807x_v5.4
+    path: ../../feeds/ipq807x
 include:
-  - wifi-ax-v54
+  - wifi-ax
   - ucentral-ap
+  - turris
+  - safe-search
+  - parental
+  - cyber
+  - oqs
 packages:
-  - ipq50xx
+  - ipq807x
 diffconfig: |
   CONFIG_KERNEL_IPQ_MEM_PROFILE=512

profiles/optimcloud_d50.yml

@@ -1,15 +1,20 @@
 profile: optimcloud_d50
-target: ipq50xx
-subtarget: generic
+target: ipq807x
+subtarget: ipq50xx
 description: Build image for the OptimCloud D50
-image: bin/targets/ipq50xx/generic/openwrt-ipq50xx-optimcloud-d50-squashfs-sysupgrade.tar
+image: bin/targets/ipq807x/ipq50xx/openwrt-ipq807x-optimcloud_d50-squashfs-sysupgrade.tar
 feeds:
   - name: ipq807x
-    path: ../../feeds/ipq807x_v5.4
+    path: ../../feeds/ipq807x
 include:
-  - wifi-ax-v54
+  - wifi-ax
   - ucentral-ap
+  - turris
+  - safe-search
+  - parental
+  - cyber
+  - oqs
 packages:
-  - ipq50xx
+  - ipq807x
 diffconfig: |
   CONFIG_KERNEL_IPQ_MEM_PROFILE=512

profiles/optimcloud_d60-5g.yml

@@ -1,15 +1,20 @@
 profile: optimcloud_d60-5g
-target: ipq50xx
-subtarget: generic
+target: ipq807x
+subtarget: ipq50xx
 description: Build image for the OptimCloud D60-5G
-image: bin/targets/ipq50xx/generic/openwrt-ipq50xx-optimcloud_d60-5g-squashfs-sysupgrade.tar
+image: bin/targets/ipq807x/ipq50xx/openwrt-ipq807x-optimcloud_d60-5g-squashfs-sysupgrade.tar
 feeds:
   - name: ipq807x
-    path: ../../feeds/ipq807x_v5.4
+    path: ../../feeds/ipq807x
 include:
-  - wifi-ax-v54
+  - wifi-ax
   - ucentral-ap
+  - turris
+  - safe-search
+  - parental
+  - cyber
+  - oqs
 packages:
-  - ipq50xx
+  - ipq807x
 diffconfig: |
   CONFIG_KERNEL_IPQ_MEM_PROFILE=512

profiles/optimcloud_d60.yml

@@ -1,15 +1,20 @@
 profile: optimcloud_d60
-target: ipq50xx
-subtarget: generic
+target: ipq807x
+subtarget: ipq50xx
 description: Build image for the OptimCloud D60
-image: bin/targets/ipq50xx/generic/openwrt-ipq50xx-optimcloud-d60-squashfs-sysupgrade.tar
+image: bin/targets/ipq807x/ipq50xx/openwrt-ipq807x-optimcloud_d60-squashfs-sysupgrade.tar
 feeds:
   - name: ipq807x
-    path: ../../feeds/ipq807x_v5.4
+    path: ../../feeds/ipq807x
 include:
-  - wifi-ax-v54
+  - wifi-ax
   - ucentral-ap
+  - turris
+  - safe-search
+  - parental
+  - cyber
+  - oqs
 packages:
-  - ipq50xx
+  - ipq807x
 diffconfig: |
   CONFIG_KERNEL_IPQ_MEM_PROFILE=512