OvmfPkg/MemEncryptSevLib: 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/Library/BaseMemEncryptSevLib/BaseMemEncryptSevLib.inf b/OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSevLib.inf
index 81b075194ace8f10d38c839ad180f2f76799d22d..2f0a2392a7adb60476134dcf6bc5d3b96d5eedb0 100644 (file)
--- a/OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSevLib.inf
+++ b/OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSevLib.inf
@@ -31,8 +31,8 @@
 #\r
 \r
 [Packages]\r
-  MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
+  MdePkg/MdePkg.dec\r
   OvmfPkg/OvmfPkg.dec\r
   UefiCpuPkg/UefiCpuPkg.dec\r
 \r
@@ -42,12 +42,12 @@
   X64/VirtualMemory.c\r
 \r
 [Sources.IA32]\r
-  MemEncryptSevLibInternal.c\r
   Ia32/MemEncryptSevLib.c\r
+  MemEncryptSevLibInternal.c\r
 \r
 [LibraryClasses]\r
   BaseLib\r
-  CpuLib\r
   CacheMaintenanceLib\r
+  CpuLib\r
   DebugLib\r
   MemoryAllocationLib\r

diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/Ia32/MemEncryptSevLib.c b/OvmfPkg/Library/BaseMemEncryptSevLib/Ia32/MemEncryptSevLib.c
index 614c97b23bb69722db19f5c9967692dd3dacac9f..5d909c17b0bcfeac0b8bfe41bafdf91d4263794c 100644 (file)
--- a/OvmfPkg/Library/BaseMemEncryptSevLib/Ia32/MemEncryptSevLib.c
+++ b/OvmfPkg/Library/BaseMemEncryptSevLib/Ia32/MemEncryptSevLib.c
@@ -16,10 +16,10 @@
 \r
 #include <Library/BaseLib.h>\r
 #include <Library/DebugLib.h>\r
-#include <Register/Cpuid.h>\r
+#include <Library/MemEncryptSevLib.h>\r
 #include <Register/Amd/Cpuid.h>\r
 #include <Register/Amd/Msr.h>\r
-#include <Library/MemEncryptSevLib.h>\r
+#include <Register/Cpuid.h>\r
 \r
 /**\r
   This function clears memory encryption bit for the memory region specified by\r

diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/MemEncryptSevLibInternal.c b/OvmfPkg/Library/BaseMemEncryptSevLib/MemEncryptSevLibInternal.c
index 44c2c98a6afc4d2073abaef8150a2f34f427a46f..7078ab0d3f4607a4b4160e7a760b6d1e24d8ca34 100644 (file)
--- a/OvmfPkg/Library/BaseMemEncryptSevLib/MemEncryptSevLibInternal.c
+++ b/OvmfPkg/Library/BaseMemEncryptSevLib/MemEncryptSevLibInternal.c
@@ -16,10 +16,10 @@
 \r
 #include <Library/BaseLib.h>\r
 #include <Library/DebugLib.h>\r
-#include <Register/Cpuid.h>\r
+#include <Library/MemEncryptSevLib.h>\r
 #include <Register/Amd/Cpuid.h>\r
 #include <Register/Amd/Msr.h>\r
-#include <Library/MemEncryptSevLib.h>\r
+#include <Register/Cpuid.h>\r
 \r
 STATIC BOOLEAN mSevStatus = FALSE;\r
 STATIC BOOLEAN mSevStatusChecked = FALSE;\r

diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/MemEncryptSevLib.c b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/MemEncryptSevLib.c
index f165722ae550d7e8c505617b159db15583c11a93..62059242fc793b9afe0f3453f81c881a5cb746c9 100644 (file)
--- a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/MemEncryptSevLib.c
+++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/MemEncryptSevLib.c
@@ -16,10 +16,10 @@
 \r
 #include <Library/BaseLib.h>\r
 #include <Library/DebugLib.h>\r
-#include <Register/Cpuid.h>\r
+#include <Library/MemEncryptSevLib.h>\r
 #include <Register/Amd/Cpuid.h>\r
 #include <Register/Amd/Msr.h>\r
-#include <Library/MemEncryptSevLib.h>\r
+#include <Register/Cpuid.h>\r
 \r
 #include "VirtualMemory.h"\r
 \r

diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c
index 39b246048f1f2f37b745d6a60e1b82ca4c643d79..c1bfa35d7a300a013ee1b53dcea9b6930ad33085 100644 (file)
--- a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c
+++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c
@@ -18,8 +18,8 @@
 **/\r
 \r
 #include <Library/CpuLib.h>\r
-#include <Register/Cpuid.h>\r
 #include <Register/Amd/Cpuid.h>\r
+#include <Register/Cpuid.h>\r
 \r
 #include "VirtualMemory.h"\r
 \r

diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.h b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.h
index 67ff69122d73905209dbd57ffbc272d1252a352f..95a08f3558e985043170c89e20b82b874ff978ac 100644 (file)
--- a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.h
+++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.h
@@ -20,13 +20,13 @@
 #ifndef __VIRTUAL_MEMORY__\r
 #define __VIRTUAL_MEMORY__\r
 \r
-#include <Uefi.h>\r
 #include <Library/BaseLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
+#include <Library/CacheMaintenanceLib.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
+#include <Uefi.h>\r
 \r
-#include <Library/CacheMaintenanceLib.h>\r
 #define SYS_CODE64_SEL 0x38\r
 \r
 #pragma pack(1)\r