From 5db1cce1452d5a5ec635572e072a42fb111b1009 Mon Sep 17 00:00:00 2001
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Date: Thu, 16 Jun 2016 11:51:10 +0200
Subject: ArmPkg ArmVirtPkg MdeModulePkg: switch to separate ArmMmuLib

Switch all users of ArmLib that depend on the MMU routines to the new,
separate ArmMmuLib. This needs to occur in one go, since the MMU
routines are removed from ArmLib build at the same time, to prevent
conflicting symbols.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
---
 MdeModulePkg/Core/DxeIplPeim/Arm/DxeLoadFunc.c | 2 +-
 MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'MdeModulePkg/Core')

diff --git a/MdeModulePkg/Core/DxeIplPeim/Arm/DxeLoadFunc.c b/MdeModulePkg/Core/DxeIplPeim/Arm/DxeLoadFunc.c
index d6581a3125..3acc4544b4 100644
--- a/MdeModulePkg/Core/DxeIplPeim/Arm/DxeLoadFunc.c
+++ b/MdeModulePkg/Core/DxeIplPeim/Arm/DxeLoadFunc.c
@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #include "DxeIpl.h"
 
-#include <Library/ArmLib.h>
+#include <Library/ArmMmuLib.h>
 
 /**
    Transfers control to DxeCore.
diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
index 6275ccebbd..2bc41be829 100644
--- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
@@ -81,7 +81,7 @@
   PeiServicesTablePointerLib
 
 [LibraryClasses.ARM, LibraryClasses.AARCH64]
-  ArmLib
+  ArmMmuLib
 
 [Ppis]
   gEfiDxeIplPpiGuid                 ## PRODUCES
-- 
cgit v1.2.3