From 7a0c508dec55b59d74c7a76ab341b2d5fcc0b113 Mon Sep 17 00:00:00 2001
From: Sean Khan <datapronix@protonmail.com>
Date: Sun, 27 Apr 2025 14:05:03 -0400
Subject: [PATCH] treewide: rework handling platform specific features

Overhaul the way platform-specific requirements are handled since
IPQ60xx and IPQ50xx don't support all the same features as IPQ807x.

Signed-off-by: Sean Khan <datapronix@protonmail.com>
---
 qca-nss-clients/Makefile | 255 ++++++++++++++++++++++++---------------
 qca-nss-drv/Config.in    |  11 ++
 qca-nss-drv/Makefile     |   2 +-
 qca-nss-ecm/Makefile     |  15 ++-
 4 files changed, 180 insertions(+), 103 deletions(-)

diff --git a/qca-nss-clients/Makefile b/qca-nss-clients/Makefile
index 4f95f50..50ddc3c 100644
--- a/qca-nss-clients/Makefile
+++ b/qca-nss-clients/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=qca-nss-clients
-PKG_RELEASE:=7
+PKG_RELEASE:=8
 
 PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/nss-clients.git
 PKG_SOURCE_PROTO:=git
@@ -90,8 +90,11 @@ define KernelPackage/qca-nss-drv-tun6rd
   CATEGORY:=Kernel modules
   SUBMENU:=Network Devices
   TITLE:=NSS connection manager for 6rd tunnels
-  DEPENDS:=+@NSS_DRV_TUN6RD_ENABLE +kmod-sit +6rd \
-		   +kmod-qca-nss-drv
+  DEPENDS:=@(TARGET_qualcommax||TARGET_ipq806x) \
+	   +kmod-qca-nss-drv \
+	   +@NSS_DRV_TUN6RD_ENABLE \
+	   +6rd \
+	   +kmod-sit
   FILES:=$(PKG_BUILD_DIR)/qca-nss-tun6rd.ko
   AUTOLOAD:=$(call AutoLoad,60,qca-nss-tun6rd)
 endef
@@ -105,9 +108,10 @@ define KernelPackage/qca-nss-drv-dtlsmgr
   CATEGORY:=Kernel modules
   SUBMENU:=Network Devices
   TITLE:=NSS connection manager for DTLS sessions
-  DEPENDS:=+@NSS_DRV_DTLS_ENABLE \
-		   +kmod-qca-nss-drv \
-		   +kmod-qca-nss-cfi-cryptoapi
+  DEPENDS:=@(TARGET_qualcommax_ipq807x||TARGET_qualcommax_ipq60xx) \
+	   +kmod-qca-nss-drv \
+	   +@NSS_DRV_DTLS_ENABLE \
+	   +kmod-qca-nss-cfi-cryptoapi
   FILES:=$(PKG_BUILD_DIR)/dtls/$(DTLSMGR_DIR)/qca-nss-dtlsmgr.ko
 endef
 
@@ -120,10 +124,10 @@ define KernelPackage/qca-nss-drv-tlsmgr
   CATEGORY:=Kernel modules
   SUBMENU:=Network Devices
   TITLE:=NSS connection manager for TLS sessions
-  DEPENDS:=@(TARGET_qualcommax||TARGET_ipq807x||TARGET_ipq60xx) \
-		   +@NSS_DRV_TLS_ENABLE \
-		   +kmod-qca-nss-drv \
-		   +PACKAGE_kmod-qca-nss-cfi-cryptoapi:kmod-qca-nss-cfi-cryptoapi
+  DEPENDS:=@(TARGET_qualcommax_ipq807x||TARGET_qualcommax_ipq60xx) \
+	   +kmod-qca-nss-drv \
+	   +@NSS_DRV_TLS_ENABLE \
+	   +PACKAGE_kmod-qca-nss-cfi-cryptoapi:kmod-qca-nss-cfi-cryptoapi
   FILES:=$(PKG_BUILD_DIR)/tls/qca-nss-tlsmgr.ko
 endef
 
@@ -136,8 +140,11 @@ define KernelPackage/qca-nss-drv-l2tpv2
   CATEGORY:=Kernel modules
   SUBMENU:=Network Devices
   TITLE:=NSS connection manager for L2TPv2 protocol
-  DEPENDS:=+@NSS_DRV_L2TP_ENABLE +kmod-ppp +kmod-l2tp \
-		   +kmod-qca-nss-drv
+  DEPENDS:=@(TARGET_qualcommax||TARGET_ipq806x) \
+	   +kmod-qca-nss-drv \
+	   +@NSS_DRV_L2TP_ENABLE \
+	   +kmod-l2tp \
+	   +kmod-ppp
   FILES:=$(PKG_BUILD_DIR)/l2tp/l2tpv2/qca-nss-l2tpv2.ko
   KCONFIG:=CONFIG_L2TP=y
   AUTOLOAD:=$(call AutoLoad,51,qca-nss-l2tpv2)
@@ -152,8 +159,10 @@ define KernelPackage/qca-nss-drv-pptp
   CATEGORY:=Kernel modules
   SUBMENU:=Network Devices
   TITLE:=NSS connection manager for PPTP protocol
