summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2013-12-03 09:40:39 +0100
committerGerd Hoffmann <kraxel@redhat.com>2013-12-06 12:37:01 +0100
commit590e8d45581730a210eb32d58a87305ea6edb706 (patch)
treeed9c9e5ef68ba9caabec3070ce3ec333c1c44013
parent4623b20e5a14e5d4b0fa040807f7ecc02051204b (diff)
qemu: fix GENERATE_ACPI_TABLES=n in fw_cfg.c
Change-Id: Ib8dc069c9e503747c349e96a466feb42279afd08 Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-on: http://review.coreboot.org/4305 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
-rw-r--r--src/mainboard/emulation/qemu-i440fx/fw_cfg.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/mainboard/emulation/qemu-i440fx/fw_cfg.c b/src/mainboard/emulation/qemu-i440fx/fw_cfg.c
index 085f2a9ad4..047f211db0 100644
--- a/src/mainboard/emulation/qemu-i440fx/fw_cfg.c
+++ b/src/mainboard/emulation/qemu-i440fx/fw_cfg.c
@@ -20,7 +20,9 @@
#include <smbios.h>
#include <console/console.h>
#include <arch/io.h>
-#include <arch/acpigen.h>
+#if CONFIG_GENERATE_ACPI_TABLES
+# include <arch/acpigen.h>
+#endif
#include "fw_cfg.h"
#include "fw_cfg_if.h"
@@ -120,6 +122,9 @@ int fw_cfg_max_cpus(void)
}
/* ---------------------------------------------------------------------- */
+
+#if CONFIG_GENERATE_ACPI_TABLES
+
/*
* Starting with release 1.7 qemu provides acpi tables via fw_cfg.
* Main advantage is that new (virtual) hardware which needs acpi
@@ -309,6 +314,8 @@ err:
return 0;
}
+#endif /* CONFIG_GENERATE_ACPI_TABLES */
+
/* ---------------------------------------------------------------------- */
/* pick up smbios information from fw_cfg */