diff --git a/qca/qca-nss-drv/Config.in b/qca/qca-nss-drv/Config.in
index 58ee4e8..d523b3f 100644
--- a/qca/qca-nss-drv/Config.in
+++ b/qca/qca-nss-drv/Config.in
@@ -93,10 +93,15 @@ config NSS_DRV_IPV4_REASM_ENABLE
 	default n
 	prompt "Enable IPV4_REASM"
 
+config NSS_DRV_IPV6_ENABLE
+	bool
+	default y
+	prompt "Enable IPV6"
+
 config NSS_DRV_IPV6_REASM_ENABLE
 	bool
 	default n
-	depends on IPV6
+	depends on NSS_DRV_IPV6_ENABLE
 	prompt "Enable IPV6_REASM"
 
 config NSS_DRV_L2TP_ENABLE
diff --git a/qca/qca-nss-drv/Makefile b/qca/qca-nss-drv/Makefile
index 38eb90b..18537b8 100644
--- a/qca/qca-nss-drv/Makefile
+++ b/qca/qca-nss-drv/Makefile
@@ -37,7 +37,6 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_NSS_DRV_MIRROR_ENABLE \
 	CONFIG_NSS_DRV_OAM_ENABLE \
 	CONFIG_NSS_DRV_PORTID_ENABLE \
-	CONFIG_NSS_DRV_PPE_ENABLE \
 	CONFIG_NSS_DRV_PPPOE_ENABLE \
 	CONFIG_NSS_DRV_PPTP_ENABLE \
 	CONFIG_NSS_DRV_PVXLAN_ENABLE \
@@ -106,8 +105,6 @@ ifeq ($(CONFIG_TARGET_SUBTARGET), "ipq807x")
 else ifeq ($(CONFIG_TARGET_BOARD), "ipq60xx")
   SOC="ipq60xx_64"
   subtarget:=$(CONFIG_TARGET_SUBTARGET)
-else
-  SOC=$(CONFIG_TARGET_BOARD)
 endif
 
 define Build/InstallDev
@@ -131,166 +128,212 @@ else ifdef CONFIG_NSS_MEM_PROFILE_LOW
   EXTRA_CFLAGS += -DNSS_MEM_PROFILE_LOW
 endif
 
+DRV_MAKE_OPTS:=
+
 ifndef CONFIG_NSS_DRV_BRIDGE_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_BRIDGE_ENABLE=n
 endif
+
 ifneq ($(CONFIG_TARGET_BOARD), "ipq806x")
 ifndef CONFIG_NSS_DRV_C2C_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_C2C_ENABLE=n
 endif
 endif
+
 ifndef CONFIG_NSS_DRV_CLMAP_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_CLMAP_ENABLE=n
 endif
+
 ifndef CONFIG_NSS_DRV_CRYPTO_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_CRYPTO_ENABLE=n
 endif
+
 ifndef CONFIG_NSS_DRV_DMA_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_DMA_ENABLE=n
 endif
+
 ifndef CONFIG_NSS_DRV_DTLS_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_DTLS_ENABLE=n
 endif
+
 ifndef CONFIG_NSS_DRV_EDMA_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_EDMA_ENABLE=n
 endif
+
 ifndef CONFIG_NSS_DRV_GRE_ENABLE
 ifndef CONFIG_PACKAGE_kmod-gre
    DRV_MAKE_OPTS += NSS_DRV_GRE_ENABLE=n
 endif
 endif
+
 ifndef CONFIG_NSS_DRV_GRE_REDIR_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_GRE_REDIR_ENABLE=n
 endif
+
 ifndef CONFIG_NSS_DRV_GRE_TUNNEL_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_GRE_TUNNEL_ENABLE=n
 endif
+
 ifndef CONFIG_NSS_DRV_IGS_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_IGS_ENABLE=n
 endif
+
 ifndef CONFIG_NSS_DRV_IPSEC_ENABLE
 ifndef CONFIG_PACKAGE_kmod-ipsec
    DRV_MAKE_OPTS += NSS_DRV_IPSEC_ENABLE=n
 endif
 endif
+
 ifndef CONFIG_NSS_DRV_IPV4_REASM_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_IPV4_REASM_ENABLE=n
 endif
+
 ifndef CONFIG_NSS_DRV_IPV6_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_IPV6_ENABLE=n
 endif
+
 ifndef CONFIG_NSS_DRV_IPV6_REASM_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_IPV6_REASM_ENABLE=n
 endif
+
 ifndef CONFIG_NSS_DRV_L2TP_ENABLE
 ifndef CONFIG_PACKAGE_kmod-l2tp
    DRV_MAKE_OPTS += NSS_DRV_L2TP_ENABLE=n
 endif
 endif