-  DEPENDS:=+@NSS_DRV_PPTP_ENABLE +kmod-pptp \
-		   +kmod-qca-nss-drv
+  DEPENDS:=@(TARGET_qualcommax||TARGET_ipq806x) \
+	   +kmod-qca-nss-drv \
+	   +@NSS_DRV_PPTP_ENABLE \
+	   +kmod-pptp
   FILES:=$(PKG_BUILD_DIR)/pptp/qca-nss-pptp.ko
   AUTOLOAD:=$(call AutoLoad,51,qca-nss-pptp)
 endef
@@ -167,9 +176,12 @@ define KernelPackage/qca-nss-drv-pppoe
   CATEGORY:=Kernel modules
   SUBMENU:=Network Devices
   TITLE:=NSS connection manager for PPPoE protocol
-  DEPENDS:=+@NSS_DRV_PPPOE_ENABLE +kmod-ppp +kmod-pppoe \
-		   +PACKAGE_kmod-bonding:kmod-bonding \
-		   +kmod-qca-nss-drv
+  DEPENDS:=@(TARGET_qualcommax||TARGET_ipq806x) \
+	   +kmod-qca-nss-drv \
+	   +@NSS_DRV_PPPOE_ENABLE \
+	   +kmod-bonding \
+	   +kmod-ppp \
+	   +kmod-pppoe
   FILES:=$(PKG_BUILD_DIR)/pppoe/qca-nss-pppoe.ko
   AUTOLOAD:=$(call AutoLoad,51,qca-nss-pppoe)
 endef
@@ -183,9 +195,10 @@ define KernelPackage/qca-nss-drv-map-t
   CATEGORY:=Kernel modules
   SUBMENU:=Network Devices
   TITLE:=NSS connection manager for MAP-T protocol
-  DEPENDS:=+@NSS_DRV_MAPT_ENABLE \
-		   +kmod-nat46 \
-		   +kmod-qca-nss-drv
+  DEPENDS:=@TARGET_qualcommax \
+	   +kmod-qca-nss-drv \
+	   +@NSS_DRV_MAPT_ENABLE \
+	   +kmod-nat46
   FILES:=$(PKG_BUILD_DIR)/map/map-t/qca-nss-map-t.ko
   AUTOLOAD:=$(call AutoLoad,51,qca-nss-map-t)
 endef
@@ -199,9 +212,10 @@ define KernelPackage/qca-nss-drv-gre
   CATEGORY:=Kernel modules
   SUBMENU:=Network Devices
   TITLE:=NSS connection manager for GRE protocol
-  DEPENDS:=@(TARGET_qualcommax||TARGET_ipq807x||TARGET_ipq60xx||TARGET_ipq806x||TARGET_ipq50xx) \
-		   +@NSS_DRV_GRE_ENABLE +kmod-gre6 \
-		   +kmod-qca-nss-drv
+  DEPENDS:=@(TARGET_qualcommax||TARGET_ipq806x) \
+	   +kmod-qca-nss-drv \
+	   +@NSS_DRV_GRE_ENABLE \
+	   +kmod-gre6
   FILES:=$(PKG_BUILD_DIR)/gre/qca-nss-gre.ko $(PKG_BUILD_DIR)/gre/test/qca-nss-gre-test.ko
   AUTOLOAD:=$(call AutoLoad,51,qca-nss-gre)
 endef
@@ -215,8 +229,11 @@ define KernelPackage/qca-nss-drv-tunipip6
   CATEGORY:=Kernel modules
   SUBMENU:=Network Devices
   TITLE:=NSS connection manager for IPIP6 tunnels
-  DEPENDS:=+@NSS_DRV_TUNIPIP6_ENABLE +kmod-iptunnel6 +kmod-ip6-tunnel \
-		   +kmod-qca-nss-drv
+  DEPENDS:=@(TARGET_qualcommax||TARGET_ipq806x) \
+	   +kmod-qca-nss-drv \
+	   +@NSS_DRV_TUNIPIP6_ENABLE \
+	   +kmod-ip6-tunnel \
+	   +kmod-iptunnel6
   FILES:=$(PKG_BUILD_DIR)/tunipip6/qca-nss-tunipip6.ko
   AUTOLOAD:=$(call AutoLoad,60,qca-nss-tunipip6)
 endef
@@ -230,7 +247,8 @@ define KernelPackage/qca-nss-drv-profile
   SECTION:=kernel
   CATEGORY:=Kernel modules
   SUBMENU:=Network Devices
-  DEPENDS:=@TARGET_ipq806x +kmod-qca-nss-drv
+  DEPENDS:=@TARGET_ipq806x \
+	   +kmod-qca-nss-drv
   TITLE:=Profiler for QCA NSS driver (IPQ806x)
   FILES:=$(PKG_BUILD_DIR)/profiler/qca-nss-profile-drv.ko
 endef
@@ -244,8 +262,11 @@ define KernelPackage/qca-nss-drv-ipsecmgr
   CATEGORY:=Kernel modules
   SUBMENU:=Network Devices
   TITLE:=NSS connection manager for IPSEC protocol
