From f96a1e6e0927a0a185ccf4623701324c6fc6c0bc Mon Sep 17 00:00:00 2001 From: Raymond Mao Date: Mon, 15 Jul 2024 17:17:12 -0700 Subject: [PATCH] configs: Enable sysinfo for QEMU Arm64 Enable sysinfo smbios by default for Arm64. Do not enable QFW if SYSINFO_SMBIOS is defined. Signed-off-by: Raymond Mao --- cmd/Kconfig | 4 ++-- configs/qemu_arm64_defconfig | 2 ++ lib/Kconfig | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index 40ac5a8dbac..9e3012039ac 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -2325,8 +2325,8 @@ config CMD_SYSBOOT config CMD_QFW bool "qfw" select QFW - default y if TARGET_QEMU_ARM_32BIT || TARGET_QEMU_ARM_64BIT || \ - TARGET_QEMU_X86 || TARGET_QEMU_X86_64 + default y if (TARGET_QEMU_ARM_32BIT || TARGET_QEMU_ARM_64BIT || \ + TARGET_QEMU_X86 || TARGET_QEMU_X86_64) && !SYSINFO_SMBIOS help This provides access to the QEMU firmware interface. The main feature is to allow easy loading of files passed to qemu-system diff --git a/configs/qemu_arm64_defconfig b/configs/qemu_arm64_defconfig index 7e166f43908..dac656f5c88 100644 --- a/configs/qemu_arm64_defconfig +++ b/configs/qemu_arm64_defconfig @@ -60,6 +60,8 @@ CONFIG_PCIE_ECAM_GENERIC=y CONFIG_SCSI=y CONFIG_DEBUG_UART_PL011=y CONFIG_DEBUG_UART_SHIFT=2 +CONFIG_SYSINFO=y +CONFIG_SYSINFO_SMBIOS=y CONFIG_SYSRESET=y CONFIG_SYSRESET_CMD_POWEROFF=y CONFIG_SYSRESET_PSCI=y diff --git a/lib/Kconfig b/lib/Kconfig index 189e6eb31aa..8fd928d55b7 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -307,7 +307,7 @@ config SPL_ACPI config GENERATE_ACPI_TABLE bool "Generate an ACPI (Advanced Configuration and Power Interface) table" depends on ACPI - select QFW if QEMU + select QFW if QEMU && !SYSINFO_SMBIOS help The Advanced Configuration and Power Interface (ACPI) specification provides an open standard for device configuration and management