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>

diff --git a/package/boot/uboot-envtools/files/qualcommax b/package/boot/uboot-envtools/files/qualcommax_ipq807x
similarity index 100%
rename from package/boot/uboot-envtools/files/qualcommax
rename to package/boot/uboot-envtools/files/qualcommax_ipq807x

diff --git a/package/kernel/qca-nss-dp/Makefile b/package/kernel/qca-nss-dp/Makefile
index aad49b80552cf8c3ba90f8ee60f75a11e8eb4376..8e9e9c4f09c5cd886ea22356a64b7bc96d165b1d 100644 (file)
--- 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
index 169252663b75b8195b91af86de5469d2adc3871f..a40aefb2eeed4decaced1f977c43a8b600599483 100644 (file)
--- 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
index c6b74e05c91bf9b4beac48fa1287361a2b05c052..a9d4c06b77aea1fbcda730057f7b01d2220278c2 100644 (file)
--- 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 (file)
index f5cb1fb..0000000
--- 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
similarity index 100%
rename from target/linux/qualcommax/image/generic.mk
rename to 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
similarity index 100%
rename from target/linux/qualcommax/base-files/etc/board.d/01_leds
rename to 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
similarity index 100%
rename from target/linux/qualcommax/base-files/etc/board.d/02_network
rename to 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
similarity index 100%
rename from target/linux/qualcommax/base-files/etc/hotplug.d/firmware/11-ath11k-caldata
rename to 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
similarity index 100%
rename from target/linux/qualcommax/base-files/etc/init.d/bootcount
rename to 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
similarity index 100%
rename from target/linux/qualcommax/base-files/lib/upgrade/buffalo.sh
rename to 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
similarity index 100%
rename from target/linux/qualcommax/base-files/lib/upgrade/mmc.sh
rename to 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
similarity index 100%
rename from target/linux/qualcommax/base-files/lib/upgrade/platform.sh
rename to 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 (file)
index 0000000..22a9b78
--- /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