diff options
author | Madhukar Pappireddy <madhukar.pappireddy@arm.com> | 2023-05-11 00:44:49 +0200 |
---|---|---|
committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2023-05-11 00:44:49 +0200 |
commit | e1eef33572acf2872f1afa9d8fc7471707d32d7c (patch) | |
tree | f610edc3c71c27c9bca8177b9f6b684f0391beb4 /plat/arm | |
parent | 8700c6f784c5029aa09696980c0a9b0ea9962f98 (diff) | |
parent | fd51b21573ec2e0d815caecb89cc323aac0fca6d (diff) | |
download | arm-trusted-firmware-e1eef33572acf2872f1afa9d8fc7471707d32d7c.tar.gz |
Merge "fix(spmd): fix build error with spmd" into integration
Diffstat (limited to 'plat/arm')
-rw-r--r-- | plat/arm/board/corstone1000/common/corstone1000_bl31_setup.c | 4 | ||||
-rw-r--r-- | plat/arm/board/n1sdp/n1sdp_bl31_setup.c | 4 | ||||
-rw-r--r-- | plat/arm/board/tc/tc_bl31_setup.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/plat/arm/board/corstone1000/common/corstone1000_bl31_setup.c b/plat/arm/board/corstone1000/common/corstone1000_bl31_setup.c index b6765a60e..2549d3566 100644 --- a/plat/arm/board/corstone1000/common/corstone1000_bl31_setup.c +++ b/plat/arm/board/corstone1000/common/corstone1000_bl31_setup.c @@ -6,7 +6,7 @@ #include <stdint.h> -#if defined(SPD_spmd) +#if defined(SPD_spmd) && (SPMC_AT_EL3 == 0) /* * A dummy implementation of the platform handler for Group0 secure interrupt. */ @@ -15,4 +15,4 @@ int plat_spmd_handle_group0_interrupt(uint32_t intid) (void)intid; return -1; } -#endif /*defined(SPD_spmd)*/ +#endif /*defined(SPD_spmd) && (SPMC_AT_EL3 == 0)*/ diff --git a/plat/arm/board/n1sdp/n1sdp_bl31_setup.c b/plat/arm/board/n1sdp/n1sdp_bl31_setup.c index 6809541a6..bd0566006 100644 --- a/plat/arm/board/n1sdp/n1sdp_bl31_setup.c +++ b/plat/arm/board/n1sdp/n1sdp_bl31_setup.c @@ -160,7 +160,7 @@ void bl31_platform_setup(void) remote_dmc_ecc_setup(plat_info.remote_ddr_size); } -#if defined(SPD_spmd) +#if defined(SPD_spmd) && (SPMC_AT_EL3 == 0) /* * A dummy implementation of the platform handler for Group0 secure interrupt. */ @@ -169,4 +169,4 @@ int plat_spmd_handle_group0_interrupt(uint32_t intid) (void)intid; return -1; } -#endif /*defined(SPD_spmd)*/ +#endif /*defined(SPD_spmd) && (SPMC_AT_EL3 == 0)*/ diff --git a/plat/arm/board/tc/tc_bl31_setup.c b/plat/arm/board/tc/tc_bl31_setup.c index 630324fb3..6afbd9931 100644 --- a/plat/arm/board/tc/tc_bl31_setup.c +++ b/plat/arm/board/tc/tc_bl31_setup.c @@ -83,7 +83,7 @@ void __init bl31_plat_arch_setup(void) fconf_populate("HW_CONFIG", hw_config_info->config_addr); } -#if defined(SPD_spmd) && (SPMD_SPM_AT_SEL2 == 1) +#if defined(SPD_spmd) && (SPMC_AT_EL3 == 0) void tc_bl31_plat_runtime_setup(void) { arm_bl31_plat_runtime_setup(); @@ -115,4 +115,4 @@ int plat_spmd_handle_group0_interrupt(uint32_t intid) return -1; } -#endif /*defined(SPD_spmd) && (SPMD_SPM_AT_SEL2 == 1)*/ +#endif /*defined(SPD_spmd) && (SPMC_AT_EL3 == 0)*/ |