ArmPkg: Added Aarch64 support

[mirror_edk2.git] / ArmPkg / ArmPkg.dsc

diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc
index 1b8cff110f842f482bb6e796e1f781108bf80f0e..638054d325180e64885355f77b4bbfd334039da0 100644 (file)
--- a/ArmPkg/ArmPkg.dsc
+++ b/ArmPkg/ArmPkg.dsc
@@ -25,7 +25,7 @@
   PLATFORM_VERSION               = 0.1\r
   DSC_SPECIFICATION              = 0x00010005\r
   OUTPUT_DIRECTORY               = Build/Arm\r
-  SUPPORTED_ARCHITECTURES        = ARM\r
+  SUPPORTED_ARCHITECTURES        = ARM|AARCH64\r
   BUILD_TARGETS                  = DEBUG|RELEASE\r
   SKUID_IDENTIFIER               = DEFAULT\r
 \r
@@ -61,8 +61,8 @@
   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf\r
   DefaultExceptionHandlerLib|ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf\r
 \r
-  ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf\r
   CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf\r
+  ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf\r
   ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf\r
   ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf\r
   DmaLib|ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf\r
@@ -76,6 +76,12 @@
   \r
   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf\r
 \r
+[LibraryClasses.ARM]\r
+  ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf\r
+\r
+[LibraryClasses.AARCH64]\r
+  ArmLib|ArmPkg/Library/ArmLib/AArch64/AArch64Lib.inf\r
+\r
 [LibraryClasses.common.PEIM]\r
   HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf\r
   PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf\r
@@ -89,20 +95,15 @@
 [LibraryClasses.ARM]\r
   NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf\r
 \r
+[LibraryClasses.AARCH64]\r
+  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf\r
+\r
 [Components.common]\r
   ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf\r
   ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf\r
   ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf\r
-#  ArmPkg/Library/ArmLib/Arm11/Arm11ArmLib.inf\r
-#  ArmPkg/Library/ArmLib/Arm11/Arm11ArmLibPrePi.inf\r
-#  ArmPkg/Library/ArmLib/Arm9/Arm9ArmLib.inf\r
-#  ArmPkg/Library/ArmLib/Arm9/Arm9ArmLibPrePi.inf\r
-  ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf\r
-  ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.inf\r
-  ArmPkg/Library/ArmLib/ArmV7/ArmV7LibSec.inf\r
   ArmPkg/Library/ArmLib/Null/NullArmLib.inf\r
   ArmPkg/Library/BaseMemoryLibStm/BaseMemoryLibStm.inf\r
-  ArmPkg/Library/BaseMemoryLibVstm/BaseMemoryLibVstm.inf\r
   ArmPkg/Library/BasePeCoffLib/BasePeCoffLib.inf\r
   ArmPkg/Library/BdsLib/BdsLib.inf\r
   ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf\r
@@ -116,9 +117,6 @@
   ArmPkg/Library/SemihostLib/SemihostLib.inf\r
   ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf\r
 \r
-  ArmPkg/Drivers/ArmCpuLib/ArmCortexA8Lib/ArmCortexA8Lib.inf\r
-  ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Lib.inf\r
-  ArmPkg/Drivers/ArmCpuLib/ArmCortexA15Lib/ArmCortexA15Lib.inf\r
   ArmPkg/Drivers/CpuDxe/CpuDxe.inf\r
   ArmPkg/Drivers/CpuPei/CpuPei.inf\r
   ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf\r
@@ -133,3 +131,24 @@
 \r
   ArmPkg/Application/LinuxLoader/LinuxAtagLoader.inf\r
   ArmPkg/Application/LinuxLoader/LinuxFdtLoader.inf\r
+\r
+[Components.ARM]\r
+  ArmPkg/Library/BaseMemoryLibVstm/BaseMemoryLibVstm.inf\r
+\r
+  ArmPkg/Drivers/ArmCpuLib/ArmCortexA8Lib/ArmCortexA8Lib.inf\r
+  ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Lib.inf\r
+  ArmPkg/Drivers/ArmCpuLib/ArmCortexA15Lib/ArmCortexA15Lib.inf\r
+\r
+#  ArmPkg/Library/ArmLib/Arm11/Arm11ArmLib.inf\r
+#  ArmPkg/Library/ArmLib/Arm11/Arm11ArmLibPrePi.inf\r
+#  ArmPkg/Library/ArmLib/Arm9/Arm9ArmLib.inf\r
+#  ArmPkg/Library/ArmLib/Arm9/Arm9ArmLibPrePi.inf\r
+  ArmPkg/Library/ArmLib/ArmV7/ArmV7LibSec.inf\r
+  ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.inf\r
+\r
+[Components.AARCH64]\r
+  ArmPkg/Drivers/ArmCpuLib/ArmCortexAEMv8Lib/ArmCortexAEMv8Lib.inf\r
+  ArmPkg/Drivers/ArmCpuLib/ArmCortexA5xLib/ArmCortexA5xLib.inf\r
+\r
+  ArmPkg/Library/ArmLib/AArch64/AArch64LibSec.inf\r
+  ArmPkg/Library/ArmLib/AArch64/AArch64LibPrePi.inf\r