commit 9aa8a77f935158a075684db13cf6a2631f1c4268
author Haojian Zhuang <haojian.zhuang@linaro.org> Wed Apr 19 21:50:13 2017 +0800
committer Haojian Zhuang <haojian.zhuang@linaro.org> Wed Apr 19 21:50:13 2017 +0800
tree 40ad2e530625c1205c7f2a846ac2c7bb517024f5
parent e37b568758396b57581d31e6654244a4cc334014

Revert "EmbeddedPkg/AndroidBootApp: add the workaround on UFS"

This reverts commit f6822254291292a8bb8580929a4e22c3212ef177.

EmbeddedPkg/Application/AndroidBoot/AndroidBootApp.c

diff --git a/EmbeddedPkg/Application/AndroidBoot/AndroidBootApp.c b/EmbeddedPkg/Application/AndroidBoot/AndroidBootApp.c
index 93717e8..17ff4fc 100644
--- a/EmbeddedPkg/Application/AndroidBoot/AndroidBootApp.c
+++ b/EmbeddedPkg/Application/AndroidBoot/AndroidBootApp.c
@@ -111,47 +111,17 @@
     return EFI_BUFFER_TOO_SMALL;
   }
 
-  {
-  #if 0
-    /* Load header of boot.img */
-    Status = BlockIo->ReadBlocks (
-                        BlockIo,
-                        MediaId,
-                        PartitionPath->PartitionStart,
-                        Size,
-                        Buffer
-                        );
-    if (EFI_ERROR (Status)) {
-      DEBUG ((EFI_D_ERROR, "Failed to read blocks: %r\n", Status));
-      goto EXIT;
-    }
-  #else
-  #define SMALL_SIZE            (8 * 1024 * 1024)
-
-    UINTN   Offset = 0, Count;
-    for (; Size > 0; ) {
-      if (Size > SMALL_SIZE) {
-        Count = SMALL_SIZE;
-        Size = Size - Count;
-      } else {
-        Count = Size;
-        Size = 0;
-      }
-      Status = BlockIo->ReadBlocks (
-                          BlockIo,
-                          MediaId,
-                          PartitionPath->PartitionStart + (Offset / 4096),
-                          Count,
-                          Buffer + Offset
-                          );
-      if (EFI_ERROR (Status)) {
-        DEBUG ((EFI_D_ERROR, "Failed to read blocks: %r at Offset 0x%x\n", Status, Offset));
-        ASSERT (0);
-        goto EXIT;
-      }
-      Offset += Count;
-    }
-  #endif
+  /* Load header of boot.img */
+  Status = BlockIo->ReadBlocks (
+                      BlockIo,
+                      MediaId,
+                      PartitionPath->PartitionStart,
+                      Size,
+                      Buffer
+                      );
+  if (EFI_ERROR (Status)) {
+    DEBUG ((EFI_D_ERROR, "Failed to read blocks: %r\n", Status));
+    goto EXIT;
   }
 
   Status = AbootimgBoot (Buffer, Size);