aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2016-10-26 20:07:17 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-10-26 20:07:17 +0000
commita3d50249601e68f7d3c885d4259725c54130a213 (patch)
treec6785b0272ab92e9fd5e0cc4f1d0fcf35cfc6918
parenta3f92afeeb5f51a8ee193dfbf64adf52692a216b (diff)
parent314cdb0db6d834e3c0dab859c8084220a8aca197 (diff)
downloadOpenPlatformPkg-a3d50249601e68f7d3c885d4259725c54130a213.tar.gz
Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: 911a23ccd8 am: 6f399d2f9bandroid-wear-o-preview-4android-wear-o-preview-3android-o-preview-3android-o-preview-2
am: 314cdb0db6 Change-Id: I2f1b294680b6d665eff37bdb456e93b50b5f2e08
-rw-r--r--Platforms/Hisilicon/HiKey/HiKeyFastbootDxe/HiKeyFastboot.c2
-rw-r--r--Platforms/Hisilicon/HiKey/HiKeyFastbootDxe/HiKeyFastbootDxe.inf1
2 files changed, 3 insertions, 0 deletions
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 @@ HiKeyFastbootPlatformFlashPartition (
}
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