RISC-V QEMU provides the ACPI tables. We do not need to generate them ourselves.
Signed-off-by: Heinrich Schuchardt heinrich.schuchardt@canonical.com --- lib/acpi/Makefile | 2 +- lib/acpi/acpi_writer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/acpi/Makefile b/lib/acpi/Makefile index c1c9675b5d..19fa6ac869 100644 --- a/lib/acpi/Makefile +++ b/lib/acpi/Makefile @@ -12,7 +12,7 @@ obj-$(CONFIG_$(SPL_)ACPIGEN) += acpi_table.o obj-y += acpi_writer.o
# With QEMU the ACPI tables come from there, not from U-Boot -ifndef CONFIG_QEMU +ifeq ($(CONFIG_QEMU)$(CONFIG_TARGET_QEMU_VIRT),) obj-y += base.o obj-y += csrt.o obj-y += mcfg.o diff --git a/lib/acpi/acpi_writer.c b/lib/acpi/acpi_writer.c index 946f90e8e7..df547c945b 100644 --- a/lib/acpi/acpi_writer.c +++ b/lib/acpi/acpi_writer.c @@ -48,7 +48,7 @@ int acpi_write_one(struct acpi_ctx *ctx, const struct acpi_writer *entry) return 0; }
-#ifndef CONFIG_QEMU +#if !defined(CONFIG_QEMU) && !defined(CONFIG_TARGET_QEMU_VIRT) static int acpi_write_all(struct acpi_ctx *ctx) { const struct acpi_writer *writer =