summaryrefslogtreecommitdiff
path: root/plat/fvp/bl31_fvp_setup.c
diff options
context:
space:
mode:
authorDan Handley <dan.handley@arm.com>2014-06-20 09:43:15 +0100
committerDan Handley <dan.handley@arm.com>2014-07-09 16:36:39 +0100
commit1e8c5c4f20ef820c339992a89a4680f2ccddd69b (patch)
treef002ca49e24f23299cdb08ad3fb4f8020eab1b20 /plat/fvp/bl31_fvp_setup.c
parent6f3b195a18a151c08a4812497aaf4cee700d8b1b (diff)
Refactor fvp gic code to be a generic driver
Refactor the FVP gic code in plat/fvp/fvp_gic.c to be a generic ARM GIC driver in drivers/arm/gic/arm_gic.c. Provide the platform specific inputs in the arm_gic_setup() function so that the driver has no explicit dependency on platform code. Provide weak implementations of the platform interrupt controller API in a new file, plat/common/plat_gic.c. These simply call through to the ARM GIC driver. Move the only remaining FVP GIC function, fvp_gic_init() to plat/fvp/aarch64/fvp_common.c and remove plat/fvp/fvp_gic.c Fixes ARM-software/tf-issues#182 Change-Id: Iea82fe095fad62dd33ba9efbddd48c57717edd21
Diffstat (limited to 'plat/fvp/bl31_fvp_setup.c')
-rw-r--r--plat/fvp/bl31_fvp_setup.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/plat/fvp/bl31_fvp_setup.c b/plat/fvp/bl31_fvp_setup.c
index 8337ea45..96f4772a 100644
--- a/plat/fvp/bl31_fvp_setup.c
+++ b/plat/fvp/bl31_fvp_setup.c
@@ -30,6 +30,7 @@
#include <arch.h>
#include <arch_helpers.h>
+#include <arm_gic.h>
#include <assert.h>
#include <bl_common.h>
#include <bl31.h>
@@ -183,7 +184,8 @@ void bl31_platform_setup(void)
unsigned int reg_val;
/* Initialize the gic cpu and distributor interfaces */
- gic_setup();
+ fvp_gic_init();
+ arm_gic_setup();
/*
* TODO: Configure the CLCD before handing control to