refactor(build): remove redundant `eval` calls

Execute expressions directly without `eval` when they do not expand to
Make syntax (i.e. where `eval` is provably pointless).

Additionally, remove the obsolete `eval` feature check - we mandate at
least GNU Make 4.3, which always supports it.

Change-Id: I26f1723f084d0428a2cbe336e76f0765a9818a5a
Signed-off-by: Chris Kay <chris.kay@arm.com>

7 files changed, 22 insertions, 22 deletions

diff --git a/drivers/arm/ethosn/ethosn_npu.mk b/drivers/arm/ethosn/ethosn_npu.mk
index 4a31b597d..10ff378f0 100644
--- a/drivers/arm/ethosn/ethosn_npu.mk
+++ b/drivers/arm/ethosn/ethosn_npu.mk
@@ -7,12 +7,12 @@
 # Arm(R) Ethos(TM)-N NPU SiP service
 ETHOSN_NPU_DRIVER			:=	0
 
-$(eval $(call assert_boolean,ETHOSN_NPU_DRIVER))
+$(call assert_boolean,ETHOSN_NPU_DRIVER)
 $(eval $(call add_define,ETHOSN_NPU_DRIVER))
 
 #Ethos-N NPU TZMP1
 ETHOSN_NPU_TZMP1			:=	0
-$(eval $(call assert_boolean,ETHOSN_NPU_TZMP1))
+$(call assert_boolean,ETHOSN_NPU_TZMP1)
 $(eval $(call add_define,ETHOSN_NPU_TZMP1))
 ifeq (${ETHOSN_NPU_TZMP1},1)
   ifeq (${ETHOSN_NPU_DRIVER},0)
diff --git a/drivers/arm/gic/v3/gicv3.mk b/drivers/arm/gic/v3/gicv3.mk
index 89bce95de..ed70ff18c 100644
--- a/drivers/arm/gic/v3/gicv3.mk
+++ b/drivers/arm/gic/v3/gicv3.mk
@@ -34,25 +34,25 @@ GICV3_SOURCES	+=	drivers/arm/gic/v3/gic600_multichip.c
 endif
 
 # Set GIC-600 support
-$(eval $(call assert_boolean,GICV3_SUPPORT_GIC600))
+$(call assert_boolean,GICV3_SUPPORT_GIC600)
 $(eval $(call add_define,GICV3_SUPPORT_GIC600))
 
 # Set GIC-600AE FMU support
-$(eval $(call assert_boolean,GICV3_SUPPORT_GIC600AE_FMU))
+$(call assert_boolean,GICV3_SUPPORT_GIC600AE_FMU)
 $(eval $(call add_define,GICV3_SUPPORT_GIC600AE_FMU))
 
 # Set GIC-600 multichip support
-$(eval $(call assert_boolean,GICV3_IMPL_GIC600_MULTICHIP))
+$(call assert_boolean,GICV3_IMPL_GIC600_MULTICHIP)
 $(eval $(call add_define,GICV3_IMPL_GIC600_MULTICHIP))
 
 # Set GICv4 extension
-$(eval $(call assert_boolean,GIC_ENABLE_V4_EXTN))
+$(call assert_boolean,GIC_ENABLE_V4_EXTN)
 $(eval $(call add_define,GIC_ENABLE_V4_EXTN))
 
 # Set support for extended PPI and SPI range
-$(eval $(call assert_boolean,GIC_EXT_INTID))
+$(call assert_boolean,GIC_EXT_INTID)
 $(eval $(call add_define,GIC_EXT_INTID))
 
 # Set errata workaround for GIC600/GIC600AE
-$(eval $(call assert_boolean,GIC600_ERRATA_WA_2384374))
+$(call assert_boolean,GIC600_ERRATA_WA_2384374)
 $(eval $(call add_define,GIC600_ERRATA_WA_2384374))
diff --git a/drivers/arm/sfcp/sfcp.mk b/drivers/arm/sfcp/sfcp.mk
index ab1485011..942fa1a6d 100644
--- a/drivers/arm/sfcp/sfcp.mk
+++ b/drivers/arm/sfcp/sfcp.mk
@@ -30,18 +30,18 @@ SFCP_SOURCES	+=	$(addprefix drivers/arm/mhu/,			\
 					mhu_v3_x.c				\
 				)
 
