Merge branch 'NSS-12.5-K6.x' of https://github.com/qosmio/nss-packages into NSS-12.5-K6.x

This commit is contained in:
Sean Khan 2025-01-15 02:18:05 -05:00
commit bbaa20f43c
5 changed files with 13 additions and 4 deletions

View File

@ -16,7 +16,7 @@ PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/package.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 #4.4/5.4 + ipq807x/ipq60xx/ipq50xx
CFI_OCF_DIR:=ocf/v2.0 CFI_OCF_DIR:=ocf/v2.0
CFI_CRYPTOAPI_DIR:=cryptoapi/v2.0 CFI_CRYPTOAPI_DIR:=cryptoapi/v2.0

View File

@ -69,11 +69,14 @@ ifeq ($(CONFIG_TARGET_SUBTARGET), "ipq807x")
else ifeq ($(CONFIG_TARGET_SUBTARGET), "ipq60xx") else ifeq ($(CONFIG_TARGET_SUBTARGET), "ipq60xx")
SOC="ipq60xx_64" SOC="ipq60xx_64"
subtarget:=$(CONFIG_TARGET_SUBTARGET) subtarget:=$(CONFIG_TARGET_SUBTARGET)
else ifeq ($(CONFIG_TARGET_SUBTARGET), "ipq50xx")
SOC="ipq50xx_64"
subtarget:=$(CONFIG_TARGET_SUBTARGET)
else else
SOC=$(CONFIG_TARGET_BOARD) SOC=$(CONFIG_TARGET_BOARD)
endif 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 # DTLS Manager v2.0 for Hawkeye/Cypress
DTLSMGR_DIR:=v2.0 DTLSMGR_DIR:=v2.0
# IPsec Manager v2.0 for Hawkeye/Cypress # IPsec Manager v2.0 for Hawkeye/Cypress
@ -739,7 +742,7 @@ define Build/Compile
CROSS_COMPILE="$(TARGET_CROSS)" \ CROSS_COMPILE="$(TARGET_CROSS)" \
ARCH="$(LINUX_KARCH)" \ ARCH="$(LINUX_KARCH)" \
M="$(PKG_BUILD_DIR)" \ 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)" \ DTLSMGR_DIR="$(DTLSMGR_DIR)" \
IPSECMGR_DIR="$(IPSECMGR_DIR)" \ IPSECMGR_DIR="$(IPSECMGR_DIR)" \
SoC=$(SOC) \ SoC=$(SOC) \

View File

@ -18,7 +18,7 @@ include $(INCLUDE_DIR)/package.mk
# v1.0 is for Akronite # v1.0 is for Akronite
# v2.0 is for Hawkeye/Cypress/Maple # 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 NSS_CRYPTO_DIR:=v2.0
else else
NSS_CRYPTO_DIR:=v1.0 NSS_CRYPTO_DIR:=v1.0

View File

@ -119,6 +119,9 @@ ifeq ($(CONFIG_TARGET_SUBTARGET), "ipq807x")
else ifeq ($(CONFIG_TARGET_SUBTARGET), "ipq60xx") else ifeq ($(CONFIG_TARGET_SUBTARGET), "ipq60xx")
SOC="ipq60xx_64" SOC="ipq60xx_64"
subtarget:=$(CONFIG_TARGET_SUBTARGET) subtarget:=$(CONFIG_TARGET_SUBTARGET)
else ifeq ($(CONFIG_TARGET_SUBTARGET), "ipq50xx")
SOC="ipq50xx_64"
subtarget:=$(CONFIG_TARGET_SUBTARGET)
endif endif
define Build/InstallDev define Build/InstallDev

View File

@ -55,6 +55,9 @@ ifeq ($(CONFIG_TARGET_SUBTARGET), "ipq807x")
else ifeq ($(CONFIG_TARGET_SUBTARGET), "ipq60xx") else ifeq ($(CONFIG_TARGET_SUBTARGET), "ipq60xx")
SOC=ipq60xx_64 SOC=ipq60xx_64
subtarget:=$(CONFIG_TARGET_SUBTARGET) subtarget:=$(CONFIG_TARGET_SUBTARGET)
else ifeq ($(CONFIG_TARGET_SUBTARGET), "ipq50xx")
SOC=ipq50xx_64
subtarget:=$(CONFIG_TARGET_SUBTARGET)
endif endif
define Build/Compile define Build/Compile