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>

diff --git a/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf b/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf
index 789a896857aa53660a52030d1a2fbc525cef2695..e816e9583da84fe7d29c3018bf37db6c9ffa4750 100755 (executable)
--- a/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf
+++ b/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf
@@ -54,7 +54,6 @@
   LzmaDecompressLib\r
   PeCoffGetEntryPointLib\r
   PrePiLib\r
-  ArmPlatformLib\r
   ArmPlatformStackLib\r
   MemoryAllocationLib\r
   HobLib\r

diff --git a/ArmVirtPkg/PrePi/PrePi.c b/ArmVirtPkg/PrePi/PrePi.c
index c4fa979c43efa3afb08a2d2150f98a16ea7732cc..fce4ab9428a578d45a73b19a47b9828aa9c7a5c4 100755 (executable)
--- a/ArmVirtPkg/PrePi/PrePi.c
+++ b/ArmVirtPkg/PrePi/PrePi.c
@@ -13,6 +13,7 @@
 **/\r
 \r
 #include <PiPei.h>\r
+#include <Pi/PiBootMode.h>\r
 \r
 #include <Library/PrePiLib.h>\r
 #include <Library/PrintLib.h>\r
@@ -85,7 +86,7 @@ PrePiMain (
   BuildCpuHob (PcdGet8 (PcdPrePiCpuMemorySize), PcdGet8 (PcdPrePiCpuIoSize));\r
 \r
   // Set the Boot Mode\r
-  SetBootMode (ArmPlatformGetBootMode ());\r
+  SetBootMode (BOOT_WITH_FULL_CONFIGURATION);\r
 \r
   // Initialize Platform HOBs (CpuHob and FvHob)\r
   Status = PlatformPeim ();\r
@@ -123,9 +124,6 @@ CEntryPoint (
 {\r
   UINT64   StartTimeStamp;\r
 \r
-  // Initialize the platform specific controllers\r
-  ArmPlatformInitialize (MpId);\r
-\r
   if (PerformanceMeasurementEnabled ()) {\r
     // Initialize the Timer Library to setup the Timer HW controller\r
     TimerConstructor ();\r

diff --git a/ArmVirtPkg/PrePi/PrePi.h b/ArmVirtPkg/PrePi/PrePi.h
index 153f06b9c7fb8ac6701931bc72654cb95831c510..14c9bf92c115b09e169bbb2a82138700b87a0bcf 100644 (file)
--- a/ArmVirtPkg/PrePi/PrePi.h
+++ b/ArmVirtPkg/PrePi/PrePi.h
@@ -25,7 +25,6 @@
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/HobLib.h>\r
 #include <Library/SerialPortLib.h>\r
-#include <Library/ArmPlatformLib.h>\r
 \r
 #define SerialPrint(txt)  SerialPortWrite (txt, AsciiStrLen(txt)+1);\r
 \r