tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
AJFISH 2010-01-17 04:44:33 +00:00
parent d4f167a92a
commit 920cb92642
6 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArmPkg/Drivers/CpuDxe/Mmu.c
View File

@ -438,6 +438,8 @@ UpdatePageEntries (
volatile ARM_FIRST_LEVEL_DESCRIPTOR *FirstLevelTable; volatile ARM_FIRST_LEVEL_DESCRIPTOR *FirstLevelTable;
volatile ARM_PAGE_TABLE_ENTRY *PageTable; volatile ARM_PAGE_TABLE_ENTRY *PageTable;
Status = EFI_SUCCESS;
// EntryMask: bitmask of values to change (1 = change this value, 0 = leave alone) // EntryMask: bitmask of values to change (1 = change this value, 0 = leave alone)
// EntryValue: values at bit positions specified by EntryMask // EntryValue: values at bit positions specified by EntryMask
EntryMask = ARM_PAGE_DESC_TYPE_MASK; EntryMask = ARM_PAGE_DESC_TYPE_MASK;

1
BeagleBoardPkg/PciEmulation/PciEmulation.c
View File

@ -436,7 +436,6 @@ PciIoAttributes (
case EfiPciIoAttributeOperationDisable: case EfiPciIoAttributeOperationDisable:
// Since we are not a real PCI device no enable/set or disable operations exist. // Since we are not a real PCI device no enable/set or disable operations exist.
return EFI_SUCCESS; return EFI_SUCCESS;
break;
default: default:
ASSERT (FALSE); ASSERT (FALSE);

3
BeagleBoardPkg/Sec/Cache.c
View File

@ -38,14 +38,11 @@ InitCache (
IN UINT32 MemoryLength IN UINT32 MemoryLength
) )
{ {
UINTN UncachedMemoryMask;
UINT32 CacheAttributes; UINT32 CacheAttributes;
ARM_MEMORY_REGION_DESCRIPTOR MemoryTable[5]; ARM_MEMORY_REGION_DESCRIPTOR MemoryTable[5];
VOID *TranslationTableBase; VOID *TranslationTableBase;
UINTN TranslationTableSize; UINTN TranslationTableSize;
UncachedMemoryMask = PcdGet64(PcdArmUncachedMemoryMask);
if (FeaturePcdGet(PcdCacheEnable) == TRUE) { if (FeaturePcdGet(PcdCacheEnable) == TRUE) {
CacheAttributes = DDR_ATTRIBUTES_CACHED; CacheAttributes = DDR_ATTRIBUTES_CACHED;
} else { } else {

2
BeagleBoardPkg/Sec/Sec.c
View File

@ -239,7 +239,7 @@ CEntryPoint (
// //
#ifdef __CC_ARM #ifdef __CC_ARM
// Print out the command for the RVD debugger to load symbols for this image // 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__ #elif __GNUC__
// This may not work correctly if you generate PE/COFF directlyas then the Offset would not be required // 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)); DEBUG ((EFI_D_ERROR, "add-symbol-file %a 0x%08x\n", FilePath, PeCoffImage + Offset));

2
BeagleBoardPkg/Sec/Sec.inf
View File

@ -52,8 +52,6 @@
gEmbeddedTokenSpaceGuid.PcdCacheEnable gEmbeddedTokenSpaceGuid.PcdCacheEnable
[FixedPcd] [FixedPcd]
gArmTokenSpaceGuid.PcdArmUncachedMemoryMask
gEmbeddedTokenSpaceGuid.PcdEmbeddedFdBaseAddress gEmbeddedTokenSpaceGuid.PcdEmbeddedFdBaseAddress
gEmbeddedTokenSpaceGuid.PcdEmbeddedFdSize gEmbeddedTokenSpaceGuid.PcdEmbeddedFdSize
gEmbeddedTokenSpaceGuid.PcdFlashFvMainBase gEmbeddedTokenSpaceGuid.PcdFlashFvMainBase

2
EmbeddedPkg/GdbStub/GdbStub.c
View File

@ -976,7 +976,7 @@ PeCoffLoaderGetDebuggerInfo (
case CODEVIEW_SIGNATURE_RSDS: case CODEVIEW_SIGNATURE_RSDS:
return (VOID *) ((CHAR8 *)CodeViewEntryPointer + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_RSDS_ENTRY)); return (VOID *) ((CHAR8 *)CodeViewEntryPointer + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_RSDS_ENTRY));
case CODEVIEW_SIGNATURE_MTOC: case CODEVIEW_SIGNATURE_MTOC:
*DebugBase = (VOID *)(UINTN)((UINTN)DebugBase + SizeOfHeaders); *DebugBase = (VOID *)(UINTN)((UINTN)DebugBase - SizeOfHeaders);
return (VOID *) ((CHAR8 *)CodeViewEntryPointer + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_MTOC_ENTRY)); return (VOID *) ((CHAR8 *)CodeViewEntryPointer + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_MTOC_ENTRY));
default: default:
break; break;