diff options
| author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-09-25 11:37:23 +0100 |
|---|---|---|
| committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-09-28 15:31:53 +0100 |
| commit | 60e19f574414d69ec1f73c89c082e7e3fc14fdcd (patch) | |
| tree | ec94f77437259886e1bf1901c9e360450f856e92 /include | |
| parent | fe199e3bac38cc824a280ec35b7d55b6dae9a9ca (diff) | |
| download | platform_external_arm-trusted-firmware-60e19f574414d69ec1f73c89c082e7e3fc14fdcd.tar.gz platform_external_arm-trusted-firmware-60e19f574414d69ec1f73c89c082e7e3fc14fdcd.tar.bz2 platform_external_arm-trusted-firmware-60e19f574414d69ec1f73c89c082e7e3fc14fdcd.zip | |
plat/arm: Migrate to new interfaces
- Remove references to removed build options.
- Remove support for legacy GIC driver.
- Remove support for LOAD_IMAGE_V2=0.
Change-Id: I72f8c05620bdf4a682765e6e53e2c04ca749a3d5
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/plat/arm/common/arm_def.h | 15 | ||||
| -rw-r--r-- | include/plat/arm/common/plat_arm.h | 8 |
2 files changed, 0 insertions, 23 deletions
diff --git a/include/plat/arm/common/arm_def.h b/include/plat/arm/common/arm_def.h index c4994173a..23cd12f51 100644 --- a/include/plat/arm/common/arm_def.h +++ b/include/plat/arm/common/arm_def.h @@ -166,21 +166,6 @@ #define ARM_IRQ_SEC_SGI_7 15 /* - * List of secure interrupts are deprecated, but are retained only to support - * legacy configurations. - */ -#define ARM_G1S_IRQS ARM_IRQ_SEC_PHY_TIMER, \ - ARM_IRQ_SEC_SGI_1, \ - ARM_IRQ_SEC_SGI_2, \ - ARM_IRQ_SEC_SGI_3, \ - ARM_IRQ_SEC_SGI_4, \ - ARM_IRQ_SEC_SGI_5, \ - ARM_IRQ_SEC_SGI_7 - -#define ARM_G0_IRQS ARM_IRQ_SEC_SGI_0, \ - ARM_IRQ_SEC_SGI_6 - -/* * Define a list of Group 1 Secure and Group 0 interrupt properties as per GICv3 * terminology. On a GICv2 system or mode, the lists will be merged and treated * as Group 0 interrupts. diff --git a/include/plat/arm/common/plat_arm.h b/include/plat/arm/common/plat_arm.h index 53b4a45c1..3f344abce 100644 --- a/include/plat/arm/common/plat_arm.h +++ b/include/plat/arm/common/plat_arm.h @@ -17,7 +17,6 @@ /******************************************************************************* * Forward declarations ******************************************************************************/ -struct bl31_params; struct meminfo; struct image_info; struct bl_params; @@ -197,13 +196,8 @@ void arm_bl2u_platform_setup(void); void arm_bl2u_plat_arch_setup(void); /* BL31 utility functions */ -#if LOAD_IMAGE_V2 void arm_bl31_early_platform_setup(void *from_bl2, uintptr_t soc_fw_config, uintptr_t hw_config, void *plat_params_from_bl2); -#else -void arm_bl31_early_platform_setup(struct bl31_params *from_bl2, uintptr_t soc_fw_config, - uintptr_t hw_config, void *plat_params_from_bl2); -#endif /* LOAD_IMAGE_V2 */ void arm_bl31_platform_setup(void); void arm_bl31_plat_runtime_setup(void); void arm_bl31_plat_arch_setup(void); @@ -252,13 +246,11 @@ void plat_arm_error_handler(int err); unsigned int plat_arm_get_cpu_pe_count(u_register_t mpidr); #endif -#if LOAD_IMAGE_V2 /* * This function is called after loading SCP_BL2 image and it is used to perform * any platform-specific actions required to handle the SCP firmware. */ int plat_arm_bl2_handle_scp_bl2(struct image_info *scp_bl2_image_info); -#endif /* * Optional functions required in ARM standard platforms |