ArmPkg/ArmMmuLib ARM: remove dummy constructor

Make the CONSTRUCTOR define in the .INF AARCH64 only, so we can drop
the empty stub that exists for ARM.

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

diff --git a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c
index 74ac31de98cc33d2f3aa1eec6828f7426487bc74..a6601258bee0ab8abd30ae4afc57b392fdd5fddb 100644 (file)
--- a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c
+++ b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c
@@ -830,12 +830,3 @@ ArmClearMemoryRegionReadOnly (
 {\r
   return ArmSetMemoryAttributes (BaseAddress, Length, __EFI_MEMORY_RWX);\r
 }\r
-\r
-RETURN_STATUS\r
-EFIAPI\r
-ArmMmuBaseLibConstructor (\r
-  VOID\r
-  )\r
-{\r
-  return RETURN_SUCCESS;\r
-}\r

diff --git a/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf b/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
index 5028a955afac17f69b33039f57c85b66ba6cee14..3dfe68ba48a6de353166d42d55858fcf80af8d1f 100644 (file)
--- a/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
+++ b/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
@@ -14,6 +14,8 @@
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   LIBRARY_CLASS                  = ArmMmuLib\r
+\r
+[Defines.AARCH64]\r
   CONSTRUCTOR                    = ArmMmuBaseLibConstructor\r
 \r
 [Sources.AARCH64]\r