Index: coreboot-v2-cleanup-configlb/src/mainboard/gigabyte/m57sli/Config.lb
===================================================================
--- coreboot-v2-cleanup-configlb/src/mainboard/gigabyte/m57sli/Config.lb	(revision 4095)
+++ coreboot-v2-cleanup-configlb/src/mainboard/gigabyte/m57sli/Config.lb	(working copy)
@@ -81,15 +81,17 @@
 if HAVE_PIRQ_TABLE object irq_tables.o end
 #object reset.o
 
+	makedefine CACHE_AS_RAM_AUTO_C:=cache_as_ram_auto.c
+
 	if CONFIG_USE_INIT	
 		makerule ./cache_as_ram_auto.o
-		        depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h"
-        		action "$(CC) $(DISTRO_CFLAGS) -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/cache_as_ram_auto.c -Os -nostdinc -nostdlib -fno-builtin -Wall -c -o $@"
+		        depends "$(MAINBOARD)/$(CACHE_AS_RAM_AUTO_C) option_table.h"
+        		action "$(CC) $(DISTRO_CFLAGS) -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/$(CACHE_AS_RAM_AUTO_C) -Os -nostdinc -nostdlib -fno-builtin -Wall -c -o $@"
 		end
 	else
 		makerule ./cache_as_ram_auto.inc
-        		depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h"
-		        action "$(CC) $(DISTRO_CFLAGS) -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/cache_as_ram_auto.c -Os -nostdinc -nostdlib -fno-builtin -Wall $(DEBUG_CFLAGS) -c -S -o $@"
+        		depends "$(MAINBOARD)/$(CACHE_AS_RAM_AUTO_C) option_table.h"
+		        action "$(CC) $(DISTRO_CFLAGS) -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/$(CACHE_AS_RAM_AUTO_C) -Os -nostdinc -nostdlib -fno-builtin -Wall $(DEBUG_CFLAGS) -c -S -o $@"
 		        action "perl -e 's/\.rodata/.rom.data/g' -pi $@"
         		action "perl -e 's/\.text/.section .rom.text/g' -pi $@"
 		end
@@ -100,7 +102,7 @@
     if CONFIG_AP_CODE_IN_CAR
         makerule ./apc_auto.o
                 depends "$(MAINBOARD)/apc_auto.c option_table.h"
-                action "$(CC) -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/apc_auto.c -Os -nostdinc -nostdlib -fno-builtin -Wall -c -o $@"
+                action "$(CC) $(DISTRO_CFLAGS) -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/apc_auto.c -Os -nostdinc -nostdlib -fno-builtin -Wall -c -o $@"
         end
         ldscript /arch/i386/init/ldscript_apc.lb
     end
Index: coreboot-v2-cleanup-configlb/src/mainboard/gigabyte/ga_2761gxdk/Config.lb
===================================================================
--- coreboot-v2-cleanup-configlb/src/mainboard/gigabyte/ga_2761gxdk/Config.lb	(revision 4095)
+++ coreboot-v2-cleanup-configlb/src/mainboard/gigabyte/ga_2761gxdk/Config.lb	(working copy)
@@ -162,7 +162,7 @@
 ldscript /southbridge/sis/sis966/id.lds
 
 ##
-## ROMSTRAP table for MCP55
+## ROMSTRAP table for SiS966
 ##
 if HAVE_FAILOVER_BOOT
     if USE_FAILOVER_IMAGE
Index: coreboot-v2-cleanup-configlb/src/mainboard/tyan/s2912/Config.lb
===================================================================
--- coreboot-v2-cleanup-configlb/src/mainboard/tyan/s2912/Config.lb	(revision 4095)
+++ coreboot-v2-cleanup-configlb/src/mainboard/tyan/s2912/Config.lb	(working copy)
@@ -72,8 +72,8 @@
 ##
 ## Build the objects we have code for in this directory.
 ##
+driver mainboard.o
 
-driver mainboard.o
 #needed by irq_tables and mptable and acpi_tables
 object get_bus_conf.o
 
@@ -86,7 +86,7 @@
 	if CONFIG_USE_INIT
 		makerule ./cache_as_ram_auto.o
 			depends "$(MAINBOARD)/$(CACHE_AS_RAM_AUTO_C) option_table.h"
