Fix some more headers. Add some missing library classes in .dec file and update .dsc to default to cortex ARM cpu type.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9718 6f19259b-4bc3-4df7-8a09-765794883524

3 files changed, 47 insertions, 5 deletions

diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec
index 9773f450e3..5509b4e04b 100644
--- a/ArmPkg/ArmPkg.dec
+++ b/ArmPkg/ArmPkg.dec
@@ -1,4 +1,18 @@
-#%HEADER%

+#/** @file

+# ARM processor package.

+#

+# Copyright (c) 2009 - 2010, Apple Inc. All rights reserved.

+#

+#  All rights reserved. This program and the accompanying materials

+#    are licensed and made available under the terms and conditions of the BSD License

+#    which accompanies this distribution. The full text of the license may be found at

+#    http://opensource.org/licenses/bsd-license.php

+#

+#    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+#    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+#

+#**/

+

 [Defines]

   DEC_SPECIFICATION              = 0x00010005

   PACKAGE_NAME                   = ArmPkg

@@ -18,13 +32,16 @@
   Include                        # Root include for the package

 

 [LibraryClasses.common]

+  ArmLib|Include/Library/ArmLib.h

   SemihostLib|Include/Library/Semihosting.h

+  UncachedMemoryAllocationLib|Include/Library/UncachedMemoryAllocationLib.h

 

 [Guids.common]

   gArmTokenSpaceGuid       = { 0xBB11ECFE, 0x820F, 0x4968, { 0xBB, 0xA6, 0xF7, 0x6A, 0xFE, 0x30, 0x25, 0x96 } }

 

 [Protocols.common]

   gTimerDebugSupportProtocolGuid = { 0x68300561, 0x0197, 0x465d, { 0xb5, 0xa1, 0x28, 0xeb, 0xa1, 0x98, 0xdd, 0x0b } }

+  gVirtualUncachedPagesProtocolGuid = { 0xAD651C7D, 0x3C22, 0x4DBF, { 0x92, 0xe8, 0x38, 0xa7, 0xcd, 0xae, 0x87, 0xb2 } }

 

 [PcdsFeatureFlag.common]

   gArmTokenSpaceGuid.PcdCpuDxeProduceDebugSupport|FALSE|BOOLEAN|0x00000001

diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc
index ca4f4fa555..e73d770131 100644
--- a/ArmPkg/ArmPkg.dsc
+++ b/ArmPkg/ArmPkg.dsc
@@ -1,7 +1,15 @@
-#%HEADER%
 #/** @file
+# ARM processor package.
 #
-# ARM Package
+# Copyright (c) 2009 - 2010, Apple Inc. All rights reserved.
+#
+#  All rights reserved. This program and the accompanying materials
+#    are licensed and made available under the terms and conditions of the BSD License
+#    which accompanies this distribution. The full text of the license may be found at
+#    http://opensource.org/licenses/bsd-license.php
+#
+#    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #**/
 
@@ -36,10 +44,27 @@
   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
   UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
 
-  ArmLib|ArmPkg/Library/ArmLib/Null/NullArmLib.inf
   SemihostLib|ArmPkg/Library/SemihostLib/SemihostLib.inf
   UncachedMemoryAllocationLib|ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf
+  DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
+
+  ArmLib|ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexArmLib.inf
+
+[LibraryClasses.ARM]
+  #
+  # Note: This NULL library feature is not yet in the edk2/BaseTools, but it is checked in to 
+  # the BaseTools project. So you need to build with the BaseTools project util this feature gets synced.
+  #
+  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
+
+[BuildOptions]
+  XCODE:*_*_ARM_ARCHCC_FLAGS     == -arch armv6 -march=armv6
+  XCODE:*_*_ARM_ARCHASM_FLAGS    == -arch armv6
+  XCODE:*_*_ARM_ARCHDLINK_FLAGS  == -arch armv6
 
+  RVCT:*_*_ARM_ARCHCC_FLAGS     == --cpu Cortex-A8
+  RVCT:*_*_ARM_ARCHASM_FLAGS    == --cpu Cortex-A8
+ 
 
 [Components.common]
   ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
diff --git a/ArmPkg/Filesystem/SemihostFs/SemihostFs.inf b/ArmPkg/Filesystem/SemihostFs/SemihostFs.inf
index 7fca293d6f..d5fe460903 100644
--- a/ArmPkg/Filesystem/SemihostFs/SemihostFs.inf
+++ b/ArmPkg/Filesystem/SemihostFs/SemihostFs.inf
@@ -1,4 +1,4 @@
-#%HEADER%
+
 #/** @file
 #  Support a Semi Host file system over a debuggers JTAG
 #