[edk2-devel] [edk2-platforms][PATCH 08/30] Platform/SiFive: CoreInfoHob uses RiscVFirmwareContextLib

[Abner Chang]

CoreInfoHob uses RiscVFirmwareContextLib to get the
pointer of FirmwareContext.

Cc: Sunil V L <sunilvl at ventanamicro.com>
Cc: Daniel Schaefer <daniel.schaefer at hpe.com>

Signed-off-by: Abner Chang <abner.chang at hpe.com>
---
 .../Library/PeiCoreInfoHobLib/PeiCoreInfoHobLib.inf         | 3 ++-
 Silicon/SiFive/U54/Library/PeiCoreInfoHobLib/CoreInfoHob.c  | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Platform/SiFive/U5SeriesPkg/Library/PeiCoreInfoHobLib/PeiCoreInfoHobLib.inf b/Platform/SiFive/U5SeriesPkg/Library/PeiCoreInfoHobLib/PeiCoreInfoHobLib.inf
index d741f04747..4fe7827313 100644
--- a/Platform/SiFive/U5SeriesPkg/Library/PeiCoreInfoHobLib/PeiCoreInfoHobLib.inf
+++ b/Platform/SiFive/U5SeriesPkg/Library/PeiCoreInfoHobLib/PeiCoreInfoHobLib.inf
@@ -34,9 +34,10 @@
 
 [LibraryClasses]
   BaseLib
-  PcdLib
   MemoryAllocationLib
+  PcdLib
   PrintLib
+  RiscVFirmwareContextLib
   SiliconSiFiveU54CoreInfoLib
 
 [Guids]
diff --git a/Silicon/SiFive/U54/Library/PeiCoreInfoHobLib/CoreInfoHob.c b/Silicon/SiFive/U54/Library/PeiCoreInfoHobLib/CoreInfoHob.c
index 326c4525bb..37363a0028 100644
--- a/Silicon/SiFive/U54/Library/PeiCoreInfoHobLib/CoreInfoHob.c
+++ b/Silicon/SiFive/U54/Library/PeiCoreInfoHobLib/CoreInfoHob.c
@@ -1,7 +1,7 @@
 /**@file
   Build up platform processor information of SiFive U54 core.
 
-  Copyright (c) 2019 - 2020, Hewlett Packard Enterprise Development LP. All rights reserved.<BR>
+  Copyright (c) 2019 - 2021, Hewlett Packard Enterprise Development LP. All rights reserved.<BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -17,7 +17,7 @@
 #include <Library/FirmwareContextProcessorSpecificLib.h>
 #include <Library/HobLib.h>
 #include <Library/PcdLib.h>
-#include <Library/RiscVEdk2SbiLib.h>
+#include <Library/RiscVFirmwareContextLib.h>
 
 #include <RiscVImpl.h>
 #include <sbi/sbi_hart.h>
@@ -63,7 +63,7 @@ CreateU54E51CoreProcessorSpecificDataHob (
     return EFI_INVALID_PARAMETER;
   }
 
-  SbiGetFirmwareContext (&FirmwareContext);
+  GetFirmwareContextPointer (&FirmwareContext);
   ASSERT (FirmwareContext != NULL);
   if (FirmwareContext == NULL) {
     DEBUG ((DEBUG_ERROR, "Failed to get the pointer of EFI_RISCV_OPENSBI_FIRMWARE_CONTEXT of hart %d\n", HartId));
-- 
2.31.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#82322): https://edk2.groups.io/g/devel/message/82322
Mute This Topic: https://groups.io/mt/86435673/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-