diff --git a/qca-nss-cfi/Makefile b/qca-nss-cfi/Makefile
index e644f34..c9e30db 100644
--- a/qca-nss-cfi/Makefile
+++ b/qca-nss-cfi/Makefile
@@ -17,11 +17,11 @@ include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/package.mk
 
 ifneq (, $(findstring $(CONFIG_TARGET_SUBTARGET), "ipq807x" "ipq60xx" "ipq50xx"))
-#4.4/5.4 + ipq807x/ipq60xx/ipq50xx
+# 4.4/5.4 + ipq807x/ipq60xx/ipq50xx
   CFI_OCF_DIR:=ocf/v2.0
   CFI_CRYPTOAPI_DIR:=cryptoapi/v2.0
 else
-#4.4 Kernel + ipq806x
+# 4.4 Kernel + ipq806x
   CFI_CRYPTOAPI_DIR:=cryptoapi/v1.1
   CFI_OCF_DIR:=ocf/v1.0
   CFI_IPSEC_DIR:=ipsec/v1.0
@@ -33,8 +33,50 @@ define KernelPackage/qca-nss-cfi-cryptoapi
   SUBMENU:=Cryptographic API modules
   DEPENDS:=@TARGET_qualcommax +kmod-qca-nss-crypto +kmod-crypto-authenc @BROKEN
   TITLE:=Kernel driver for NSS cfi
+ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-cfi-cryptoapi),)
   FILES:=$(PKG_BUILD_DIR)/$(CFI_CRYPTOAPI_DIR)/qca-nss-cfi-cryptoapi.ko
   AUTOLOAD:=$(call AutoLoad,59,qca-nss-cfi-cryptoapi)
+endif
+endef
+
+define KernelPackage/qca-nss-cfi-cryptoapi/Description
+This package contains a NSS cfi driver for QCA chipset
+endef
+
+ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-cfi-cryptoapi),)
+
+ifeq ($(CONFIG_TARGET_BOARD), "qualcommax")
+  SOC:=$(CONFIG_TARGET_SUBTARGET)
+endif
+
+EXTRA_CFLAGS+= \
+  -DCONFIG_NSS_DEBUG_LEVEL=4 \
+  -I$(LINUX_DIR)/crypto/ocf \
+  -I$(STAGING_DIR)/usr/include/qca-nss-crypto \
+  -I$(STAGING_DIR)/usr/include/crypto \
+  -I$(STAGING_DIR)/usr/include/qca-nss-drv
+
+ifneq (, $(findstring $(CONFIG_TARGET_SUBTARGET), "ipq807x" "ipq60xx" "ipq50xx"))
+EXTRA_CFLAGS+= -I$(STAGING_DIR)/usr/include/qca-nss-clients
+endif
+
+MAKE_OPTS+= \
+	cryptoapi=y \
+	NSS_CRYPTOAPI_ABLK=n \
+	NSS_CRYPTOAPI_SKCIPHER=y
+
+MAKE_OPTS+= \
+	CFI_CRYPTOAPI_DIR=$(CFI_CRYPTOAPI_DIR) \
+	CFI_IPSEC_DIR=$(CFI_IPSEC_DIR) \
+	SoC=$(SOC)
+
+define Build/Compile
+	+$(KERNEL_MAKE) \
+		M="$(PKG_BUILD_DIR)" \
+		EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
+		$(strip $(MAKE_OPTS)) \
+		$(PKG_JOBS) \
+		modules
 endef
 
 define Build/InstallDev
