diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2018-02-01 16:42:05 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-01 16:42:05 +0000 |
| commit | b6cfb58831d750b05b93a19f8268b5a79233fdcb (patch) | |
| tree | ed9376e1cc2928b538e30aa6489bb67f5c2d89a8 | |
| parent | cf7dd2dad5c0663d68111149624b47c7b7f6b15c (diff) | |
| parent | e6e91c7c2bfe19a2157c47679aeb2c93ebe0c4cc (diff) | |
| download | device_linaro_bootloader_OpenPlatformPkg-b6cfb58831d750b05b93a19f8268b5a79233fdcb.tar.gz device_linaro_bootloader_OpenPlatformPkg-b6cfb58831d750b05b93a19f8268b5a79233fdcb.tar.bz2 device_linaro_bootloader_OpenPlatformPkg-b6cfb58831d750b05b93a19f8268b5a79233fdcb.zip | |
Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: 70378c6da6
am: e6e91c7c2b
Change-Id: I78c46d62288192b018d0f62d34ffaf6b6d4f1e8e
| -rw-r--r-- | Platforms/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c | 4 |
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
);
}
|