From d116bba47055ec40d03aae66e81a023b5c161b3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@users.noreply.github.com>
Date: Wed, 20 Dec 2023 16:16:53 +0100
Subject: [PATCH] Enable virtio-mem and DMI tables/fw_cfg sysfs for aarch64 and
 ova (#3004)

Enable options that can be useful on virtualized systems as modules.

Fixes #2987
---
 buildroot                                                     | 2 +-
 .../board/arm-uefi/generic-aarch64/kernel.config              | 4 ++++
 buildroot-external/board/pc/ova/kernel.config                 | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/buildroot b/buildroot
index 8a75878da..4c89661fd 160000
--- a/buildroot
+++ b/buildroot
@@ -1 +1 @@
-Subproject commit 8a75878da422b4fb26578de3a6760aef8c4fccaa
+Subproject commit 4c89661fd1cf1343a2f2c3e1a8535147a9087e02
diff --git a/buildroot-external/board/arm-uefi/generic-aarch64/kernel.config b/buildroot-external/board/arm-uefi/generic-aarch64/kernel.config
index 24cc8c7a7..2990764b7 100644
--- a/buildroot-external/board/arm-uefi/generic-aarch64/kernel.config
+++ b/buildroot-external/board/arm-uefi/generic-aarch64/kernel.config
@@ -6,6 +6,7 @@ CONFIG_VIRTIO=y
 CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_NET=y
 CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_MEM=m
 CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_BLK=y
 CONFIG_VIRTIO_BLK_SCSI=y
@@ -26,6 +27,9 @@ CONFIG_DAX=y
 CONFIG_FS_DAX=y
 CONFIG_ZONE_DEVICE=y
 
+CONFIG_DMI_SYSFS=m
+CONFIG_FW_CFG_SYSFS=m
+
 CONFIG_NVME_CORE=y
 CONFIG_BLK_DEV_NVME=y
 CONFIG_NVME_HWMON=y
diff --git a/buildroot-external/board/pc/ova/kernel.config b/buildroot-external/board/pc/ova/kernel.config
index f2ba98238..5de433d31 100644
--- a/buildroot-external/board/pc/ova/kernel.config
+++ b/buildroot-external/board/pc/ova/kernel.config
@@ -10,6 +10,9 @@ CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
 CONFIG_MEMORY_HOTREMOVE=y
 CONFIG_ACPI_HOTPLUG_MEMORY=y
 
+CONFIG_DMI_SYSFS=m
+CONFIG_FW_CFG_SYSFS=m
+
 CONFIG_VMXNET3=y
 CONFIG_VMWARE_VMCI_VSOCKETS=y
 CONFIG_VMWARE_VMCI=y
@@ -33,6 +36,7 @@ CONFIG_VIRTIO=y
 CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_NET=y
 CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_MEM=m
 CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_BLK=y
 CONFIG_VIRTIO_BLK_SCSI=y