-  DEPENDS:=@!TARGET_ipq95xx +@NSS_DRV_IPSEC_ENABLE +kmod-qca-nss-drv +kmod-qca-nss-cfi-cryptoapi \
-		+PACKAGE_kmod-qca-nss-drv-l2tpv2:kmod-qca-nss-drv-l2tpv2
+  DEPENDS:=@(TARGET_qualcommax_ipq807x||TARGET_qualcommax_ipq60xx) \
+	   +kmod-qca-nss-drv \
+	   +@NSS_DRV_IPSEC_ENABLE \
+	   +kmod-qca-nss-cfi-cryptoapi \
+	   +PACKAGE_kmod-qca-nss-drv-l2tpv2:kmod-qca-nss-drv-l2tpv2
   FILES:=$(PKG_BUILD_DIR)/ipsecmgr/$(IPSECMGR_DIR)/qca-nss-ipsecmgr.ko
   AUTOLOAD:=$(call AutoLoad,60,qca-nss-ipsecmgr)
 endef
@@ -259,8 +280,11 @@ define KernelPackage/qca-nss-drv-ipsecmgr-klips
   CATEGORY:=Kernel modules
   SUBMENU:=Network Devices
   TITLE:=Kernel driver for NSS (ipsec klips)
-  DEPENDS:=@!TARGET_ipq95xx +kmod-qca-nss-drv-ipsecmgr +kmod-qca-nss-cfi-cryptoapi \
-		+PACKAGE_kmod-qca-nss-drv-vxlanmgr:kmod-qca-nss-drv-vxlanmgr
+  DEPENDS:=@(TARGET_qualcommax_ipq807x||TARGET_qualcommax_ipq60xx) \
+	   @LINUX_5_4 \
+	   +kmod-qca-nss-drv-ipsecmgr \
+	   +kmod-qca-nss-cfi-cryptoapi \
+	   +PACKAGE_kmod-qca-nss-drv-vxlanmgr:kmod-qca-nss-drv-vxlanmgr
   FILES:=$(PKG_BUILD_DIR)/ipsecmgr/$(IPSECMGR_DIR)/plugins/klips/qca-nss-ipsec-klips.ko
 endef
 
@@ -273,8 +297,11 @@ define KernelPackage/qca-nss-drv-ipsecmgr-xfrm
   CATEGORY:=Kernel modules
   SUBMENU:=Network Devices
   TITLE:=Kernel driver for NSS (ipsec xfrm)
-  DEPENDS:=@!TARGET_ipq95xx +kmod-qca-nss-drv-ipsecmgr \
-		+PACKAGE_kmod-qca-nss-drv-vxlanmgr:kmod-qca-nss-drv-vxlanmgr +kmod-ipsec
+  DEPENDS:=@(TARGET_qualcommax_ipq807x||TARGET_qualcommax_ipq60xx) \
+	   +kmod-qca-nss-drv-ipsecmgr \
+	   +kmod-qca-nss-ecm \
+	   +PACKAGE_kmod-qca-nss-drv-vxlanmgr:kmod-qca-nss-drv-vxlanmgr \
+	   +kmod-ipsec
   FILES:=$(PKG_BUILD_DIR)/ipsecmgr/$(IPSECMGR_DIR)/plugins/xfrm/qca-nss-ipsec-xfrm.ko
 endef
 
@@ -286,8 +313,11 @@ define KernelPackage/qca-nss-drv-capwapmgr
   SECTION:=kernel
   CATEGORY:=Kernel modules
   SUBMENU:=Network Devices
-  DEPENDS:=@!TARGET_ipq95xx +kmod-qca-nss-drv +kmod-qca-nss-drv-dtlsmgr +@NSS_DRV_TRUSTSEC_ENABLE
-  TITLE:=NSS CAPWAP manager for QCA NSS (IPQ806x)
+  DEPENDS:=@(TARGET_qualcommax_ipq807x||TARGET_qualcommax_ipq60xx) \
+	   +kmod-qca-nss-drv \
+	   +kmod-qca-nss-drv-dtlsmgr \
+	   +@NSS_DRV_TRUSTSEC_ENABLE
+  TITLE:=NSS CAPWAP manager for QCA NSS
   FILES:=$(PKG_BUILD_DIR)/capwapmgr/qca-nss-capwapmgr.ko
 endef
 
@@ -300,11 +330,11 @@ define KernelPackage/qca-nss-drv-bridge-mgr
   CATEGORY:=Kernel modules
   SUBMENU:=Network Devices
   TITLE:=Kernel driver for NSS bridge manager
-  DEPENDS:=@(TARGET_qualcommax||TARGET_ipq807x||TARGET_ipq60xx) \
-		   +@NSS_DRV_BRIDGE_ENABLE \
-		   +kmod-qca-nss-drv \
-		   +kmod-qca-nss-drv-vlan-mgr \
-		   +PACKAGE_kmod-bonding:kmod-bonding
+  DEPENDS:=@(TARGET_qualcommax_ipq807x||TARGET_qualcommax_ipq60xx) \
+	   +kmod-qca-nss-drv \
+	   +@NSS_DRV_BRIDGE_ENABLE \
+	   +kmod-qca-nss-drv-vlan-mgr \
+	   +kmod-bonding
 ifneq ($(CONFIG_PACKAGE_kmod-qca-ovsmgr),)
   DEPENDS+=kmod-qca-ovsmgr
 endif
