From 83f564f7464c34c7713b20b61007b24b217f0b88 Mon Sep 17 00:00:00 2001
From: Mathew McBride <matt@traverse.com.au>
Date: Mon, 5 Sep 2022 16:55:02 +1000
Subject: [PATCH] armvirt: config changes required for framebuffer console

These Kconfig options are required to get a screen console
working with the VMware Fusion ARM (Apple Silicon) preview.
They are likely to be the same for other Arm standard
"desktop" hardware that may emerge.

Signed-off-by: Mathew McBride <matt@traverse.com.au>
---
 target/linux/armvirt/config-6.1 | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/target/linux/armvirt/config-6.1 b/target/linux/armvirt/config-6.1
index df09b946ace8..a48af89b875b 100644
--- a/target/linux/armvirt/config-6.1
+++ b/target/linux/armvirt/config-6.1
@@ -84,6 +84,7 @@ CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_COMMON_CLK=y
 # CONFIG_COMPAT_32BIT_TIME is not set
+CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_PM=y
@@ -132,6 +133,9 @@ CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_FONT_8x16=y
 CONFIG_FONT_AUTOSELECT=y
 CONFIG_FONT_SUPPORT=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 CONFIG_FRAME_POINTER=y
 CONFIG_FS_IOMAP=y
 CONFIG_FS_MBCACHE=y
@@ -172,6 +176,8 @@ CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
+CONFIG_HID=y
+CONFIG_HID_GENERIC=y
 CONFIG_HOTPLUG_CPU=y
 CONFIG_HOTPLUG_PCI_ACPI=y
 CONFIG_HVC_DRIVER=y
@@ -183,6 +189,7 @@ CONFIG_I2C_HID_ACPI=y
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 # CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set
 CONFIG_INITRAMFS_SOURCE=""
+CONFIG_INPUT_KEYBOARD=y
 CONFIG_IRQCHIP=y
 CONFIG_IRQ_DOMAIN=y
 CONFIG_IRQ_DOMAIN_HIERARCHY=y
@@ -303,6 +310,9 @@ CONFIG_TREE_SRCU=y
 CONFIG_UCS2_STRING=y
 CONFIG_UNMAP_KERNEL_AT_EL0=y
 CONFIG_USB=y
+CONFIG_USB_HID=y
+CONFIG_USB_HIDDEV=y
+CONFIG_USB_PCI=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_XHCI_HCD=y
@@ -319,5 +329,8 @@ CONFIG_VIRTIO_PCI_LEGACY=y
 CONFIG_VIRTIO_PCI_LIB=y
 CONFIG_VMAP_STACK=y
 CONFIG_WATCHDOG_CORE=y
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
 CONFIG_XPS=y
 CONFIG_ZONE_DMA32=y
-- 
2.30.2