Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: 70378c6da6 am: e6e91c7c2bandroid-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-dev

am: b6cfb58831

Change-Id: I9ba3b08df0ac649e0fe3afcabee25c88b0df3620

1 files changed, 2 insertions, 2 deletions

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 @@ AbootimgAppendKernelArgs (
   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

       );

   }