From 83314c13d0a85f54b0e3c9726a9062268f638212 Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Tue, 13 Jun 2023 22:07:06 +0200 Subject: [PATCH] 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 --- .../files/{qualcommax => qualcommax_ipq807x} | 0 package/kernel/qca-nss-dp/Makefile | 4 ++-- package/kernel/qca-ssdk/Makefile | 2 +- target/linux/qualcommax/Makefile | 5 ++--- target/linux/qualcommax/generic/target.mk | 1 - target/linux/qualcommax/image/{generic.mk => ipq807x.mk} | 0 .../{ => ipq807x}/base-files/etc/board.d/01_leds | 0 .../{ => ipq807x}/base-files/etc/board.d/02_network | 0 .../base-files/etc/hotplug.d/firmware/11-ath11k-caldata | 0 .../{ => ipq807x}/base-files/etc/init.d/bootcount | 0 .../{ => ipq807x}/base-files/lib/upgrade/buffalo.sh | 0 .../qualcommax/{ => ipq807x}/base-files/lib/upgrade/mmc.sh | 0 .../{ => ipq807x}/base-files/lib/upgrade/platform.sh | 0 target/linux/qualcommax/ipq807x/target.mk | 7 +++++++ 14 files changed, 12 insertions(+), 7 deletions(-) rename package/boot/uboot-envtools/files/{qualcommax => qualcommax_ipq807x} (100%) delete mode 100644 target/linux/qualcommax/generic/target.mk rename target/linux/qualcommax/image/{generic.mk => ipq807x.mk} (100%) rename target/linux/qualcommax/{ => ipq807x}/base-files/etc/board.d/01_leds (100%) rename target/linux/qualcommax/{ => ipq807x}/base-files/etc/board.d/02_network (100%) rename target/linux/qualcommax/{ => ipq807x}/base-files/etc/hotplug.d/firmware/11-ath11k-caldata (100%) rename target/linux/qualcommax/{ => ipq807x}/base-files/etc/init.d/bootcount (100%) rename target/linux/qualcommax/{ => ipq807x}/base-files/lib/upgrade/buffalo.sh (100%) rename target/linux/qualcommax/{ => ipq807x}/base-files/lib/upgrade/mmc.sh (100%) rename target/linux/qualcommax/{ => ipq807x}/base-files/lib/upgrade/platform.sh (100%) create mode 100644 target/linux/qualcommax/ipq807x/target.mk 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 aad49b80552c..8e9e9c4f09c5 100644 --- 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 169252663b75..a40aefb2eeed 100644 --- 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 c6b74e05c91b..a9d4c06b77ae 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 f5cb1fb19b94..000000000000 --- 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 index 000000000000..22a9b78d592d --- /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