@@ -43,47 +85,16 @@ define Build/InstallDev
 	$(CP) $(PKG_BUILD_DIR)/include/* $(1)/usr/include/qca-nss-cfi
 endef
 
-define KernelPackage/qca-nss-cfi-cryptoapi/Description
-This package contains a NSS cfi driver for QCA chipset
-endef
-
-EXTRA_CFLAGS+= \
-	-DCONFIG_NSS_DEBUG_LEVEL=4 \
-	-I$(LINUX_DIR)/crypto/ocf \
-	-I$(STAGING_DIR)/usr/include/qca-nss-crypto \
-	-I$(STAGING_DIR)/usr/include/crypto \
-	-I$(STAGING_DIR)/usr/include/qca-nss-drv
-
-ifneq (, $(findstring $(CONFIG_TARGET_SUBTARGET), "ipq807x"))
-EXTRA_CFLAGS+= -I$(STAGING_DIR)/usr/include/qca-nss-clients
-endif
-
-# Build individual packages if selected
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-cfi-cryptoapi),)
-MAKE_OPTS+= \
-	cryptoapi=y \
-	NSS_CRYPTOAPI_ABLK=n \
-	NSS_CRYPTOAPI_SKCIPHER=y
-endif
-
-ifeq ($(CONFIG_TARGET_BOARD), "qualcommax")
-	SOC:=$(CONFIG_TARGET_SUBTARGET)
-endif
+else
 
 define Build/Compile
-	+$(MAKE) -C "$(LINUX_DIR)" $(strip $(MAKE_OPTS)) \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		ARCH="$(LINUX_KARCH)" \
-		M="$(PKG_BUILD_DIR)" \
-		EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
-		CC="$(TARGET_CC)" \
-		CFI_CRYPTOAPI_DIR=$(CFI_CRYPTOAPI_DIR) \
-		CFI_OCF_DIR=$(CFI_OCF_DIR) \
-		CFI_IPSEC_DIR=$(CFI_IPSEC_DIR) \
-		SoC=$(SOC) \
-		$(KERNEL_MAKE_FLAGS) \
-		$(PKG_JOBS) \
-		modules
+	:
 endef
 
+define Build/Install
+	:
+endef
+
+endif
+
 $(eval $(call KernelPackage,qca-nss-cfi-cryptoapi))
diff --git a/qca-nss-clients/Makefile b/qca-nss-clients/Makefile
index 55d532c..b8d5d56 100644
--- a/qca-nss-clients/Makefile
+++ b/qca-nss-clients/Makefile
@@ -127,7 +127,7 @@ define KernelPackage/qca-nss-drv-tlsmgr
   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
+	   +kmod-qca-nss-cfi-cryptoapi
   FILES:=$(PKG_BUILD_DIR)/tls/qca-nss-tlsmgr.ko
 endef
 
@@ -372,7 +372,7 @@ define KernelPackage/qca-nss-drv-qdisc
 	   +kmod-qca-nss-drv \
 	   +@NSS_DRV_SHAPER_ENABLE \
 	   +@NSS_DRV_IGS_ENABLE \
-	   +(!TARGET_qualcommax_ipq50xx):kmod-qca-nss-drv-bridge-mgr
+	   +!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
diff --git a/qca-nss-crypto/Makefile b/qca-nss-crypto/Makefile
index 36e0f62..0912cad 100644
--- a/qca-nss-crypto/Makefile
+++ b/qca-nss-crypto/Makefile
@@ -16,6 +16,28 @@ PKG_BUILD_PARALLEL:=1
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/package.mk
 
+define KernelPackage/qca-nss-crypto
+	SECTION:=kernel
+	CATEGORY:=Kernel modules
+	SUBMENU:=Cryptographic API modules
+	DEPENDS:=@(TARGET_qualcommax||TARGET_ipq806x) \
+		+kmod-qca-nss-drv \
+		+@NSS_DRV_CRYPTO_ENABLE \
+		+TARGET_qualcommax_ipq807x:nss-eip-firmware \
+		+TARGET_qualcommax_ipq60xx:nss-eip-firmware
+	TITLE:=Kernel driver for NSS crypto driver
+ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-crypto),)
+	FILES:=$(PKG_BUILD_DIR)/$(NSS_CRYPTO_DIR)/src/qca-nss-crypto.ko \
+	$(PKG_BUILD_DIR)/$(NSS_CRYPTO_DIR)/tool/qca-nss-crypto-tool.ko
+	AUTOLOAD:=$(call AutoProbe,qca-nss-crypto)
+endif
+endef
+
+define KernelPackage/qca-nss-crypto/Description
+This package contains a NSS crypto driver for QCA chipset
+endef
+
+ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-crypto),)
 # v1.0 is for Akronite
 # v2.0 is for Hawkeye/Cypress/Maple
 ifneq (, $(findstring $(CONFIG_TARGET_SUBTARGET), "ipq807x" "ipq60xx" "ipq50xx"))
@@ -24,30 +46,6 @@ else
 NSS_CRYPTO_DIR:=v1.0
 endif
 
-define KernelPackage/qca-nss-crypto
-	SECTION:=kernel
-	CATEGORY:=Kernel modules
-	SUBMENU:=Cryptographic API modules
-	DEPENDS:=@(TARGET_qualcommax||TARGET_ipq806x) \
-		  +kmod-qca-nss-drv \
-		  +@NSS_DRV_CRYPTO_ENABLE \
-		  +TARGET_qualcommax_ipq807x:nss-eip-firmware \
-		  +TARGET_qualcommax_ipq60xx:nss-eip-firmware
-	TITLE:=Kernel driver for NSS crypto driver
-	FILES:=$(PKG_BUILD_DIR)/$(NSS_CRYPTO_DIR)/src/qca-nss-crypto.ko \
-	$(PKG_BUILD_DIR)/$(NSS_CRYPTO_DIR)/tool/qca-nss-crypto-tool.ko
-	AUTOLOAD:=$(call AutoProbe,qca-nss-crypto)
-endef
-
-define KernelPackage/qca-nss-crypto/Description
-This package contains a NSS crypto driver for QCA chipset
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/qca-nss-crypto
-	$(CP) $(PKG_BUILD_DIR)/$(NSS_CRYPTO_DIR)/include/* $(1)/usr/include/qca-nss-crypto
-endef
-
 EXTRA_CFLAGS+= \
 	-DCONFIG_NSS_DEBUG_LEVEL=4 \
 	-I$(STAGING_DIR)/usr/include/qca-nss-crypto \
@@ -59,18 +57,34 @@ ifeq ($(CONFIG_TARGET_BOARD), "qualcommax")
 	SOC:=$(CONFIG_TARGET_SUBTARGET)
 endif
 
+MAKE_OPTS+= \
+	NSS_CRYPTO_DIR=$(NSS_CRYPTO_DIR) \
+	SoC=$(SOC) \
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include/qca-nss-crypto
+	$(CP) $(PKG_BUILD_DIR)/$(NSS_CRYPTO_DIR)/include/* $(1)/usr/include/qca-nss-crypto
+endef
+
 define Build/Compile
-	+$(MAKE) -C "$(LINUX_DIR)" \
-		CC="$(TARGET_CC)" \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		ARCH="$(LINUX_KARCH)" \
+	+$(KERNEL_MAKE) \
 		M="$(PKG_BUILD_DIR)" \
 		EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
-		NSS_CRYPTO_DIR=$(NSS_CRYPTO_DIR) \
-		SoC=$(SOC) \
-		$(KERNEL_MAKE_FLAGS) \
+		$(strip $(MAKE_OPTS)) \
 		$(PKG_JOBS) \
 		modules
 endef
 
+else
+
+define Build/Compile
+	:
+endef
+
+define Build/Install
+	:
+endef
+
+endif
+
 $(eval $(call KernelPackage,qca-nss-crypto))