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

16 files changed, 74 insertions, 75 deletions

diff --git a/ArmPlatformPkg/ArmPlatformPkg.dsc b/ArmPlatformPkg/ArmPlatformPkg.dsc
index a12040b6b2..7854c037ea 100644
--- a/ArmPlatformPkg/ArmPlatformPkg.dsc
+++ b/ArmPlatformPkg/ArmPlatformPkg.dsc
@@ -429,4 +429,3 @@
   #

   MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf

   ArmPlatformPkg/Bds/Bds.inf

-  

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Debugger_scripts/rvi_hw_setup.inc b/ArmPlatformPkg/ArmRealViewEbPkg/Debugger_scripts/rvi_hw_setup.inc
index ba4190d568..f7c211f15a 100644
--- 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

 setmem /32 0x6D0000C4=0xBA9DC4C6

 setmem /32 0x6D0000C8=0x00012522

-setmem /32 0x6D0000D4=0x0004E201
\ No newline at end of file
+setmem /32 0x6D0000D4=0x0004E201

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
index df1073d144..69f51406fd 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 6a3e93329e..545f3bdb0c 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/FastbootTransportUsbDxe.inf

   INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf

-
+

   #

   # Networking stack

   #

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc
index a2aa986f49..02b3bcf4b4 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 3b56d0d548..0dcd76e788 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 77751b4a54..a7f17f6e65 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 8f84f91da4..d9736ed747 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 3e397880e9..e1d60ece3e 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 67aa6af1fb..d114b162c7 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 012d470f71..725ce203ad 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 647f9b6bbe..5970eb0f4a 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 55fdc59548..ae3e9b9156 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.dsc
@@ -262,12 +262,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 b495a1b947..ed557b5c10 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/ArmVExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressFoundationLibSec.inf b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressFoundationLibSec.inf
index 0677737a29..70245b0f4a 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressFoundationLibSec.inf
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressFoundationLibSec.inf
@@ -47,4 +47,4 @@
   gArmTokenSpaceGuid.PcdArmPrimaryCoreMask

   gArmTokenSpaceGuid.PcdArmPrimaryCore

 

-  gArmPlatformTokenSpaceGuid.PcdCoreCount
\ No newline at end of file
+  gArmPlatformTokenSpaceGuid.PcdCoreCount

diff --git a/ArmPlatformPkg/Bds/BdsHelper.c b/ArmPlatformPkg/Bds/BdsHelper.c
index 693bc7d12a..d051f074ee 100644
--- a/ArmPlatformPkg/Bds/BdsHelper.c
+++ b/ArmPlatformPkg/Bds/BdsHelper.c
@@ -36,7 +36,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);

 

@@ -63,7 +63,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);

     }

@@ -151,7 +151,7 @@ GetHIInputInteger (
   @param[out]  EFI_IP_ADDRESS  OutIpAddr  Returned IPv4 address. Valid if

                                           and only if the returned value

                                           is equal to EFI_SUCCESS

-
+

   @retval  EFI_SUCCESS            Input completed

   @retval  EFI_ABORTED            Editing aborted by the user

   @retval  EFI_OUT_OF_RESOURCES   Fail to perform the operation due to

@@ -196,7 +196,7 @@ GetHIInputIP (
   @param[out]  EFI_IP_ADDRESS  OutIpAddr  Returned IPv4 address. Valid if

                                           and only if the returned value

                                           is equal to EFI_SUCCESS

-
+

   @retval  EFI_SUCCESS            Update completed

   @retval  EFI_ABORTED            Editing aborted by the user

   @retval  EFI_INVALID_PARAMETER  The string returned by the user is

@@ -243,7 +243,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')) {