diff options
| author | danh-arm <dan.handley@arm.com> | 2014-11-04 16:01:40 +0000 |
|---|---|---|
| committer | danh-arm <dan.handley@arm.com> | 2014-11-04 16:01:40 +0000 |
| commit | e73f4ef6072096584f44cb0046c78194df359e8a (patch) | |
| tree | e5b1602b93cf92d37cd8601fd46dd0b0a68ed369 /plat/juno/bl31_plat_setup.c | |
| parent | 82b9b2973b108e91367159f2f42dec2fc45f168d (diff) | |
| parent | 33132e643a030847529c324e41c673e54a81a1ee (diff) | |
Merge pull request #219 from jcastillo-arm/jc/tf-issues/253
Improvements to ARM GIC driver
Juno: Use the generic ARM GIC driver
Diffstat (limited to 'plat/juno/bl31_plat_setup.c')
| -rw-r--r-- | plat/juno/bl31_plat_setup.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/plat/juno/bl31_plat_setup.c b/plat/juno/bl31_plat_setup.c index 4a92d44a..c4504622 100644 --- a/plat/juno/bl31_plat_setup.c +++ b/plat/juno/bl31_plat_setup.c @@ -29,6 +29,7 @@ */ #include <arch.h> +#include <arm_gic.h> #include <assert.h> #include <bl31.h> #include <bl_common.h> @@ -151,7 +152,8 @@ void bl31_platform_setup(void) mhu_secure_init(); /* Initialize the gic cpu and distributor interfaces */ - gic_setup(); + plat_gic_init(); + arm_gic_setup(); /* Enable and initialize the System level generic timer */ mmio_write_32(SYS_CNTCTL_BASE + CNTCR_OFF, CNTCR_FCREQ(0) | CNTCR_EN); |