diff options
| author | Dan Handley <dan.handley@arm.com> | 2014-07-25 14:56:46 +0100 |
|---|---|---|
| committer | Dan Handley <dan.handley@arm.com> | 2014-07-25 14:56:46 +0100 |
| commit | 54d0911f643820350e52b97c494938e4f5ff2dd0 (patch) | |
| tree | 88e9ccafbd21cf11b2b714a85433b9122716268c | |
| parent | 705bf6806ba03169966a7c7df53a195d0255fefa (diff) | |
| parent | 2b98e7890b4fc28d0be9ca5b073fcd3f9eccde0e (diff) | |
Merge pull request #168 from sandrine-bailleux/sb/set-default-gic-arch
Define ARM_GIC_ARCH default value for all platforms
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | plat/fvp/platform.mk | 5 |
2 files changed, 7 insertions, 5 deletions
@@ -51,6 +51,9 @@ NS_TIMER_SWITCH := 0 RESET_TO_BL31 := 0 # Include FP registers in cpu context CTX_INCLUDE_FPREGS := 0 +# Determine the version of ARM GIC architecture to use for interrupt management +# in EL3. The platform port can change this value if needed. +ARM_GIC_ARCH := 2 # Checkpatch ignores @@ -188,6 +191,10 @@ $(eval $(call add_define,RESET_TO_BL31)) $(eval $(call assert_boolean,CTX_INCLUDE_FPREGS)) $(eval $(call add_define,CTX_INCLUDE_FPREGS)) +# Process ARM_GIC_ARCH flag +$(eval $(call add_define,ARM_GIC_ARCH)) + + ASFLAGS += -nostdinc -ffreestanding -Wa,--fatal-warnings \ -Werror -Wmissing-include-dirs \ -mgeneral-regs-only -D__ASSEMBLY__ \ diff --git a/plat/fvp/platform.mk b/plat/fvp/platform.mk index 21ac1e73..b22a3393 100644 --- a/plat/fvp/platform.mk +++ b/plat/fvp/platform.mk @@ -82,8 +82,3 @@ BL31_SOURCES += drivers/arm/cci400/cci400.c \ plat/fvp/aarch64/fvp_helpers.S \ plat/fvp/aarch64/fvp_common.c \ plat/fvp/drivers/pwrc/fvp_pwrc.c - -# Flag used by the platform port to determine the version of ARM GIC -# architecture to use for interrupt management in EL3. -ARM_GIC_ARCH := 2 -$(eval $(call add_define,ARM_GIC_ARCH)) |