@@ -321,10 +351,10 @@ define KernelPackage/qca-nss-drv-vlan-mgr
   CATEGORY:=Kernel modules
   SUBMENU:=Network Devices
   TITLE:=Kernel driver for NSS vlan manager
-  DEPENDS:=@(TARGET_qualcommax||TARGET_ipq807x||TARGET_ipq60xx) \
-		   +@NSS_DRV_VLAN_ENABLE \
-		   +kmod-qca-nss-drv \
-		   +PACKAGE_kmod-bonding:kmod-bonding
+  DEPENDS:=@(TARGET_qualcommax_ipq807x||TARGET_qualcommax_ipq60xx) \
+	   +kmod-qca-nss-drv \
+	   +@NSS_DRV_VLAN_ENABLE \
+	   +kmod-bonding
   FILES:=$(PKG_BUILD_DIR)/vlan/qca-nss-vlan.ko
   AUTOLOAD:=$(call AutoLoad,51,qca-nss-vlan)
 endef
@@ -338,8 +368,11 @@ define KernelPackage/qca-nss-drv-qdisc
   CATEGORY:=Kernel modules
   SUBMENU:=Network Devices
   TITLE:=Qdisc for configuring shapers in NSS
-  DEPENDS:=+@NSS_DRV_SHAPER_ENABLE +@NSS_DRV_IGS_ENABLE +@NSS_DRV_BRIDGE_ENABLE \
-		   +kmod-qca-nss-drv
+  DEPENDS:=@(TARGET_qualcommax||TARGET_ipq806x) \
+	   +kmod-qca-nss-drv \
+	   +@NSS_DRV_SHAPER_ENABLE \
+	   +@NSS_DRV_IGS_ENABLE \
+	   +(!TARGET_qualcommax_ipq50xx):kmod-qca-nss-drv-bridge-mgr
   FILES:=$(PKG_BUILD_DIR)/nss_qdisc/qca-nss-qdisc.ko
   KCONFIG:=CONFIG_NET_CLS_ACT=y
 endef
@@ -353,9 +386,13 @@ define KernelPackage/qca-nss-drv-igs
   CATEGORY:=Kernel modules
   SUBMENU:=Network Devices
   TITLE:=NSS connection manager to perform ingress shaping
-  DEPENDS:=@(TARGET_qualcommax||TARGET_ipq807x||TARGET_ipq60xx||TARGET_ipq806x||TARGET_ipq50xx) \
-		   +@NSS_DRV_IGS_ENABLE +kmod-sched-core +kmod-nf-conntrack +kmod-ifb +kmod-qca-nss-drv-qdisc \
-		   +kmod-qca-nss-drv
+  DEPENDS:=@(TARGET_qualcommax||TARGET_ipq806x) \
+	   +kmod-qca-nss-drv \
+	   +@NSS_DRV_IGS_ENABLE \
+	   +kmod-qca-nss-drv-qdisc \
+	   +kmod-ifb \
+	   +kmod-nf-conntrack \
+	   +kmod-sched-core
   FILES:=$(PKG_BUILD_DIR)/nss_qdisc/igs/act_nssmirred.ko
 endef
 
@@ -368,10 +405,11 @@ define KernelPackage/qca-nss-drv-lag-mgr
   CATEGORY:=Kernel modules
   SUBMENU:=Network Devices
   TITLE:=NSS LAG (link aggregation) manager
-  DEPENDS:=+@NSS_DRV_LAG_ENABLE \
-		   +kmod-qca-nss-drv-vlan-mgr \
-		   +kmod-qca-nss-drv \
-		   +kmod-bonding
+  DEPENDS:=@(TARGET_qualcommax_ipq807x||TARGET_qualcommax_ipq60xx) \
+	   +kmod-qca-nss-drv \
+	   +@NSS_DRV_LAG_ENABLE \
+	   +kmod-qca-nss-drv-vlan-mgr \
+	   +kmod-bonding
   FILES:=$(PKG_BUILD_DIR)/lag/qca-nss-lag-mgr.ko
   AUTOLOAD:=$(call AutoLoad,51,qca-nss-lag-mgr)
 endef
@@ -384,17 +422,29 @@ define KernelPackage/qca-nss-drv-netlink
   SECTION:=kernel
   CATEGORY:=Kernel modules
   SUBMENU:=Network Devices
