diff options
Diffstat (limited to 'services/std_svc/std_svc_setup.c')
-rw-r--r-- | services/std_svc/std_svc_setup.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/services/std_svc/std_svc_setup.c b/services/std_svc/std_svc_setup.c index 1d80fa3433..7787a2fa23 100644 --- a/services/std_svc/std_svc_setup.c +++ b/services/std_svc/std_svc_setup.c @@ -14,7 +14,7 @@ #include <lib/psci/psci.h> #include <lib/runtime_instr.h> #include <services/sdei.h> -#include <services/spm_svc.h> +#include <services/spm_mm_svc.h> #include <services/std_svc.h> #include <smccc_helpers.h> #include <tools_share/uuid.h> @@ -45,8 +45,8 @@ static int32_t std_svc_setup(void) ret = 1; } -#if ENABLE_SPM - if (spm_setup() != 0) { +#if SPM_MM + if (spm_mm_setup() != 0) { ret = 1; } #endif @@ -103,14 +103,14 @@ static uintptr_t std_svc_smc_handler(uint32_t smc_fid, SMC_RET1(handle, ret); } -#if ENABLE_SPM && SPM_MM +#if SPM_MM /* * Dispatch SPM calls to SPM SMC handler and return its return * value */ - if (is_spm_fid(smc_fid)) { - return spm_smc_handler(smc_fid, x1, x2, x3, x4, cookie, - handle, flags); + if (is_spm_mm_fid(smc_fid)) { + return spm_mm_smc_handler(smc_fid, x1, x2, x3, x4, cookie, + handle, flags); } #endif |