diff --git a/qca-nss-cfi/Makefile b/qca-nss-cfi/Makefile
index 1253173..e644f34 100644
--- a/qca-nss-cfi/Makefile
+++ b/qca-nss-cfi/Makefile
@@ -16,7 +16,7 @@ PKG_BUILD_PARALLEL:=1
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/package.mk
 
-ifneq (, $(findstring $(CONFIG_TARGET_SUBTARGET), "ipq807x" "ipq60xx"))
+ifneq (, $(findstring $(CONFIG_TARGET_SUBTARGET), "ipq807x" "ipq60xx" "ipq50xx"))
 #4.4/5.4 + ipq807x/ipq60xx/ipq50xx
   CFI_OCF_DIR:=ocf/v2.0
   CFI_CRYPTOAPI_DIR:=cryptoapi/v2.0
diff --git a/qca-nss-clients/Makefile b/qca-nss-clients/Makefile
index 646b443..b523f6c 100644
--- a/qca-nss-clients/Makefile
+++ b/qca-nss-clients/Makefile
@@ -69,11 +69,14 @@ ifeq ($(CONFIG_TARGET_SUBTARGET), "ipq807x")
 else ifeq ($(CONFIG_TARGET_SUBTARGET), "ipq60xx")
   SOC="ipq60xx_64"
   subtarget:=$(CONFIG_TARGET_SUBTARGET)
+else ifeq ($(CONFIG_TARGET_SUBTARGET), "ipq50xx")
+  SOC="ipq50xx_64"
+  subtarget:=$(CONFIG_TARGET_SUBTARGET)
 else
   SOC=$(CONFIG_TARGET_BOARD)
 endif
 
-ifneq (, $(findstring $(subtarget), "ipq807x" "ipq807x_64" "ipq60xx" "ipq60xx_64"))
+ifneq (, $(findstring $(subtarget), "ipq807x" "ipq807x_64" "ipq60xx" "ipq60xx_64" "ipq50xx" "ipq50xx_64"))
 # DTLS Manager v2.0 for Hawkeye/Cypress
   DTLSMGR_DIR:=v2.0
 # IPsec Manager v2.0 for Hawkeye/Cypress
@@ -739,7 +742,7 @@ define Build/Compile
 	  CROSS_COMPILE="$(TARGET_CROSS)" \
 	  ARCH="$(LINUX_KARCH)" \
 	  M="$(PKG_BUILD_DIR)" \
-	  EXTRA_CFLAGS="$(EXTRA_CFLAGS) -Wno-enum-conversion" \
+	  EXTRA_CFLAGS="$(EXTRA_CFLAGS) -Wno-enum-conversion -Wno-unused-variable -Wno-int-conversion" \
 	  DTLSMGR_DIR="$(DTLSMGR_DIR)" \
 	  IPSECMGR_DIR="$(IPSECMGR_DIR)" \
 	  SoC=$(SOC) \
diff --git a/qca-nss-crypto/Makefile b/qca-nss-crypto/Makefile
index b093975..f9ff009 100644
--- a/qca-nss-crypto/Makefile
+++ b/qca-nss-crypto/Makefile
@@ -18,7 +18,7 @@ include $(INCLUDE_DIR)/package.mk
 
 # v1.0 is for Akronite
 # v2.0 is for Hawkeye/Cypress/Maple
-ifneq (, $(findstring $(CONFIG_TARGET_SUBTARGET), "ipq807x" "ipq60xx"))
+ifneq (, $(findstring $(CONFIG_TARGET_SUBTARGET), "ipq807x" "ipq60xx" "ipq50xx"))
 NSS_CRYPTO_DIR:=v2.0
 else
 NSS_CRYPTO_DIR:=v1.0
diff --git a/qca-nss-drv/Makefile b/qca-nss-drv/Makefile
index eeb413a..e2311e3 100644
--- a/qca-nss-drv/Makefile
+++ b/qca-nss-drv/Makefile
@@ -119,6 +119,9 @@ ifeq ($(CONFIG_TARGET_SUBTARGET), "ipq807x")
 else ifeq ($(CONFIG_TARGET_SUBTARGET), "ipq60xx")
   SOC="ipq60xx_64"
   subtarget:=$(CONFIG_TARGET_SUBTARGET)
+else ifeq ($(CONFIG_TARGET_SUBTARGET), "ipq50xx")
+  SOC="ipq50xx_64"
+  subtarget:=$(CONFIG_TARGET_SUBTARGET)
 endif
 
 define Build/InstallDev
diff --git a/qca-nss-macsec/Makefile b/qca-nss-macsec/Makefile
index c17c4bf..c3deca3 100644
--- a/qca-nss-macsec/Makefile
+++ b/qca-nss-macsec/Makefile
@@ -55,6 +55,9 @@ ifeq ($(CONFIG_TARGET_SUBTARGET), "ipq807x")
 else ifeq ($(CONFIG_TARGET_SUBTARGET), "ipq60xx")
 	SOC=ipq60xx_64
 	subtarget:=$(CONFIG_TARGET_SUBTARGET)
+else ifeq ($(CONFIG_TARGET_SUBTARGET), "ipq50xx")
+	SOC=ipq50xx_64
+	subtarget:=$(CONFIG_TARGET_SUBTARGET)
 endif
 
 define Build/Compile