-  DEPENDS:=+@NSS_DRV_C2C_ENABLE +@NSS_DRV_GRE_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 +@NSS_DRV_L2TP_ENABLE +@NSS_DRV_MAPT_ENABLE \
-		   +@NSS_DRV_CAPWAP_ENABLE +@NSS_DRV_LSO_RX_ENABLE +@NSS_DRV_UDP_ST_ENABLE +@NSS_DRV_PPTP_ENABLE +@NSS_DRV_WIFIOFFLOAD_ENABLE +@NSS_DRV_WIFI_LEGACY_ENABLE \
-		   +@NSS_DRV_PPPOE_ENABLE \
-		   +kmod-qca-nss-drv \
-		   +kmod-ppp \
-		   +kmod-pppoe \
-		   +PACKAGE_kmod-qca-nss-drv-ipsecmgr:kmod-qca-nss-drv-ipsecmgr \
-		   +PACKAGE_kmod-qca-nss-drv-dtlsmgr:kmod-qca-nss-drv-dtlsmgr \
-		   +PACKAGE_kmod-qca-nss-drv-capwapmgr:kmod-qca-nss-drv-capwapmgr
+  DEPENDS:=@TARGET_qualcommax \
+	   +kmod-qca-nss-drv \
+	   +@NSS_DRV_IPV6_ENABLE \
+	   +@NSS_DRV_WIFIOFFLOAD_ENABLE \
+	   +@NSS_DRV_UDP_ST_ENABLE:NSS_DRV_RMNET_ENABLE \
+	   +@NSS_DRV_C2C_ENABLE:NSS_DRV_C2C_ENABLE \
+	   +PACKAGE_kmod-qca-nss-drv-capwapmgr:kmod-qca-nss-drv-capwapmgr \
+	   +PACKAGE_kmod-qca-nss-drv-dtlsmgr:kmod-qca-nss-drv-dtlsmgr \
+	   +PACKAGE_kmod-qca-nss-drv-gre:kmod-qca-nss-drv-gre \
+	   +PACKAGE_kmod-qca-nss-drv-ipsecmgr-xfrm:kmod-qca-nss-drv-ipsecmgr \
+	   +PACKAGE_kmod-qca-nss-drv-igs:kmod-qca-nss-drv-igs \
+	   +PACKAGE_kmod-qca-nss-drv-l2tpv2:kmod-qca-nss-drv-l2tpv2 \
+	   +PACKAGE_kmod-qca-nss-drv-lag-mgr:kmod-qca-nss-drv-lag-mgr \
+	   +PACKAGE_kmod-qca-nss-drv-map-t:kmod-qca-nss-drv-map-t \
+	   +PACKAGE_kmod-qca-nss-drv-match:kmod-qca-nss-drv-match \
+	   +PACKAGE_kmod-qca-nss-drv-mirror:kmod-qca-nss-drv-mirror \
+	   +PACKAGE_kmod-qca-nss-drv-pppoe:kmod-qca-nss-drv-pppoe \
+	   +PACKAGE_kmod-qca-nss-drv-pptp:kmod-qca-nss-drv-pptp \
+	   +PACKAGE_kmod-qca-nss-drv-qdisc:kmod-qca-nss-drv-qdisc \
+	   +PACKAGE_kmod-qca-nss-drv-tun6rd:kmod-qca-nss-drv-tun6rd \
+	   +PACKAGE_kmod-qca-nss-drv-tunipip6:kmod-qca-nss-drv-tunipip6 \
+	   +PACKAGE_kmod-qca-nss-drv-vxlanmgr:kmod-qca-nss-drv-vxlanmgr \
+	   +@(PACKAGE_kmod-qca-nss-drv-gre):NSS_DRV_GRE_REDIR_ENABLE
   TITLE:=NSS NETLINK manager for QCA NSS driver
   FILES:=$(PKG_BUILD_DIR)/netlink/qca-nss-netlink.ko
 endef
@@ -408,9 +458,12 @@ define KernelPackage/qca-nss-drv-ovpn-mgr
   CATEGORY:=Kernel modules
   SUBMENU:=Network Devices
   TITLE:=Kernel driver for NSS OpenVPN manager
-  DEPENDS:=@(TARGET_qualcommax||TARGET_ipq807x||TARGET_ipq60xx) \
-		   +@NSS_DRV_QVPN_ENABLE +kmod-qca-nss-drv +kmod-tun +kmod-ipt-conntrack \
-		   +kmod-qca-nss-cfi-cryptoapi
+  DEPENDS:=@(TARGET_qualcommax_ipq807x||TARGET_qualcommax_ipq60xx) \
+	   +kmod-qca-nss-drv \
+	   +@NSS_DRV_QVPN_ENABLE \
+	   +kmod-qca-nss-cfi-cryptoapi \
+	   +kmod-ipt-conntrack \
+	   +kmod-tun
   FILES:=$(PKG_BUILD_DIR)/openvpn/src/qca-nss-ovpn-mgr.ko
 endef
 
@@ -423,9 +476,9 @@ 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_qualcommax||TARGET_ipq807x||TARGET_ipq60xx) \
-		   +kmod-qca-nss-drv-ovpn-mgr \
-		   +kmod-qca-nss-ecm
+  DEPENDS:=@(TARGET_qualcommax_ipq807x||TARGET_qualcommax_ipq60xx) \
+	   +kmod-qca-nss-drv-ovpn-mgr \
+	   +kmod-qca-nss-ecm
   FILES:=$(PKG_BUILD_DIR)/openvpn/plugins/qca-nss-ovpn-link.ko
 endef
 
@@ -437,8 +490,10 @@ define KernelPackage/qca-nss-drv-pvxlanmgr
   SECTION:=kernel
   CATEGORY:=Kernel modules
   SUBMENU:=Network Devices
