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 3356b8f4f58305b77bbe9de59a103c391be72d86..0a07e3b9bee54869030d87c1d1cade0dcf4c8ead 100644 (file)
--- a/src/arch/i386/lib/Config.lb
+++ b/src/arch/i386/lib/Config.lb
@@ -1,6 +1,7 @@
 uses CONFIG_USE_INIT
 uses CONFIG_USE_PRINTK_IN_CAR
-uses USE_FAILOVER_IMAGE
+uses CONFIG_USE_FAILOVER_IMAGE
+uses CONFIG_CBFS
 
 object c_start.S
 object cpu.c
@@ -12,7 +13,11 @@ object exception.c
 
 initobject printk_init.o
 
-if USE_FAILOVER_IMAGE
+if CONFIG_USE_FAILOVER_IMAGE
 else
-       initobject copy_and_run.o
+       if CONFIG_CBFS
+               initobject cbfs_and_run.o
+       else
+               initobject copy_and_run.o
+       end
 end