From 0709055ed66330fe7709c77d2dfbcb87f0c94272 Mon Sep 17 00:00:00 2001 From: Antonio Nino Diaz Date: Wed, 30 Jan 2019 16:01:49 +0000 Subject: Remove support for the SMC Calling Convention 2.0 This reverts commit 2f370465241c ("Add support for the SMC Calling Convention 2.0"). SMCCC v2.0 is no longer required for SPM, and won't be needed in the future. Removing it makes the SMC handling code less complicated. The SPM implementation based on SPCI and SPRT was using it, but it has been adapted to SMCCC v1.0. Change-Id: I36795b91857b2b9c00437cfbfed04b3c1627f578 Signed-off-by: Antonio Nino Diaz --- Makefile | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 4e606a2c..0169f3f6 100644 --- a/Makefile +++ b/Makefile @@ -432,16 +432,6 @@ ifeq ($(BL2_AT_EL3)-$(BL2_IN_XIP_MEM),0-1) $(error "BL2_IN_XIP_MEM is only supported when BL2_AT_EL3 is enabled") endif -# SMC Calling Convention checks -ifneq (${SMCCC_MAJOR_VERSION},1) - ifneq (${SPD},none) - $(error "SMC Calling Convention 1.X must be used with SPDs") - endif - ifeq (${ARCH},aarch32) - $(error "Only SMCCC 1.X is supported in AArch32 mode.") - endif -endif - # For RAS_EXTENSION, require that EAs are handled in EL3 first ifeq ($(RAS_EXTENSION),1) ifneq ($(HANDLE_EA_EL3_FIRST),1) @@ -624,7 +614,6 @@ $(eval $(call assert_boolean,BL2_IN_XIP_MEM)) $(eval $(call assert_numeric,ARM_ARCH_MAJOR)) $(eval $(call assert_numeric,ARM_ARCH_MINOR)) -$(eval $(call assert_numeric,SMCCC_MAJOR_VERSION)) ################################################################################ # Add definitions to the cpp preprocessor based on the current build options. @@ -664,7 +653,6 @@ $(eval $(call add_define,RAS_EXTENSION)) $(eval $(call add_define,RESET_TO_BL31)) $(eval $(call add_define,SEPARATE_CODE_AND_RODATA)) $(eval $(call add_define,RECLAIM_INIT_CODE)) -$(eval $(call add_define,SMCCC_MAJOR_VERSION)) $(eval $(call add_define,SPD_${SPD})) $(eval $(call add_define,SPIN_ON_BL1_EXIT)) $(eval $(call add_define,SPM_MM)) -- cgit v1.2.3