ArmPlatformPkg: Fix build issues

Other compiler version ... other warnings

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

diff --git a/ArmPlatformPkg/ArmPlatformPkg.dec b/ArmPlatformPkg/ArmPlatformPkg.dec
index a332f2cca3aafbd1403aa6f5bb1e6fa192a00ed4..3eb3608954f9a07b15cd501e990e3fc8e3783f24 100644 (file)
--- a/ArmPlatformPkg/ArmPlatformPkg.dec
+++ b/ArmPlatformPkg/ArmPlatformPkg.dec
@@ -112,7 +112,7 @@
   # BDS - Boot Manager
   #
   gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Platform"|VOID*|0x00000019
-  gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L""|VOID*|0x0000000C
+  gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Default Boot Device"|VOID*|0x0000000C
   gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L""|VOID*|0x0000000D
   gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|""|VOID*|0x000000F
   # PcdDefaultBootType define the type of the binary pointed by PcdDefaultBootDevicePath: 

diff --git a/ArmPlatformPkg/Bds/Bds.c b/ArmPlatformPkg/Bds/Bds.c
index 7b49be4c114e0e6f8c3ec22792edecfd0e73cca5..a10c90a815866a1ea96c31ecbdaede410d60f885 100644 (file)
--- a/ArmPlatformPkg/Bds/Bds.c
+++ b/ArmPlatformPkg/Bds/Bds.c
@@ -351,7 +351,7 @@ BdsEntry (
   //
   // Declare the Firmware Vendor
   //
-  if (PcdGetPtr(PcdFirmwareVendor)) {
+  if (FixedPcdGetPtr(PcdFirmwareVendor) != NULL) {
     Size = 0x100;
     gST->FirmwareVendor = AllocateRuntimePool (Size);
     ASSERT (gST->FirmwareVendor != NULL);

diff --git a/ArmPlatformPkg/Library/EblCmdLib/EblCmdMmu.c b/ArmPlatformPkg/Library/EblCmdLib/EblCmdMmu.c
index 4b001eaef325d6ebe7d0ae2d100ee901ebf3ba8b..34776939163f2c8438cdb06566cf29affb4f0f08 100644 (file)
--- a/ArmPlatformPkg/Library/EblCmdLib/EblCmdMmu.c
+++ b/ArmPlatformPkg/Library/EblCmdLib/EblCmdMmu.c
@@ -128,8 +128,8 @@ MmuEntryGetAddress (
     } else if ((Entry.Value & 0x3) == 2) {    // Section Type\r
       return Entry.Value & TT_DESCRIPTOR_SECTION_BASE_ADDRESS_MASK;\r
     } else if ((Entry.Value & 0x3) == 1) {    // Level2 Table\r
-      MMU_ENTRY Entry = MmuEntryCreate(Level2,(UINT32*)(Entry.Value & 0xFFFFC000),0);\r
-      return MmuEntryGetAddress(Entry);\r
+      MMU_ENTRY Level2Entry = MmuEntryCreate (Level2,(UINT32*)(Entry.Value & 0xFFFFC000),0);\r
+      return MmuEntryGetAddress (Level2Entry);\r
     } else {                                  // Page Type\r
       return 0;\r
     }\r

diff --git a/ArmPlatformPkg/PrePi/PrePi.c b/ArmPlatformPkg/PrePi/PrePi.c
index 501821465a7dfd9314e3f51101e8ff45d289734f..98831ed1841b7a16d084720634a3708326e66559 100755 (executable)
--- a/ArmPlatformPkg/PrePi/PrePi.c
+++ b/ArmPlatformPkg/PrePi/PrePi.c
@@ -135,6 +135,8 @@ CEntryPoint (
 {\r
   UINT64   StartTimeStamp;\r
 \r
+  StartTimeStamp = 0;\r
+\r
   if ((CoreId == 0) && PerformanceMeasurementEnabled ()) {\r
     // Initialize the Timer Library to setup the Timer HW controller\r
     TimerConstructor ();\r

diff --git a/EmbeddedPkg/Library/PrePiHobLib/Hob.c b/EmbeddedPkg/Library/PrePiHobLib/Hob.c
index c86ccb0b399d211dcdb43783b206dfdf97f8c407..a92a1de52e986460da30e8b1c08b98b47b1247eb 100644 (file)
--- a/EmbeddedPkg/Library/PrePiHobLib/Hob.c
+++ b/EmbeddedPkg/Library/PrePiHobLib/Hob.c
@@ -206,7 +206,7 @@ CreateHobList (
 
   BuildResourceDescriptorHob (EFI_RESOURCE_SYSTEM_MEMORY, Attributes, (UINTN)MemoryBegin, MemoryLength);
 
-  BuildStackHob ((UINTN)StackBase, ((UINT64)MemoryBegin + MemoryLength) - (UINTN)StackBase);
+  BuildStackHob ((EFI_PHYSICAL_ADDRESS)(UINTN)StackBase, ((UINTN)MemoryBegin + MemoryLength) - (UINTN)StackBase);
 
   if (FeaturePcdGet (PcdPrePiProduceMemoryTypeInformationHob)) {
     // Optional feature that helps prevent EFI memory map fragmentation.