commit 8a4fb6f6582d2bbe6470978724ea648fad43fba5
author Dan Handley <dan.handley@arm.com> Thu Apr 17 17:48:52 2014 +0100
committer Dan Handley <dan.handley@arm.com> Tue May 06 12:35:02 2014 +0100
tree 8f66054c7c4eb773fee4266de546b5ec8d216d5d
parent bdbfc3c298b4cdc36412d6abd55a4fe79e643b44

Refactor GIC header files

Move the function prototypes from gic.h into either gic_v2.h or
gic_v3.h as appropriate. Update the source files to include the
correct headers.

Change-Id: I368cfda175cdcbd3a68f46e2332738ec49048e19

plat/fvp/aarch64/bl1_plat_helpers.S

diff --git a/plat/fvp/aarch64/bl1_plat_helpers.S b/plat/fvp/aarch64/bl1_plat_helpers.S
index 69fb14b..64f230d 100644
--- a/plat/fvp/aarch64/bl1_plat_helpers.S
+++ b/plat/fvp/aarch64/bl1_plat_helpers.S
@@ -30,7 +30,7 @@
 
 #include <arch.h>
 #include <platform.h>
-#include <gic.h>
+#include <gic_v2.h>
 #include <asm_macros.S>
 #include "../drivers/pwrc/fvp_pwrc.h"
 

plat/fvp/plat_gic.c

diff --git a/plat/fvp/plat_gic.c b/plat/fvp/plat_gic.c
index 8929172..be892ac 100644
--- a/plat/fvp/plat_gic.c
+++ b/plat/fvp/plat_gic.c
@@ -31,7 +31,8 @@
 #include <stdint.h>
 #include <arch_helpers.h>
 #include <platform.h>
-#include <gic.h>
+#include <gic_v2.h>
+#include <gic_v3.h>
 #include <debug.h>
 
 

plat/fvp/plat_pm.c

diff --git a/plat/fvp/plat_pm.c b/plat/fvp/plat_pm.c
index 2a414c9..4359638 100644
--- a/plat/fvp/plat_pm.c
+++ b/plat/fvp/plat_pm.c
@@ -38,7 +38,7 @@
 #include <bl31.h>
 #include <bakery_lock.h>
 #include <cci400.h>
-#include <gic.h>
+#include <gic_v2.h>
 /* Only included for error codes */
 #include <psci.h>
 #include "drivers/pwrc/fvp_pwrc.h"