ArmPlatformPkg/ArmVExpressPkg: Clean line endings

The edk2 tree mandates CRLF line terminators. Earlier patches added some
lines with LF terminators. Clean them up.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15132 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf
index a74878ba2bda6fd6ab48c604e673412af11a8b7f..36bb06a371f5dc03209224103c9bf2ed9bc8b1d3 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf
@@ -181,7 +181,7 @@ READ_LOCK_STATUS   = TRUE
   #\r
   INF ArmPlatformPkg/ArmVExpressPkg/ArmFvpDxe/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-A15.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc
index fa3c7a1aa00cf940f73e75c11b94ea0767f8262f..cc0af8ddf5a6a400bcd29af1692e7655dc50c98d 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc
@@ -42,10 +42,10 @@
 \r
   TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf \r
 \r
-  # Virtio Support
-  VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf
-  VirtioMmioDeviceLib|OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceLib.inf
-
+  # Virtio Support\r
+  VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf\r
+  VirtioMmioDeviceLib|OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceLib.inf\r
+\r
 [LibraryClasses.common.SEC]\r
   ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7LibSec.inf\r
   ArmPlatformSecLib|ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/ArmVExpressSecLib.inf\r
@@ -267,12 +267,12 @@
   #\r
   EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf\r
   ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf\r
-
-  #
-  # Platform Driver
-  #
-  ArmPlatformPkg/ArmVExpressPkg/ArmFvpDxe/ArmFvpDxe.inf
-  OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
+\r
+  #\r
+  # Platform Driver\r
+  #\r
+  ArmPlatformPkg/ArmVExpressPkg/ArmFvpDxe/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.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc
index 7d6fe69830c0619d26705e68fce50787af086c8b..5ac815f785a3ebb2bb7fe40ffda1e531b25550b1 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc
@@ -42,10 +42,10 @@
 \r
   TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf \r
 \r
-  # Virtio Support
-  VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf
-  VirtioMmioDeviceLib|OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceLib.inf
-
+  # Virtio Support\r
+  VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf\r
+  VirtioMmioDeviceLib|OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceLib.inf\r
+\r
 [LibraryClasses.common.SEC]\r
   ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7LibSec.inf\r
   ArmPlatformSecLib|ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/ArmVExpressSecLib.inf\r
@@ -269,12 +269,12 @@
   #\r
   EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf\r
   ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf\r
-
-  #
-  # Platform Driver
-  #
-  ArmPlatformPkg/ArmVExpressPkg/ArmFvpDxe/ArmFvpDxe.inf
-  OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
+\r
+  #\r
+  # Platform Driver\r
+  #\r
+  ArmPlatformPkg/ArmVExpressPkg/ArmFvpDxe/ArmFvpDxe.inf\r
+  OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
   \r
   #\r
   # FAT filesystem + GPT/MBR partitioning\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc
index bb32e1bc60fb63dceeac8cac617158ac12b37132..97e77ffdadd93b65724e5527441f2e497b73c361 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc
@@ -40,11 +40,11 @@
 \r
   #DebugAgentTimerLib|ArmPlatformPkg/ArmVExpressPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf\r
 \r
-
-  # Virtio Support
-  VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf
-  VirtioMmioDeviceLib|OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceLib.inf
-
+\r
+  # Virtio Support\r
+  VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf\r
+  VirtioMmioDeviceLib|OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceLib.inf\r
+\r
 [LibraryClasses.common.SEC]\r
   ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7LibSec.inf\r
   ArmPlatformSecLib|ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/ArmVExpressSecLib.inf\r
@@ -269,12 +269,12 @@
   #\r
   EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf\r
   ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf\r
-
-  #
-  # Platform Driver
-  #
-  ArmPlatformPkg/ArmVExpressPkg/ArmFvpDxe/ArmFvpDxe.inf
-  OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
+\r
+  #\r
+  # Platform Driver\r
+  #\r
+  ArmPlatformPkg/ArmVExpressPkg/ArmFvpDxe/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 f4ae329ae8ccd2140304ac2980e0c6920b64843a..914e0da0fa73254fd951510a19e3dae61323aa91 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/ArmFvpDxe/ArmFvpDxe.inf
-  INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
-
+\r
+  #\r
+  # Platform  Driver\r
+  #\r
+  INF ArmPlatformPkg/ArmVExpressPkg/ArmFvpDxe/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 2942b99acf7c8ffd405e78fbc34b584e8e245d10..02ac49ca6fbce78bdb66b099e777982b11b38e33 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.dsc
@@ -34,10 +34,10 @@
   ArmCpuLib|ArmPkg/Drivers/ArmCpuLib/ArmCortexAEMv8Lib/ArmCortexAEMv8Lib.inf\r
   ArmPlatformLib|ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressFoundationLib.inf\r
 \r
-  # Virtio Support
-  VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf
-  VirtioMmioDeviceLib|OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceLib.inf
-
+  # Virtio Support\r
+  VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf\r
+  VirtioMmioDeviceLib|OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceLib.inf\r
+\r
   ArmPlatformSysConfigLib|ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf\r
 \r
   TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf\r
@@ -225,12 +225,12 @@
   ArmPkg/Filesystem/SemihostFs/SemihostFs.inf\r
 \r
   #\r
-  # Platform Driver
-  #
-  ArmPlatformPkg/ArmVExpressPkg/ArmFvpDxe/ArmFvpDxe.inf
-  OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
-
-  #
+  # Platform Driver\r
+  #\r
+  ArmPlatformPkg/ArmVExpressPkg/ArmFvpDxe/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 bfb6cdf3d1a272bc82880842b9f956c9d19ab171..aa6d80d290993409d616247d04f53ee777ad6b2f 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/ArmFvpDxe/ArmFvpDxe.inf
-  INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
-
-  #
+  # Platform Driver\r
+  #\r
+  INF ArmPlatformPkg/ArmVExpressPkg/ArmFvpDxe/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 5d22f1d9bf3c67fa0428016840f011082244b787..1b5b02c79e86ef1018792904cc95795d74f42baf 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.dsc
@@ -40,10 +40,10 @@
 \r
   TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf\r
 \r
-  # VirtIo Support
-  VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf
-  VirtioMmioDeviceLib|OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceLib.inf
-
+  # VirtIo Support\r
+  VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf\r
+  VirtioMmioDeviceLib|OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceLib.inf\r
+\r
 [LibraryClasses.common.SEC]\r
   ArmLib|ArmPkg/Library/ArmLib/AArch64/AArch64LibSec.inf\r
   ArmPlatformSecLib|ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/ArmVExpressSecLib.inf\r
@@ -259,12 +259,12 @@
   ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf\r
  \r
   #\r
-  # Platform Driver
-  #
-  ArmPlatformPkg/ArmVExpressPkg/ArmFvpDxe/ArmFvpDxe.inf
-  OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
-
-  #
+  # Platform Driver\r
+  #\r
+  ArmPlatformPkg/ArmVExpressPkg/ArmFvpDxe/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 5e34115cb556e59196628f22f567775b7ce30d8c..8da9561a3401f194bdeda8c7a681505ac69a3ab1 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/ArmFvpDxe/ArmFvpDxe.inf
-  INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
-
+\r
+  #\r
+  # Platform Driver\r
+  #\r
+  INF ArmPlatformPkg/ArmVExpressPkg/ArmFvpDxe/ArmFvpDxe.inf\r
+  INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
+\r
   #\r
   # UEFI application (Shell Embedded Boot Loader)\r
   #\r