ARM Packages: Corrected non-DOS line endings

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ronald Cron <ronald.cron@arm.com>
Reviewed-By: Olivier Martin <olivier.martin@arm.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15832 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPkg/Drivers/ArmGic/ArmGicLib.c b/ArmPkg/Drivers/ArmGic/ArmGicLib.c
index 41e970bc4968bcd2558fd68d9b2c14ebb9d5b7b3..717b18b9e6407f11f98141d78a77725b74e92522 100644 (file)
--- a/ArmPkg/Drivers/ArmGic/ArmGicLib.c
+++ b/ArmPkg/Drivers/ArmGic/ArmGicLib.c
@@ -157,7 +157,7 @@ ArmGicDisableDistributor (
   // Disable Gic Distributor\r
   MmioWrite32 (GicDistributorBase + ARM_GIC_ICDDCR, 0x0);\r
 }\r
-
+\r
 VOID\r
 EFIAPI\r
 ArmGicEnableInterruptInterface (\r

diff --git a/ArmPkg/Drivers/CpuDxe/ArmV6/Exception.c b/ArmPkg/Drivers/CpuDxe/ArmV6/Exception.c
index 80006261260a1206b40b049a71c39cf184e892fa..22c56a347ba81ea2e72daddf632f51cc0ccddf30 100644 (file)
--- 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.\r
     //      The Vector Base Address Register defines the location\r
     ArmWriteVBar (PcdGet32(PcdCpuVectorBaseAddress));\r
-  } else {
+  } else {\r
     // The Vector table must be 32-byte aligned\r
     if (((UINT32)ExceptionHandlersStart & ARM_VECTOR_TABLE_ALIGNMENT) != 0) {\r
       ASSERT (0);\r

diff --git a/ArmPkg/Library/BdsLib/BdsFilePath.c b/ArmPkg/Library/BdsLib/BdsFilePath.c
index 411fcc1fcc8f810a983b76fba1e6f340a7a1a536..f754b8899bdc7d397b3c313a67839486d296aa5f 100644 (file)
--- a/ArmPkg/Library/BdsLib/BdsFilePath.c
+++ b/ArmPkg/Library/BdsLib/BdsFilePath.c
@@ -300,24 +300,24 @@ TryRemovableDevice (
   return Status;\r
 }\r
 \r
-STATIC
+STATIC\r
 EFI_STATUS\r
-BdsConnectAndUpdateDevicePath (
-  IN OUT EFI_DEVICE_PATH_PROTOCOL  **DevicePath,
-  OUT    EFI_HANDLE                *Handle,
-  OUT    EFI_DEVICE_PATH_PROTOCOL  **RemainingDevicePath
+BdsConnectAndUpdateDevicePath (\r
+  IN OUT EFI_DEVICE_PATH_PROTOCOL  **DevicePath,\r
+  OUT    EFI_HANDLE                *Handle,\r
+  OUT    EFI_DEVICE_PATH_PROTOCOL  **RemainingDevicePath\r
   )\r
 {\r
   EFI_DEVICE_PATH*            Remaining;\r
   EFI_DEVICE_PATH*            NewDevicePath;\r
   EFI_STATUS                  Status;\r
 \r
-  if ((DevicePath == NULL) || (*DevicePath == NULL) || (Handle == NULL)) {
+  if ((DevicePath == NULL) || (*DevicePath == NULL) || (Handle == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   do {\r
-    Remaining = *DevicePath;
+    Remaining = *DevicePath;\r
     // The LocateDevicePath() function locates all devices on DevicePath that support Protocol and returns\r
     // the handle to the device that is closest to DevicePath. On output, the device path pointer is modified\r
     // to point to the remaining part of the device path\r
@@ -337,7 +337,7 @@ BdsConnectAndUpdateDevicePath (
   if (!EFI_ERROR (Status)) {\r
     // Now, we have got the whole Device Path connected, call again ConnectController to ensure all the supported Driver\r
     // Binding Protocol are connected (such as DiskIo and SimpleFileSystem)\r
-    Remaining = *DevicePath;
+    Remaining = *DevicePath;\r
     Status = gBS->LocateDevicePath (&gEfiDevicePathProtocolGuid, &Remaining, Handle);\r
     if (!EFI_ERROR (Status)) {\r
       Status = gBS->ConnectController (*Handle, NULL, Remaining, FALSE);\r
@@ -360,11 +360,11 @@ BdsConnectAndUpdateDevicePath (
     //TODO: Should we just return success and leave the caller decide if it is the expected RemainingPath\r
     Status = EFI_SUCCESS;\r
   } else {\r
-    Status = TryRemovableDevice (*DevicePath, Handle, &NewDevicePath);
+    Status = TryRemovableDevice (*DevicePath, Handle, &NewDevicePath);\r
     if (!EFI_ERROR (Status)) {\r
-      Status = BdsConnectAndUpdateDevicePath (&NewDevicePath, Handle, RemainingDevicePath);
-      *DevicePath = NewDevicePath;
-      return Status;
+      Status = BdsConnectAndUpdateDevicePath (&NewDevicePath, Handle, RemainingDevicePath);\r
+      *DevicePath = NewDevicePath;\r
+      return Status;\r
     }\r
   }\r
 \r
@@ -375,28 +375,28 @@ BdsConnectAndUpdateDevicePath (
   return Status;\r
 }\r
 \r
-/**
-  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
-
+/**\r
+  Connect a Device Path and return the handle of the driver that support this DevicePath\r
+\r
+  @param  DevicePath            Device Path of the File to connect\r
+  @param  Handle                Handle of the driver that support this DevicePath\r
+  @param  RemainingDevicePath   Remaining DevicePath nodes that do not match the driver DevicePath\r
+\r
+  @retval EFI_SUCCESS           A driver that matches the Device Path has been found\r
+  @retval EFI_NOT_FOUND         No handles match the search.\r
+  @retval EFI_INVALID_PARAMETER DevicePath or Handle is NULL\r
+\r
 **/\r
-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\r
+BdsConnectDevicePath (\r
+  IN  EFI_DEVICE_PATH_PROTOCOL* DevicePath,\r
+  OUT EFI_HANDLE                *Handle,\r
+  OUT EFI_DEVICE_PATH_PROTOCOL  **RemainingDevicePath\r
+  )\r
+{\r
+  return BdsConnectAndUpdateDevicePath (&DevicePath, Handle, RemainingDevicePath);\r
+}\r
+\r
 BOOLEAN\r
 BdsFileSystemSupport (\r
   IN EFI_DEVICE_PATH *DevicePath,\r
@@ -926,8 +926,8 @@ BDS_FILE_LOADER FileLoaders[] = {
 };\r
 \r
 EFI_STATUS\r
-BdsLoadImageAndUpdateDevicePath (
-  IN OUT EFI_DEVICE_PATH       **DevicePath,
+BdsLoadImageAndUpdateDevicePath (\r
+  IN OUT EFI_DEVICE_PATH       **DevicePath,\r
   IN     EFI_ALLOCATE_TYPE     Type,\r
   IN OUT EFI_PHYSICAL_ADDRESS* Image,\r
   OUT    UINTN                 *FileSize\r
@@ -938,15 +938,15 @@ BdsLoadImageAndUpdateDevicePath (
   EFI_DEVICE_PATH *RemainingDevicePath;\r
   BDS_FILE_LOADER*  FileLoader;\r
 \r
-  Status = BdsConnectAndUpdateDevicePath (DevicePath, &Handle, &RemainingDevicePath);
+  Status = BdsConnectAndUpdateDevicePath (DevicePath, &Handle, &RemainingDevicePath);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
   FileLoader = FileLoaders;\r
   while (FileLoader->Support != NULL) {\r
-    if (FileLoader->Support (*DevicePath, Handle, RemainingDevicePath)) {
-      return FileLoader->LoadImage (*DevicePath, Handle, RemainingDevicePath, Type, Image, FileSize);
+    if (FileLoader->Support (*DevicePath, Handle, RemainingDevicePath)) {\r
+      return FileLoader->LoadImage (*DevicePath, Handle, RemainingDevicePath, Type, Image, FileSize);\r
     }\r
     FileLoader++;\r
   }\r
@@ -955,16 +955,16 @@ BdsLoadImageAndUpdateDevicePath (
 }\r
 \r
 EFI_STATUS\r
-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 (\r
+  IN     EFI_DEVICE_PATH       *DevicePath,\r
+  IN     EFI_ALLOCATE_TYPE     Type,\r
+  IN OUT EFI_PHYSICAL_ADDRESS* Image,\r
+  OUT    UINTN                 *FileSize\r
+  )\r
+{\r
+  return BdsLoadImageAndUpdateDevicePath (&DevicePath, Type, Image, FileSize);\r
+}\r
+\r
 /**\r
   Start an EFI Application from a Device Path\r
 \r
@@ -991,7 +991,7 @@ BdsStartEfiApplication (
   EFI_LOADED_IMAGE_PROTOCOL*   LoadedImage;\r
 \r
   // Find the nearest supported file loader\r
-  Status = BdsLoadImageAndUpdateDevicePath (&DevicePath, AllocateAnyPages, &BinaryBuffer, &BinarySize);
+  Status = BdsLoadImageAndUpdateDevicePath (&DevicePath, AllocateAnyPages, &BinaryBuffer, &BinarySize);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memcpy.asm b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memcpy.asm
index f81db28fba6b7bd1e75d3937ea7324319927eb6d..60556b105d7eaaf5b437c185876e72b0c625f001 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memcpy.asm
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memcpy.asm
@@ -38,4 +38,4 @@ L5
   bne  L5\r
   pop  {pc}\r
 \r
-  END
\ No newline at end of file
+  END\r

diff --git a/ArmPlatformPkg/ArmPlatformPkg.dsc b/ArmPlatformPkg/ArmPlatformPkg.dsc
index a12040b6b2a5f5047b6dd72ddbc9b2a0e42ab917..7854c037eaef75a2262d76539ccda8eefa0680db 100644 (file)
--- a/ArmPlatformPkg/ArmPlatformPkg.dsc
+++ b/ArmPlatformPkg/ArmPlatformPkg.dsc
@@ -429,4 +429,3 @@
   #\r
   MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
   ArmPlatformPkg/Bds/Bds.inf\r
-  \r

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Debugger_scripts/rvi_hw_setup.inc b/ArmPlatformPkg/ArmRealViewEbPkg/Debugger_scripts/rvi_hw_setup.inc
index ba4190d56843ef3016b845e14c10be74280cbdfc..f7c211f15a6d71df3ff298e881271de1f3f93f6f 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Debugger_scripts/rvi_hw_setup.inc
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Debugger_scripts/rvi_hw_setup.inc
@@ -64,4 +64,4 @@ setmem /16 0x6D0000B4=0x0032
 setmem /16 0x6D0000BC=0x0000\r
 setmem /32 0x6D0000C4=0xBA9DC4C6\r
 setmem /32 0x6D0000C8=0x00012522\r
-setmem /32 0x6D0000D4=0x0004E201
\ No newline at end of file
+setmem /32 0x6D0000D4=0x0004E201\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
index df1073d144b2554c143bb546297fb113892e9e47..69f51406fd2f265bfa9c004fa95d2bd56acf3de9 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
@@ -192,7 +192,7 @@
 \r
   # ISP1761 USB OTG Controller\r
   gEmbeddedTokenSpaceGuid.PcdIsp1761BaseAddress|0x4f000000\r
-
+\r
   # LAN9118 Ethernet Driver PCDs\r
   gEmbeddedTokenSpaceGuid.PcdLan9118DxeBaseAddress|0x4E000000\r
 \r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
index 6a3e93329e17f46632580714c275ab521fc7c33c..545f3bdb0c19e7786e2dc2bff6dc9106c681cee4 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
@@ -199,11 +199,11 @@ READ_LOCK_STATUS   = TRUE
   #\r
   INF EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf\r
   INF ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf\r
-
-  #
+\r
+  #\r
   # USB support\r
   #\r
-  INF EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf
+  INF EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf\r
 \r
   #\r
   # Android Fastboot\r
@@ -211,7 +211,7 @@ READ_LOCK_STATUS   = TRUE
   INF EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf\r
   INF EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf\r
   INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf\r
-
+\r
   #\r
   # Networking stack\r
   #\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc
index a2aa986f49626a1ca82af24034d7b8f9ee4c4955..02b3bcf4b4057c9422746b71c99c530e83a24644 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc
@@ -266,12 +266,12 @@
   #\r
   EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf\r
   ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf\r
-
-  #
-  # Platform Driver
-  #
-  ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf
-  OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
+\r
+  #\r
+  # Platform Driver\r
+  #\r
+  ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf\r
+  OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
   \r
   #\r
   # FAT filesystem + GPT/MBR partitioning\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf
index 3b56d0d548dc3cab91455e6aef00a90108601657..0dcd76e78829eda06466b4a14ed7c5e398719834 100644 (file)
--- 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\r
 \r
   #\r
-  # Platform  Driver
-  #
-  INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf
-  INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
-
-  #
+  # Platform  Driver\r
+  #\r
+  INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf\r
+  INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
+\r
+  #\r
   # UEFI application (Shell Embedded Boot Loader) \r
   #  \r
   INF ShellBinPkg/UefiShell/UefiShell.inf \r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc
index 77751b4a54dc6c213246c43cd59537f6e1b51a7b..a7f17f6e6571046024152a60b431a3afb6d5c1b1 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc
@@ -268,12 +268,12 @@
   #\r
   EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf\r
   ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf\r
-
-  #
-  # Platform Driver
-  #
-  ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf
-  OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
+\r
+  #\r
+  # Platform Driver\r
+  #\r
+  ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf\r
+  OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
   \r
   #\r
   # FAT filesystem + GPT/MBR partitioning\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf
index 8f84f91da46e512c175c8e16065c8cb0bd0b9575..d9736ed747b1da88a51b8094d065a04da3e35c23 100644 (file)
--- 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\r
 \r
   #\r
-  # Platform  Driver
-  #
-  INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf
-  INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
-
-  #
+  # Platform  Driver\r
+  #\r
+  INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf\r
+  INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
+\r
+  #\r
   # UEFI application (Shell Embedded Boot Loader) \r
   #  \r
   INF ShellBinPkg/UefiShell/UefiShell.inf \r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc
index 3e397880e9256560fcff484e537ef9ed419ea861..e1d60ece3e7ad1759172513c107f3a2e46902a41 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc
@@ -268,12 +268,12 @@
   #\r
   EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf\r
   ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf\r
-
-  #
-  # Platform Driver
-  #
-  ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf
-  OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
+\r
+  #\r
+  # Platform Driver\r
+  #\r
+  ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf\r
+  OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
   \r
   #\r
   # FAT filesystem + GPT/MBR partitioning\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf
index 67aa6af1fb5b9291d34f0159c01783da87ec9e01..d114b162c7a19e322f77e4e7e081957eb8939ff6 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf
@@ -166,13 +166,13 @@ READ_LOCK_STATUS   = TRUE
   #\r
   INF EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf\r
   INF ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf\r
-
-  #
-  # Platform  Driver
-  #
-  INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf
-  INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
-
+\r
+  #\r
+  # Platform  Driver\r
+  #\r
+  INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf\r
+  INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
+\r
   #\r
   # UEFI application (Shell Embedded Boot Loader) \r
   #  \r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.dsc
index 012d470f718d30d078413d3f8e15d9ccb701d2c6..725ce203ad85b2f5d785c203ceb74dfab350b566 100644 (file)
--- 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\r
 \r
   #\r
-  # Platform Driver
-  #
-  ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf
-  OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
-
-  #
+  # Platform Driver\r
+  #\r
+  ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf\r
+  OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
+\r
+  #\r
   # FAT filesystem + GPT/MBR partitioning\r
   #\r
   MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.fdf
index 647f9b6bbedd2c55803da614b2e14b5da3ce3744..5970eb0f4a2699c3edcbe75dee42ff196ec859fe 100644 (file)
--- 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\r
 \r
   #\r
-  # Platform Driver
-  #
-  INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf
-  INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
-
-  #
+  # Platform Driver\r
+  #\r
+  INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf\r
+  INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
+\r
+  #\r
   # UEFI application (Shell Embedded Boot Loader)\r
   #\r
   INF ShellBinPkg/UefiShell/UefiShell.inf\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.dsc
index 55fdc595487a43266f098bdf6acc2d9ac8fa373a..ae3e9b91568c8ad2b05b5b87be094422e33a47a0 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.dsc
@@ -262,12 +262,12 @@
   ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf\r
  \r
   #\r
-  # Platform Driver
-  #
-  ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf
-  OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
-
-  #
+  # Platform Driver\r
+  #\r
+  ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf\r
+  OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
+\r
+  #\r
   # FAT filesystem + GPT/MBR partitioning\r
   #\r
   MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.fdf
index b495a1b947a806ac7e48935d7acc63c2fc53e5d3..ed557b5c10118519266f950e540c33cc091901db 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.fdf
@@ -163,13 +163,13 @@ READ_LOCK_STATUS   = TRUE
   #\r
   INF EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf\r
   INF ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf\r
-
-  #
-  # Platform Driver
-  #
-  INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf
-  INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
-
+\r
+  #\r
+  # Platform Driver\r
+  #\r
+  INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf\r
+  INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
+\r
   #\r
   # UEFI application (Shell Embedded Boot Loader)\r
   #\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressFoundationLibSec.inf b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressFoundationLibSec.inf
index 0677737a290abd92d2ffecfff3d9dfaa4a9345f6..70245b0f4aac97822fc376efe456efad484c14dc 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressFoundationLibSec.inf
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressFoundationLibSec.inf
@@ -47,4 +47,4 @@
   gArmTokenSpaceGuid.PcdArmPrimaryCoreMask\r
   gArmTokenSpaceGuid.PcdArmPrimaryCore\r
 \r
-  gArmPlatformTokenSpaceGuid.PcdCoreCount
\ No newline at end of file
+  gArmPlatformTokenSpaceGuid.PcdCoreCount\r

diff --git a/ArmPlatformPkg/Bds/BdsHelper.c b/ArmPlatformPkg/Bds/BdsHelper.c
index 693bc7d12a1494ae2e87c9581857e88699da6662..d051f074eeb75b610e040f9aed2db1b679a41a7f 100644 (file)
--- a/ArmPlatformPkg/Bds/BdsHelper.c
+++ b/ArmPlatformPkg/Bds/BdsHelper.c
@@ -36,7 +36,7 @@ EditHIInputStr (
   Print (CmdLine);\r
 \r
   // To prevent a buffer overflow, we only allow to enter (MaxCmdLine-1) characters\r
-  for (CmdLineIndex = StrLen (CmdLine); CmdLineIndex < MaxCmdLine; ) {
+  for (CmdLineIndex = StrLen (CmdLine); CmdLineIndex < MaxCmdLine; ) {\r
     Status = gBS->WaitForEvent (1, &gST->ConIn->WaitForKey, &WaitIndex);\r
     ASSERT_EFI_ERROR (Status);\r
 \r
@@ -63,7 +63,7 @@ EditHIInputStr (
       }\r
     } else if ((Key.ScanCode == SCAN_ESC) || (Char == 0x1B) || (Char == 0x0)) {\r
       return EFI_INVALID_PARAMETER;\r
-    } else if (CmdLineIndex < (MaxCmdLine-1)) {
+    } else if (CmdLineIndex < (MaxCmdLine-1)) {\r
       CmdLine[CmdLineIndex++] = Key.UnicodeChar;\r
       Print (L"%c", Key.UnicodeChar);\r
     }\r
@@ -151,7 +151,7 @@ GetHIInputInteger (
   @param[out]  EFI_IP_ADDRESS  OutIpAddr  Returned IPv4 address. Valid if\r
                                           and only if the returned value\r
                                           is equal to EFI_SUCCESS\r
-
+\r
   @retval  EFI_SUCCESS            Input completed\r
   @retval  EFI_ABORTED            Editing aborted by the user\r
   @retval  EFI_OUT_OF_RESOURCES   Fail to perform the operation due to\r
@@ -196,7 +196,7 @@ GetHIInputIP (
   @param[out]  EFI_IP_ADDRESS  OutIpAddr  Returned IPv4 address. Valid if\r
                                           and only if the returned value\r
                                           is equal to EFI_SUCCESS\r
-
+\r
   @retval  EFI_SUCCESS            Update completed\r
   @retval  EFI_ABORTED            Editing aborted by the user\r
   @retval  EFI_INVALID_PARAMETER  The string returned by the user is\r
@@ -243,7 +243,7 @@ GetHIInputBoolean (
 \r
   while(1) {\r
     Print (L"[y/n] ");\r
-    Status = GetHIInputStr (CmdBoolean, 2);
+    Status = GetHIInputStr (CmdBoolean, 2);\r
     if (EFI_ERROR(Status)) {\r
       return Status;\r
     } else if ((CmdBoolean[0] == L'y') || (CmdBoolean[0] == L'Y')) {\r

diff --git a/BeagleBoardPkg/Debugger_scripts/rvi_hw_setup.inc b/BeagleBoardPkg/Debugger_scripts/rvi_hw_setup.inc
index ba4190d56843ef3016b845e14c10be74280cbdfc..f7c211f15a6d71df3ff298e881271de1f3f93f6f 100644 (file)
--- a/BeagleBoardPkg/Debugger_scripts/rvi_hw_setup.inc
+++ b/BeagleBoardPkg/Debugger_scripts/rvi_hw_setup.inc
@@ -64,4 +64,4 @@ setmem /16 0x6D0000B4=0x0032
 setmem /16 0x6D0000BC=0x0000\r
 setmem /32 0x6D0000C4=0xBA9DC4C6\r
 setmem /32 0x6D0000C8=0x00012522\r
-setmem /32 0x6D0000D4=0x0004E201
\ No newline at end of file
+setmem /32 0x6D0000D4=0x0004E201\r

diff --git a/EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf b/EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf
index 28a41b5d5ffa59f916dc71575fed6b44d2bb333f..7e0395a47f163d2e690216aa1183987508944a56 100644 (file)
--- a/EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf
+++ b/EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf
@@ -41,4 +41,4 @@
   EmbeddedPkg/EmbeddedPkg.dec\r
 \r
 [Pcd]\r
-  gEmbeddedTokenSpaceGuid.PcdIsp1761BaseAddress
\ No newline at end of file
+  gEmbeddedTokenSpaceGuid.PcdIsp1761BaseAddress\r

diff --git a/EmbeddedPkg/EmbeddedPkg.dec b/EmbeddedPkg/EmbeddedPkg.dec
index 3f227ad3bc235fa69bae723f620eaf45336409ad..9d02b80b2c7602f0e25290a9e7fc8f94557c82ca 100644 (file)
--- a/EmbeddedPkg/EmbeddedPkg.dec
+++ b/EmbeddedPkg/EmbeddedPkg.dec
@@ -65,7 +65,7 @@
   gAndroidFastbootTransportProtocolGuid = { 0x74bd9fe0, 0x8902, 0x11e3, {0xb9, 0xd3, 0xf7, 0x22, 0x38, 0xfc, 0x9a, 0x31}}\r
   gAndroidFastbootPlatformProtocolGuid =  { 0x524685a0, 0x89a0, 0x11e3, {0x9d, 0x4d, 0xbf, 0xa9, 0xf6, 0xa4, 0x03, 0x08}}\r
   gUsbDeviceProtocolGuid =  { 0x021bd2ca, 0x51d2, 0x11e3, {0x8e, 0x56, 0xb7, 0x54, 0x17, 0xc7,  0x0b, 0x44 }}\r
-
+\r
 [PcdsFeatureFlag.common]\r
   gEmbeddedTokenSpaceGuid.PcdEmbeddedMacBoot|FALSE|BOOLEAN|0x00000001\r
   gEmbeddedTokenSpaceGuid.PcdEmbeddedDirCmd|TRUE|BOOLEAN|0x00000002\r