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

[coreboot.git] / src / mainboard / tyan / s2895 / Config.lb

diff --git a/src/mainboard/tyan/s2895/Config.lb b/src/mainboard/tyan/s2895/Config.lb
index a8023fe0c72bdcbc0b385befa8a30a4735cf8f4a..3bf256f3e351cc5e0e87b8dce053a433e4f5117f 100644 (file)
--- a/src/mainboard/tyan/s2895/Config.lb
+++ b/src/mainboard/tyan/s2895/Config.lb
@@ -1,5 +1,5 @@
-## 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
@@ -12,15 +12,15 @@ driver mainboard.o
 #needed by irq_tables and mptable and acpi_tables
 object get_bus_conf.o
 
-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 HAVE_ACPI_TABLES
+if CONFIG_HAVE_ACPI_TABLES
         object acpi_tables.o
        makerule dsdt.c
-               depends "$(MAINBOARD)/dsdt.dsl"
-               action  "iasl -p $(CURDIR)/dsdt -tc $(MAINBOARD)/dsdt.dsl"
+               depends "$(CONFIG_MAINBOARD)/dsdt.dsl"
+               action  "iasl -p $(CURDIR)/dsdt -tc $(CONFIG_MAINBOARD)/dsdt.dsl"
                action  "mv dsdt.hex dsdt.c"
        end
         object ./dsdt.o
@@ -30,13 +30,13 @@ end
 
 if CONFIG_USE_INIT
        makerule ./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 ./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
@@ -45,13 +45,13 @@ end
 ##
 ## Build our 16 bit and 32 bit coreboot entry code
 ##
-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
@@ -70,8 +70,8 @@ mainboardinit cpu/x86/32bit/entry32.inc
 ##
 ## Build our reset vector (This is where coreboot is entered)
 ##
-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
@@ -79,7 +79,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
@@ -97,13 +97,13 @@ ldscript /southbridge/nvidia/ck804/id.lds
 ##
 ## ROMSTRAP table for CK804
 ##
-if HAVE_FAILOVER_BOOT
-       if USE_FAILOVER_IMAGE
+if CONFIG_HAVE_FAILOVER_BOOT
+       if CONFIG_USE_FAILOVER_IMAGE
                mainboardinit southbridge/nvidia/ck804/romstrap.inc
                ldscript /southbridge/nvidia/ck804/romstrap.lds
        end
 else
-       if USE_FALLBACK_IMAGE
+       if CONFIG_USE_FALLBACK_IMAGE
                mainboardinit southbridge/nvidia/ck804/romstrap.inc
                ldscript /southbridge/nvidia/ck804/romstrap.lds
        end
@@ -119,12 +119,12 @@ end
 ### Things are delicate and we test to see if we should
 ### failover to another image.
 ###
-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