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

[coreboot.git] / src / mainboard / msi / ms7260 / Config.lb

diff --git a/src/mainboard/msi/ms7260/Config.lb b/src/mainboard/msi/ms7260/Config.lb
index fdea44ed0a63a5aa5ec659c1157f5ecd4ae96f4c..d17e0973f233a194d6e15fee11d843a0585739a9 100644 (file)
--- a/src/mainboard/msi/ms7260/Config.lb
+++ b/src/mainboard/msi/ms7260/Config.lb
@@ -18,50 +18,50 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-## XIP_ROM_SIZE must be a power of 2.
-default XIP_ROM_SIZE = 64 * 1024
+## CONFIG_XIP_ROM_SIZE must be a power of 2.
+default CONFIG_XIP_ROM_SIZE = 64 * 1024
 include /config/failovercalculation.lb
 
 arch i386 end
 
 driver mainboard.o
 object get_bus_conf.o # Needed by irq_tables and mptable (and acpi_tables).
-if HAVE_MP_TABLE object mptable.o end
-if HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_HAVE_MP_TABLE object mptable.o end
+if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
 # object reset.o
 
   if CONFIG_USE_INIT
     makerule ./cache_as_ram_auto.o
-      depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h"
-      action "$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) -I$(TOP)/src -I. -c $(MAINBOARD)/cache_as_ram_auto.c -o $@"
+      depends "$(CONFIG_MAINBOARD)/cache_as_ram_auto.c option_table.h"
+      action "$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) -I$(TOP)/src -I. -c $(CONFIG_MAINBOARD)/cache_as_ram_auto.c -o $@"
     end
   else
     makerule ./cache_as_ram_auto.inc
-      depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h"
-      action "$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(TOP)/src -I. -c -S $(MAINBOARD)/cache_as_ram_auto.c -o $@"
+      depends "$(CONFIG_MAINBOARD)/cache_as_ram_auto.c option_table.h"
+      action "$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(TOP)/src -I. -c -S $(CONFIG_MAINBOARD)/cache_as_ram_auto.c -o $@"
       action "perl -e 's/\.rodata/.rom.data/g' -pi $@"
       action "perl -e 's/\.text/.section .rom.text/g' -pi $@"
     end
   end
 
-if USE_FAILOVER_IMAGE
+if CONFIG_USE_FAILOVER_IMAGE
 else
   if CONFIG_AP_CODE_IN_CAR
     makerule ./apc_auto.o
-      depends "$(MAINBOARD)/apc_auto.c option_table.h"
-      action "$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) -I$(TOP)/src -I. -c $(MAINBOARD)/apc_auto.c -o $@"
+      depends "$(CONFIG_MAINBOARD)/apc_auto.c option_table.h"
+      action "$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) -I$(TOP)/src -I. -c $(CONFIG_MAINBOARD)/apc_auto.c -o $@"
     end
     ldscript /arch/i386/init/ldscript_apc.lb
   end
 end
 
-if HAVE_FAILOVER_BOOT
-  if USE_FAILOVER_IMAGE
+if CONFIG_HAVE_FAILOVER_BOOT
+  if CONFIG_USE_FAILOVER_IMAGE
     mainboardinit cpu/x86/16bit/entry16.inc
     ldscript /cpu/x86/16bit/entry16.lds
   end
 else
-  if USE_FALLBACK_IMAGE
+  if CONFIG_USE_FALLBACK_IMAGE
     mainboardinit cpu/x86/16bit/entry16.inc
     ldscript /cpu/x86/16bit/entry16.lds
   end
@@ -76,8 +76,8 @@ mainboardinit cpu/x86/32bit/entry32.inc
     ldscript /cpu/amd/car/cache_as_ram.lds
   end
 
-if HAVE_FAILOVER_BOOT
-  if USE_FAILOVER_IMAGE
+if CONFIG_HAVE_FAILOVER_BOOT
+  if CONFIG_USE_FAILOVER_IMAGE
     mainboardinit cpu/x86/16bit/reset16.inc
     ldscript /cpu/x86/16bit/reset16.lds
   else
@@ -85,7 +85,7 @@ if HAVE_FAILOVER_BOOT
     ldscript /cpu/x86/32bit/reset32.lds
   end
 else
-  if USE_FALLBACK_IMAGE
+  if CONFIG_USE_FALLBACK_IMAGE
     mainboardinit cpu/x86/16bit/reset16.inc
     ldscript /cpu/x86/16bit/reset16.lds
   else
@@ -98,13 +98,13 @@ mainboardinit southbridge/nvidia/mcp55/id.inc
 ldscript /southbridge/nvidia/mcp55/id.lds
 
 # ROMSTRAP table for MCP55.
-if HAVE_FAILOVER_BOOT
-  if USE_FAILOVER_IMAGE
+if CONFIG_HAVE_FAILOVER_BOOT
+  if CONFIG_USE_FAILOVER_IMAGE
     mainboardinit southbridge/nvidia/mcp55/romstrap.inc
     ldscript /southbridge/nvidia/mcp55/romstrap.lds
   end
 else
-  if USE_FALLBACK_IMAGE
+  if CONFIG_USE_FALLBACK_IMAGE
     mainboardinit southbridge/nvidia/mcp55/romstrap.inc
     ldscript /southbridge/nvidia/mcp55/romstrap.lds
   end
@@ -112,12 +112,12 @@ end
 
   mainboardinit cpu/amd/car/cache_as_ram.inc
 
-if HAVE_FAILOVER_BOOT
-  if USE_FAILOVER_IMAGE
+if CONFIG_HAVE_FAILOVER_BOOT
+  if CONFIG_USE_FAILOVER_IMAGE
       ldscript /arch/i386/lib/failover_failover.lds
   end
 else
-  if USE_FALLBACK_IMAGE
+  if CONFIG_USE_FALLBACK_IMAGE
       ldscript /arch/i386/lib/failover.lds
   end
 end