Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedk am: b26de94592 am: 99d893a486 am: 527bce9ce4
am: 5dca885968

Change-Id: I6af0ab21dfc7f43ac09aee0b43420e2e765910df
diff --git a/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c b/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c
index 2ae589a..8000f97 100644
--- a/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c
+++ b/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c
@@ -137,7 +137,7 @@
     StrCat (UnicodeArgs, SerialNoArgs);

   }

 

-  BdsLoadOptions->OptionalDataSize = 512;

+  BdsLoadOptions->OptionalDataSize = StrSize (UnicodeArgs);

   BdsLoadOptions->OptionalData = UnicodeArgs;

   BdsLoadOptions->Description = NULL;