-  DEPENDS:=+@NSS_DRV_PVXLAN_ENABLE \
-		   +kmod-qca-nss-drv
+  DEPENDS:=@TARGET_qualcommax \
+	   +kmod-qca-nss-drv \
+	   +@NSS_DRV_PVXLAN_ENABLE \
+	   +kmod-vxlan
   TITLE:=NSS connection manager for PVxLANs
   FILES:=$(PKG_BUILD_DIR)/pvxlanmgr/qca-nss-pvxlanmgr.ko
 endef
@@ -451,9 +506,9 @@ define KernelPackage/qca-nss-drv-eogremgr
   SECTION:=kernel
   CATEGORY:=Kernel modules
   SUBMENU:=Network Devices
-  DEPENDS:=+@NSS_DRV_GRE_ENABLE \
-		   +kmod-qca-nss-drv \
-		   +kmod-qca-nss-drv-gre
+  DEPENDS:=@TARGET_qualcommax \
+	   +kmod-qca-nss-drv \
+	   +kmod-qca-nss-drv-gre
   TITLE:=NSS EOGRE manager for QCA NSS driver
   FILES:=$(PKG_BUILD_DIR)/eogremgr/qca-nss-eogremgr.ko
 endef
@@ -466,9 +521,10 @@ define KernelPackage/qca-nss-drv-clmapmgr
   SECTION:=kernel
   CATEGORY:=Kernel modules
   SUBMENU:=Network Devices
-  DEPENDS:=+@NSS_DRV_CLMAP_ENABLE \
-		   +kmod-qca-nss-drv \
-		   +kmod-qca-nss-drv-eogremgr
+  DEPENDS:=@TARGET_qualcommax \
+	   +kmod-qca-nss-drv \
+	   +@NSS_DRV_CLMAP_ENABLE \
+	   +kmod-qca-nss-drv-eogremgr
   TITLE:=NSS clmap manager for QCA NSS driver
   FILES:=$(PKG_BUILD_DIR)/clmapmgr/qca-nss-clmapmgr.ko
 endef
@@ -481,8 +537,10 @@ define KernelPackage/qca-nss-drv-vxlanmgr
   SECTION:=kernel
   CATEGORY:=Kernel modules
   SUBMENU:=Network Devices
-  DEPENDS:=+@NSS_DRV_VXLAN_ENABLE +@NSS_DRV_PVXLAN_ENABLE +kmod-vxlan \
-		   +kmod-qca-nss-drv
+  DEPENDS:=@TARGET_qualcommax \
+	   +kmod-qca-nss-drv \
+	   +@NSS_DRV_VXLAN_ENABLE \
+	   +kmod-vxlan
   TITLE:=NSS VxLAN manager for QCA NSS driver
   FILES:=$(PKG_BUILD_DIR)/vxlanmgr/qca-nss-vxlanmgr.ko
   AUTOLOAD:=$(call AutoLoad,51,qca-nss-vxlanmgr)
@@ -496,8 +554,10 @@ define KernelPackage/qca-nss-drv-match
  SECTION:=kernel
  CATEGORY:=Kernel modules
  SUBMENU:=Network Devices
- DEPENDS:=+@NSS_DRV_MATCH_ENABLE +@NSS_DRV_WIFIOFFLOAD_ENABLE \
-		  +kmod-qca-nss-drv
+ DEPENDS:=@TARGET_qualcommax \
+	   +kmod-qca-nss-drv \
+	   +@NSS_DRV_MATCH_ENABLE \
+	   +@NSS_DRV_WIFIOFFLOAD_ENABLE
  TITLE:=NSS Match for QCA NSS driver
  FILES:=$(PKG_BUILD_DIR)/match/qca-nss-match.ko
 endef
@@ -511,8 +571,9 @@ define KernelPackage/qca-nss-drv-mirror
  CATEGORY:=Kernel modules
  SUBMENU:=Network Devices
  TITLE:=Module for mirroring packets from NSS to host
- DEPENDS:=+@NSS_DRV_MIRROR_ENABLE \
-		  +kmod-qca-nss-drv
+ DEPENDS:=@TARGET_qualcommax \
+	   +kmod-qca-nss-drv \
+	   +@NSS_DRV_MIRROR_ENABLE
  FILES:=$(PKG_BUILD_DIR)/mirror/qca-nss-mirror.ko
 endef
 
@@ -525,8 +586,9 @@ define KernelPackage/qca-nss-drv-mscs
  CATEGORY:=Kernel modules
  SUBMENU:=Network Devices
  TITLE:=Module to interface wlan host driver and ECM MSCS classifier.
- DEPENDS:=@TARGET_ipq95xx +@NSS_DRV_WIFIOFFLOAD_ENABLE \
-		  +kmod-qca-nss-drv
+ DEPENDS:=@TARGET_qualcommbe \
+	   +kmod-qca-nss-drv \
+	   +@NSS_DRV_WIFIOFFLOAD_ENABLE
  FILES:=$(PKG_BUILD_DIR)/mscs/qca-nss-mscs.ko
 endef
 
@@ -538,8 +600,9 @@ define KernelPackage/qca-nss-drv-wifi-meshmgr
   SECTION:=kernel
   CATEGORY:=Kernel modules
   SUBMENU:=Network Devices
