https://bugzilla.tianocore.org/show_bug.cgi?id=263
Fix IA32 build issues in the PlatformFlashAccessLib. Some of the
UINT64 FLASH addresses values need to be typecast to UINTN.
Cc: Jiewen Yao <jiewen....@intel.com>
Cc: David Wei <david....@intel.com>
Cc: Mang Guo <mang....@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Michael Kinney <michael.d.kin...@intel.com>
---
.../Library/PlatformFlashAccessLib/PlatformFlashAccessLib.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git
a/Vlv2TbltDevicePkg/Feature/Capsule/Library/PlatformFlashAccessLib/PlatformFlashAccessLib.c
b/Vlv2TbltDevicePkg/Feature/Capsule/Library/PlatformFlashAccessLib/PlatformFlashAccessLib.c
index efa1dca..f3cb31d 100644
---
a/Vlv2TbltDevicePkg/Feature/Capsule/Library/PlatformFlashAccessLib/PlatformFlashAccessLib.c
+++
b/Vlv2TbltDevicePkg/Feature/Capsule/Library/PlatformFlashAccessLib/PlatformFlashAccessLib.c
@@ -59,7 +59,7 @@ PerformFlashWrite (
}
DEBUG((DEBUG_INFO, " - 0x%x(%x) - 0x%x\n",
(UINTN)FlashAddress, (UINTN)FlashAddressType, Length));
- LibFvbFlashDeviceBlockLock(FlashAddress, Length, FALSE);
+ LibFvbFlashDeviceBlockLock((UINTN)FlashAddress, Length, FALSE);
//
// Erase & Write
@@ -67,7 +67,7 @@ PerformFlashWrite (
Status = LibFvbFlashDeviceBlockErase((UINTN)FlashAddress, Length);
ASSERT_EFI_ERROR(Status);
if (EFI_ERROR(Status)) {
- LibFvbFlashDeviceBlockLock(FlashAddress, Length, TRUE);
+ LibFvbFlashDeviceBlockLock((UINTN)FlashAddress, Length, TRUE);
DEBUG((DEBUG_ERROR, "Flash Erase error\n"));
return Status;
}
@@ -75,12 +75,12 @@ PerformFlashWrite (
Status = LibFvbFlashDeviceWrite((UINTN)FlashAddress, &Length, Buffer);
ASSERT_EFI_ERROR(Status);
if (EFI_ERROR(Status)) {
- LibFvbFlashDeviceBlockLock(FlashAddress, Length, TRUE);
+ LibFvbFlashDeviceBlockLock((UINTN)FlashAddress, Length, TRUE);
DEBUG((DEBUG_ERROR, "Flash write error\n"));
return Status;
}
- LibFvbFlashDeviceBlockLock(FlashAddress, Length, TRUE);
+ LibFvbFlashDeviceBlockLock((UINTN)FlashAddress, Length, TRUE);
return EFI_SUCCESS;
}
@@ -146,10 +146,10 @@ MicrocodeFlashWrite (
// Save original buffer
//
if (OffsetHead != 0) {
- CopyMem((UINT8 *)AlignedBuffer, (VOID *)AlignedFlashAddress, OffsetHead);
+ CopyMem((UINT8 *)AlignedBuffer, (VOID *)(UINTN)AlignedFlashAddress,
OffsetHead);
}
if (OffsetTail != 0) {
- CopyMem((UINT8 *)AlignedBuffer + OffsetHead + Length, (VOID
*)(AlignedFlashAddress + OffsetHead + Length), OffsetTail);
+ CopyMem((UINT8 *)AlignedBuffer + OffsetHead + Length, (VOID
*)(UINTN)(AlignedFlashAddress + OffsetHead + Length), OffsetTail);
}
//
// Override new buffer
--
2.6.3.windows.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
