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

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

diff --git a/src/arch/i386/lib/Config.lb b/src/arch/i386/lib/Config.lb
index a303b82c6d3f1ab40fb62d696f909cfaf6ae7d84..0a07e3b9bee54869030d87c1d1cade0dcf4c8ead 100644 (file)
--- a/src/arch/i386/lib/Config.lb
+++ b/src/arch/i386/lib/Config.lb
@@ -1,12 +1,23 @@
-#object params.o
-#object vgabios.o CONFIG_VGABIOS
-#object idt.o  CONFIG_REALMODE_IDT
-#object pci-irq.c CONFIG_PCIBIOS_IRQ
-#option CONFIG_LOGICAL_CPUS=1
-#option CONFIG_PCIBIOS_IRQ=0
+uses CONFIG_USE_INIT
+uses CONFIG_USE_PRINTK_IN_CAR
+uses CONFIG_USE_FAILOVER_IMAGE
+uses CONFIG_CBFS
+
 object c_start.S
 object cpu.c
 object pci_ops_conf1.c
 object pci_ops_conf2.c
+object pci_ops_mmconf.c
 object pci_ops_auto.c
 object exception.c
+
+initobject printk_init.o
+
+if CONFIG_USE_FAILOVER_IMAGE
+else
+       if CONFIG_CBFS
+               initobject cbfs_and_run.o
+       else
+               initobject copy_and_run.o
+       end
+end