-  DEPENDS:=+@NSS_DRV_WIFI_MESH_ENABLE \
-		  +kmod-qca-nss-drv
+  DEPENDS:=@TARGET_qualcommax \
+	   +kmod-qca-nss-drv \
+	   +@NSS_DRV_WIFI_MESH_ENABLE
   TITLE:=NSS WiFi-Mesh manager for QCA NSS driver
   FILES:=$(PKG_BUILD_DIR)/wifi_meshmgr/qca-nss-wifi-meshmgr.ko
   AUTOLOAD:=$(call AutoLoad,51,qca-nss-wifi-meshmgr)
@@ -599,7 +662,7 @@ EXTRA_CFLAGS += -DNSS_CAPWAPMGR_ONE_NETDEV
 endif
 
 ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-tun6rd),)
-NSS_CLIENTS_MAKE_OPTS+=tun6rd=m
+NSS_CLIENTS_MAKE_OPTS+=tun6rd=y
 endif
 
 ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-dtlsmgr),)
@@ -608,7 +671,7 @@ endif
 
 ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-tlsmgr),)
 EXTRA_CFLAGS+= -I$(PKG_BUILD_DIR)/exports
-NSS_CLIENTS_MAKE_OPTS+=tlsmgr=m
+NSS_CLIENTS_MAKE_OPTS+=tlsmgr=y
 endif
 
 ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-l2tpv2),)
@@ -751,10 +814,10 @@ define Build/Compile
 	  modules
 endef
 
-# $(eval $(call KernelPackage,qca-nss-drv-profile))
-# $(eval $(call KernelPackage,qca-nss-drv-capwapmgr))
+$(eval $(call KernelPackage,qca-nss-drv-profile))
+$(eval $(call KernelPackage,qca-nss-drv-capwapmgr))
 $(eval $(call KernelPackage,qca-nss-drv-tun6rd))
-# $(eval $(call KernelPackage,qca-nss-drv-dtlsmgr))
+$(eval $(call KernelPackage,qca-nss-drv-dtlsmgr))
 $(eval $(call KernelPackage,qca-nss-drv-l2tpv2))
 $(eval $(call KernelPackage,qca-nss-drv-pptp))
 $(eval $(call KernelPackage,qca-nss-drv-pppoe))
@@ -772,12 +835,12 @@ $(eval $(call KernelPackage,qca-nss-drv-lag-mgr))
 $(eval $(call KernelPackage,qca-nss-drv-gre))
 # $(eval $(call KernelPackage,qca-nss-drv-ovpn-mgr))
 # $(eval $(call KernelPackage,qca-nss-drv-ovpn-link))
-# $(eval $(call KernelPackage,qca-nss-drv-pvxlanmgr))
+$(eval $(call KernelPackage,qca-nss-drv-pvxlanmgr))
 $(eval $(call KernelPackage,qca-nss-drv-eogremgr))
-# $(eval $(call KernelPackage,qca-nss-drv-clmapmgr))
+$(eval $(call KernelPackage,qca-nss-drv-clmapmgr))
 $(eval $(call KernelPackage,qca-nss-drv-vxlanmgr))
 $(eval $(call KernelPackage,qca-nss-drv-match))
-# $(eval $(call KernelPackage,qca-nss-drv-tlsmgr))
+$(eval $(call KernelPackage,qca-nss-drv-tlsmgr))
 $(eval $(call KernelPackage,qca-nss-drv-mirror))
-# $(eval $(call KernelPackage,qca-nss-drv-mscs))
+$(eval $(call KernelPackage,qca-nss-drv-mscs))
 $(eval $(call KernelPackage,qca-nss-drv-wifi-meshmgr))
diff --git a/qca-nss-drv/Config.in b/qca-nss-drv/Config.in
index d1bcb64..9798dcb 100644
--- a/qca-nss-drv/Config.in
+++ b/qca-nss-drv/Config.in
@@ -30,16 +30,19 @@ config NSS_DRV_BRIDGE_ENABLE
 	bool
 	default n
 	prompt "Enable BRIDGE"
+	depends on TARGET_qualcommax_ipq807x || TARGET_qualcommax_ipq60xx
 
 config NSS_DRV_CAPWAP_ENABLE
 	bool
 	default n
 	prompt "Enable CAPWAP"
+	depends on TARGET_qualcommax_ipq807x || TARGET_qualcommax_ipq60xx
 
 config NSS_DRV_C2C_ENABLE
 	bool
 	default n
 	prompt "Enable C2C"
+	depends on TARGET_ipq806x || TARGET_qualcommax_ipq807x
 
 config NSS_DRV_CLMAP_ENABLE
 	bool
@@ -55,6 +58,7 @@ config NSS_DRV_DTLS_ENABLE
 	bool
 	default n
 	prompt "Enable DTLS"
+	depends on TARGET_qualcommax_ipq807x || TARGET_qualcommax_ipq60xx
 
 config NSS_DRV_GRE_ENABLE
 	bool
@@ -108,6 +112,7 @@ config NSS_DRV_LAG_ENABLE
 	bool
 	default n
 	prompt "Enable LAG"
