Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-19 02:54:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "fix(spmd): fix build error with spmd" into integration

Browse source
This commit is contained in:
Madhukar Pappireddy 2023-05-11 00:44:49 +02:00 • committed by TrustedFirmware Code Review
commit e1eef33572
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plat/arm/board/corstone1000/common/corstone1000_bl31_setup.c
View file

@ -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)*/

4
plat/arm/board/n1sdp/n1sdp_bl31_setup.c
View file

@ -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)*/

4
plat/arm/board/tc/tc_bl31_setup.c
View file

@ -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)*/

2
plat/hisilicon/hikey960/hikey960_bl31_setup.c
View file

@ -245,7 +245,7 @@ static uint64_t hikey_debug_fiq_handler(uint32_t id,
return 0;
}
#elif defined(SPD_spmd) && (SPMD_SPM_AT_SEL2 == 1)
#elif defined(SPD_spmd) && (SPMC_AT_EL3 == 0)
/*
* A dummy implementation of the platform handler for Group0 secure interrupt.
*/

4
plat/qemu/common/qemu_common.c
View file

@ -163,7 +163,7 @@ int plat_spmc_shmem_reclaim(struct ffa_mtd *desc)
}
#endif
#if defined(SPD_spmd) && (SPMD_SPM_AT_SEL2 == 1)
#if defined(SPD_spmd) && (SPMC_AT_EL3 == 0)
/*
* A dummy implementation of the platform handler for Group0 secure interrupt.
*/
@ -172,4 +172,4 @@ int plat_spmd_handle_group0_interrupt(uint32_t intid)
(void)intid;
return -1;
}
#endif /*defined(SPD_spmd) && (SPMD_SPM_AT_SEL2 == 1)*/
#endif /*defined(SPD_spmd) && (SPMC_AT_EL3 == 0)*/