OvmfPkg/AmdSevDxe: sort #includes, and entries in INF file sections

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Brijesh Singh <brijesh.singh@amd.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Brijesh Singh <brijesh.singh@amd.com>
Reviewed-by: Brijesh Singh <brijesh.singh@amd.com>

diff --git a/OvmfPkg/AmdSevDxe/AmdSevDxe.c b/OvmfPkg/AmdSevDxe/AmdSevDxe.c
index 065d7381b35bfb9866c530a458697d1717b90c6d..9ac13acb8b2207a786648805001aaa382d28a156 100644 (file)
--- a/OvmfPkg/AmdSevDxe/AmdSevDxe.c
+++ b/OvmfPkg/AmdSevDxe/AmdSevDxe.c
@@ -16,15 +16,14 @@
 \r
 **/\r
 \r
 \r
 **/\r
 \r

-#include <PiDxe.h>\r
-\r

 #include <Library/BaseLib.h>\r
 #include <Library/BaseLib.h>\r

-#include <Library/DebugLib.h>\r

 #include <Library/BaseMemoryLib.h>\r
 #include <Library/BaseMemoryLib.h>\r

-#include <Library/MemoryAllocationLib.h>\r
-#include <Library/UefiBootServicesTableLib.h>\r
+#include <Library/DebugLib.h>\r

 #include <Library/DxeServicesTableLib.h>\r
 #include <Library/MemEncryptSevLib.h>\r
 #include <Library/DxeServicesTableLib.h>\r
 #include <Library/MemEncryptSevLib.h>\r

+#include <Library/MemoryAllocationLib.h>\r
+#include <Library/UefiBootServicesTableLib.h>\r
+#include <PiDxe.h>\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r

diff --git a/OvmfPkg/AmdSevDxe/AmdSevDxe.inf b/OvmfPkg/AmdSevDxe/AmdSevDxe.inf
index 2ed778979373458bb22b17b61dfeb985f1601559..d4a0a2635d2ebb451e794d033b3c9bba136985ff 100644 (file)
--- a/OvmfPkg/AmdSevDxe/AmdSevDxe.inf
+++ b/OvmfPkg/AmdSevDxe/AmdSevDxe.inf
@@ -27,18 +27,18 @@
   AmdSevDxe.c\r
 \r
 [Packages]\r
   AmdSevDxe.c\r
 \r
 [Packages]\r

-  MdePkg/MdePkg.dec\r

   MdeModulePkg/MdeModulePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r

+  MdePkg/MdePkg.dec\r

   OvmfPkg/OvmfPkg.dec\r
 \r
 [LibraryClasses]\r
   BaseLib\r
   OvmfPkg/OvmfPkg.dec\r
 \r
 [LibraryClasses]\r
   BaseLib\r

-  UefiLib\r
-  UefiDriverEntryPoint\r
-  UefiBootServicesTableLib\r
-  DxeServicesTableLib\r

   DebugLib\r
   DebugLib\r

+  DxeServicesTableLib\r

   MemEncryptSevLib\r
   MemEncryptSevLib\r

+  UefiBootServicesTableLib\r
+  UefiDriverEntryPoint\r
+  UefiLib\r

 \r
 [Depex]\r
   TRUE\r
 \r
 [Depex]\r
   TRUE\r