From deaaae9ebce25f67e58c0a204165e3a396086209 Mon Sep 17 00:00:00 2001 From: Velosh Date: Mon, 12 Dec 2022 01:37:54 +0300 Subject: [PATCH] Remove secgetspf stuff Avoid: make[5]: secgetspf: No such file or directory Signed-off-by: Velosh --- Makefile | 22 +++---------------- .../qualcomm/wcn39xx/qcacld-3.0/Kbuild | 4 ---- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index 469a33e55dea..994e1ad79322 100755 --- a/Makefile +++ b/Makefile @@ -1031,26 +1031,10 @@ ifeq ($(CONFIG_RELR),y) LDFLAGS_vmlinux += --pack-dyn-relocs=relr endif -USE_SECGETSPF := $(shell echo $(PATH)) -ifneq ($(findstring buildscript/build_common/core/bin, $(USE_SECGETSPF)),) - ifneq ($(shell secgetspf SEC_PRODUCT_FEATURE_BIOAUTH_CONFIG_FINGERPRINT_TZ), false) - ifeq ($(CONFIG_SENSORS_FINGERPRINT), y) - ifndef CONFIG_SEC_FACTORY - export KBUILD_FP_SENSOR_CFLAGS := -DENABLE_SENSORS_FPRINT_SECURE - endif - endif +ifeq ($(CONFIG_SENSORS_FINGERPRINT), y) + ifndef CONFIG_SEC_FACTORY + export KBUILD_FP_SENSOR_CFLAGS := -DENABLE_SENSORS_FPRINT_SECURE endif -else - ifeq ($(CONFIG_SENSORS_FINGERPRINT), y) - ifndef CONFIG_SEC_FACTORY - export KBUILD_FP_SENSOR_CFLAGS := -DENABLE_SENSORS_FPRINT_SECURE - endif - endif -endif -ifneq ($(shell secgetspf SEC_PRODUCT_FEATURE_COMMON_CONFIG_SEP_VERSION),) - SEP_MAJOR_VERSION := $(shell secgetspf SEC_PRODUCT_FEATURE_COMMON_CONFIG_SEP_VERSION | cut -f1 -d.) - SEP_MINOR_VERSION := $(shell secgetspf SEC_PRODUCT_FEATURE_COMMON_CONFIG_SEP_VERSION | cut -f2 -d.) - export KBUILD_SEP_VERSION := -DSEP_KVERSION=$(SEP_MAJOR_VERSION)$(SEP_MINOR_VERSION) endif # Default kernel image to build when no specific target is given. diff --git a/drivers/net/wireless/qualcomm/wcn39xx/qcacld-3.0/Kbuild b/drivers/net/wireless/qualcomm/wcn39xx/qcacld-3.0/Kbuild index 7de5f96faf53..951862c31c59 100755 --- a/drivers/net/wireless/qualcomm/wcn39xx/qcacld-3.0/Kbuild +++ b/drivers/net/wireless/qualcomm/wcn39xx/qcacld-3.0/Kbuild @@ -3292,10 +3292,6 @@ EXTRA_CFLAGS += -DSEC_WRITE_VERSION_IN_SYSFS EXTRA_CFLAGS += -DSEC_WRITE_SOFTAP_INFO_IN_SYSFS #EXTRA_CFLAGS += -DSEC_WRITE_ANT_GPIO_INFO_IN_SYSFS -ifeq ($(shell secgetspf SEC_PRODUCT_FEATURE_WLAN_SUPPORT_MIMO), TRUE) -EXTRA_CFLAGS += -DSEC_CONFIG_SUPPORT_MIMO -endif - endif # Currently, for versions of gcc which support it, the kernel Makefile