qualcommax: move ipq807x support to subtarget

Now that qualcommax exists as a target and dependencies have been updated
let move ipq807x support to subtarget of qualcommax.

This is mostly copy/paste with the exception of having to update SSDK and
NSS-DP to use CONFIG_TARGET_SUBTARGET.

This is a preparation for later addition of IPQ60xx and IPQ50xx support.

Signed-off-by: Robert Marko <robimarko@gmail.com>

11 files changed, 9 insertions, 4 deletions

diff --git a/target/linux/qualcommax/Makefile b/target/linux/qualcommax/Makefile
index c6b74e05c9..a9d4c06b77 100644
--- a/target/linux/qualcommax/Makefile
+++ b/target/linux/qualcommax/Makefile
@@ -6,7 +6,7 @@ BOARDNAME:=Qualcomm Atheros 802.11ax WiSoC-s
 FEATURES:=squashfs ramdisk fpu nand rtc emmc
 KERNELNAME:=Image dtbs
 CPU_TYPE:=cortex-a53
-SUBTARGETS:=generic
+SUBTARGETS:=ipq807x
 
 KERNEL_PATCHVER:=6.1
 
@@ -14,8 +14,7 @@ include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += \
 	kmod-usb3 kmod-usb-dwc3 kmod-usb-dwc3-qcom \
 	kmod-leds-gpio kmod-gpio-button-hotplug \
-	kmod-phy-aquantia kmod-qca-nss-dp \
-	ath11k-firmware-ipq8074 kmod-ath11k-ahb \
+	kmod-qca-nss-dp kmod-ath11k-ahb \
 	wpad-basic-mbedtls uboot-envtools \
 	e2fsprogs kmod-fs-ext4 losetup
 
diff --git a/target/linux/qualcommax/generic/target.mk b/target/linux/qualcommax/generic/target.mk
deleted file mode 100644
index f5cb1fb19b..0000000000
--- a/target/linux/qualcommax/generic/target.mk
+++ /dev/null
@@ -1 +0,0 @@
-BOARDNAME:=Generic
diff --git a/target/linux/qualcommax/image/generic.mk b/target/linux/qualcommax/image/ipq807x.mk
index 6003f2a5c0..6003f2a5c0 100644
--- a/target/linux/qualcommax/image/generic.mk
+++ b/target/linux/qualcommax/image/ipq807x.mk
diff --git a/target/linux/qualcommax/base-files/etc/board.d/01_leds b/target/linux/qualcommax/ipq807x/base-files/etc/board.d/01_leds
index a89b4c1564..a89b4c1564 100644
--- a/target/linux/qualcommax/base-files/etc/board.d/01_leds
+++ b/target/linux/qualcommax/ipq807x/base-files/etc/board.d/01_leds
diff --git a/target/linux/qualcommax/base-files/etc/board.d/02_network b/target/linux/qualcommax/ipq807x/base-files/etc/board.d/02_network
index 8175a99f97..8175a99f97 100644
--- a/target/linux/qualcommax/base-files/etc/board.d/02_network
+++ b/target/linux/qualcommax/ipq807x/base-files/etc/board.d/02_network
diff --git a/target/linux/qualcommax/base-files/etc/hotplug.d/firmware/11-ath11k-caldata b/target/linux/qualcommax/ipq807x/base-files/etc/hotplug.d/firmware/11-ath11k-caldata
index f9315573ec..f9315573ec 100644
--- a/target/linux/qualcommax/base-files/etc/hotplug.d/firmware/11-ath11k-caldata
+++ b/target/linux/qualcommax/ipq807x/base-files/etc/hotplug.d/firmware/11-ath11k-caldata
diff --git a/target/linux/qualcommax/base-files/etc/init.d/bootcount b/target/linux/qualcommax/ipq807x/base-files/etc/init.d/bootcount
index 6917446a9b..6917446a9b 100755
--- a/target/linux/qualcommax/base-files/etc/init.d/bootcount
+++ b/target/linux/qualcommax/ipq807x/base-files/etc/init.d/bootcount
diff --git a/target/linux/qualcommax/base-files/lib/upgrade/buffalo.sh b/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/buffalo.sh
index d0ed258890..d0ed258890 100644
--- a/target/linux/qualcommax/base-files/lib/upgrade/buffalo.sh
+++ b/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/buffalo.sh
diff --git a/target/linux/qualcommax/base-files/lib/upgrade/mmc.sh b/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/mmc.sh
index dac9ddd568..dac9ddd568 100644
--- a/target/linux/qualcommax/base-files/lib/upgrade/mmc.sh
+++ b/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/mmc.sh
diff --git a/target/linux/qualcommax/base-files/lib/upgrade/platform.sh b/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/platform.sh
index 458eb16b79..458eb16b79 100644
--- a/target/linux/qualcommax/base-files/lib/upgrade/platform.sh
+++ b/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/platform.sh
diff --git a/target/linux/qualcommax/ipq807x/target.mk b/target/linux/qualcommax/ipq807x/target.mk
new file mode 100644
index 0000000000..22a9b78d59
--- /dev/null
+++ b/target/linux/qualcommax/ipq807x/target.mk
@@ -0,0 +1,7 @@
+SUBTARGET:=ipq807x
+BOARDNAME:=Qualcomm Atheros IPQ807x
+DEFAULT_PACKAGES += kmod-phy-aquantia ath11k-firmware-ipq8074
+
+define Target/Description
+	Build firmware images for Qualcomm Atheros IPQ807x based boards.
+endef