ArmPkg/ArmLib/AArch64: Use the appropriate macros and update comments

[mirror_edk2.git] / ArmPkg / ArmPkg.dec

diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec
index e664f8626a4ca96461b6801f15176821cefe5204..3326e7b584b59db3fced3f2984872bc0266d8f50 100644 (file)
--- a/ArmPkg/ArmPkg.dec
+++ b/ArmPkg/ArmPkg.dec
@@ -147,10 +147,6 @@
   gArmTokenSpaceGuid.PcdArmPrimaryCoreMask|0xF03|UINT32|0x00000031\r
   # The Primary Core is ClusterId[0] & CoreId[0] \r
   gArmTokenSpaceGuid.PcdArmPrimaryCore|0|UINT32|0x00000037\r
-  # Number of the CPU Interface for the Primary Core (eg: The number for the CPU0 of\r
-  # Cluster1 might be 4 if the implementer had followed the convention: Cpu Interface\r
-  # = 4 * Cluster)\r
-  gArmTokenSpaceGuid.PcdGicPrimaryCoreId|0|UINT32|0x00000043\r
 \r
   #\r
   # ARM L2x0 PCDs\r
@@ -185,3 +181,18 @@
   gArmTokenSpaceGuid.PcdArmLinuxFdtMaxOffset|0x4000|UINT32|0x00000023\r
   # The FDT blob must be loaded at a 64bit aligned address.\r
   gArmTokenSpaceGuid.PcdArmLinuxFdtAlignment|0x8|UINT32|0x00000026\r
+\r
+[PcdsFixedAtBuild.AARCH64]\r
+  # By default we do transition to EL2 non-secure mode with Stack for EL2.\r
+  #        Mode Description              Bits\r
+  # NS EL2 SP2 all interupts disabled =  0x3c9\r
+  # NS EL1 SP1 all interupts disabled =  0x3c5\r
+  # Other modes include using SP0 or switching to Aarch32, but these are\r
+  # not currently supported.\r
+  gArmTokenSpaceGuid.PcdArmNonSecModeTransition|0x3c9|UINT32|0x0000003E\r
+  # If the fixed FDT address is not available, then it should be loaded above the kernel.\r
+  # The recommendation from the AArch64 Linux kernel is to have the FDT below 512MB.\r
+  # (see the kernel doc: Documentation/arm64/booting.txt)\r
+  gArmTokenSpaceGuid.PcdArmLinuxFdtMaxOffset|0x20000000|UINT32|0x00000023\r
+  # The FDT blob must be loaded at a 2MB aligned address.\r
+  gArmTokenSpaceGuid.PcdArmLinuxFdtAlignment|0x00200000|UINT32|0x00000026\r