This patch unifies the use of config options in v2 to all start with CONFIG_

[coreboot.git] / src / arch / i386 / boot / Config.lb

diff --git a/src/arch/i386/boot/Config.lb b/src/arch/i386/boot/Config.lb
index c5a14d0f78d2986c54ed9cb902055bb4714e59f3..9c576921a0c94ac950c2d75cae94d35372e5b726 100644 (file)
--- a/src/arch/i386/boot/Config.lb
+++ b/src/arch/i386/boot/Config.lb
@@ -1,13 +1,21 @@
-uses HAVE_PIRQ_TABLE
-uses HAVE_ACPI_TABLES
+uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_MULTIBOOT
+uses CONFIG_HAVE_ACPI_RESUME
 
 object boot.o
-object linuxbios_table.o
+object coreboot_table.o
+if CONFIG_MULTIBOOT
+object multiboot.o
+end
 object tables.o
-if HAVE_PIRQ_TABLE
+if CONFIG_HAVE_PIRQ_TABLE
 object pirq_routing.o 
 end
-if HAVE_ACPI_TABLES
+if CONFIG_HAVE_ACPI_TABLES
 object acpi.o
+object acpigen.o
+if CONFIG_HAVE_ACPI_RESUME
+object wakeup.S
+end
 end
-