summaryrefslogtreecommitdiff
path: root/plat/arm
diff options
context:
space:
mode:
authordanh-arm <dan.handley@arm.com>2017-06-05 14:41:31 +0100
committerGitHub <noreply@github.com>2017-06-05 14:41:31 +0100
commitc66f4adee3db52a734707ffe2cc324fb1c9fb576 (patch)
treeea1113dc6f539e2b7a77b26c004837ce7ec2bc97 /plat/arm
parent03dd6391f9c4d54197d83842def5d1a5321cacbb (diff)
parente1c59ab3f18a49301f649251b4d8a7d011cc9fb9 (diff)
Merge pull request #961 from jeenu-arm/gic-600
Introduce ARM GIC-600 driver
Diffstat (limited to 'plat/arm')
-rw-r--r--plat/arm/board/fvp/platform.mk11
1 files changed, 8 insertions, 3 deletions
diff --git a/plat/arm/board/fvp/platform.mk b/plat/arm/board/fvp/platform.mk
index 6dae116c..d6e8ced4 100644
--- a/plat/arm/board/fvp/platform.mk
+++ b/plat/arm/board/fvp/platform.mk
@@ -31,13 +31,18 @@ endif
$(eval $(call add_define,FVP_INTERCONNECT_DRIVER))
-# Choose the GIC sources depending upon the how the FVP will be invoked
-ifeq (${FVP_USE_GIC_DRIVER}, FVP_GICV3)
-FVP_GIC_SOURCES := drivers/arm/gic/common/gic_common.c \
+FVP_GICV3_SOURCES := drivers/arm/gic/common/gic_common.c \
drivers/arm/gic/v3/gicv3_main.c \
drivers/arm/gic/v3/gicv3_helpers.c \
plat/common/plat_gicv3.c \
plat/arm/common/arm_gicv3.c
+
+# Choose the GIC sources depending upon the how the FVP will be invoked
+ifeq (${FVP_USE_GIC_DRIVER}, FVP_GICV3)
+FVP_GIC_SOURCES := ${FVP_GICV3_SOURCES}
+else ifeq (${FVP_USE_GIC_DRIVER},FVP_GIC600)
+FVP_GIC_SOURCES := ${FVP_GICV3_SOURCES} \
+ drivers/arm/gic/v3/gic600.c
else ifeq (${FVP_USE_GIC_DRIVER}, FVP_GICV2)
FVP_GIC_SOURCES := drivers/arm/gic/common/gic_common.c \
drivers/arm/gic/v2/gicv2_main.c \