diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2020-02-26 13:49:03 +0100 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2020-03-05 21:08:30 +0000 |
| commit | b58ec859c78c7b0c120ac040dc4dd1790d926c7c (patch) | |
| tree | 27f62fa341c1631ed59ec31c0d7da48429037a22 | |
| parent | f9ec8e51d28b52dca9aa5a3aa75c7112f4cf6b73 (diff) | |
| download | edk2-b58ec859c78c7b0c120ac040dc4dd1790d926c7c.tar.gz edk2-b58ec859c78c7b0c120ac040dc4dd1790d926c7c.tar.bz2 edk2-b58ec859c78c7b0c120ac040dc4dd1790d926c7c.zip | |
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>
| -rw-r--r-- | ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c | 9 | ||||
| -rw-r--r-- | ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c | 10 | ||||
| -rw-r--r-- | ArmPkg/Library/ArmLib/ArmLib.c | 2 |
3 files changed, 11 insertions, 10 deletions
diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c index 0ed8dae9a4..924bf48020 100644 --- a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c +++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c @@ -7,11 +7,12 @@ **/
-#include <Uefi.h>
-#include <Chipset/AArch64.h>
+#include <Base.h>
+
#include <Library/ArmLib.h>
-#include <Library/BaseLib.h>
-#include <Library/IoLib.h>
+
+#include <Chipset/AArch64.h>
+
#include "AArch64Lib.h"
#include "ArmLibPrivate.h"
diff --git a/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c b/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c index 38516d4f1b..5d93aa6e0b 100644 --- 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
**/
-#include <Uefi.h>
-#include <Chipset/ArmV7.h>
+
+#include <Base.h>
+
#include <Library/ArmLib.h>
-#include <Library/BaseLib.h>
-#include <Library/IoLib.h>
+
+#include <Chipset/ArmV7.h>
+
#include "ArmV7Lib.h"
#include "ArmLibPrivate.h"
diff --git a/ArmPkg/Library/ArmLib/ArmLib.c b/ArmPkg/Library/ArmLib/ArmLib.c index c682c3ab63..3905d02c5e 100644 --- a/ArmPkg/Library/ArmLib/ArmLib.c +++ b/ArmPkg/Library/ArmLib/ArmLib.c @@ -10,8 +10,6 @@ #include <Base.h>
#include <Library/ArmLib.h>
-#include <Library/DebugLib.h>
-#include <Library/PcdLib.h>
#include "ArmLibPrivate.h"
|