diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2017-11-13 15:13:07 +0000 |
|---|---|---|
| committer | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2017-11-23 16:05:03 +0000 |
| commit | 0ae69a2e04fa95fc951eb269d93b2fbe2d56d458 (patch) | |
| tree | 95cac92e7b1adfd467634380124a87db2afa4762 /ArmVirtPkg | |
| parent | 832709565e76a3f068848964a9c1dac4fa5d21f2 (diff) | |
| download | edk2-0ae69a2e04fa95fc951eb269d93b2fbe2d56d458.tar.gz | |
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>
Diffstat (limited to 'ArmVirtPkg')
| -rwxr-xr-x | ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf | 1 | ||||
| -rwxr-xr-x | ArmVirtPkg/PrePi/PrePi.c | 6 | ||||
| -rw-r--r-- | ArmVirtPkg/PrePi/PrePi.h | 1 |
3 files changed, 2 insertions, 6 deletions
diff --git a/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf b/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf index 789a896857..e816e9583d 100755 --- a/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf +++ b/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf @@ -54,7 +54,6 @@ LzmaDecompressLib
PeCoffGetEntryPointLib
PrePiLib
- ArmPlatformLib
ArmPlatformStackLib
MemoryAllocationLib
HobLib
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 ();
diff --git a/ArmVirtPkg/PrePi/PrePi.h b/ArmVirtPkg/PrePi/PrePi.h index 153f06b9c7..14c9bf92c1 100644 --- a/ArmVirtPkg/PrePi/PrePi.h +++ b/ArmVirtPkg/PrePi/PrePi.h @@ -25,7 +25,6 @@ #include <Library/MemoryAllocationLib.h>
#include <Library/HobLib.h>
#include <Library/SerialPortLib.h>
-#include <Library/ArmPlatformLib.h>
#define SerialPrint(txt) SerialPortWrite (txt, AsciiStrLen(txt)+1);
|