From ab2f9df69fcbbb74af5809f6ea3bb5c76595f207 Mon Sep 17 00:00:00 2001 From: Adrian Vladu Date: Fri, 4 Oct 2024 09:12:16 +0000 Subject: [PATCH 1/6] sys-kernel: enable kernel virtio vnc output --- .../sys-kernel/coreos-modules/files/commonconfig-6.6 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 index d0f30edb5c4..b97695a37fa 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 @@ -161,8 +161,9 @@ CONFIG_DM_UEVENT=y CONFIG_DM_VERITY=m CONFIG_DM_ZERO=m CONFIG_DNS_RESOLVER=y -CONFIG_DRM=m -CONFIG_DRM_VIRTIO_GPU=m +CONFIG_DRM=y +CONFIG_DRM_SIMPLEDRM=y +CONFIG_DRM_VIRTIO_GPU=y CONFIG_DUMMY=m CONFIG_DYNAMIC_DEBUG=y CONFIG_E100=m @@ -859,6 +860,7 @@ CONFIG_STRICT_DEVMEM=y CONFIG_STRIP_ASM_SYMS=y CONFIG_SUNDANCE=m CONFIG_SUNRPC_DEBUG=y +CONFIG_SYSFB_SIMPLEFB=y CONFIG_SYSFS=y CONFIG_SYSVIPC=y CONFIG_TARGET_CORE=m @@ -925,7 +927,7 @@ CONFIG_VIA_RHINE=m CONFIG_VIA_RHINE_MMIO=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m -CONFIG_VIRTIO_CONSOLE=m +CONFIG_VIRTIO_CONSOLE=y CONFIG_VIRTIO_INPUT=m CONFIG_VIRTIO_MMIO=y CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y From 519f211c262d74ec3170c7b3199dc1ba5051776b Mon Sep 17 00:00:00 2001 From: Adrian Vladu Date: Fri, 4 Oct 2024 09:13:40 +0000 Subject: [PATCH 2/6] grub: set more tty-s on arm64 --- build_library/grub.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_library/grub.cfg b/build_library/grub.cfg index 11743bbb8ff..80413cd9934 100644 --- a/build_library/grub.cfg +++ b/build_library/grub.cfg @@ -79,7 +79,7 @@ if [ -z "$linux_console" ]; then terminal_output console serial_com0 elif [ "$grub_platform" = efi ]; then if [ "$grub_cpu" = arm64 ]; then - set linux_console="console=ttyAMA0,115200n8" + set linux_console="console=ttyAMA0,115200n8 console=tty console=tty0 console=hvc0" else set linux_console="console=ttyS0,115200n8 console=tty0" fi From 06d683deef0f187fb0242491dd2dc7cf05889cf0 Mon Sep 17 00:00:00 2001 From: Adrian Vladu Date: Thu, 10 Oct 2024 06:41:54 +0000 Subject: [PATCH 3/6] set arm64 console to tty0 --- build_library/grub.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_library/grub.cfg b/build_library/grub.cfg index 80413cd9934..32f7642468c 100644 --- a/build_library/grub.cfg +++ b/build_library/grub.cfg @@ -79,7 +79,7 @@ if [ -z "$linux_console" ]; then terminal_output console serial_com0 elif [ "$grub_platform" = efi ]; then if [ "$grub_cpu" = arm64 ]; then - set linux_console="console=ttyAMA0,115200n8 console=tty console=tty0 console=hvc0" + set linux_console="console=ttyAMA0,115200n8 console=tty0" else set linux_console="console=ttyS0,115200n8 console=tty0" fi From 104d4dbd739f11104f9d08b5d75b692810ba1f61 Mon Sep 17 00:00:00 2001 From: Adrian Vladu Date: Thu, 10 Oct 2024 06:42:06 +0000 Subject: [PATCH 4/6] Revert "sys-kernel: enable kernel virtio vnc output" This reverts commit ab2f9df69fcbbb74af5809f6ea3bb5c76595f207. --- .../sys-kernel/coreos-modules/files/commonconfig-6.6 | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 index b97695a37fa..d0f30edb5c4 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 @@ -161,9 +161,8 @@ CONFIG_DM_UEVENT=y CONFIG_DM_VERITY=m CONFIG_DM_ZERO=m CONFIG_DNS_RESOLVER=y -CONFIG_DRM=y -CONFIG_DRM_SIMPLEDRM=y -CONFIG_DRM_VIRTIO_GPU=y +CONFIG_DRM=m +CONFIG_DRM_VIRTIO_GPU=m CONFIG_DUMMY=m CONFIG_DYNAMIC_DEBUG=y CONFIG_E100=m @@ -860,7 +859,6 @@ CONFIG_STRICT_DEVMEM=y CONFIG_STRIP_ASM_SYMS=y CONFIG_SUNDANCE=m CONFIG_SUNRPC_DEBUG=y -CONFIG_SYSFB_SIMPLEFB=y CONFIG_SYSFS=y CONFIG_SYSVIPC=y CONFIG_TARGET_CORE=m @@ -927,7 +925,7 @@ CONFIG_VIA_RHINE=m CONFIG_VIA_RHINE_MMIO=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m -CONFIG_VIRTIO_CONSOLE=y +CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_INPUT=m CONFIG_VIRTIO_MMIO=y CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y From fa5000d7a6d6ea9c9c1747f76a5dcd1c530c3aae Mon Sep 17 00:00:00 2001 From: Adrian Vladu Date: Thu, 10 Oct 2024 08:56:54 +0000 Subject: [PATCH 5/6] sys-kernel/coreos-modules: set virtio-gpu as builtin --- .../sys-kernel/coreos-modules/files/commonconfig-6.6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 index d0f30edb5c4..5e2283275bb 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 @@ -162,7 +162,7 @@ CONFIG_DM_VERITY=m CONFIG_DM_ZERO=m CONFIG_DNS_RESOLVER=y CONFIG_DRM=m -CONFIG_DRM_VIRTIO_GPU=m +CONFIG_DRM_VIRTIO_GPU=y CONFIG_DUMMY=m CONFIG_DYNAMIC_DEBUG=y CONFIG_E100=m From 08afac8869889ef862020d523e09e8694eb87093 Mon Sep 17 00:00:00 2001 From: Adrian Vladu Date: Thu, 10 Oct 2024 12:44:49 +0000 Subject: [PATCH 6/6] sys-kernel/coreos-modules: enable DRM as built-in --- .../sys-kernel/coreos-modules/files/commonconfig-6.6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 index 5e2283275bb..d3b6f0c549e 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 @@ -161,7 +161,7 @@ CONFIG_DM_UEVENT=y CONFIG_DM_VERITY=m CONFIG_DM_ZERO=m CONFIG_DNS_RESOLVER=y -CONFIG_DRM=m +CONFIG_DRM=y CONFIG_DRM_VIRTIO_GPU=y CONFIG_DUMMY=m CONFIG_DYNAMIC_DEBUG=y