Skip to content

Commit 0815cdf

Browse files
authored
Merge pull request #2359 from flatcar/ader1990/fix-arm64-vnc-console-output
sys-kernel: enable kernel virtio vnc output
2 parents c4b6797 + d8c5d9b commit 0815cdf

3 files changed

Lines changed: 5 additions & 4 deletions

File tree

build_library/grub.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ if [ -z "$linux_console" ]; then
7979
terminal_output console serial_com0
8080
elif [ "$grub_platform" = efi ]; then
8181
if [ "$grub_cpu" = arm64 ]; then
82-
set linux_console="console=ttyAMA0,115200n8"
82+
set linux_console="console=ttyAMA0,115200n8 console=tty0"
8383
else
8484
set linux_console="console=ttyS0,115200n8 console=tty0"
8585
fi
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Enable VNC console serial logs on ARM64 QEMU/KVM instances ([flatcar/scripts#2359](https://github.com/flatcar/scripts/pull/2359))

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.12

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,12 +169,12 @@ CONFIG_DM_UEVENT=y
169169
CONFIG_DM_VERITY=m
170170
CONFIG_DM_ZERO=m
171171
CONFIG_DNS_RESOLVER=y
172-
CONFIG_DRM=m
172+
CONFIG_DRM=y
173173
CONFIG_DRM_FBDEV_EMULATION=y
174174
CONFIG_DRM_QXL=m
175175
CONFIG_DRM_SIMPLEDRM=m
176176
CONFIG_DRM_TTM_HELPER=m
177-
CONFIG_DRM_VIRTIO_GPU=m
177+
CONFIG_DRM_VIRTIO_GPU=y
178178
CONFIG_DST_CACHE=y
179179
CONFIG_DUMMY=m
180180
CONFIG_DYNAMIC_DEBUG=y
@@ -1009,7 +1009,7 @@ CONFIG_VIA_RHINE=m
10091009
CONFIG_VIA_RHINE_MMIO=y
10101010
CONFIG_VIRTIO_BALLOON=m
10111011
CONFIG_VIRTIO_BLK=m
1012-
CONFIG_VIRTIO_CONSOLE=m
1012+
CONFIG_VIRTIO_CONSOLE=y
10131013
CONFIG_VIRTIO_FS=m
10141014
CONFIG_VIRTIO_INPUT=m
10151015
CONFIG_VIRTIO_MMIO=y

0 commit comments

Comments
 (0)