ls1043: Migrate to new interfaces
- Migrate to new GIC interfaces.
- Remove references to removed build options.
Change-Id: I6f90a33d5438a9d7b71be3f93e8d9da278c8c6e6
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
diff --git a/plat/layerscape/common/ls_bl31_setup.c b/plat/layerscape/common/ls_bl31_setup.c
index 25fe407..1114a51 100644
--- a/plat/layerscape/common/ls_bl31_setup.c
+++ b/plat/layerscape/common/ls_bl31_setup.c
@@ -7,8 +7,10 @@
#include <assert.h>
#include <bl_common.h>
#include <console.h>
-#include <mmio.h>
#include <gicv2.h>
+#include <interrupt_props.h>
+#include <mmio.h>
+
#include "ls_16550.h"
#include "plat_ls.h"
#include "soc.h"
@@ -20,15 +22,16 @@
static entry_point_info_t bl32_image_ep_info;
static entry_point_info_t bl33_image_ep_info;
-const unsigned int g0_interrupt_array1[] = {
- 9
+static const interrupt_prop_t g0_interrupt_props[] = {
+ INTR_PROP_DESC(9, GIC_HIGHEST_SEC_PRIORITY,
+ GICV2_INTR_GROUP0, GIC_INTR_CFG_LEVEL),
};
gicv2_driver_data_t ls_gic_data = {
.gicd_base = GICD_BASE,
.gicc_base = GICC_BASE,
- .g0_interrupt_num = ARRAY_SIZE(g0_interrupt_array1),
- .g0_interrupt_array = g0_interrupt_array1,
+ .interrupt_props = g0_interrupt_props,
+ .interrupt_props_num = ARRAY_SIZE(g0_interrupt_props),
};