diff options
| author | danh-arm <dan.handley@arm.com> | 2014-07-10 14:44:24 +0100 |
|---|---|---|
| committer | danh-arm <dan.handley@arm.com> | 2014-07-10 14:44:24 +0100 |
| commit | 3fc938b56a55985ba46c37cf5526df0a7daa775c (patch) | |
| tree | e6e2cbdd6e15d1581fb10f16a06e56da826677b2 /plat/fvp/bl31_fvp_setup.c | |
| parent | 06bd026229ec9a2a8ded52c7e4b8cf8046d891a6 (diff) | |
| parent | 1e8c5c4f20ef820c339992a89a4680f2ccddd69b (diff) | |
Merge pull request #146 from danh-arm/dh/refactor-fvp-gic
Refactor fvp config and gic code
Diffstat (limited to 'plat/fvp/bl31_fvp_setup.c')
| -rw-r--r-- | plat/fvp/bl31_fvp_setup.c | 4 |
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 |