diff options
| author | Greg Hartman <ghartman@google.com> | 2019-04-17 12:58:54 -0700 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2019-09-16 13:09:02 +0530 |
| commit | 2fdc85a52656f078e8f44b132ba68d254ffe8f31 (patch) | |
| tree | ee797367177a0f047c51ebe386e1014a31508a75 /arch | |
| parent | 838a193c658cefaac53cc874d79ff184920bb054 (diff) | |
ANDROID: cuttlefish_defconfig: Make arm64 serial port config compatible with crosvm
BUG: 118442619
Test: Ran ~/bin/crosvm run --disable-sandbox ~/image, saw output
Change-Id: If086af28b69eca5353a101228ae986653bc1465e
Signed-off-by: Greg Hartman <ghartman@google.com>
(cherry picked from commit 2860dfe869a94c8c1950effb55da116f83ebc740)
[AmitP: Added ANDROID tag in the commit headline]
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/configs/cuttlefish_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig index 00a15e187109..fbb1d18f5fe5 100644 --- a/arch/arm64/configs/cuttlefish_defconfig +++ b/arch/arm64/configs/cuttlefish_defconfig @@ -45,8 +45,6 @@ CONFIG_CP15_BARRIER_EMULATION=y CONFIG_SETEND_EMULATION=y CONFIG_ARM64_SW_TTBR0_PAN=y CONFIG_RANDOMIZE_BASE=y -CONFIG_CMDLINE="console=ttyAMA0" -CONFIG_CMDLINE_EXTEND=y # CONFIG_EFI is not set CONFIG_COMPAT=y CONFIG_PM_WAKELOCKS=y @@ -283,6 +281,7 @@ CONFIG_SERIAL_8250_NR_UARTS=48 CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_VIRTIO_CONSOLE=y @@ -382,6 +381,7 @@ CONFIG_MMC=y # CONFIG_MMC_BLOCK is not set CONFIG_RTC_CLASS=y # CONFIG_RTC_SYSTOHC is not set +CONFIG_RTC_DRV_PL030=y CONFIG_RTC_DRV_PL031=y CONFIG_VIRTIO_PCI=y # CONFIG_VIRTIO_PCI_LEGACY is not set |