From 920cb926428be7049526140d523df379f6fe3ad1 Mon Sep 17 00:00:00 2001 From: AJFISH Date: Sun, 17 Jan 2010 04:44:33 +0000 Subject: Fix RVCT compiler warnings, and a bug in the GdbStub git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9790 6f19259b-4bc3-4df7-8a09-765794883524 --- BeagleBoardPkg/PciEmulation/PciEmulation.c | 1 - BeagleBoardPkg/Sec/Cache.c | 3 --- BeagleBoardPkg/Sec/Sec.c | 2 +- BeagleBoardPkg/Sec/Sec.inf | 2 -- 4 files changed, 1 insertion(+), 7 deletions(-) (limited to 'BeagleBoardPkg') diff --git a/BeagleBoardPkg/PciEmulation/PciEmulation.c b/BeagleBoardPkg/PciEmulation/PciEmulation.c index f558597932..fa44570b4c 100644 --- a/BeagleBoardPkg/PciEmulation/PciEmulation.c +++ b/BeagleBoardPkg/PciEmulation/PciEmulation.c @@ -436,7 +436,6 @@ PciIoAttributes ( case EfiPciIoAttributeOperationDisable: // Since we are not a real PCI device no enable/set or disable operations exist. return EFI_SUCCESS; - break; default: ASSERT (FALSE); diff --git a/BeagleBoardPkg/Sec/Cache.c b/BeagleBoardPkg/Sec/Cache.c index d7c906244c..12b585e7cf 100755 --- a/BeagleBoardPkg/Sec/Cache.c +++ b/BeagleBoardPkg/Sec/Cache.c @@ -38,14 +38,11 @@ InitCache ( IN UINT32 MemoryLength ) { - UINTN UncachedMemoryMask; UINT32 CacheAttributes; ARM_MEMORY_REGION_DESCRIPTOR MemoryTable[5]; VOID *TranslationTableBase; UINTN TranslationTableSize; - UncachedMemoryMask = PcdGet64(PcdArmUncachedMemoryMask); - if (FeaturePcdGet(PcdCacheEnable) == TRUE) { CacheAttributes = DDR_ATTRIBUTES_CACHED; } else { diff --git a/BeagleBoardPkg/Sec/Sec.c b/BeagleBoardPkg/Sec/Sec.c index 5b4d2946db..537475204c 100755 --- a/BeagleBoardPkg/Sec/Sec.c +++ b/BeagleBoardPkg/Sec/Sec.c @@ -239,7 +239,7 @@ CEntryPoint ( // #ifdef __CC_ARM // Print out the command for the RVD debugger to load symbols for this image - DEBUG ((EFI_D_ERROR, "load /a /ni /np %a &0x%08x\n", SecDeCygwinPathIfNeeded (FilePath), PeCoffImage + Offset)); + DEBUG ((EFI_D_ERROR, "load /a /ni /np %a &0x%08x\n", SecDeCygwinPathIfNeeded (FilePath), (CHAR8 *)PeCoffImage + Offset)); #elif __GNUC__ // This may not work correctly if you generate PE/COFF directlyas then the Offset would not be required DEBUG ((EFI_D_ERROR, "add-symbol-file %a 0x%08x\n", FilePath, PeCoffImage + Offset)); diff --git a/BeagleBoardPkg/Sec/Sec.inf b/BeagleBoardPkg/Sec/Sec.inf index 79a5eb4b10..0f611e3132 100755 --- a/BeagleBoardPkg/Sec/Sec.inf +++ b/BeagleBoardPkg/Sec/Sec.inf @@ -52,8 +52,6 @@ gEmbeddedTokenSpaceGuid.PcdCacheEnable [FixedPcd] - gArmTokenSpaceGuid.PcdArmUncachedMemoryMask - gEmbeddedTokenSpaceGuid.PcdEmbeddedFdBaseAddress gEmbeddedTokenSpaceGuid.PcdEmbeddedFdSize gEmbeddedTokenSpaceGuid.PcdFlashFvMainBase -- cgit v1.2.3