+	depends on TARGET_qualcommax_ipq807x || TARGET_qualcommax_ipq60xx
 
 config NSS_DRV_MAPT_ENABLE
 	bool
@@ -128,6 +133,7 @@ config NSS_DRV_OAM_ENABLE
 	bool
 	default n
 	prompt "Enable OAM"
+	depends on TARGET_qualcommax_ipq806x
 
 config NSS_DRV_PORTID_ENABLE
 	bool
@@ -158,6 +164,7 @@ config NSS_DRV_QRFS_ENABLE
 	bool
 	default n
 	prompt "Enable QRFS"
+	depends on TARGET_qualcommax_ipq807x
 
 config NSS_DRV_QVPN_ENABLE
 	bool
@@ -169,6 +176,7 @@ config NSS_DRV_RMNET_ENABLE
 	bool
 	default n
 	prompt "Enable RMNET"
+	depends on TARGET_qualcommax_ipq807x
 
 config NSS_DRV_SHAPER_ENABLE
 	bool
@@ -184,6 +192,7 @@ config NSS_DRV_TLS_ENABLE
 	bool
 	default n
 	prompt "Enable TLS"
+	depends on TARGET_qualcommax_ipq807x || TARGET_qualcommax_ipq60xx
 
 config NSS_DRV_TRUSTSEC_ENABLE
 	bool
@@ -194,6 +203,7 @@ config NSS_DRV_UDP_ST_ENABLE
 	bool
 	default n
 	prompt "Enable UDP Speedtest"
+	depends on TARGET_qualcommax_ipq807x || TARGET_qualcommax_ipq50xx
 
 config NSS_DRV_TRUSTSEC_RX_ENABLE
 	bool
@@ -225,6 +235,7 @@ config NSS_DRV_VLAN_ENABLE
 	bool
 	default n
 	prompt "Enable VLAN"
+	depends on TARGET_qualcommax_ipq807x || TARGET_qualcommax_ipq60xx
 
 config NSS_DRV_VXLAN_ENABLE
 	bool
diff --git a/qca-nss-drv/Makefile b/qca-nss-drv/Makefile
index ef05ab8..8a95cfd 100644
--- a/qca-nss-drv/Makefile
+++ b/qca-nss-drv/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=qca-nss-drv
-PKG_RELEASE:=15
+PKG_RELEASE:=16
 
 PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/nss-drv.git
 PKG_SOURCE_PROTO:=git
diff --git a/qca-nss-ecm/Makefile b/qca-nss-ecm/Makefile
index e73a7e9..e5b371f 100644
--- a/qca-nss-ecm/Makefile
+++ b/qca-nss-ecm/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=qca-nss-ecm
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/qca-nss-ecm.git
 PKG_SOURCE_PROTO:=git
@@ -15,6 +15,9 @@ PKG_BUILD_PARALLEL:=1
 PKG_FLAGS:=nonshared
 PKG_BUILD_FLAGS:=gc-sections lto
 
+PKG_CONFIG_DEPENDS:= \
+	CONFIG_NSS_DRV_PPPOE_ENABLE
+
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/package.mk
 
@@ -22,11 +25,12 @@ define KernelPackage/qca-nss-ecm
   SECTION:=kernel
   CATEGORY:=Kernel modules
   SUBMENU:=Network Support
-  DEPENDS:=@(TARGET_qualcommax||TARGET_ipq807x||TARGET_ipq60xx) \
+  DEPENDS:=@(TARGET_qualcommbe||TARGET_qualcommax||TARGET_ipq806x) \
 		   +ethtool \
 		   +kmod-nf-conntrack \
-		   +@NSS_DRV_IPV6_ENABLE \
-		   +@NSS_DRV_VIRT_IF_ENABLE \
+		   +@(TARGET_qualcommax||TARGET_ipq806x):NSS_DRV_IPV6_ENABLE \
+		   +@(TARGET_qualcommax||TARGET_ipq806x):NSS_DRV_VIRT_IF_ENABLE \
+		   +@((TARGET_qualcommax||TARGET_ipq806x)&&PACKAGE_kmod-pppoe):NSS_DRV_PPPOE_ENABLE \
 		   +PACKAGE_kmod-qca-nss-drv:kmod-qca-nss-drv \
 		   +PACKAGE_kmod-qca-mcs:kmod-qca-mcs \
 		   +PACKAGE_kmod-bonding:kmod-bonding \
@@ -35,8 +39,7 @@ define KernelPackage/qca-nss-ecm
 		   +PACKAGE_kmod-ppp:kmod-ppp \
 		   +PACKAGE_kmod-pppoe:kmod-pppoe \
 		   +PACKAGE_kmod-pppoe:kmod-pptp \
-		   +PACKAGE_kmod-pppoe:kmod-pppol2tp \
-		   +@(PACKAGE_kmod-pppoe):NSS_DRV_PPPOE_ENABLE
+		   +PACKAGE_kmod-pppoe:kmod-pppol2tp
   TITLE:=QCA NSS Enhanced Connection Manager (ECM)
   FILES:=$(PKG_BUILD_DIR)/ecm.ko
   KCONFIG:=CONFIG_BRIDGE_NETFILTER=y \