-			action "$(CC) $(DISTRO_CFLAGS) -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/cache_as_ram_auto.c -Os -nostdinc -nostdlib -fno-builtin -Wall -c -o $@"
+			action "$(CC) $(DISTRO_CFLAGS) -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/$(CACHE_AS_RAM_AUTO_C) -Os -nostdinc -nostdlib -fno-builtin -Wall -c -o $@"
 		end
 	else
 		makerule ./cache_as_ram_auto.inc
Index: coreboot-v2-cleanup-configlb/src/mainboard/tyan/s2891/Config.lb
===================================================================
--- coreboot-v2-cleanup-configlb/src/mainboard/tyan/s2891/Config.lb	(revision 4095)
+++ coreboot-v2-cleanup-configlb/src/mainboard/tyan/s2891/Config.lb	(working copy)
@@ -1,4 +1,23 @@
 ##
+## This file is part of the coreboot project.
+##
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+##
+
+##
 ## Compute the location and size of where this firmware image
 ## (coreboot plus bootloader) will live in the boot rom chip.
 ##
@@ -35,15 +54,11 @@
 
 arch i386 end
 
-
 ##
 ## Build the objects we have code for in this directory.
 ##
-
 driver mainboard.o
 
-#dir /drivers/ati/ragexl
-
 #needed by irq_tables and mptable and acpi_tables
 object get_bus_conf.o
 
@@ -63,15 +78,17 @@
 	#./fadt.o is moved to southbridge/nvidia/ck804/Config.lb
 end
 
+	makedefine CACHE_AS_RAM_AUTO_C:=cache_as_ram_auto.c
+
 if CONFIG_USE_INIT
-	makerule ./auto.o
-		depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h"
-		action "$(CC) $(DISTRO_CFLAGS) -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/cache_as_ram_auto.c -Os -nostdinc -nostdlib -fno-builtin -Wall -c -o auto.o"
+	makerule ./cache_as_ram_auto.o
+		depends "$(MAINBOARD)/$(CACHE_AS_RAM_AUTO_C) option_table.h"
+		action "$(CC) $(DISTRO_CFLAGS) -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/$(CACHE_AS_RAM_AUTO_C) -Os -nostdinc -nostdlib -fno-builtin -Wall -c -o $@"
 	end
 else
-	makerule ./auto.inc
-		depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h"
-		action "$(CC) $(DISTRO_CFLAGS) -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/cache_as_ram_auto.c -Os -nostdinc -nostdlib -fno-builtin -Wall $(DEBUG_CFLAGS) -c -S -o $@"
+	makerule ./cache_as_ram_auto.inc
+		depends "$(MAINBOARD)/$(CACHE_AS_RAM_AUTO_C) option_table.h"
+		action "$(CC) $(DISTRO_CFLAGS) -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/$(CACHE_AS_RAM_AUTO_C) -Os -nostdinc -nostdlib -fno-builtin -Wall $(DEBUG_CFLAGS) -c -S -o $@"
 		action "perl -e 's/\.rodata/.rom.data/g' -pi $@"
 		action "perl -e 's/\.text/.section .rom.text/g' -pi $@"
 	end
@@ -142,9 +159,9 @@
 ## Setup RAM
 ##
 	if CONFIG_USE_INIT
-		initobject auto.o
+		initobject cache_as_ram_auto.o
 	else
-		mainboardinit ./auto.inc
+		mainboardinit ./cache_as_ram_auto.inc
 	end
 
 ##
Index: coreboot-v2-cleanup-configlb/src/mainboard/tyan/s2892/Config.lb
===================================================================
--- coreboot-v2-cleanup-configlb/src/mainboard/tyan/s2892/Config.lb	(revision 4095)
+++ coreboot-v2-cleanup-configlb/src/mainboard/tyan/s2892/Config.lb	(working copy)
@@ -1,4 +1,23 @@
 ##
+## This file is part of the coreboot project.
+##
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+##
+
+##
 ## Compute the location and size of where this firmware image
 ## (coreboot plus bootloader) will live in the boot rom chip.
 ##
@@ -35,15 +54,11 @@
 
 arch i386 end
 
-
 ##
 ## Build the objects we have code for in this directory.
 ##
-
 driver mainboard.o
 
-#dir /drivers/ati/ragexl
-
 #needed by irq_tables and mptable and acpi_tables
 object get_bus_conf.o
 
@@ -63,15 +78,17 @@
 	#./fadt.o is moved to southbridge/nvidia/ck804/Config.lb
 end
 
