commit d0f8f8d7d1112bdadeb46cc9ba8c4b0321ce06b6
author Dmitry Shmidt <dimitrysh@google.com> Thu Feb 01 19:41:44 2018 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 01 19:41:44 2018 +0000
tree ed9376e1cc2928b538e30aa6489bb67f5c2d89a8
parent 3e3800f0dc7f1ac58047c803d8d09aa91fcb4a54
parent b6cfb58831d750b05b93a19f8268b5a79233fdcb

Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: 70378c6da6 am: e6e91c7c2b
am: b6cfb58831

Change-Id: I9ba3b08df0ac649e0fe3afcabee25c88b0df3620

Platforms/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c

diff --git a/Platforms/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c b/Platforms/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c
index 6e4db11..6ef1c3d 100644
--- a/Platforms/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c
+++ b/Platforms/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c
@@ -412,13 +412,13 @@
   if (mBoardId == HIKEY960_BOARDID_V1) {

     UnicodeSPrint (

       Args + StrLen (Args), Size - StrLen (Args),

-      L" earlycon=pl011,0xfdf05000,115200 console=ttyAMA5 androidboot.serialno=%s",

+      L" console=ttyAMA5 androidboot.serialno=%s",

       RandomSN->UnicodeSN

       );

   } else {

     UnicodeSPrint (

       Args + StrLen (Args), Size - StrLen (Args),

-      L" earlycon=pl011,0xfff32000,115200 console=ttyAMA6 androidboot.serialno=%s",

+      L" console=ttyAMA6 androidboot.serialno=%s",

       RandomSN->UnicodeSN

       );

   }