The line endings & trailing space issues have been addressed in SVN rev15832 & rev15833. Our build infrastructure has been updated to test for malicious line endings/trailing spaces in the ARM packages.
> -----Original Message----- > From: Leif Lindholm [mailto:[email protected]] > Sent: 09 July 2014 15:44 > To: [email protected] > Cc: Olivier Martin > Subject: [PATCH] Whitespace fixup for ARM Directories > > The result of running: > find ArmP* -not -name "*.sh" -not -name "*.patch" -not -name "*.py" - > exec unix2dos {} \; > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Leif Lindholm <[email protected]> > --- > ArmPkg/Drivers/ArmGic/ArmGicLib.c | 2 +- > ArmPkg/Drivers/CpuDxe/ArmV6/Exception.c | 2 +- > ArmPkg/Library/BdsLib/BdsFilePath.c | 98 ++++++++++-- > -------- > .../ArmVExpressPkg/ArmVExpress-CTA9x4.dsc | 2 +- > .../ArmVExpressPkg/ArmVExpress-CTA9x4.fdf | 8 +- > .../ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc | 12 +-- > .../ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf | 12 +-- > .../ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc | 12 +-- > .../ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf | 12 +-- > .../ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc | 12 +-- > .../ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf | 14 +-- > .../ArmVExpress-RTSM-AEMv8Ax4-foundation.dsc | 12 +-- > .../ArmVExpress-RTSM-AEMv8Ax4-foundation.fdf | 12 +-- > .../ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.dsc | 12 +-- > .../ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.fdf | 14 +-- > ArmPlatformPkg/Bds/BdsHelper.c | 6 +- > 16 files changed, 121 insertions(+), 121 deletions(-) > > diff --git a/ArmPkg/Drivers/ArmGic/ArmGicLib.c > b/ArmPkg/Drivers/ArmGic/ArmGicLib.c > index 41e970b..717b18b 100644 > --- a/ArmPkg/Drivers/ArmGic/ArmGicLib.c > +++ b/ArmPkg/Drivers/ArmGic/ArmGicLib.c > @@ -157,7 +157,7 @@ ArmGicDisableDistributor ( > // Disable Gic Distributor > MmioWrite32 (GicDistributorBase + ARM_GIC_ICDDCR, 0x0); > } > - > + > VOID > EFIAPI > ArmGicEnableInterruptInterface ( > diff --git a/ArmPkg/Drivers/CpuDxe/ArmV6/Exception.c > b/ArmPkg/Drivers/CpuDxe/ArmV6/Exception.c > index 8000626..22c56a3 100644 > --- a/ArmPkg/Drivers/CpuDxe/ArmV6/Exception.c > +++ b/ArmPkg/Drivers/CpuDxe/ArmV6/Exception.c > @@ -208,7 +208,7 @@ InitializeExceptions ( > //Note: On ARM processor with the Security Extension, the Vector > Table can be located anywhere in the memory. > // The Vector Base Address Register defines the location > ArmWriteVBar (PcdGet32(PcdCpuVectorBaseAddress)); > - } else { > + } else { > // The Vector table must be 32-byte aligned > if (((UINT32)ExceptionHandlersStart & ARM_VECTOR_TABLE_ALIGNMENT) > != 0) { > ASSERT (0); > diff --git a/ArmPkg/Library/BdsLib/BdsFilePath.c > b/ArmPkg/Library/BdsLib/BdsFilePath.c > index 411fcc1..f754b88 100644 > --- a/ArmPkg/Library/BdsLib/BdsFilePath.c > +++ b/ArmPkg/Library/BdsLib/BdsFilePath.c > @@ -300,24 +300,24 @@ TryRemovableDevice ( > return Status; > } > > -STATIC > +STATIC > EFI_STATUS > -BdsConnectAndUpdateDevicePath ( > - IN OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath, > - OUT EFI_HANDLE *Handle, > - OUT EFI_DEVICE_PATH_PROTOCOL **RemainingDevicePath > +BdsConnectAndUpdateDevicePath ( > + IN OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath, > + OUT EFI_HANDLE *Handle, > + OUT EFI_DEVICE_PATH_PROTOCOL **RemainingDevicePath > ) > { > EFI_DEVICE_PATH* Remaining; > EFI_DEVICE_PATH* NewDevicePath; > EFI_STATUS Status; > > - if ((DevicePath == NULL) || (*DevicePath == NULL) || (Handle == > NULL)) { > + if ((DevicePath == NULL) || (*DevicePath == NULL) || (Handle == > NULL)) { > return EFI_INVALID_PARAMETER; > } > > do { > - Remaining = *DevicePath; > + Remaining = *DevicePath; > // The LocateDevicePath() function locates all devices on > DevicePath that support Protocol and returns > // the handle to the device that is closest to DevicePath. On > output, the device path pointer is modified > // to point to the remaining part of the device path > @@ -337,7 +337,7 @@ BdsConnectAndUpdateDevicePath ( > if (!EFI_ERROR (Status)) { > // Now, we have got the whole Device Path connected, call again > ConnectController to ensure all the supported Driver > // Binding Protocol are connected (such as DiskIo and > SimpleFileSystem) > - Remaining = *DevicePath; > + Remaining = *DevicePath; > Status = gBS->LocateDevicePath (&gEfiDevicePathProtocolGuid, > &Remaining, Handle); > if (!EFI_ERROR (Status)) { > Status = gBS->ConnectController (*Handle, NULL, Remaining, > FALSE); > @@ -360,11 +360,11 @@ BdsConnectAndUpdateDevicePath ( > //TODO: Should we just return success and leave the caller decide > if it is the expected RemainingPath > Status = EFI_SUCCESS; > } else { > - Status = TryRemovableDevice (*DevicePath, Handle, &NewDevicePath); > + Status = TryRemovableDevice (*DevicePath, Handle, &NewDevicePath); > if (!EFI_ERROR (Status)) { > - Status = BdsConnectAndUpdateDevicePath (&NewDevicePath, Handle, > RemainingDevicePath); > - *DevicePath = NewDevicePath; > - return Status; > + Status = BdsConnectAndUpdateDevicePath (&NewDevicePath, Handle, > RemainingDevicePath); > + *DevicePath = NewDevicePath; > + return Status; > } > } > > @@ -375,28 +375,28 @@ BdsConnectAndUpdateDevicePath ( > return Status; > } > > -/** > - Connect a Device Path and return the handle of the driver that > support this DevicePath > - > - @param DevicePath Device Path of the File to connect > - @param Handle Handle of the driver that support this > DevicePath > - @param RemainingDevicePath Remaining DevicePath nodes that do not > match the driver DevicePath > - > - @retval EFI_SUCCESS A driver that matches the Device Path > has been found > - @retval EFI_NOT_FOUND No handles match the search. > - @retval EFI_INVALID_PARAMETER DevicePath or Handle is NULL > - > +/** > + Connect a Device Path and return the handle of the driver that > support this DevicePath > + > + @param DevicePath Device Path of the File to connect > + @param Handle Handle of the driver that support this > DevicePath > + @param RemainingDevicePath Remaining DevicePath nodes that do not > match the driver DevicePath > + > + @retval EFI_SUCCESS A driver that matches the Device Path > has been found > + @retval EFI_NOT_FOUND No handles match the search. > + @retval EFI_INVALID_PARAMETER DevicePath or Handle is NULL > + > **/ > -EFI_STATUS > -BdsConnectDevicePath ( > - IN EFI_DEVICE_PATH_PROTOCOL* DevicePath, > - OUT EFI_HANDLE *Handle, > - OUT EFI_DEVICE_PATH_PROTOCOL **RemainingDevicePath > - ) > -{ > - return BdsConnectAndUpdateDevicePath (&DevicePath, Handle, > RemainingDevicePath); > -} > - > +EFI_STATUS > +BdsConnectDevicePath ( > + IN EFI_DEVICE_PATH_PROTOCOL* DevicePath, > + OUT EFI_HANDLE *Handle, > + OUT EFI_DEVICE_PATH_PROTOCOL **RemainingDevicePath > + ) > +{ > + return BdsConnectAndUpdateDevicePath (&DevicePath, Handle, > RemainingDevicePath); > +} > + > BOOLEAN > BdsFileSystemSupport ( > IN EFI_DEVICE_PATH *DevicePath, > @@ -926,8 +926,8 @@ BDS_FILE_LOADER FileLoaders[] = { > }; > > EFI_STATUS > -BdsLoadImageAndUpdateDevicePath ( > - IN OUT EFI_DEVICE_PATH **DevicePath, > +BdsLoadImageAndUpdateDevicePath ( > + IN OUT EFI_DEVICE_PATH **DevicePath, > IN EFI_ALLOCATE_TYPE Type, > IN OUT EFI_PHYSICAL_ADDRESS* Image, > OUT UINTN *FileSize > @@ -938,15 +938,15 @@ BdsLoadImageAndUpdateDevicePath ( > EFI_DEVICE_PATH *RemainingDevicePath; > BDS_FILE_LOADER* FileLoader; > > - Status = BdsConnectAndUpdateDevicePath (DevicePath, &Handle, > &RemainingDevicePath); > + Status = BdsConnectAndUpdateDevicePath (DevicePath, &Handle, > &RemainingDevicePath); > if (EFI_ERROR (Status)) { > return Status; > } > > FileLoader = FileLoaders; > while (FileLoader->Support != NULL) { > - if (FileLoader->Support (*DevicePath, Handle, > RemainingDevicePath)) { > - return FileLoader->LoadImage (*DevicePath, Handle, > RemainingDevicePath, Type, Image, FileSize); > + if (FileLoader->Support (*DevicePath, Handle, > RemainingDevicePath)) { > + return FileLoader->LoadImage (*DevicePath, Handle, > RemainingDevicePath, Type, Image, FileSize); > } > FileLoader++; > } > @@ -955,16 +955,16 @@ BdsLoadImageAndUpdateDevicePath ( > } > > EFI_STATUS > -BdsLoadImage ( > - IN EFI_DEVICE_PATH *DevicePath, > - IN EFI_ALLOCATE_TYPE Type, > - IN OUT EFI_PHYSICAL_ADDRESS* Image, > - OUT UINTN *FileSize > - ) > -{ > - return BdsLoadImageAndUpdateDevicePath (&DevicePath, Type, Image, > FileSize); > -} > - > +BdsLoadImage ( > + IN EFI_DEVICE_PATH *DevicePath, > + IN EFI_ALLOCATE_TYPE Type, > + IN OUT EFI_PHYSICAL_ADDRESS* Image, > + OUT UINTN *FileSize > + ) > +{ > + return BdsLoadImageAndUpdateDevicePath (&DevicePath, Type, Image, > FileSize); > +} > + > /** > Start an EFI Application from a Device Path > > @@ -991,7 +991,7 @@ BdsStartEfiApplication ( > EFI_LOADED_IMAGE_PROTOCOL* LoadedImage; > > // Find the nearest supported file loader > - Status = BdsLoadImageAndUpdateDevicePath (&DevicePath, > AllocateAnyPages, &BinaryBuffer, &BinarySize); > + Status = BdsLoadImageAndUpdateDevicePath (&DevicePath, > AllocateAnyPages, &BinaryBuffer, &BinarySize); > if (EFI_ERROR (Status)) { > return Status; > } > diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc > b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc > index df1073d..69f5140 100644 > --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc > +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc > @@ -192,7 +192,7 @@ > > # ISP1761 USB OTG Controller > gEmbeddedTokenSpaceGuid.PcdIsp1761BaseAddress|0x4f000000 > - > + > # LAN9118 Ethernet Driver PCDs > gEmbeddedTokenSpaceGuid.PcdLan9118DxeBaseAddress|0x4E000000 > > diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf > b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf > index 6a3e933..545f3bd 100644 > --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf > +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf > @@ -199,11 +199,11 @@ READ_LOCK_STATUS = TRUE > # > INF EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf > INF ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf > - > - # > + > + # > # USB support > # > - INF EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf > + INF EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf > > # > # Android Fastboot > @@ -211,7 +211,7 @@ READ_LOCK_STATUS = TRUE > INF EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf > INF > EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsb > Dxe.inf > INF > ArmPlatformPkg/ArmVExpressPkg/ArmVExpressFastBootDxe/ArmVExpressFastBoo > tDxe.inf > - > + > # > # Networking stack > # > diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc > b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc > index a2aa986..02b3bcf 100644 > --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc > +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc > @@ -266,12 +266,12 @@ > # > EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf > ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf > - > - # > - # Platform Driver > - # > - ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf > - OvmfPkg/VirtioBlkDxe/VirtioBlk.inf > + > + # > + # Platform Driver > + # > + ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf > + OvmfPkg/VirtioBlkDxe/VirtioBlk.inf > > # > # FAT filesystem + GPT/MBR partitioning > diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf > b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf > index 3b56d0d..0dcd76e 100644 > --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf > +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf > @@ -182,12 +182,12 @@ READ_LOCK_STATUS = TRUE > INF ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf > > # > - # Platform Driver > - # > - INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf > - INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf > - > - # > + # Platform Driver > + # > + INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf > + INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf > + > + # > # UEFI application (Shell Embedded Boot Loader) > # > INF ShellBinPkg/UefiShell/UefiShell.inf > diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM- > A15_MPCore.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM- > A15_MPCore.dsc > index 77751b4..a7f17f6 100644 > --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc > +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc > @@ -268,12 +268,12 @@ > # > EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf > ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf > - > - # > - # Platform Driver > - # > - ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf > - OvmfPkg/VirtioBlkDxe/VirtioBlk.inf > + > + # > + # Platform Driver > + # > + ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf > + OvmfPkg/VirtioBlkDxe/VirtioBlk.inf > > # > # FAT filesystem + GPT/MBR partitioning > diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM- > A15_MPCore.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM- > A15_MPCore.fdf > index 8f84f91..d9736ed 100644 > --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf > +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf > @@ -182,12 +182,12 @@ READ_LOCK_STATUS = TRUE > INF ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf > > # > - # Platform Driver > - # > - INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf > - INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf > - > - # > + # Platform Driver > + # > + INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf > + INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf > + > + # > # UEFI application (Shell Embedded Boot Loader) > # > INF ShellBinPkg/UefiShell/UefiShell.inf > diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc > b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc > index 3e39788..e1d60ec 100644 > --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc > +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc > @@ -268,12 +268,12 @@ > # > EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf > ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf > - > - # > - # Platform Driver > - # > - ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf > - OvmfPkg/VirtioBlkDxe/VirtioBlk.inf > + > + # > + # Platform Driver > + # > + ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf > + OvmfPkg/VirtioBlkDxe/VirtioBlk.inf > > # > # FAT filesystem + GPT/MBR partitioning > diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf > b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf > index 67aa6af..d114b16 100644 > --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf > +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf > @@ -166,13 +166,13 @@ READ_LOCK_STATUS = TRUE > # > INF EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf > INF ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf > - > - # > - # Platform Driver > - # > - INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf > - INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf > - > + > + # > + # Platform Driver > + # > + INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf > + INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf > + > # > # UEFI application (Shell Embedded Boot Loader) > # > diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4- > foundation.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM- > AEMv8Ax4-foundation.dsc > index 012d470..725ce20 100644 > --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4- > foundation.dsc > +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4- > foundation.dsc > @@ -225,12 +225,12 @@ > ArmPkg/Filesystem/SemihostFs/SemihostFs.inf > > # > - # Platform Driver > - # > - ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf > - OvmfPkg/VirtioBlkDxe/VirtioBlk.inf > - > - # > + # Platform Driver > + # > + ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf > + OvmfPkg/VirtioBlkDxe/VirtioBlk.inf > + > + # > # FAT filesystem + GPT/MBR partitioning > # > MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf > diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4- > foundation.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM- > AEMv8Ax4-foundation.fdf > index 4e1c5a2..2033e23 100644 > --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4- > foundation.fdf > +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4- > foundation.fdf > @@ -155,12 +155,12 @@ READ_LOCK_STATUS = TRUE > INF > MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf > > # > - # Platform Driver > - # > - INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf > - INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf > - > - # > + # Platform Driver > + # > + INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf > + INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf > + > + # > # UEFI application (Shell Embedded Boot Loader) > # > INF ShellBinPkg/UefiShell/UefiShell.inf > diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM- > AEMv8Ax4.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM- > AEMv8Ax4.dsc > index 6b3f520..1b306bf 100644 > --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.dsc > +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.dsc > @@ -259,12 +259,12 @@ > ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf > > # > - # Platform Driver > - # > - ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf > - OvmfPkg/VirtioBlkDxe/VirtioBlk.inf > - > - # > + # Platform Driver > + # > + ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf > + OvmfPkg/VirtioBlkDxe/VirtioBlk.inf > + > + # > # FAT filesystem + GPT/MBR partitioning > # > MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf > diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM- > AEMv8Ax4.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM- > AEMv8Ax4.fdf > index 83ceec4..1bf9a35 100644 > --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.fdf > +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.fdf > @@ -163,13 +163,13 @@ READ_LOCK_STATUS = TRUE > # > INF EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf > INF ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf > - > - # > - # Platform Driver > - # > - INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf > - INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf > - > + > + # > + # Platform Driver > + # > + INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf > + INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf > + > # > # UEFI application (Shell Embedded Boot Loader) > # > diff --git a/ArmPlatformPkg/Bds/BdsHelper.c > b/ArmPlatformPkg/Bds/BdsHelper.c > index 152061d..c07b8af 100644 > --- a/ArmPlatformPkg/Bds/BdsHelper.c > +++ b/ArmPlatformPkg/Bds/BdsHelper.c > @@ -35,7 +35,7 @@ EditHIInputStr ( > Print (CmdLine); > > // To prevent a buffer overflow, we only allow to enter (MaxCmdLine- > 1) characters > - for (CmdLineIndex = StrLen (CmdLine); CmdLineIndex < MaxCmdLine; ) { > + for (CmdLineIndex = StrLen (CmdLine); CmdLineIndex < MaxCmdLine; ) { > Status = gBS->WaitForEvent (1, &gST->ConIn->WaitForKey, > &WaitIndex); > ASSERT_EFI_ERROR (Status); > > @@ -62,7 +62,7 @@ EditHIInputStr ( > } > } else if ((Key.ScanCode == SCAN_ESC) || (Char == 0x1B) || (Char > == 0x0)) { > return EFI_INVALID_PARAMETER; > - } else if (CmdLineIndex < (MaxCmdLine-1)) { > + } else if (CmdLineIndex < (MaxCmdLine-1)) { > CmdLine[CmdLineIndex++] = Key.UnicodeChar; > Print (L"%c", Key.UnicodeChar); > } > @@ -187,7 +187,7 @@ GetHIInputBoolean ( > > while(1) { > Print (L"[y/n] "); > - Status = GetHIInputStr (CmdBoolean, 2); > + Status = GetHIInputStr (CmdBoolean, 2); > if (EFI_ERROR(Status)) { > return Status; > } else if ((CmdBoolean[0] == L'y') || (CmdBoolean[0] == L'Y')) { > -- > 1.7.10.4 > ------------------------------------------------------------------------------ _______________________________________________ edk2-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/edk2-devel
