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 <[email protected]>
lede-project · Jun 16, 2023 · 83314c1 · 83314c1
1 parent f02f6aa
commit 83314c1
Show file tree

Hide file tree

Showing 14 changed files with 12 additions and 7 deletions.
diff --git a/package/boot/uboot-envtools/files/qualcommax → ...t/uboot-envtools/files/qualcommax_ipq807x b/package/boot/uboot-envtools/files/qualcommax → ...t/uboot-envtools/files/qualcommax_ipq807x
diff --git a/package/kernel/qca-nss-dp/Makefile b/package/kernel/qca-nss-dp/Makefile
@@ -39,7 +39,7 @@ EXTRA_CFLAGS+= \
 
 NSS_DP_HAL_DIR:=$(PKG_BUILD_DIR)/hal
 define Build/Configure
-	$(LN) $(NSS_DP_HAL_DIR)/soc_ops/$(CONFIG_TARGET_BOARD)/nss_$(CONFIG_TARGET_BOARD).h \
+	$(LN) $(NSS_DP_HAL_DIR)/soc_ops/$(CONFIG_TARGET_SUBTARGET)/nss_$(CONFIG_TARGET_SUBTARGET).h \
 		$(PKG_BUILD_DIR)/exports/nss_dp_arch.h
 endef
 
@@ -48,7 +48,7 @@ define Build/Compile
 		CROSS_COMPILE="$(TARGET_CROSS)" \
 		ARCH="$(LINUX_KARCH)" \
 		M="$(PKG_BUILD_DIR)" \
-		EXTRA_CFLAGS="$(EXTRA_CFLAGS)" SoC="$(CONFIG_TARGET_BOARD)" \
+		EXTRA_CFLAGS="$(EXTRA_CFLAGS)" SoC="$(CONFIG_TARGET_SUBTARGET)" \
 		$(KERNEL_MAKE_FLAGS) \
 		$(PKG_JOBS) \
 		modules

diff --git a/package/kernel/qca-ssdk/Makefile b/package/kernel/qca-ssdk/Makefile
@@ -51,7 +51,7 @@ MAKE_FLAGS+= \
 	EXTRA_CFLAGS=-fno-stack-protector -I$(STAGING_DIR)/usr/include \
 	$(LNX_CONFIG_OPTS)
 
-ifeq ($(CONFIG_TARGET_BOARD), "ipq807x")
+ifeq ($(CONFIG_TARGET_SUBTARGET), "ipq807x")
     MAKE_FLAGS+= CHIP_TYPE=HPPE PTP_FEATURE=disable SWCONFIG_FEATURE=disable
 endif
 

diff --git a/target/linux/qualcommax/Makefile b/target/linux/qualcommax/Makefile
@@ -6,16 +6,15 @@ 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
 
 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
diff --git a/target/linux/qualcommax/image/generic.mk → target/linux/qualcommax/image/ipq807x.mk b/target/linux/qualcommax/image/generic.mk → target/linux/qualcommax/image/ipq807x.mk
diff --git a/...qualcommax/base-files/etc/board.d/01_leds → ...ax/ipq807x/base-files/etc/board.d/01_leds b/...qualcommax/base-files/etc/board.d/01_leds → ...ax/ipq807x/base-files/etc/board.d/01_leds
diff --git a/...lcommax/base-files/etc/board.d/02_network → ...ipq807x/base-files/etc/board.d/02_network b/...lcommax/base-files/etc/board.d/02_network → ...ipq807x/base-files/etc/board.d/02_network
diff --git a/.../etc/hotplug.d/firmware/11-ath11k-caldata → .../etc/hotplug.d/firmware/11-ath11k-caldata b/.../etc/hotplug.d/firmware/11-ath11k-caldata → .../etc/hotplug.d/firmware/11-ath11k-caldata
diff --git a/...ualcommax/base-files/etc/init.d/bootcount → ...x/ipq807x/base-files/etc/init.d/bootcount b/...ualcommax/base-files/etc/init.d/bootcount → ...x/ipq807x/base-files/etc/init.d/bootcount
diff --git a/...lcommax/base-files/lib/upgrade/buffalo.sh → ...ipq807x/base-files/lib/upgrade/buffalo.sh b/...lcommax/base-files/lib/upgrade/buffalo.sh → ...ipq807x/base-files/lib/upgrade/buffalo.sh
diff --git a/.../qualcommax/base-files/lib/upgrade/mmc.sh → ...max/ipq807x/base-files/lib/upgrade/mmc.sh b/.../qualcommax/base-files/lib/upgrade/mmc.sh → ...max/ipq807x/base-files/lib/upgrade/mmc.sh
diff --git a/...commax/base-files/lib/upgrade/platform.sh → ...pq807x/base-files/lib/upgrade/platform.sh b/...commax/base-files/lib/upgrade/platform.sh → ...pq807x/base-files/lib/upgrade/platform.sh
diff --git a/target/linux/qualcommax/ipq807x/target.mk 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