Bring S2912 and S2912_Fam10 Config.lb in line with each other.

- Use $(CACHE_AS_RAM_AUTO_C) instead of cache_as_ram_auto.c
- Compile apc_auto.c with $(DISTRO_CFLAGS)
- Clean up whitespace

If anyone can explain the remaining differences in Config.lb which are
NOT caused by the K8/Fam10 switch, I'd be glad to hear them.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Peter Stuge <peter@stuge.se>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4095 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

2 files changed, 13 insertions, 11 deletions

diff --git a/src/mainboard/tyan/s2912/Config.lb b/src/mainboard/tyan/s2912/Config.lb
index b0cac7b0f4..178dbb7841 100644
--- a/src/mainboard/tyan/s2912/Config.lb
+++ b/src/mainboard/tyan/s2912/Config.lb
@@ -81,15 +81,17 @@ 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 ./cache_as_ram_auto.o
-			depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h"
+			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. $(CFLAGS) $(CPPFLAGS) $(MAINBOARD)/$(CACHE_AS_RAM_AUTO_C) -Os -nostdinc -nostdlib -fno-builtin $(DEBUG_CFLAGS) -Wall -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 @@ else
     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
@@ -259,7 +261,7 @@ chip northbridge/amd/amdk8/root_complex
 							device pnp 2e.9 off end #  GPIO_SUSLED
 							device pnp 2e.a off end #  ACPI
 							device pnp 2e.b on #  HW Monitor
- 								io 0x60 = 0x290
+								io 0x60 = 0x290
 								irq 0x70 = 5
 							end
 						end
@@ -345,16 +347,16 @@ chip northbridge/amd/amdk8/root_complex
 
 	end # PCI domain
 
-#       chip drivers/generic/debug
-#	       device pnp 0.0 off end # chip name
+#	chip drivers/generic/debug
+#		device pnp 0.0 off end # chip name
 #		device pnp 0.1 on end # pci_regs_all
 #		device pnp 0.2 on end # mem
 #		device pnp 0.3 off end # cpuid
 #		device pnp 0.4 on end # smbus_regs_all
 #		device pnp 0.5 off end # dual core msr
 #		device pnp 0.6 off end # cache size
-#	       device pnp 0.7 off end # tsc
+#		device pnp 0.7 off end # tsc
 #		device pnp 0.8 off  end # io
 #		device pnp 0.9 off end # io
-#       end
+#	end
 end #root_complex
diff --git a/src/mainboard/tyan/s2912_fam10/Config.lb b/src/mainboard/tyan/s2912_fam10/Config.lb
index b39e917b75..1b469b112e 100644
--- a/src/mainboard/tyan/s2912_fam10/Config.lb
+++ b/src/mainboard/tyan/s2912_fam10/Config.lb
@@ -263,7 +263,7 @@ chip northbridge/amd/amdfam10/root_complex
 							device pnp 2e.9 off end #  GPIO_SUSLED
 							device pnp 2e.a off end #  ACPI
 							device pnp 2e.b on #  HW Monitor
- 								io 0x60 = 0x290
+								io 0x60 = 0x290
 								irq 0x70 = 5
 							end
 						end
@@ -330,7 +330,7 @@ chip northbridge/amd/amdfam10/root_complex
 							device pci 4.0 on end
 							register "rom_address" = "0xfff00000"
 						end
-					 end # PCI
+					end # PCI
 					device pci 6.1 off end # AZA
 					device pci 8.0 on end # NIC
 					device pci 9.0 on end # NIC