summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2017-06-30 17:22:43 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-06-30 17:22:43 +0000
commitbf17b58f6082d3b5cf0ba68998ed279a8c9a1cf7 (patch)
treeee8acecec9945631698bda24e02a3e63d2885b0d
parentd12728add197560b5d9281bc6f1fe08387b884a7 (diff)
parent5dca885968606dba0ef6592d90b0a1a1c8027ebc (diff)
downloadedk2-bf17b58f6082d3b5cf0ba68998ed279a8c9a1cf7.tar.gz
Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedk am: b26de94592 am: 99d893a486 am: 527bce9ce4oreo-mr1-dev
am: 5dca885968 Change-Id: I6af0ab21dfc7f43ac09aee0b43420e2e765910df
-rw-r--r--EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c b/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c
index 2ae589ac7..8000f97e4 100644
--- a/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c
+++ b/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c
@@ -137,7 +137,7 @@ BootAndroidBootImg (
StrCat (UnicodeArgs, SerialNoArgs);
}
- BdsLoadOptions->OptionalDataSize = 512;
+ BdsLoadOptions->OptionalDataSize = StrSize (UnicodeArgs);
BdsLoadOptions->OptionalData = UnicodeArgs;
BdsLoadOptions->Description = NULL;