According to the bug:
https://bugzilla.tianocore.org/show_bug.cgi?id=2777
the deprecated code under DISABLE_NEW_DEPRECATED_INTERFACES
will be removed, which will result in compilation breakage
of the Marvell platforms. Prevent that by switching to the
different PcdSet API.

Signed-off-by: Marcin Wojtas <m...@semihalf.com>
---
 Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c | 21 +++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c 
b/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c
index fba75b6..a5d4ec3 100644
--- a/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c
+++ b/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c
@@ -1059,15 +1059,18 @@ MvFvbConfigureFlashInstance (
         return EFI_OUT_OF_RESOURCES;
     }
 
-    PcdSet64 (PcdFlashNvStorageVariableBase64,
-      (UINT64) FlashInstance->RegionBaseAddress);
-    PcdSet64 (PcdFlashNvStorageFtwWorkingBase64,
-      (UINT64) FlashInstance->RegionBaseAddress
-      + VariableSize);
-    PcdSet64 (PcdFlashNvStorageFtwSpareBase64,
-      (UINT64) FlashInstance->RegionBaseAddress
-      + VariableSize
-      + FtwWorkingSize);
+    Status = PcdSet64S (PcdFlashNvStorageVariableBase64,
+               (UINT64) FlashInstance->RegionBaseAddress);
+    ASSERT_EFI_ERROR (Status);
+    Status = PcdSet64S (PcdFlashNvStorageFtwWorkingBase64,
+               (UINT64) FlashInstance->RegionBaseAddress
+               + VariableSize);
+    ASSERT_EFI_ERROR (Status);
+    Status = PcdSet64S (PcdFlashNvStorageFtwSpareBase64,
+               (UINT64) FlashInstance->RegionBaseAddress
+               + VariableSize
+               + FtwWorkingSize);
+    ASSERT_EFI_ERROR (Status);
 
     // Fill the buffer with data from flash
     DataOffset = GET_DATA_OFFSET (FlashInstance->FvbOffset,
-- 
2.7.4


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#63577): https://edk2.groups.io/g/devel/message/63577
Mute This Topic: https://groups.io/mt/75909686/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to