+	makedefine CACHE_AS_RAM_AUTO_C:=cache_as_ram_auto.c
+
 if CONFIG_USE_INIT
-	makerule ./auto.o
-		depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h"
-		action "$(CC) $(DISTRO_CFLAGS) -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/cache_as_ram_auto.c -Os -nostdinc -nostdlib -fno-builtin -Wall -c -o auto.o"
+	makerule ./cache_as_ram_auto.o
+		depends "$(MAINBOARD)/$(CACHE_AS_RAM_AUTO_C) option_table.h"
+		action "$(CC) $(DISTRO_CFLAGS) -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/$(CACHE_AS_RAM_AUTO_C) -Os -nostdinc -nostdlib -fno-builtin -Wall -c -o $@"
 	end
 else
-	makerule ./auto.inc
-		depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h"
-		action "$(CC) $(DISTRO_CFLAGS) -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/cache_as_ram_auto.c -Os -nostdinc -nostdlib -fno-builtin -Wall $(DEBUG_CFLAGS) -c -S -o $@"
+	makerule ./cache_as_ram_auto.inc
+		depends "$(MAINBOARD)/$(CACHE_AS_RAM_AUTO_C) option_table.h"
+		action "$(CC) $(DISTRO_CFLAGS) -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/$(CACHE_AS_RAM_AUTO_C) -Os -nostdinc -nostdlib -fno-builtin -Wall $(DEBUG_CFLAGS) -c -S -o $@"
 		action "perl -e 's/\.rodata/.rom.data/g' -pi $@"
 		action "perl -e 's/\.text/.section .rom.text/g' -pi $@"
 	end
@@ -142,9 +159,9 @@
 ## Setup RAM
 ##
 	if CONFIG_USE_INIT
-		initobject auto.o
+		initobject cache_as_ram_auto.o
 	else
-		mainboardinit ./auto.inc
+		mainboardinit ./cache_as_ram_auto.inc
 	end
 
 ##
Index: coreboot-v2-cleanup-configlb/src/mainboard/tyan/s2895/Config.lb
===================================================================
--- coreboot-v2-cleanup-configlb/src/mainboard/tyan/s2895/Config.lb	(revision 4095)
+++ coreboot-v2-cleanup-configlb/src/mainboard/tyan/s2895/Config.lb	(working copy)
@@ -1,4 +1,23 @@
 ##
+## This file is part of the coreboot project.
+##
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+##
+
+##
 ## Compute the location and size of where this firmware image
 ## (coreboot plus bootloader) will live in the boot rom chip.
 ##
@@ -51,8 +70,8 @@
 ##
 ## Build the objects we have code for in this directory.
 ##
+driver mainboard.o
 
-driver mainboard.o
 #needed by irq_tables and mptable and acpi_tables
 object get_bus_conf.o
 
@@ -72,15 +91,17 @@
 	#./fadt.o is moved to southbridge/nvidia/ck804/Config.lb
 end
 
+	makedefine CACHE_AS_RAM_AUTO_C:=cache_as_ram_auto.c
+
 if CONFIG_USE_INIT
-	makerule ./auto.o
-		depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h"
-		action "$(CC) $(DISTRO_CFLAGS) -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/cache_as_ram_auto.c -Os -nostdinc -nostdlib -fno-builtin -Wall -c -o auto.o"
+	makerule ./cache_as_ram_auto.o
+		depends "$(MAINBOARD)/$(CACHE_AS_RAM_AUTO_C) option_table.h"
+		action "$(CC) $(DISTRO_CFLAGS) -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/$(CACHE_AS_RAM_AUTO_C) -Os -nostdinc -nostdlib -fno-builtin -Wall -c -o $@"
 	end
 else
-	makerule ./auto.inc
-		depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h"
-		action "$(CC) $(DISTRO_CFLAGS) -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/cache_as_ram_auto.c -Os -nostdinc -nostdlib -fno-builtin -Wall $(DEBUG_CFLAGS) -c -S -o $@"
+	makerule ./cache_as_ram_auto.inc
+		depends "$(MAINBOARD)/$(CACHE_AS_RAM_AUTO_C) option_table.h"
+		action "$(CC) $(DISTRO_CFLAGS) -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/$(CACHE_AS_RAM_AUTO_C) -Os -nostdinc -nostdlib -fno-builtin -Wall $(DEBUG_CFLAGS) -c -S -o $@"
 		action "perl -e 's/\.rodata/.rom.data/g' -pi $@"
 		action "perl -e 's/\.text/.section .rom.text/g' -pi $@"
 	end
