ArmPkg/ArmLib: clean up library includes

Suspiciously, ArmLib's INF does not contain a [LibraryClasses]
section at all, but it turns out that all the library includes
it contains (except for ArmLib.h itself) are actually bogus so
let's just drop all of them. While at it, replace <Uefi.h> with
the more accurate <Base.h> for a BASE type module, and put the
includes in a consistent order.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif@nuviainc.com>

diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c
index 0ed8dae9a4b0ff8b64ede03e56eff03c9408acde..924bf48020e0ec426b925239173adf01619d0901 100644 (file)
--- a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c
+++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c
@@ -7,11 +7,12 @@
 \r
 **/\r
 \r
-#include <Uefi.h>\r
-#include <Chipset/AArch64.h>\r
+#include <Base.h>\r
+\r
 #include <Library/ArmLib.h>\r
-#include <Library/BaseLib.h>\r
-#include <Library/IoLib.h>\r
+\r
+#include <Chipset/AArch64.h>\r
+\r
 #include "AArch64Lib.h"\r
 #include "ArmLibPrivate.h"\r
 \r

diff --git a/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c b/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c
index 38516d4f1b87d1b4bd4ef7f9ea29bf4c2b56aa2a..5d93aa6e0b8c1a11b7bab14bbc19a55a6bfab636 100644 (file)
--- a/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c
+++ b/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c
@@ -6,11 +6,13 @@
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
-#include <Uefi.h>\r
-#include <Chipset/ArmV7.h>\r
+\r
+#include <Base.h>\r
+\r
 #include <Library/ArmLib.h>\r
-#include <Library/BaseLib.h>\r
-#include <Library/IoLib.h>\r
+\r
+#include <Chipset/ArmV7.h>\r
+\r
 #include "ArmV7Lib.h"\r
 #include "ArmLibPrivate.h"\r
 \r

diff --git a/ArmPkg/Library/ArmLib/ArmLib.c b/ArmPkg/Library/ArmLib/ArmLib.c
index c682c3ab63396a97f57573b89c00f3dff3800934..3905d02c5e7e27e387b78038c277c7e9dd35bf86 100644 (file)
--- a/ArmPkg/Library/ArmLib/ArmLib.c
+++ b/ArmPkg/Library/ArmLib/ArmLib.c
@@ -10,8 +10,6 @@
 #include <Base.h>\r
 \r
 #include <Library/ArmLib.h>\r
-#include <Library/DebugLib.h>\r
-#include <Library/PcdLib.h>\r
 \r
 #include "ArmLibPrivate.h"\r
 \r