summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2018-12-20 21:53:21 -0800
committerandroid-build-merger <android-build-merger@google.com>2018-12-20 21:53:21 -0800
commitd611cb9b25276ac4650b1aaf9ee0155f90164e8d (patch)
treee49292284b5bc17246927451170287c7d0c728b4
parent77e59dd49e13717d9c2c573ad09a3e01ac079caa (diff)
parent5d32321b0bbc9a32d622ca4cbd42bd273381f096 (diff)
downloadedk2-d611cb9b25276ac4650b1aaf9ee0155f90164e8d.tar.gz
Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into HEAD
am: 5d32321b0b Change-Id: I8e24147b4a7ec42c7fb58d36bd9e2c2d80fe9271
-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 (