ArmVirtPkg/PrePi: remove dependency on ArmPlatformLib

Remove the pointless dependency on ArmPlatformLib: none of the code we
call from it actually does anything useful.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

1 files changed, 2 insertions, 4 deletions

diff --git a/ArmVirtPkg/PrePi/PrePi.c b/ArmVirtPkg/PrePi/PrePi.c
index c4fa979c43..fce4ab9428 100755
--- a/ArmVirtPkg/PrePi/PrePi.c
+++ b/ArmVirtPkg/PrePi/PrePi.c
@@ -13,6 +13,7 @@
 **/

 

 #include <PiPei.h>

+#include <Pi/PiBootMode.h>

 

 #include <Library/PrePiLib.h>

 #include <Library/PrintLib.h>

@@ -85,7 +86,7 @@ PrePiMain (
   BuildCpuHob (PcdGet8 (PcdPrePiCpuMemorySize), PcdGet8 (PcdPrePiCpuIoSize));

 

   // Set the Boot Mode

-  SetBootMode (ArmPlatformGetBootMode ());

+  SetBootMode (BOOT_WITH_FULL_CONFIGURATION);

 

   // Initialize Platform HOBs (CpuHob and FvHob)

   Status = PlatformPeim ();

@@ -123,9 +124,6 @@ CEntryPoint (
 {

   UINT64   StartTimeStamp;

 

-  // Initialize the platform specific controllers

-  ArmPlatformInitialize (MpId);

-

   if (PerformanceMeasurementEnabled ()) {

     // Initialize the Timer Library to setup the Timer HW controller

     TimerConstructor ();