diff options
-rw-r--r-- | ArmPkg/ArmPkg.dec | 2 | ||||
-rw-r--r-- | ArmPkg/Drivers/CpuDxe/Mmu.c | 16 | ||||
-rw-r--r-- | ArmPkg/Drivers/PL390Gic/PL390GicDxe.c | 4 | ||||
-rw-r--r-- | ArmPkg/Drivers/TimerDxe/TimerDxe.c | 2 | ||||
-rw-r--r-- | ArmPkg/Filesystem/SemihostFs/Arm/SemihostFs.h | 42 | ||||
-rw-r--r-- | ArmPkg/Filesystem/SemihostFs/SemihostFs.inf | 1 | ||||
-rw-r--r-- | ArmPkg/Library/BdsLib/BdsLinuxLoader.c | 5 | ||||
-rw-r--r-- | ArmPlatformPkg/Bds/Bds.c | 4 | ||||
-rw-r--r-- | ArmPlatformPkg/Bds/BootOptionSupport.c | 2 | ||||
-rwxr-xr-x | ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.c | 2 | ||||
-rw-r--r-- | Omap35xxPkg/TimerDxe/TimerDxe.inf | 2 |
11 files changed, 30 insertions, 52 deletions
diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec index 2a32dc3..cd2578f 100644 --- a/ArmPkg/ArmPkg.dec +++ b/ArmPkg/ArmPkg.dec @@ -2,7 +2,7 @@ # ARM processor package.
#
# Copyright (c) 2009 - 2010, Apple Inc. All rights reserved.<BR>
-# Copyright (c) 2011-2012, ARM Limited. All rights reserved.
+# Copyright (c) 2011 - 2012, ARM Limited. All rights reserved.
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
diff --git a/ArmPkg/Drivers/CpuDxe/Mmu.c b/ArmPkg/Drivers/CpuDxe/Mmu.c index 7bed1f6..dcc7b68 100644 --- a/ArmPkg/Drivers/CpuDxe/Mmu.c +++ b/ArmPkg/Drivers/CpuDxe/Mmu.c @@ -749,14 +749,14 @@ ConvertSectionToPages ( DEBUG ((EFI_D_PAGE, "Converting section at 0x%x to pages\n", (UINTN)BaseAddress));
- // obtain page table base
+ // Obtain page table base
FirstLevelTable = (ARM_FIRST_LEVEL_DESCRIPTOR *)ArmGetTTBR0BaseAddress ();
- // calculate index into first level translation table for start of modification
+ // Calculate index into first level translation table for start of modification
FirstLevelIdx = TT_DESCRIPTOR_SECTION_BASE_ADDRESS(BaseAddress) >> TT_DESCRIPTOR_SECTION_BASE_SHIFT;
ASSERT (FirstLevelIdx < TRANSLATION_TABLE_SECTION_COUNT);
- // get section attributes and convert to page attributes
+ // Get section attributes and convert to page attributes
SectionDescriptor = FirstLevelTable[FirstLevelIdx];
PageDescriptor = TT_DESCRIPTOR_PAGE_TYPE_PAGE;
PageDescriptor |= TT_DESCRIPTOR_CONVERT_TO_PAGE_CACHE_POLICY(SectionDescriptor,0);
@@ -765,7 +765,7 @@ ConvertSectionToPages ( PageDescriptor |= TT_DESCRIPTOR_CONVERT_TO_PAGE_NG(SectionDescriptor);
PageDescriptor |= TT_DESCRIPTOR_CONVERT_TO_PAGE_S(SectionDescriptor);
- // allocate a page table for the 4KB entries (we use up a full page even though we only need 1KB)
+ // Allocate a page table for the 4KB entries (we use up a full page even though we only need 1KB)
Status = gBS->AllocatePages (AllocateAnyPages, EfiBootServicesData, 1, &PageTableAddr);
if (EFI_ERROR(Status)) {
return Status;
@@ -773,18 +773,18 @@ ConvertSectionToPages ( PageTable = (volatile ARM_PAGE_TABLE_ENTRY *)(UINTN)PageTableAddr;
- // write the page table entries out
+ // Write the page table entries out
for (Index = 0; Index < TRANSLATION_TABLE_PAGE_COUNT; Index++) {
PageTable[Index] = TT_DESCRIPTOR_PAGE_BASE_ADDRESS(BaseAddress + (Index << 12)) | PageDescriptor;
}
- // flush d-cache so descriptors make it back to uncached memory for subsequent table walks
+ // Flush d-cache so descriptors make it back to uncached memory for subsequent table walks
WriteBackInvalidateDataCacheRange ((VOID *)(UINTN)PageTableAddr, TT_DESCRIPTOR_PAGE_SIZE);
- // formulate page table entry, Domain=0, NS=0
+ // Formulate page table entry, Domain=0, NS=0
PageTableDescriptor = (((UINTN)PageTableAddr) & TT_DESCRIPTOR_SECTION_PAGETABLE_ADDRESS_MASK) | TT_DESCRIPTOR_SECTION_TYPE_PAGE_TABLE;
- // write the page table entry out, replacing section entry
+ // Write the page table entry out, replacing section entry
FirstLevelTable[FirstLevelIdx] = PageTableDescriptor;
return EFI_SUCCESS;
diff --git a/ArmPkg/Drivers/PL390Gic/PL390GicDxe.c b/ArmPkg/Drivers/PL390Gic/PL390GicDxe.c index aa68af9..1a8239e 100644 --- a/ArmPkg/Drivers/PL390Gic/PL390GicDxe.c +++ b/ArmPkg/Drivers/PL390Gic/PL390GicDxe.c @@ -118,11 +118,11 @@ EnableInterruptSource ( return EFI_UNSUPPORTED; } - // calculate enable register offset and bit position + // Calculate enable register offset and bit position RegOffset = Source / 32; RegShift = Source % 32; - // write set-enable register + // Write set-enable register MmioWrite32 (PcdGet32(PcdGicDistributorBase) + ARM_GIC_ICDISER + (4*RegOffset), 1 << RegShift); return EFI_SUCCESS; diff --git a/ArmPkg/Drivers/TimerDxe/TimerDxe.c b/ArmPkg/Drivers/TimerDxe/TimerDxe.c index 6f09cb2..50de766 100644 --- a/ArmPkg/Drivers/TimerDxe/TimerDxe.c +++ b/ArmPkg/Drivers/TimerDxe/TimerDxe.c @@ -137,7 +137,7 @@ TimerDriverSetTimerPeriod ( { UINT64 TimerTicks; - // always disable the timer + // Always disable the timer ArmArchTimerDisableTimer (); if (TimerPeriod != 0) { diff --git a/ArmPkg/Filesystem/SemihostFs/Arm/SemihostFs.h b/ArmPkg/Filesystem/SemihostFs/Arm/SemihostFs.h index 7907a11..a9b200b 100644 --- a/ArmPkg/Filesystem/SemihostFs/Arm/SemihostFs.h +++ b/ArmPkg/Filesystem/SemihostFs/Arm/SemihostFs.h @@ -17,35 +17,13 @@ #define __SEMIHOST_FS_H__
EFI_STATUS
-SemihostFsSupported(
- IN EFI_DRIVER_BINDING_PROTOCOL *This,
- IN EFI_HANDLE Controller,
- IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath
- );
-
-EFI_STATUS
-SemihostFsStart(
- IN EFI_DRIVER_BINDING_PROTOCOL *This,
- IN EFI_HANDLE Controller,
- IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath
- );
-
-EFI_STATUS
-SemihostFsStop(
- IN EFI_DRIVER_BINDING_PROTOCOL *This,
- IN EFI_HANDLE Controller,
- IN UINTN NumberOfChildren,
- IN EFI_HANDLE *ChildHandleBuffer
- );
-
-EFI_STATUS
-VolumeOpen(
+VolumeOpen (
IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *This,
OUT EFI_FILE **Root
);
EFI_STATUS
-FileOpen(
+FileOpen (
IN EFI_FILE *File,
OUT EFI_FILE **NewHandle,
IN CHAR16 *FileName,
@@ -54,7 +32,7 @@ FileOpen( );
EFI_STATUS
-FileClose(
+FileClose (
IN EFI_FILE *File
);
@@ -64,33 +42,33 @@ FileDelete( );
EFI_STATUS
-FileRead(
+FileRead (
IN EFI_FILE *File,
IN OUT UINTN *BufferSize,
OUT VOID *Buffer
);
EFI_STATUS
-FileWrite(
+FileWrite (
IN EFI_FILE *File,
IN OUT UINTN *BufferSize,
IN VOID *Buffer
);
EFI_STATUS
-FileGetPosition(
+FileGetPosition (
IN EFI_FILE *File,
OUT UINT64 *Position
);
EFI_STATUS
-FileSetPosition(
+FileSetPosition (
IN EFI_FILE *File,
IN UINT64 Position
);
EFI_STATUS
-FileGetInfo(
+FileGetInfo (
IN EFI_FILE *File,
IN EFI_GUID *InformationType,
IN OUT UINTN *BufferSize,
@@ -98,7 +76,7 @@ FileGetInfo( );
EFI_STATUS
-FileSetInfo(
+FileSetInfo (
IN EFI_FILE *File,
IN EFI_GUID *InformationType,
IN UINTN BufferSize,
@@ -106,7 +84,7 @@ FileSetInfo( );
EFI_STATUS
-FileFlush(
+FileFlush (
IN EFI_FILE *File
);
diff --git a/ArmPkg/Filesystem/SemihostFs/SemihostFs.inf b/ArmPkg/Filesystem/SemihostFs/SemihostFs.inf index 608b36b..ca9d489 100644 --- a/ArmPkg/Filesystem/SemihostFs/SemihostFs.inf +++ b/ArmPkg/Filesystem/SemihostFs/SemihostFs.inf @@ -1,4 +1,3 @@ - #/** @file # Support a Semi Host file system over a debuggers JTAG # diff --git a/ArmPkg/Library/BdsLib/BdsLinuxLoader.c b/ArmPkg/Library/BdsLib/BdsLinuxLoader.c index 5ef3c1c..a3ba580 100644 --- a/ArmPkg/Library/BdsLib/BdsLinuxLoader.c +++ b/ArmPkg/Library/BdsLib/BdsLinuxLoader.c @@ -13,6 +13,7 @@ **/ #include "BdsInternal.h" +#include "BdsLinuxLoader.h" #define ALIGN32_BELOW(addr) ALIGN_POINTER(addr - 32,32) @@ -122,7 +123,7 @@ Exit: Start a Linux kernel from a Device Path @param LinuxKernel Device Path to the Linux Kernel - @param Parameters Linux kernel agruments + @param Parameters Linux kernel arguments @param Fdt Device Path to the Flat Device Tree @retval EFI_SUCCESS All drivers have been connected @@ -193,7 +194,7 @@ BdsBootLinuxAtag ( Start a Linux kernel from a Device Path @param LinuxKernel Device Path to the Linux Kernel - @param Parameters Linux kernel agruments + @param Parameters Linux kernel arguments @param Fdt Device Path to the Flat Device Tree @retval EFI_SUCCESS All drivers have been connected diff --git a/ArmPlatformPkg/Bds/Bds.c b/ArmPlatformPkg/Bds/Bds.c index 1adade4..11a76de 100644 --- a/ArmPlatformPkg/Bds/Bds.c +++ b/ArmPlatformPkg/Bds/Bds.c @@ -307,8 +307,8 @@ StartDefaultBootOnTimeout ( UINTN BootOrderSize;
UINTN Index;
CHAR16 BootVariableName[9];
- EFI_STATUS Status;
- EFI_INPUT_KEY Key;
+ EFI_STATUS Status;
+ EFI_INPUT_KEY Key;
Size = sizeof(UINT16);
Timeout = (UINT16)PcdGet16 (PcdPlatformBootTimeOut);
diff --git a/ArmPlatformPkg/Bds/BootOptionSupport.c b/ArmPlatformPkg/Bds/BootOptionSupport.c index e22280d..fbdd594 100644 --- a/ArmPlatformPkg/Bds/BootOptionSupport.c +++ b/ArmPlatformPkg/Bds/BootOptionSupport.c @@ -778,7 +778,7 @@ BdsLoadOptionTftpList ( Status = GenerateDeviceDescriptionName (HandleBuffer[Index], DeviceDescription);
ASSERT_EFI_ERROR (Status);
}
- UnicodeSPrint (SupportedDevice->Description,BOOT_DEVICE_DESCRIPTION_MAX,L"TFP on %s",DeviceDescription);
+ UnicodeSPrint (SupportedDevice->Description,BOOT_DEVICE_DESCRIPTION_MAX,L"TFTP on %s",DeviceDescription);
SupportedDevice->DevicePathProtocol = DevicePathProtocol;
SupportedDevice->Support = &BdsLoadOptionSupportList[BDS_DEVICE_TFTP];
diff --git a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.c b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.c index e5dd29c..fa24c45 100755 --- a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.c +++ b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.c @@ -35,7 +35,7 @@ InitMmu ( UINTN TranslationTableSize;
// Get Virtual Memory Map from the Platform Library
- ArmPlatformGetVirtualMemoryMap(&MemoryTable);
+ ArmPlatformGetVirtualMemoryMap (&MemoryTable);
//Note: Because we called PeiServicesInstallPeiMemory() before to call InitMmu() the MMU Page Table resides in
// DRAM (even at the top of DRAM as it is the first permanent memory allocation)
diff --git a/Omap35xxPkg/TimerDxe/TimerDxe.inf b/Omap35xxPkg/TimerDxe/TimerDxe.inf index eefcc49..6cfab77 100644 --- a/Omap35xxPkg/TimerDxe/TimerDxe.inf +++ b/Omap35xxPkg/TimerDxe/TimerDxe.inf @@ -1,6 +1,6 @@ #/** @file # -# Component discription file for Timer module +# Component description file for Timer module # # Copyright (c) 2009, Apple Inc. All rights reserved.<BR> # This program and the accompanying materials |