summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordavidcunado-arm <david.cunado@arm.com>2016-09-26 10:20:08 +0100
committerGitHub <noreply@github.com>2016-09-26 10:20:08 +0100
commitbce266f07ba326def12eb349cb8f511d4da4cb48 (patch)
treea02fd7eca4e12b94951946189f5d526168e14c08
parentec413b885cb8e5ef9f4e3d2af3983cce2aa1e214 (diff)
parent4faa4a1d3d16641514df10d9cc715d7d9d119805 (diff)
Merge pull request #717 from sandrine-bailleux-arm/sb/foundation-fvp-v10
Whitelist version 9.6 of Foundation FVP
-rw-r--r--plat/arm/board/fvp/fvp_common.c1
-rw-r--r--plat/arm/board/fvp/fvp_def.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/plat/arm/board/fvp/fvp_common.c b/plat/arm/board/fvp/fvp_common.c
index fbbe34e6..3df472cd 100644
--- a/plat/arm/board/fvp/fvp_common.c
+++ b/plat/arm/board/fvp/fvp_common.c
@@ -189,6 +189,7 @@ void fvp_config_setup(void)
case REV_FOUNDATION_FVP_V2_0:
case REV_FOUNDATION_FVP_V2_1:
case REV_FOUNDATION_FVP_v9_1:
+ case REV_FOUNDATION_FVP_v9_6:
break;
default:
WARN("Unrecognized Foundation FVP revision %x\n", rev);
diff --git a/plat/arm/board/fvp/fvp_def.h b/plat/arm/board/fvp/fvp_def.h
index 40d20fce..edeb5b72 100644
--- a/plat/arm/board/fvp/fvp_def.h
+++ b/plat/arm/board/fvp/fvp_def.h
@@ -105,6 +105,7 @@
#define REV_FOUNDATION_FVP_V2_0 0x0
#define REV_FOUNDATION_FVP_V2_1 0x1
#define REV_FOUNDATION_FVP_v9_1 0x2
+#define REV_FOUNDATION_FVP_v9_6 0x3
#define BLD_GIC_VE_MMAP 0x0
#define BLD_GIC_A53A57_MMAP 0x1