ArmPlatformPkg/ArmVExpressPkg: Added support to differentiate ARMv8 FVP variants

[mirror_edk2.git] / ArmPlatformPkg / ArmVExpressPkg / Include / VExpressMotherBoard.h

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Include/VExpressMotherBoard.h b/ArmPlatformPkg/ArmVExpressPkg/Include/VExpressMotherBoard.h
index dd16b9368ac870531ee05ec0bbc52a7e084dfba5..38691c35828b16637f0fc111879c2fe00b129685 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/Include/VExpressMotherBoard.h
+++ b/ArmPlatformPkg/ArmVExpressPkg/Include/VExpressMotherBoard.h
@@ -1,7 +1,7 @@
 /** @file\r
 *  Header defining Versatile Express constants (Base addresses, sizes, flags)\r
 *\r
-*  Copyright (c) 2011-2014, ARM Limited. All rights reserved.\r
+*  Copyright (c) 2011-2015, ARM Limited. All rights reserved.\r
 *\r
 *  This program and the accompanying materials\r
 *  are licensed and made available under the terms and conditions of the BSD License\r
@@ -121,11 +121,20 @@
 //GICH          0x2c004000              0x2c010000\r
 //GICV          0x2c006000              0x2c020000\r
 \r
+#define ARM_FVP_BASE_BOARD_SYS_ID       (0x00200100)\r
+#define ARM_FVP_FOUNDATION_BOARD_SYS_ID (0x00100100)\r
+\r
+#define ARM_FVP_SYS_ID_REV_MASK        (UINT32)(0xFUL   << 28)\r
+#define ARM_FVP_SYS_ID_HBI_MASK        (UINT32)(0xFFFUL << 16)\r
+#define ARM_FVP_SYS_ID_VARIANT_MASK    (UINT32)(0xFUL   << 12)\r
+#define ARM_FVP_SYS_ID_PLAT_MASK       (UINT32)(0xFUL   << 8 )\r
+#define ARM_FVP_SYS_ID_FPGA_MASK       (UINT32)(0xFFUL  << 0 )\r
+#define ARM_FVP_GIC_VE_MMAP            0x0\r
+#define ARM_FVP_GIC_BASE_MMAP          (UINT32)(1 << 12)\r
+\r
 // The default SYS_IDs. These can be changed when starting the model.\r
 #define ARM_RTSM_SYS_ID                (0x225F500)\r
-#define ARM_FVP_BASE_SYS_ID            (0x00201100)\r
-#define ARM_FVP_FOUNDATION_SYS_ID      (0x00101100)\r
-\r
-#define ARM_FVP_SYS_ID_VARIANT_MASK    (UINT32)(0xFUL << 12)\r
+#define ARM_FVP_BASE_SYS_ID            (ARM_FVP_BASE_BOARD_SYS_ID | ARM_FVP_GIC_BASE_MMAP)\r
+#define ARM_FVP_FOUNDATION_SYS_ID      (ARM_FVP_FOUNDATION_BOARD_SYS_ID | ARM_FVP_GIC_BASE_MMAP)\r
 \r
 #endif /* VEXPRESSMOTHERBOARD_H_ */\r