@@ -177,9 +198,9 @@
 ## Setup RAM
 ##
 	if CONFIG_USE_INIT
-		initobject auto.o
+		initobject cache_as_ram_auto.o
 	else
-		mainboardinit ./auto.inc
+		mainboardinit ./cache_as_ram_auto.inc
 	end
 
 ##
Index: coreboot-v2-cleanup-configlb/src/mainboard/tyan/s2912_fam10/Config.lb
===================================================================
--- coreboot-v2-cleanup-configlb/src/mainboard/tyan/s2912_fam10/Config.lb	(revision 4095)
+++ coreboot-v2-cleanup-configlb/src/mainboard/tyan/s2912_fam10/Config.lb	(working copy)
@@ -72,8 +72,8 @@
 ##
 ## Build the objects we have code for in this directory.
 ##
+driver mainboard.o
 
-driver mainboard.o
 #needed by irq_tables and mptable and acpi_tables
 object get_bus_conf.o
 
@@ -86,7 +86,7 @@
 	if CONFIG_USE_INIT
 		makerule ./cache_as_ram_auto.o
 			depends "$(MAINBOARD)/$(CACHE_AS_RAM_AUTO_C) option_table.h"
-			action "$(CC) $(DISTRO_CFLAGS) -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/cache_as_ram_auto.c -Os -nostdinc -nostdlib -fno-builtin -Wall -c -o $@"
+			action "$(CC) $(DISTRO_CFLAGS) -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/$(CACHE_AS_RAM_AUTO_C) -Os -nostdinc -nostdlib -fno-builtin -Wall -c -o $@"
 		end
 	else
 		makerule ./cache_as_ram_auto.inc
Index: coreboot-v2-cleanup-configlb/src/mainboard/msi/ms9282/Config.lb
===================================================================
--- coreboot-v2-cleanup-configlb/src/mainboard/msi/ms9282/Config.lb	(revision 4095)
+++ coreboot-v2-cleanup-configlb/src/mainboard/msi/ms9282/Config.lb	(working copy)
@@ -63,30 +63,29 @@
 ##
 ## Build the objects we have code for in this directory.
 ##
-
 driver mainboard.o
 
-#dir /drivers/ati/ragexl
 #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
 #object reset.o
 
+	makedefine CACHE_AS_RAM_AUTO_C:=cache_as_ram_auto.c
+
 if CONFIG_USE_INIT
 
-makerule ./auto.o
-        depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h"
-        action "$(CC) $(DISTRO_CFLAGS) -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/cache_as_ram_auto.c -Os -nostdinc -nostdlib -fno-builtin -Wall -c -o auto.o"
+makerule ./cache_as_ram_auto.o
+        depends "$(MAINBOARD)/$(CACHE_AS_RAM_AUTO_C) option_table.h"
+        action "$(CC) $(DISTRO_CFLAGS) -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/$(CACHE_AS_RAM_AUTO_C) -Os -nostdinc -nostdlib -fno-builtin -Wall -c -o $@"
 end
 
 else
 
-makerule ./auto.inc
-        depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h"
-        action "$(CC) $(DISTRO_CFLAGS) -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/cache_as_ram_auto.c -Os -nostdinc -nostdlib -fno-builtin -Wall $(DEBUG_CFLAGS) -c -S -o $@"
+makerule ./cache_as_ram_auto.inc
+        depends "$(MAINBOARD)/$(CACHE_AS_RAM_AUTO_C) option_table.h"
+        action "$(CC) $(DISTRO_CFLAGS) -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/$(CACHE_AS_RAM_AUTO_C) -Os -nostdinc -nostdlib -fno-builtin -Wall $(DEBUG_CFLAGS) -c -S -o $@"
        action "perl -e 's/\.rodata/.rom.data/g' -pi $@"
        action "perl -e 's/\.text/.section .rom.text/g' -pi $@"
 end
@@ -158,9 +157,9 @@
 ## Setup RAM
 ##
 if CONFIG_USE_INIT
-initobject auto.o
+initobject cache_as_ram_auto.o
 else
-mainboardinit ./auto.inc
+mainboardinit ./cache_as_ram_auto.inc
 end
 
 ##
