diff options
| author | Haojian Zhuang <haojian.zhuang@linaro.org> | 2018-02-11 19:26:26 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-11 19:26:26 +0800 |
| commit | 41438d663f47957c1859a5e7a6ade30e716c5355 (patch) | |
| tree | 4f65392000b71c810a8509b0fbc6c14b03945ac0 | |
| parent | 530ba7f79c48e933b6f41158ebea69ce4ab4a284 (diff) | |
| parent | 9ab6505992708182b862e3e4dda3ae5ba6d337b7 (diff) | |
| download | edk2-41438d663f47957c1859a5e7a6ade30e716c5355.tar.gz | |
Merge pull request #60 from hzhuang1/fix_fb_2
Fix fb 2
| -rw-r--r-- | EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.c | 46 |
1 files changed, 38 insertions, 8 deletions
diff --git a/EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.c b/EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.c index 849553630..9074c6c77 100644 --- a/EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.c +++ b/EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.c @@ -33,7 +33,8 @@ #define CHUNK_TYPE_DONT_CARE 0xCAC3
#define CHUNK_TYPE_CRC32 0xCAC4
-#define FILL_BUF_SIZE 1024
+#define FILL_BUF_SIZE (16 * 1024 * 1024)
+#define SPARSE_BLOCK_SIZE 4096
#define IS_DEVICE_PATH_NODE(node,type,subtype) (((node)->Type == (type)) && ((node)->SubType == (subtype)))
@@ -180,14 +181,35 @@ FlashSparseImage ( )
{
EFI_STATUS Status = EFI_SUCCESS;
- UINTN Chunk, Offset = 0, Index;
+ UINTN Chunk, Offset = 0, Left, Count, FillBufSize;
VOID *Image;
CHUNK_HEADER *ChunkHeader;
- UINT32 FillBuf[FILL_BUF_SIZE];
+ VOID *FillBuf;
CHAR16 OutputString[FASTBOOT_STRING_MAX_LENGTH];
Image = (VOID *)SparseHeader;
Image += SparseHeader->FileHeaderSize;
+
+ // allocate the fill buf with dynamic size
+ FillBufSize = FILL_BUF_SIZE;
+ while (FillBufSize >= SPARSE_BLOCK_SIZE) {
+ FillBuf = AllocatePool (FillBufSize);
+ if (FillBuf == NULL) {
+ FillBufSize = FillBufSize >> 1;
+ } else {
+ break;
+ }
+ };
+ if (FillBufSize < SPARSE_BLOCK_SIZE) {
+ UnicodeSPrint (
+ OutputString,
+ sizeof (OutputString),
+ L"Fail to allocate the fill buffer\n"
+ );
+ mTextOut->OutputString (mTextOut, OutputString);
+ return EFI_BUFFER_TOO_SMALL;
+ }
+
for (Chunk = 0; Chunk < SparseHeader->TotalChunks; Chunk++) {
ChunkHeader = (CHUNK_HEADER *)Image;
DEBUG ((DEBUG_INFO, "Chunk #%d - Type: 0x%x Size: %d TotalSize: %d Offset %d\n",
@@ -209,20 +231,27 @@ FlashSparseImage ( Offset += ChunkHeader->ChunkSize * SparseHeader->BlockSize;
break;
case CHUNK_TYPE_FILL:
- SetMem32 (FillBuf, FILL_BUF_SIZE * sizeof (UINT32), *(UINT32 *)Image);
- Image += sizeof (UINT32);
- for (Index = 0; Index < ChunkHeader->ChunkSize; Index++) {
+ Left = ChunkHeader->ChunkSize * SparseHeader->BlockSize;
+ while (Left > 0) {
+ if (Left > FILL_BUF_SIZE) {
+ Count = FILL_BUF_SIZE;
+ } else {
+ Count = Left;
+ }
+ SetMem32 (FillBuf, Count, *(UINT32 *)Image);
Status = mPlatform->FlashPartitionEx (
PartitionName,
Offset,
- SparseHeader->BlockSize,
+ Count,
FillBuf
);
if (EFI_ERROR (Status)) {
return Status;
}
- Offset += SparseHeader->BlockSize;
+ Offset += Count;
+ Left = Left - Count;
}
+ Image += sizeof (UINT32);
break;
case CHUNK_TYPE_DONT_CARE:
Offset += ChunkHeader->ChunkSize * SparseHeader->BlockSize;
@@ -238,6 +267,7 @@ FlashSparseImage ( break;
}
}
+ FreePool ((VOID *)FillBuf);
return Status;
}
|