andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

imx8qm: imx8qx: Migrate to new interfaces 

- Migrate to new GIC interfaces.
- Migrate to bl31_early_platform_setup2().
- Remove references to removed build options.

Change-Id: Ia7c63f75325ea4b41e32a9de3f01b0007d0ae210
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
This commit is contained in:
Antonio Nino Diaz 2018-09-24 17:56:56 +01:00
parent 82fbaa33e8
commit 601d2f3c23
5 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plat/imx/common/plat_imx8_gic.c
View File

@ -6,6 +6,7 @@
#include <bl_common.h> #include <bl_common.h>
#include <gicv3.h> #include <gicv3.h>
#include <interrupt_props.h>
#include <plat_imx8.h> #include <plat_imx8.h>
#include <platform.h> #include <platform.h>
#include <platform_def.h> #include <platform_def.h>
@ -14,11 +15,12 @@
/* the GICv3 driver only needs to be initialized in EL3 */ /* the GICv3 driver only needs to be initialized in EL3 */
uintptr_t rdistif_base_addrs[PLATFORM_CORE_COUNT]; uintptr_t rdistif_base_addrs[PLATFORM_CORE_COUNT];
/* array of Group1 secure interrupts to be configured by the gic driver */ static const interrupt_prop_t g01s_interrupt_props[] = {
const unsigned int g1s_interrupt_array[] = { 6 }; INTR_PROP_DESC(6, GIC_HIGHEST_SEC_PRIORITY,
INTR_GROUP1S, GIC_INTR_CFG_LEVEL),
/* array of Group0 interrupts to be configured by the gic driver */ INTR_PROP_DESC(7, GIC_HIGHEST_SEC_PRIORITY,
const unsigned int g0_interrupt_array[] = { 7 }; INTR_GROUP0, GIC_INTR_CFG_LEVEL),
};
static unsigned int plat_imx_mpidr_to_core_pos(unsigned long mpidr) static unsigned int plat_imx_mpidr_to_core_pos(unsigned long mpidr)
{ {
@ -28,10 +30,8 @@ static unsigned int plat_imx_mpidr_to_core_pos(unsigned long mpidr)
const gicv3_driver_data_t arm_gic_data = { const gicv3_driver_data_t arm_gic_data = {
.gicd_base = PLAT_GICD_BASE, .gicd_base = PLAT_GICD_BASE,
.gicr_base = PLAT_GICR_BASE, .gicr_base = PLAT_GICR_BASE,
.g0_interrupt_num = ARRAY_SIZE(g0_interrupt_array), .interrupt_props = g01s_interrupt_props,
.g1s_interrupt_num = ARRAY_SIZE(g1s_interrupt_array), .interrupt_props_num = ARRAY_SIZE(g01s_interrupt_props),
.g0_interrupt_array = g0_interrupt_array,
.g1s_interrupt_array = g1s_interrupt_array,
.rdistif_num = PLATFORM_CORE_COUNT, .rdistif_num = PLATFORM_CORE_COUNT,
.rdistif_base_addrs = rdistif_base_addrs, .rdistif_base_addrs = rdistif_base_addrs,
.mpidr_to_core_pos = plat_imx_mpidr_to_core_pos, .mpidr_to_core_pos = plat_imx_mpidr_to_core_pos,

4
plat/imx/imx8qm/imx8qm_bl31_setup.c
View File

@ -291,8 +291,8 @@ void mx8_partition_resources(void)
} }
void bl31_early_platform_setup(bl31_params_t *from_bl2, void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
void *plat_params_from_bl2) u_register_t arg2, u_register_t arg3)
{ {
#if DEBUG_CONSOLE #if DEBUG_CONSOLE
static console_lpuart_t console; static console_lpuart_t console;

2
plat/imx/imx8qm/platform.mk
View File

@ -32,10 +32,8 @@ BL31_SOURCES += plat/imx/common/lpuart_console.S \
include plat/imx/common/sci/sci_api.mk include plat/imx/common/sci/sci_api.mk
ENABLE_PLAT_COMPAT := 0
USE_COHERENT_MEM := 1 USE_COHERENT_MEM := 1
RESET_TO_BL31 := 1 RESET_TO_BL31 := 1
ARM_GIC_ARCH := 3
A53_DISABLE_NON_TEMPORAL_HINT := 0 A53_DISABLE_NON_TEMPORAL_HINT := 0
MULTI_CONSOLE_API := 1 MULTI_CONSOLE_API := 1
ERRATA_A72_859971 := 1 ERRATA_A72_859971 := 1

4
plat/imx/imx8qx/imx8qx_bl31_setup.c
View File

@ -250,8 +250,8 @@ void imx8_partition_resources(void)
NOTICE("Non-secure Partitioning Succeeded\n"); NOTICE("Non-secure Partitioning Succeeded\n");
} }
void bl31_early_platform_setup(bl31_params_t *from_bl2, void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
void *plat_params_from_bl2) u_register_t arg2, u_register_t arg3)
{ {
#if DEBUG_CONSOLE #if DEBUG_CONSOLE
static console_lpuart_t console; static console_lpuart_t console;

2
plat/imx/imx8qx/platform.mk
View File

@ -30,8 +30,6 @@ BL31_SOURCES += plat/imx/common/lpuart_console.S \
include plat/imx/common/sci/sci_api.mk include plat/imx/common/sci/sci_api.mk
ENABLE_PLAT_COMPAT := 0
USE_COHERENT_MEM := 1 USE_COHERENT_MEM := 1
RESET_TO_BL31 := 1 RESET_TO_BL31 := 1
ARM_GIC_ARCH := 3
MULTI_CONSOLE_API := 1 MULTI_CONSOLE_API := 1