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

[coreboot.git] / src / mainboard / asi / mb_5blgp / Config.lb

diff --git a/src/mainboard/asi/mb_5blgp/Config.lb b/src/mainboard/asi/mb_5blgp/Config.lb
index d25a22f5261e2686bf9ffaf189613386708868c9..08010fa2362292e1c9ee6b4e66532460abf66ddb 100644 (file)
--- a/src/mainboard/asi/mb_5blgp/Config.lb
+++ b/src/mainboard/asi/mb_5blgp/Config.lb
@@ -18,47 +18,38 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-if USE_FALLBACK_IMAGE
-       default ROM_SECTION_SIZE = FALLBACK_SIZE
-       default ROM_SECTION_OFFSET = (ROM_SIZE - FALLBACK_SIZE)
-else
-       default ROM_SECTION_SIZE = (ROM_SIZE - FALLBACK_SIZE)
-       default ROM_SECTION_OFFSET = 0
-end
-default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE
-                                   + ROM_SECTION_OFFSET + 1)
-default PAYLOAD_SIZE = (ROM_SECTION_SIZE - ROM_IMAGE_SIZE)
-default _ROMBASE = (CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE)
-default XIP_ROM_SIZE = 64 * 1024
-default XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
+## CONFIG_XIP_ROM_SIZE must be a power of 2.
+default CONFIG_XIP_ROM_SIZE = 64 * 1024
+include /config/nofailovercalculation.lb
+
 arch i386 end
 driver mainboard.o
-if HAVE_PIRQ_TABLE
+if CONFIG_HAVE_PIRQ_TABLE
        object irq_tables.o
 end
 makerule ./failover.E
-       depends "$(MAINBOARD)/../../../arch/i386/lib/failover.c ../romcc"
-       action "../romcc -E -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/../../../arch/i386/lib/failover.c -o $@"
+       depends "$(CONFIG_MAINBOARD)/../../../arch/i386/lib/failover.c ../romcc"
+       action "../romcc -E -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(CONFIG_MAINBOARD)/../../../arch/i386/lib/failover.c -o $@"
 end
 makerule ./failover.inc
-       depends "$(MAINBOARD)/../../../arch/i386/lib/failover.c ../romcc"
-       action "../romcc -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/../../../arch/i386/lib/failover.c -o $@"
+       depends "$(CONFIG_MAINBOARD)/../../../arch/i386/lib/failover.c ../romcc"
+       action "../romcc -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(CONFIG_MAINBOARD)/../../../arch/i386/lib/failover.c -o $@"
 end
 makerule ./auto.E
-       # depends       "$(MAINBOARD)/auto.c option_table.h ../romcc"
-       depends "$(MAINBOARD)/auto.c ../romcc"
-       action  "../romcc -E -O -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/auto.c -o $@"
+       # depends       "$(CONFIG_MAINBOARD)/auto.c option_table.h ../romcc"
+       depends "$(CONFIG_MAINBOARD)/auto.c ../romcc"
+       action  "../romcc -E -O -I$(TOP)/src -I. $(CPPFLAGS) $(CONFIG_MAINBOARD)/auto.c -o $@"
 end
 makerule ./auto.inc
-       # depends "$(MAINBOARD)/auto.c option_table.h ../romcc"
-       depends "$(MAINBOARD)/auto.c ../romcc"
-       action  "../romcc -O -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/auto.c -o $@"
+       # depends "$(CONFIG_MAINBOARD)/auto.c option_table.h ../romcc"
+       depends "$(CONFIG_MAINBOARD)/auto.c ../romcc"
+       action  "../romcc -O -I$(TOP)/src -I. $(CPPFLAGS) $(CONFIG_MAINBOARD)/auto.c -o $@"
 end
 mainboardinit cpu/x86/16bit/entry16.inc
 mainboardinit cpu/x86/32bit/entry32.inc
 ldscript /cpu/x86/16bit/entry16.lds
 ldscript /cpu/x86/32bit/entry32.lds
-if USE_FALLBACK_IMAGE
+if CONFIG_USE_FALLBACK_IMAGE
        mainboardinit cpu/x86/16bit/reset16.inc
        ldscript /cpu/x86/16bit/reset16.lds
 else
@@ -68,7 +59,7 @@ end
 mainboardinit arch/i386/lib/cpu_reset.inc
 mainboardinit arch/i386/lib/id.inc
 ldscript /arch/i386/lib/id.lds
-if USE_FALLBACK_IMAGE
+if CONFIG_USE_FALLBACK_IMAGE
        ldscript /arch/i386/lib/failover.lds
        mainboardinit ./failover.inc
 end