Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp
am: 911a23ccd8

Change-Id: I5cf0084230838f43eea342d0083f649b3a0fc5f6
diff --git a/Platforms/Hisilicon/HiKey/HiKeyFastbootDxe/HiKeyFastboot.c b/Platforms/Hisilicon/HiKey/HiKeyFastbootDxe/HiKeyFastboot.c
index d4176fe..49551ae 100644
--- a/Platforms/Hisilicon/HiKey/HiKeyFastbootDxe/HiKeyFastboot.c
+++ b/Platforms/Hisilicon/HiKey/HiKeyFastbootDxe/HiKeyFastboot.c
@@ -33,6 +33,7 @@
 #include <Library/UefiBootServicesTableLib.h>

 #include <Library/UefiRuntimeServicesTableLib.h>

 #include <Library/PrintLib.h>

+#include <Library/TimerLib.h>

 

 #include <Guid/HiKeyVariable.h>

 

@@ -557,6 +558,7 @@
   }

 

   BlockIo->FlushBlocks(BlockIo);

+  MicroSecondDelay (50000);

 

   return Status;

 }

diff --git a/Platforms/Hisilicon/HiKey/HiKeyFastbootDxe/HiKeyFastbootDxe.inf b/Platforms/Hisilicon/HiKey/HiKeyFastbootDxe/HiKeyFastbootDxe.inf
index e59b2fc..25c09d2 100644
--- a/Platforms/Hisilicon/HiKey/HiKeyFastbootDxe/HiKeyFastbootDxe.inf
+++ b/Platforms/Hisilicon/HiKey/HiKeyFastbootDxe/HiKeyFastbootDxe.inf
@@ -35,6 +35,7 @@
   UefiBootServicesTableLib

   UefiRuntimeServicesTableLib

   UefiDriverEntryPoint

+  TimerLib

 

 [Protocols]

   gAndroidFastbootPlatformProtocolGuid