summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2018-12-20 22:05:39 -0800
committerandroid-build-merger <android-build-merger@google.com>2018-12-20 22:05:39 -0800
commita2ef145276a58bad1b026793dcd8f3445574bd02 (patch)
treee49292284b5bc17246927451170287c7d0c728b4
parent64270ab3b147742803880393cef98e026bcdab92 (diff)
parentdc8f79e73d48b3d9955d80136261a0e7b617a729 (diff)
downloadedk2-a2ef145276a58bad1b026793dcd8f3445574bd02.tar.gz
Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into HEAD am: 5d32321b0b am: d611cb9b25
am: dc8f79e73d Change-Id: I45efdd6ab987c2d7823a0ee6cb934521edbf6be3
-rw-r--r--EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.c b/EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.c
index 9074c6c77..854157161 100644
--- a/EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.c
+++ b/EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.c
@@ -227,11 +227,11 @@ FlashSparseImage (
if (EFI_ERROR (Status)) {
return Status;
}
- Image += ChunkHeader->ChunkSize * SparseHeader->BlockSize;
- Offset += ChunkHeader->ChunkSize * SparseHeader->BlockSize;
+ Image += (UINTN)ChunkHeader->ChunkSize * SparseHeader->BlockSize;
+ Offset += (UINTN)ChunkHeader->ChunkSize * SparseHeader->BlockSize;
break;
case CHUNK_TYPE_FILL:
- Left = ChunkHeader->ChunkSize * SparseHeader->BlockSize;
+ Left = (UINTN)ChunkHeader->ChunkSize * SparseHeader->BlockSize;
while (Left > 0) {
if (Left > FILL_BUF_SIZE) {
Count = FILL_BUF_SIZE;
@@ -254,7 +254,7 @@ FlashSparseImage (
Image += sizeof (UINT32);
break;
case CHUNK_TYPE_DONT_CARE:
- Offset += ChunkHeader->ChunkSize * SparseHeader->BlockSize;
+ Offset += (UINTN)ChunkHeader->ChunkSize * SparseHeader->BlockSize;
break;
default:
UnicodeSPrint (