Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68e9a46b authored by Greg Hartman's avatar Greg Hartman Committed by Alistair Strachan
Browse files

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: default avatarGreg Hartman <ghartman@google.com>
(cherry picked from commit 2860dfe869a94c8c1950effb55da116f83ebc740)
parent 3e166630

arch/arm64/configs/cuttlefish_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -47,8 +47,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
@@ -286,6 +284,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
@@ -385,6 +384,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