aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2016-10-26 19:59:17 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-10-26 19:59:17 +0000
commit6f399d2f9be9ae6ccd4f7a84bc25cef503561a33 (patch)
treec6785b0272ab92e9fd5e0cc4f1d0fcf35cfc6918
parenta3f92afeeb5f51a8ee193dfbf64adf52692a216b (diff)
parent911a23ccd8744303788510039026b836f919262e (diff)
downloaddevice_linaro_bootloader_OpenPlatformPkg-o-preview.tar.gz
device_linaro_bootloader_OpenPlatformPkg-o-preview.tar.bz2
device_linaro_bootloader_OpenPlatformPkg-o-preview.zip
Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into oppandroid-o-preview-1o-preview
am: 911a23ccd8 Change-Id: I5cf0084230838f43eea342d0083f649b3a0fc5f6
-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