From 5156673ca97b2b05c06b805be9ceaa987fa4da0b Mon Sep 17 00:00:00 2001 From: bitthief Date: Thu, 27 Jul 2023 07:04:41 +0300 Subject: [PATCH] nss: rename ipq807x target to qualcommax Now that qualcommax exists as a target and dependencies have been updated, move ipq807x support to subtarget of qualcommax. Signed-off-by: bitthief --- firmware/aq-fw-download/Makefile | 2 +- firmware/nss-eip-firmware/Makefile | 2 +- qca/nss-ifb/Makefile | 2 +- qca/qca-nss-clients/Makefile | 26 ++++++++++++++------------ qca/qca-nss-drv/Makefile | 11 ++++++----- qca/qca-nss-ecm/Makefile | 27 +++++++++++++++------------ qca/qrtr/Makefile | 2 +- 7 files changed, 39 insertions(+), 33 deletions(-) diff --git a/firmware/aq-fw-download/Makefile b/firmware/aq-fw-download/Makefile index 9727068..60f5882 100755 --- a/firmware/aq-fw-download/Makefile +++ b/firmware/aq-fw-download/Makefile @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/package.mk define Package/aq-fw-download SECTION:=firmware CATEGORY:=Firmware - DEPENDS:=@TARGET_ipq807x + DEPENDS:=@TARGET_qualcommax TITLE:=Aquantia FW downloader utitlity endef diff --git a/firmware/nss-eip-firmware/Makefile b/firmware/nss-eip-firmware/Makefile index a20c9af..071aecf 100644 --- a/firmware/nss-eip-firmware/Makefile +++ b/firmware/nss-eip-firmware/Makefile @@ -12,7 +12,7 @@ define Package/nss-eip-firmware SECTION:=firmware CATEGORY:=Firmware TITLE:=NSS EIP-197 firmware - DEPENDS:=@(TARGET_ipq807x||TARGET_ipq60xx) + DEPENDS:=@(TARGET_qualcommax||TARGET_ipq60xx) endef define Build/Compile diff --git a/qca/nss-ifb/Makefile b/qca/nss-ifb/Makefile index 8882281..35abb59 100644 --- a/qca/nss-ifb/Makefile +++ b/qca/nss-ifb/Makefile @@ -18,7 +18,7 @@ define KernelPackage/nss-ifb CATEGORY:=Kernel modules SUBMENU:=Network Devices TITLE:=NSS IFB Interface - DEPENDS:=@TARGET_ipq807x +kmod-qca-nss-drv + DEPENDS:=@TARGET_qualcommax +kmod-qca-nss-drv FILES:=$(PKG_BUILD_DIR)/nss-ifb.ko KCONFIG:= endef diff --git a/qca/qca-nss-clients/Makefile b/qca/qca-nss-clients/Makefile index 6b18943..8d3cba0 100644 --- a/qca/qca-nss-clients/Makefile +++ b/qca/qca-nss-clients/Makefile @@ -14,9 +14,9 @@ PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/package.mk -ifeq ($(CONFIG_TARGET_BOARD), "ipq807x") +ifeq ($(CONFIG_TARGET_SUBTARGET), "ipq807x") SOC="ipq807x_64" - subtarget:=$(CONFIG_TARGET_BOARD) + subtarget:=$(CONFIG_TARGET_SUBTARGET) else ifeq ($(CONFIG_TARGET_BOARD), "ipq60xx") SOC="ipq60xx_64" subtarget:=$(SUBTARGET) @@ -36,7 +36,7 @@ define KernelPackage/qca-nss-drv-gre CATEGORY:=Kernel modules SUBMENU:=Network Devices TITLE:=Kernel driver for NSS (connection manager) - GRE - DEPENDS:=@(TARGET_ipq_ipq806x||TARGET_ipq806x||TARGET_ipq_ipq807x||TARGET_ipq_ipq807x_64||TARGET_ipq807x||TARGET_ipq807x_64||TARGET_ipq_ipq60xx||TARGET_ipq_ipq60xx_64||TARGET_ipq_ipq50xx||TARGET_ipq_ipq50xx_64||TARGET_ipq50xx) \ + DEPENDS:=@(TARGET_ipq_ipq806x||TARGET_ipq806x||TARGET_ipq_ipq807x||TARGET_ipq_ipq807x_64||TARGET_ipq807x||TARGET_ipq807x_64||TARGET_qualcommax||TARGET_ipq_ipq60xx||TARGET_ipq_ipq60xx_64||TARGET_ipq_ipq50xx||TARGET_ipq_ipq50xx_64||TARGET_ipq50xx) \ +@NSS_DRV_GRE_ENABLE +kmod-gre6 \ +PACKAGE_kmod-qca-nss-drv:kmod-qca-nss-drv FILES:=$(PKG_BUILD_DIR)/gre/qca-nss-gre.ko $(PKG_BUILD_DIR)/gre/test/qca-nss-gre-test.ko @@ -146,10 +146,11 @@ define KernelPackage/qca-nss-drv-bridge-mgr CATEGORY:=Kernel modules SUBMENU:=Network Devices TITLE:=Kernel driver for NSS bridge manager - DEPENDS:=@(TARGET_ipq_ipq807x||TARGET_ipq_ipq807x_64||TARGET_ipq807x||TARGET_ipq_ipq60xx||TARGET_ipq_ipq60xx_64||TARGET_ipq60xx) \ + DEPENDS:=@(TARGET_ipq_ipq807x||TARGET_ipq_ipq807x_64||TARGET_ipq807x||TARGET_qualcommax||TARGET_ipq_ipq60xx||TARGET_ipq_ipq60xx_64||TARGET_ipq60xx) \ +TARGET_ipq_ipq807x:kmod-qca-nss-drv-vlan-mgr \ +TARGET_ipq_ipq807x_64:kmod-qca-nss-drv-vlan-mgr \ +TARGET_ipq807x:kmod-qca-nss-drv-vlan-mgr \ + +TARGET_qualcommax:kmod-qca-nss-drv-vlan-mgr \ +TARGET_ipq60xx:kmod-qca-nss-drv-vlan-mgr \ +TARGET_ipq_ipq60xx:kmod-qca-nss-drv-vlan-mgr \ +TARGET_ipq_ipq60xx_64:kmod-qca-nss-drv-vlan-mgr \ @@ -202,7 +203,7 @@ define KernelPackage/qca-nss-drv-tlsmgr CATEGORY:=Kernel modules SUBMENU:=Network Devices TITLE:=Kernel driver for NSS (connection manager) - tlsmgr - DEPENDS:=@(TARGET_ipq_ipq807x||TARGET_ipq_ipq807x_64||TARGET_ipq807x||TARGET_ipq807x_64||TARGET_ipq_ipq60xx||TARGET_ipq_ipq60xx_64||TARGET_ipq60xx) \ + DEPENDS:=@(TARGET_ipq_ipq807x||TARGET_ipq_ipq807x_64||TARGET_ipq807x||TARGET_ipq807x_64||TARGET_qualcommax||TARGET_ipq_ipq60xx||TARGET_ipq_ipq60xx_64||TARGET_ipq60xx) \ +@NSS_DRV_TLS_ENABLE \ +PACKAGE_kmod-qca-nss-drv:kmod-qca-nss-drv \ +PACKAGE_kmod-qca-nss-cfi-cryptoapi:kmod-qca-nss-cfi-cryptoapi @@ -218,7 +219,7 @@ define KernelPackage/qca-nss-drv-ipsecmgr CATEGORY:=Kernel modules SUBMENU:=Network Devices TITLE:=Kernel driver for NSS (ipsec manager) - ipsecmgr - DEPENDS:=@(TARGET_ipq806x||TARGET_ipq807x) \ + DEPENDS:=@(TARGET_ipq806x||TARGET_ipq807x||TARGET_qualcommax) \ +@NSS_DRV_TSTAMP_ENABLE \ +@NSS_DRV_IPSEC_ENABLE \ +PACKAGE_kmod-qca-nss-drv:kmod-qca-nss-drv \ @@ -239,7 +240,7 @@ define KernelPackage/qca-nss-drv-ovpn-mgr CATEGORY:=Kernel modules SUBMENU:=Network Devices TITLE:=Kernel driver for NSS OpenVPN manager - DEPENDS:=@(TARGET_ipq_ipq807x||TARGET_ipq_ipq807x_64||TARGET_ipq807x||TARGET_ipq_ipq60xx||TARGET_ipq_ipq60xx_64||TARGET_ipq60xx) \ + DEPENDS:=@(TARGET_ipq_ipq807x||TARGET_ipq_ipq807x_64||TARGET_ipq807x||TARGET_qualcommax||TARGET_ipq_ipq60xx||TARGET_ipq_ipq60xx_64||TARGET_ipq60xx) \ +@NSS_DRV_OVPN_ENABLE +kmod-qca-nss-drv +kmod-tun +kmod-ipt-conntrack \ +PACKAGE_kmod-qca-nss-cfi-cryptoapi:kmod-qca-nss-cfi-cryptoapi FILES:=$(PKG_BUILD_DIR)/openvpn/src/qca-nss-ovpn-mgr.ko @@ -254,7 +255,7 @@ define KernelPackage/qca-nss-drv-ovpn-link CATEGORY:=Kernel modules SUBMENU:=Network Devices TITLE:=Kernel driver for interfacing NSS OpenVPN manager with ECM - DEPENDS:=@(TARGET_ipq_ipq807x||TARGET_ipq_ipq807x_64||TARGET_ipq807x||TARGET_ipq_ipq60xx||TARGET_ipq_ipq60xx_64||TARGET_ipq60xx) \ + DEPENDS:=@(TARGET_ipq_ipq807x||TARGET_ipq_ipq807x_64||TARGET_ipq807x||TARGET_qualcommax||TARGET_ipq_ipq60xx||TARGET_ipq_ipq60xx_64||TARGET_ipq60xx) \ +kmod-qca-nss-drv-ovpn-mgr \ +@PACKAGE_kmod-qca-nss-ecm FILES:=$(PKG_BUILD_DIR)/openvpn/plugins/qca-nss-ovpn-link.ko @@ -317,6 +318,7 @@ define KernelPackage/qca-nss-drv-lag-mgr +TARGET_ipq_ipq807x:kmod-qca-nss-drv-vlan-mgr \ +TARGET_ipq_ipq807x_64:kmod-qca-nss-drv-vlan-mgr \ +TARGET_ipq807x:kmod-qca-nss-drv-vlan-mgr \ + +TARGET_qualcommax:kmod-qca-nss-drv-vlan-mgr \ +TARGET_ipq_ipq60xx:kmod-qca-nss-drv-vlan-mgr \ +TARGET_ipq_ipq60xx_64:kmod-qca-nss-drv-vlan-mgr \ +TARGET_ipq60xx:kmod-qca-nss-drv-vlan-mgr \ @@ -350,7 +352,7 @@ define KernelPackage/qca-nss-drv-vlan-mgr CATEGORY:=Kernel modules SUBMENU:=Network Devices TITLE:=Kernel driver for NSS vlan manager - DEPENDS:=@(TARGET_ipq_ipq807x||TARGET_ipq_ipq806x||TARGET_ipq807x||TARGET_ipq_ipq60xx||TARGET_ipq_ipq60xx_64||TARGET_ipq60xx) \ + DEPENDS:=@(TARGET_ipq_ipq807x||TARGET_ipq_ipq806x||TARGET_ipq807x||TARGET_qualcommax||TARGET_ipq_ipq60xx||TARGET_ipq_ipq60xx_64||TARGET_ipq60xx) \ +@NSS_DRV_VLAN_ENABLE \ +PACKAGE_kmod-qca-nss-drv:kmod-qca-nss-drv \ +PACKAGE_kmod-bonding:kmod-bonding @@ -367,7 +369,7 @@ define KernelPackage/qca-nss-drv-igs CATEGORY:=Kernel modules SUBMENU:=Network Support TITLE:=Action for offloading traffic to an IFB interface to perform ingress shaping. - DEPENDS:=@(TARGET_ipq806x||TARGET_ipq_ipq807x||TARGET_ipq_ipq807x_64||TARGET_ipq807x||TARGET_ipq_ipq60xx||TARGET_ipq_ipq60xx_64||TARGET_ipq60xx||TARGET_ipq_ipq50xx||TARGET_ipq_ipq50xx_64||TARGET_ipq50xx) \ + DEPENDS:=@(TARGET_ipq806x||TARGET_ipq_ipq807x||TARGET_ipq_ipq807x_64||TARGET_ipq807x||TARGET_qualcommax||TARGET_ipq_ipq60xx||TARGET_ipq_ipq60xx_64||TARGET_ipq60xx||TARGET_ipq_ipq50xx||TARGET_ipq_ipq50xx_64||TARGET_ipq50xx) \ +@NSS_DRV_IGS_ENABLE +kmod-sched-core +kmod-nf-conntrack +kmod-ifb +kmod-qca-nss-drv-qdisc \ +PACKAGE_kmod-qca-nss-drv:kmod-qca-nss-drv FILES:=$(PKG_BUILD_DIR)/nss_qdisc/igs/act_nssmirred.ko @@ -397,7 +399,7 @@ define KernelPackage/qca-nss-drv-mirror SUBMENU:=Network Support TITLE:=Module for mirroring packets from NSS to host. DEPENDS:=+@NSS_DRV_MIRROR_ENABLE \ - +PACKAGE_kmod-qca-nss-drv:kmod-qca-nss-drv + +PACKAGE_kmod-qca-nss-drv:kmod-qca-nss-drv FILES:=$(PKG_BUILD_DIR)/mirror/qca-nss-mirror.ko endef @@ -410,7 +412,7 @@ define KernelPackage/qca-nss-drv-netlink CATEGORY:=Kernel modules SUBMENU:=Network Devices TITLE:=NSS NETLINK Manager for QCA NSS driver - DEPENDS:=@(TARGET_ipq806x||TARGET_ipq807x||TARGET_ipq_ipq807x_64||TARGET_ipq_ipq60xx||TARGET_ipq_ipq60xx_64||TARGET_ipq60xx||TARGET_ipq_ipq50xx||TARGET_ipq_ipq50xx_64||TARGET_ipq50xx) \ + DEPENDS:=@(TARGET_ipq806x||TARGET_ipq807x||TARGET_ipq_ipq807x_64||TARGET_qualcommax||TARGET_ipq_ipq60xx||TARGET_ipq_ipq60xx_64||TARGET_ipq60xx||TARGET_ipq_ipq50xx||TARGET_ipq_ipq50xx_64||TARGET_ipq50xx) \ +@NSS_DRV_C2C_ENABLE +@NSS_DRV_GRE_REDIR_ENABLE +@NSS_DRV_IPV4_REASM_ENABLE +@NSS_DRV_IPV6_ENABLE +@NSS_DRV_IPV6_REASM_ENABLE +@NSS_DRV_RMNET_ENABLE +@NSS_DRV_OAM_ENABLE +@NSS_DRV_QRFS_ENABLE \ +kmod-pppoe +kmod-qca-nss-drv-dtlsmgr \ +PACKAGE_kmod-qca-nss-drv:kmod-qca-nss-drv diff --git a/qca/qca-nss-drv/Makefile b/qca/qca-nss-drv/Makefile index 7400d86..c811451 100644 --- a/qca/qca-nss-drv/Makefile +++ b/qca/qca-nss-drv/Makefile @@ -67,7 +67,7 @@ define KernelPackage/qca-nss-drv SECTION:=kernel CATEGORY:=Kernel modules SUBMENU:=Network Devices - DEPENDS:=@(TARGET_ipq807x||TARGET_ipq60xx) +kmod-qca-nss-dp + DEPENDS:=@(TARGET_qualcommax||TARGET_ipq60xx) +kmod-qca-nss-dp TITLE:=Qualcomm NSS core driver FILES:=$(PKG_BUILD_DIR)/qca-nss-drv.ko AUTOLOAD:=$(call AutoLoad,32,qca-nss-drv) @@ -96,9 +96,9 @@ define KernelPackage/qca-nss-drv/Description This package contains a NSS driver for QCA chipset endef -ifeq ($(CONFIG_TARGET_BOARD), "ipq807x") +ifeq ($(CONFIG_TARGET_SUBTARGET), "ipq807x") SOC="ipq807x_64" - subtarget:=$(CONFIG_TARGET_BOARD) + subtarget:=$(CONFIG_TARGET_SUBTARGET) else ifeq ($(CONFIG_TARGET_BOARD), "ipq60xx") SOC="ipq60xx_64" subtarget:=$(SUBTARGET) @@ -119,7 +119,7 @@ EXTRA_CFLAGS+= -I$(STAGING_DIR)/usr/include/qca-nss-gmac \ -I$(STAGING_DIR)/usr/include/qca-ssdk \ -Wno-unused-variable -ifneq (, $(findstring $(CONFIG_TARGET_BOARD), "ipq807x" "ipq60xx")) +ifneq (, $(findstring $(CONFIG_TARGET_BOARD), "qualcommax" "ipq60xx")) EXTRA_CFLAGS+= -DNSS_MEM_PROFILE_MEDIUM endif @@ -266,7 +266,8 @@ define Build/Compile CROSS_COMPILE="$(TARGET_CROSS)" \ ARCH="$(LINUX_KARCH)" \ M="$(PKG_BUILD_DIR)" \ - EXTRA_CFLAGS="$(EXTRA_CFLAGS)" SoC=$(SOC) \ + EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \ + SoC=$(SOC) \ $(KERNEL_MAKE_FLAGS) \ $(PKG_JOBS) \ modules diff --git a/qca/qca-nss-ecm/Makefile b/qca/qca-nss-ecm/Makefile index aa849aa..307f3a2 100644 --- a/qca/qca-nss-ecm/Makefile +++ b/qca/qca-nss-ecm/Makefile @@ -19,7 +19,7 @@ define KernelPackage/qca-nss-ecm SECTION:=kernel CATEGORY:=Kernel modules SUBMENU:=Network Support - DEPENDS:=@(TARGET_ipq807x||TARGET_ipq60xx) \ + DEPENDS:=@(TARGET_qualcommax||TARGET_ipq60xx) \ +@NSS_DRV_IPV6_ENABLE \ +@NSS_DRV_PPE_ENABLE \ +@NSS_DRV_TUN6RD_ENABLE \ @@ -63,16 +63,16 @@ EXTRA_CFLAGS+= \ -I$(STAGING_DIR)/usr/include/qca-mcs \ -I$(STAGING_DIR)/usr/include/nat46 -ifneq (, $(findstring $(CONFIG_TARGET_BOARD), "ipq807x" "ipq60xx")) +ifneq (, $(findstring $(CONFIG_TARGET_BOARD), "qualcommax" "ipq60xx")) ECM_MAKE_OPTS+=ECM_FRONT_END_NSS_ENABLE=y \ - ECM_FRONT_END_SFE_ENABLE=n \ - ECM_NON_PORTED_SUPPORT_ENABLE=y \ - ECM_INTERFACE_BOND_ENABLE=y \ - ECM_INTERFACE_VLAN_ENABLE=y \ - ECM_CLASSIFIER_MARK_ENABLE=y \ - ECM_CLASSIFIER_DSCP_ENABLE=y \ - ECM_CLASSIFIER_PCC_ENABLE=n \ - ECM_BAND_STEERING_ENABLE=n + ECM_FRONT_END_SFE_ENABLE=n \ + ECM_NON_PORTED_SUPPORT_ENABLE=y \ + ECM_INTERFACE_BOND_ENABLE=y \ + ECM_INTERFACE_VLAN_ENABLE=y \ + ECM_CLASSIFIER_MARK_ENABLE=y \ + ECM_CLASSIFIER_DSCP_ENABLE=y \ + ECM_CLASSIFIER_PCC_ENABLE=n \ + ECM_BAND_STEERING_ENABLE=n endif # Disable ECM IPv6 support when global IPv6 support is disabled. @@ -98,7 +98,6 @@ ifneq ($(CONFIG_PACKAGE_kmod-macvlan),) ECM_MAKE_OPTS+=ECM_INTERFACE_MACVLAN_ENABLE=y endif - ifneq ($(CONFIG_PACKAGE_kmod-qca-mcs),) ECM_MAKE_OPTS+=ECM_MULTICAST_ENABLE=y endif @@ -143,13 +142,17 @@ define Build/InstallDev $(CP) $(PKG_BUILD_DIR)/exports/* $(1)/usr/include/qca-nss-ecm endef +ifeq ($(CONFIG_TARGET_BOARD), "qualcommax") + SOC:=$(CONFIG_TARGET_SUBTARGET) +endif + define Build/Compile +$(MAKE) -C "$(LINUX_DIR)" $(strip $(ECM_MAKE_OPTS)) \ CROSS_COMPILE="$(TARGET_CROSS)" \ ARCH="$(LINUX_KARCH)" \ M="$(PKG_BUILD_DIR)" \ EXTRA_CFLAGS="$(EXTRA_CFLAGS) -Wno-error=unused-function " \ - SoC=$(CONFIG_TARGET_BOARD) \ + SoC=$(SOC) \ $(KERNEL_MAKE_FLAGS) \ $(PKG_JOBS) \ modules diff --git a/qca/qrtr/Makefile b/qca/qrtr/Makefile index 38588a8..135d1bc 100644 --- a/qca/qrtr/Makefile +++ b/qca/qrtr/Makefile @@ -15,7 +15,7 @@ define Package/qrtr SECTION:=utils CATEGORY:=Utilities TITLE:=QRTR tools - DEPENDS:=@(TARGET_ipq807x) + DEPENDS:=@(TARGET_qualcommax) endef define Package/qrtr/description