-$(eval $(call add_defines, \
+$(call add_defines, \
 	PLAT_MHU_VERSION=3	\
-))
+)
 
 else ifeq (${PLAT_MHU}, MHUv2)
 SFCP_SOURCES	+=	$(addprefix drivers/arm/mhu/,			\
 					mhu_v2_x.c				\
 				)
 
-$(eval $(call add_defines, \
+$(call add_defines, \
 	PLAT_MHU_VERSION=2	\
-))
+)
 
 else
 $(error Unsupported MHU version)
@@ -54,7 +54,7 @@ PLAT_INCLUDES		+=	-Iinclude/lib/psa		\
 						-Idrivers/arm/sfcp/sfcp_core	\
 						-Idrivers/arm/sfcp/sfcp_psa/sfcp_psa_protocol
 
-$(eval $(call add_defines, \
+$(call add_defines, \
 	SFCP_PROTOCOL_EMBED_ENABLED	\
 	SFCP_PROTOCOL_POINTER_ACCESS_ENABLED	\
-))
+)
diff --git a/drivers/auth/mbedtls/mbedtls_common.mk b/drivers/auth/mbedtls/mbedtls_common.mk
index bbb2e59ae..f0073bda9 100644
--- a/drivers/auth/mbedtls/mbedtls_common.mk
+++ b/drivers/auth/mbedtls/mbedtls_common.mk
@@ -154,14 +154,14 @@ else ifeq (${DECRYPTION_SUPPORT}, aes_gcm)
 endif
 
 # Needs to be set to drive mbed TLS configuration correctly
-$(eval $(call add_defines,\
+$(call add_defines,\
     $(sort \
         TF_MBEDTLS_KEY_ALG_ID \
         TF_MBEDTLS_KEY_SIZE \
         TF_MBEDTLS_HASH_ALG_ID \
         TF_MBEDTLS_USE_AES_CCM \
         TF_MBEDTLS_USE_AES_GCM \
-)))
+))
 
 ifeq ($(filter 1,$(ENABLE_FEAT_CRYPTO)),1)
     REMOVED_CFLAGS		:=	-nostdinc -mgeneral-regs-only
diff --git a/drivers/measured_boot/rse/dice_prot_env.mk b/drivers/measured_boot/rse/dice_prot_env.mk
index 7c833076a..8e91d51e1 100644
--- a/drivers/measured_boot/rse/dice_prot_env.mk
+++ b/drivers/measured_boot/rse/dice_prot_env.mk
@@ -20,10 +20,10 @@ else
 endif #DPE_HASH_ALG
 
 # Set definitions for DICE Protection Environment
-$(eval $(call add_defines,\
+$(call add_defines,\
     $(sort \
         DPE_ALG_ID \
         DPE_DIGEST_SIZE \
-)))
+))
 
 DPE_SOURCES	+=	drivers/measured_boot/rse/dice_prot_env.c
diff --git a/drivers/measured_boot/rse/rse_measured_boot.mk b/drivers/measured_boot/rse/rse_measured_boot.mk
index 1bd971f32..e008905ed 100644
--- a/drivers/measured_boot/rse/rse_measured_boot.mk
+++ b/drivers/measured_boot/rse/rse_measured_boot.mk
@@ -20,12 +20,12 @@ else
 endif #MBOOT_RSE_HASH_ALG
 
 # Set definitions for Measured Boot driver.
-$(eval $(call add_defines,\
+$(call add_defines,\
     $(sort \
         MBOOT_ALG_ID \
         MBOOT_DIGEST_SIZE \
         MBOOT_RSE_BACKEND \
-)))
+))
 
 MEASURED_BOOT_SRC_DIR	:= drivers/measured_boot/rse/
 
diff --git a/drivers/tpm/tpm2.mk b/drivers/tpm/tpm2.mk
index 729103bef..d3c7902a3 100644
--- a/drivers/tpm/tpm2.mk
+++ b/drivers/tpm/tpm2.mk
@@ -28,10 +28,10 @@ else
     $(error "The selected MBOOT_TPM_HASH_ALG is invalid.")
 endif #MBOOT_TPM_HASH_ALG
 
-$(eval $(call add_defines,\
+$(call add_defines,\
     $(sort \
         TCG_DIGEST_SIZE \
-)))
+))
 
 ifeq (${TPM_INTERFACE}, FIFO_SPI)
     $(eval $(call add_define,TPM_INTERFACE_FIFO_SPI))