+
 ifndef CONFIG_NSS_DRV_LAG_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_LAG_ENABLE=n
 endif
+
 ifndef CONFIG_NSS_DRV_MAPT_ENABLE
 ifndef CONFIG_PACKAGE_kmod-nat46
    DRV_MAKE_OPTS += NSS_DRV_MAPT_ENABLE=n
 endif
 endif
+
 ifndef CONFIG_NSS_DRV_MATCH_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_MATCH_ENABLE=n
 endif
+
 ifndef CONFIG_NSS_DRV_MIRROR_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_MIRROR_ENABLE=n
 endif
+
 ifndef CONFIG_NSS_DRV_OAM_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_OAM_ENABLE=n
 endif
+
 ifndef CONFIG_NSS_DRV_PORTID_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_PORTID_ENABLE=n
 endif
-ifndef CONFIG_NSS_DRV_PPE_ENABLE
-   DRV_MAKE_OPTS += NSS_DRV_PPE_ENABLE=n
-endif
+
 ifndef CONFIG_NSS_DRV_PPPOE_ENABLE
 ifndef CONFIG_PACKAGE_kmod-pppoe
    DRV_MAKE_OPTS += NSS_DRV_PPPOE_ENABLE=n
 endif
 endif
+
 ifndef CONFIG_NSS_DRV_PPTP_ENABLE
 ifndef CONFIG_PACKAGE_kmod-pptp
    DRV_MAKE_OPTS += NSS_DRV_PPTP_ENABLE=n
 endif
 endif
+
 ifndef CONFIG_NSS_DRV_PVXLAN_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_PVXLAN_ENABLE=n
 endif
+
 ifndef CONFIG_NSS_DRV_QRFS_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_QRFS_ENABLE=n
 endif
+
 ifndef CONFIG_NSS_DRV_QVPN_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_QVPN_ENABLE=n
 endif
+
 ifndef CONFIG_NSS_DRV_OVPN_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_OVPN_ENABLE=n
 endif
+
 ifndef CONFIG_NSS_DRV_RMNET_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_RMNET_ENABLE=n
 endif
+
 ifndef CONFIG_NSS_DRV_SHAPER_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_SHAPER_ENABLE=n
 endif
+
 ifndef CONFIG_NSS_DRV_SJACK_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_SJACK_ENABLE=n
 endif
+
 ifndef CONFIG_NSS_DRV_TLS_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_TLS_ENABLE=n
 endif
+
 ifndef CONFIG_NSS_DRV_TRUSTSEC_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_TRUSTSEC_ENABLE=n
 endif
+
 ifndef CONFIG_NSS_DRV_TRUSTSEC_RX_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_TRUSTSEC_RX_ENABLE=n
 endif
+
 ifndef CONFIG_NSS_DRV_TSTAMP_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_TSTAMP_ENABLE=n
 endif
+
 ifndef CONFIG_NSS_DRV_TUN6RD_ENABLE
 ifndef CONFIG_PACKAGE_kmod-sit
    DRV_MAKE_OPTS += NSS_DRV_TUN6RD_ENABLE=n
 endif
 endif
+
 ifndef CONFIG_NSS_DRV_TUNIPIP6_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_TUNIPIP6_ENABLE=n
 endif
+
 ifndef CONFIG_NSS_DRV_VIRT_IF_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_VIRT_IF_ENABLE=n
 endif
+
 ifndef CONFIG_NSS_DRV_VLAN_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_VLAN_ENABLE=n
 endif
+
 ifndef CONFIG_NSS_DRV_VXLAN_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_VXLAN_ENABLE=n
 endif
+
 ifndef CONFIG_NSS_DRV_WIFIOFFLOAD_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_WIFIOFFLOAD_ENABLE=n
 endif
+
 ifndef CONFIG_NSS_DRV_WIFI_EXT_VDEV_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_WIFI_EXT_VDEV_ENABLE=n
 endif
+
 ifndef CONFIG_NSS_DRV_WIFI_MESH_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_WIFI_MESH_ENABLE=n
 endif
+
 ifndef CONFIG_NSS_DRV_UDP_ST_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_UDP_ST_ENABLE=n
 endif
+
 ifndef CONFIG_NSS_DRV_CAPWAP_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_CAPWAP_ENABLE=n
 endif
+
 ifndef CONFIG_NSS_DRV_LSO_RX_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_LSO_RX_ENABLE=n
 endif
+
 ifndef CONFIG_NSS_DRV_WIFI_LEGACY_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_WIFI_LEGACY_ENABLE=n
 endif
+
 define Build/Configure
 	$(LN) arch/nss_$(SOC).h $(PKG_BUILD_DIR)/exports/nss_arch.h
 endef