Rename build system variables to be more intuitive, and

at the same time let the user specify sources instead
of object files:
- objs becomes ramstage-srcs
- initobjs becomes romstage-srcs
- driver becomes driver-srcs
- smmobj becomes smm-srcs

The user servicable parts are named accordingly:
ramstage-y, romstage-y, driver-y, smm-y

Also, the object file names are properly renamed now, using
.ramstage.o, .romstage.o, .driver.o, .smm.o suffixes consistently.

Remove stubbed out via/epia-m700 dsdt/ssdt files - they didn't
easily fit in the build system and aren't useful anyway.

Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coreystems.de>


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

src/arch/i386/Makefile.bigbootblock.inc

@@ -20,7 +20,7 @@ $(obj)/crt0.S: $$(crt0s)
 	@printf "    GEN        $(subst $(obj)/,,$(@))\n"
 	printf '$(foreach crt0,config.h $(crt0s),#include "$(crt0:$(obj)/%=%)"\n)' > $@
 
-$(obj)/mainboard/$(MAINBOARDDIR)/crt0.initobj.o: $(obj)/mainboard/$(MAINBOARDDIR)/crt0.s
+$(obj)/mainboard/$(MAINBOARDDIR)/crt0.romstage.o: $(obj)/mainboard/$(MAINBOARDDIR)/crt0.s
 	@printf "    CC         $(subst $(obj)/,,$(@))\n"
 	$(CC) -MMD -I$(obj) -Wa,-acdlns -c -o $@ $<  > $(dir $@)/crt0.disasm
 
@@ -28,9 +28,9 @@ $(obj)/mainboard/$(MAINBOARDDIR)/crt0.s: $(obj)/crt0.S
 	@printf "    CC         $(subst $(obj)/,,$(@))\n"
 	$(CC) -MMD -x assembler-with-cpp -DASSEMBLY -E -I$(src)/include -I$(src)/arch/i386/include -I$(obj) -include $(obj)/config.h -I. -I$(src) $< -o $@
 
-$(obj)/coreboot: $$(initobjs) $(obj)/ldscript.ld
+$(obj)/coreboot: $$(romstage-objs) $(obj)/ldscript.ld
 	@printf "    LINK       $(subst $(obj)/,,$(@))\n"
-	$(CC) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(obj)/ldscript.ld $(initobjs)
+	$(CC) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(obj)/ldscript.ld $(romstage-objs)
 	$(NM) -n $(obj)/coreboot | sort > $(obj)/coreboot.map
 	$(OBJCOPY) --only-keep-debug $@ $(obj)/bootblock.debug
 	$(OBJCOPY) --strip-debug $@

src/arch/i386/Makefile.bootblock.inc

@@ -81,16 +81,16 @@ $(obj)/bootblock.elf: $(obj)/mainboard/$(MAINBOARDDIR)/bootblock.o $(obj)/bootbl
 
 #######################################################################
 # Build the romstage
-$(obj)/coreboot.romstage: $(obj)/coreboot.pre1 $$(initobjs) $(obj)/romstage/ldscript.ld
+$(obj)/coreboot.romstage: $(obj)/coreboot.pre1 $$(romstage-objs) $(obj)/romstage/ldscript.ld
 	@printf "    LINK       $(subst $(obj)/,,$(@))\n"
 	printf "CONFIG_ROMBASE = 0x0;\nAUTO_XIP_ROM_BASE = 0x0;\n" > $(obj)/location.ld
-	$(CC) -nostdlib -nostartfiles -static -o $(obj)/romstage.elf -L$(obj) -T $(obj)/romstage/ldscript.ld $(initobjs)
+	$(CC) -nostdlib -nostartfiles -static -o $(obj)/romstage.elf -L$(obj) -T $(obj)/romstage/ldscript.ld $(romstage-objs)
 	$(OBJCOPY) -O binary $(obj)/romstage.elf $(obj)/romstage.bin
 	printf "CONFIG_ROMBASE = 0x" > $(obj)/location.ld
 	$(CBFSTOOL) $(obj)/coreboot.pre1 locate $(obj)/romstage.bin $(CONFIG_CBFS_PREFIX)/romstage $(CONFIG_XIP_ROM_SIZE) > $(obj)/location.txt
 	cat $(obj)/location.txt >> $(obj)/location.ld
 	printf ';\nAUTO_XIP_ROM_BASE = CONFIG_ROMBASE & ~(CONFIG_XIP_ROM_SIZE - 1);\n' >> $(obj)/location.ld
-	$(CC) -nostdlib -nostartfiles -static -o $(obj)/romstage.elf -L$(obj) -T $(obj)/romstage/ldscript.ld $(initobjs)
+	$(CC) -nostdlib -nostartfiles -static -o $(obj)/romstage.elf -L$(obj) -T $(obj)/romstage/ldscript.ld $(romstage-objs)
 	$(NM) -n $(obj)/romstage.elf | sort > $(obj)/romstage.map
 	$(OBJCOPY) --only-keep-debug $(obj)/romstage.elf $(obj)/romstage.debug
 	$(OBJCOPY) --strip-debug $(obj)/romstage.elf
@@ -107,7 +107,7 @@ $(obj)/romstage/crt0.S: $$(crt0s)
 	mkdir -p $(obj)/romstage
 	printf '$(foreach crt0,config.h $(crt0s),#include "$(crt0:$(obj)/%=%)"\n)' > $@
 
-$(obj)/mainboard/$(MAINBOARDDIR)/crt0.initobj.o: $(obj)/mainboard/$(MAINBOARDDIR)/crt0.s
+$(obj)/mainboard/$(MAINBOARDDIR)/crt0.romstage.o: $(obj)/mainboard/$(MAINBOARDDIR)/crt0.s
 	@printf "    CC         $(subst $(obj)/,,$(@))\n"
 	$(CC) -I$(obj) -Wa,-acdlns -c -o $@ $<  > $(dir $@)/crt0.disasm
 

src/arch/i386/Makefile.inc

@@ -25,7 +25,11 @@ subdirs-y += boot
 subdirs-y += lib
 subdirs-y += smp
 
-obj-$(CONFIG_HAVE_OPTION_TABLE) += ../../option_table.o
+OPTION_TABLE_H:=
+ifeq ($(CONFIG_HAVE_OPTION_TABLE),y)
+ramstage-srcs += $(obj)/option_table.c
+OPTION_TABLE_H:=$(obj)/option_table.h
+endif
 
 #######################################################################
 # Build the final rom image
@@ -88,13 +92,13 @@ endif
 #######################################################################
 # i386 specific tools
 
-$(obj)/option_table.h: $(objutil)/options/build_opt_tbl $(top)/src/mainboard/$(MAINBOARDDIR)/cmos.layout
+$(OPTION_TABLE_H): $(objutil)/options/build_opt_tbl $(top)/src/mainboard/$(MAINBOARDDIR)/cmos.layout
 	@printf "    OPTION     $(subst $(obj)/,,$(@))\n"
-	$(objutil)/options/build_opt_tbl --config $(top)/src/mainboard/$(MAINBOARDDIR)/cmos.layout --header $(obj)/option_table.h
+	$(objutil)/options/build_opt_tbl --config $(top)/src/mainboard/$(MAINBOARDDIR)/cmos.layout --header $@
 
 $(obj)/option_table.c: $(objutil)/options/build_opt_tbl $(top)/src/mainboard/$(MAINBOARDDIR)/cmos.layout
 	@printf "    OPTION     $(subst $(obj)/,,$(@))\n"
-	$(objutil)/options/build_opt_tbl --config $(top)/src/mainboard/$(MAINBOARDDIR)/cmos.layout --option $(obj)/option_table.c
+	$(objutil)/options/build_opt_tbl --config $(top)/src/mainboard/$(MAINBOARDDIR)/cmos.layout --option $@
 
 $(objutil)/options/build_opt_tbl: $(top)/util/options/build_opt_tbl.c $(top)/src/include/pc80/mc146818rtc.h $(top)/src/include/boot/coreboot_tables.h
 	@printf "    HOSTCC     $(subst $(obj)/,,$(@))\n"
@@ -111,11 +115,11 @@ $(obj)/coreboot_ram: $(obj)/coreboot_ram.o $(src)/arch/i386/coreboot_ram.ld #ldo
 	$(OBJCOPY) --strip-debug $@
 	$(OBJCOPY) --add-gnu-debuglink=$(obj)/coreboot_ram.debug $@
 
-$(obj)/coreboot_ram.o: $(obj)/arch/i386/lib/c_start.o $$(drivers) $(obj)/coreboot.a $(LIBGCC_FILE_NAME)
+$(obj)/coreboot_ram.o: $(obj)/arch/i386/lib/c_start.ramstage.o $$(driver-objs) $(obj)/coreboot.a $(LIBGCC_FILE_NAME)
 	@printf "    CC         $(subst $(obj)/,,$(@))\n"
-	$(CC) -nostdlib -r -o $@ $(obj)/arch/i386/lib/c_start.o $(drivers) -Wl,--wrap,__divdi3 -Wl,--wrap,__udivdi3 -Wl,--wrap,__moddi3 -Wl,--wrap,__umoddi3 -Wl,--start-group $(obj)/coreboot.a $(LIBGCC_FILE_NAME) -Wl,--end-group
+	$(CC) -nostdlib -r -o $@ $(obj)/arch/i386/lib/c_start.ramstage.o $(driver-objs) -Wl,--wrap,__divdi3 -Wl,--wrap,__udivdi3 -Wl,--wrap,__moddi3 -Wl,--wrap,__umoddi3 -Wl,--start-group $(obj)/coreboot.a $(LIBGCC_FILE_NAME) -Wl,--end-group
 
-$(obj)/coreboot.a: $$(objs)
+$(obj)/coreboot.a: $$(ramstage-objs)
 	@printf "    AR         $(subst $(obj)/,,$(@))\n"
 	rm -f $(obj)/coreboot.a
 	$(AR) cr $(obj)/coreboot.a $^
@@ -191,11 +195,6 @@ ifeq ($(CONFIG_ROMCC),y)
 crt0s += $(src)/arch/i386/init/crt0_romcc_epilogue.inc
 endif
 
-OPTION_TABLE_H:=
-ifeq ($(CONFIG_HAVE_OPTION_TABLE),y)
-OPTION_TABLE_H:=$(obj)/option_table.h
-endif
-
 ifeq ($(CONFIG_ROMCC),y)
 ROMCCFLAGS ?= -mcpu=p2 -O2
 
@@ -219,36 +218,36 @@ $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(obj)/mainboard/$(MAINBOARDDIR)/
 endif
 
 # Things that appear in every board
-initobjs += $(obj)/mainboard/$(MAINBOARDDIR)/crt0.o
-objs += $(obj)/mainboard/$(MAINBOARDDIR)/mainboard.o
+romstage-srcs += $(obj)/mainboard/$(MAINBOARDDIR)/crt0.s
+ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/mainboard.c
 ifeq ($(CONFIG_GENERATE_MP_TABLE),y)
-objs += $(obj)/mainboard/$(MAINBOARDDIR)/mptable.o
+ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/mptable.c
 endif
 ifeq ($(CONFIG_GENERATE_PIRQ_TABLE),y)
-objs += $(obj)/mainboard/$(MAINBOARDDIR)/irq_tables.o
+ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/irq_tables.c
 endif
 ifeq ($(CONFIG_BOARD_HAS_HARD_RESET),y)
-objs += $(obj)/mainboard/$(MAINBOARDDIR)/reset.o
+ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/reset.c
 endif
 ifeq ($(CONFIG_GENERATE_ACPI_TABLES),y)
-objs += $(obj)/mainboard/$(MAINBOARDDIR)/acpi_tables.o
-objs += $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o
+ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/acpi_tables.c
+ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/dsdt.asl
 # make doesn't have arithmetic operators or greater-than comparisons
 ifeq ($(subst 5,4,$(CONFIG_ACPI_SSDTX_NUM)),4)
-objs += $(obj)/mainboard/$(MAINBOARDDIR)/ssdt2.o
-objs += $(obj)/mainboard/$(MAINBOARDDIR)/ssdt3.o
-objs += $(obj)/mainboard/$(MAINBOARDDIR)/ssdt4.o
+ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/ssdt2.asl
+ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/ssdt3.asl
+ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/ssdt4.asl
 endif
 ifeq ($(CONFIG_ACPI_SSDTX_NUM),5)
-objs += $(obj)/mainboard/$(MAINBOARDDIR)/ssdt5.o
+ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/ssdt5.asl
 endif
 ifeq ($(CONFIG_BOARD_HAS_FADT),y)
-objs += $(obj)/mainboard/$(MAINBOARDDIR)/fadt.o
+ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/fadt.c
 endif
 endif
 
 ifeq ($(CONFIG_HAVE_BUS_CONFIG),y)
-objs += $(obj)/mainboard/$(MAINBOARDDIR)/get_bus_conf.o
+ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/get_bus_conf.c
 endif
 
 ifeq ($(CONFIG_TINY_BOOTBLOCK),y)

src/arch/i386/boot/Makefile.inc

@@ -1,13 +1,13 @@
-obj-y += boot.o
-obj-y += coreboot_table.o
-obj-$(CONFIG_MULTIBOOT) += multiboot.o
-obj-y += gdt.o
-obj-y += tables.o
-obj-$(CONFIG_GENERATE_MP_TABLE) += mpspec.o
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += pirq_routing.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpigen.o
-obj-$(CONFIG_HAVE_ACPI_RESUME) += wakeup.o
+ramstage-y += boot.c
+ramstage-y += coreboot_table.c
+ramstage-$(CONFIG_MULTIBOOT) += multiboot.c
+ramstage-y += gdt.c
+ramstage-y += tables.c
+ramstage-$(CONFIG_GENERATE_MP_TABLE) += mpspec.c
+ramstage-$(CONFIG_GENERATE_PIRQ_TABLE) += pirq_routing.c
+ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c
+ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpigen.c
+ramstage-$(CONFIG_HAVE_ACPI_RESUME) += wakeup.S
 
-$(obj)/arch/i386/boot/coreboot_table.o : $(OPTION_TABLE_H)
+$(obj)/arch/i386/boot/coreboot_table.ramstage.o : $(OPTION_TABLE_H)
 

src/arch/i386/lib/Makefile.inc

@@ -1,13 +1,13 @@
-obj-y += c_start.o
-obj-y += cpu.o
-obj-y += pci_ops_conf1.o
-obj-y += pci_ops_conf2.o
-obj-y += pci_ops_mmconf.o
-obj-y += pci_ops_auto.o
-obj-y += exception.o
-obj-$(CONFIG_IOAPIC) += ioapic.o
+ramstage-y += c_start.S
+ramstage-y += cpu.c
+ramstage-y += pci_ops_conf1.c
+ramstage-y += pci_ops_conf2.c
+ramstage-y += pci_ops_mmconf.c
+ramstage-y += pci_ops_auto.c
+ramstage-y += exception.c
+ramstage-$(CONFIG_IOAPIC) += ioapic.c
 
-initobj-y += printk_init.o
-initobj-y += cbfs_and_run.o
+romstage-y += printk_init.c
+romstage-y += cbfs_and_run.c
 
-$(obj)/arch/i386/lib/console.o :: $(obj)/build.h
+$(obj)/arch/i386/lib/console.ramstage.o :: $(obj)/build.h

src/boot/Makefile.inc

@@ -1,2 +1,2 @@
-obj-y += hardwaremain.o
-obj-y += selfboot.o
+ramstage-y += hardwaremain.c
+ramstage-y += selfboot.c

src/console/Makefile.inc

@@ -1,21 +1,21 @@
-obj-y += printk.o
-obj-y += console.o
-obj-y += vtxprintf.o
-obj-y += vsprintf.o
+ramstage-y += printk.c
+ramstage-y += console.c
+ramstage-y += vtxprintf.c
+ramstage-y += vsprintf.c
 
-smmobj-y += printk.o
-smmobj-y += vtxprintf.o
+smm-y += printk.c
+smm-y += vtxprintf.c
 
-initobj-y += vtxprintf.o
-initobj-$(CONFIG_CACHE_AS_RAM) += console.o
+romstage-y += vtxprintf.c
+romstage-$(CONFIG_CACHE_AS_RAM) += console.c
 
-driver-$(CONFIG_CONSOLE_SERIAL8250) += uart8250_console.o
-driver-$(CONFIG_USBDEBUG) += usbdebug_console.o
-driver-$(CONFIG_CONSOLE_VGA) += vga_console.o
-driver-$(CONFIG_CONSOLE_BTEXT) += btext_console.o
-driver-$(CONFIG_CONSOLE_BTEXT) += font-8x16.o
-driver-$(CONFIG_CONSOLE_LOGBUF) += logbuf_console.o
-driver-$(CONFIG_CONSOLE_NE2K) += ne2k_console.o
+driver-$(CONFIG_CONSOLE_SERIAL8250) += uart8250_console.c
+driver-$(CONFIG_USBDEBUG) += usbdebug_console.c
+driver-$(CONFIG_CONSOLE_VGA) += vga_console.c
+driver-$(CONFIG_CONSOLE_BTEXT) += btext_console.c
+driver-$(CONFIG_CONSOLE_BTEXT) += font-8x16.c
+driver-$(CONFIG_CONSOLE_LOGBUF) += logbuf_console.c
+driver-$(CONFIG_CONSOLE_NE2K) += ne2k_console.c
 
-$(obj)/console/console.o : $(obj)/build.h
-$(obj)/console/console.initobj.o : $(obj)/build.h
+$(obj)/console/console.ramstage.o : $(obj)/build.h
+$(obj)/console/console.romstage.o : $(obj)/build.h

src/cpu/amd/dualcore/Makefile.inc

@@ -1,2 +1,2 @@
 # This is a leaf Makefile, no conditionals. If it is included it will be used.
-obj-y += amd_sibling.o
+ramstage-y += amd_sibling.c

src/cpu/amd/microcode/Makefile.inc

@@ -1 +1 @@
-obj-y += microcode.o
+ramstage-y += microcode.c

src/cpu/amd/model_10xxx/Makefile.inc

@@ -1,5 +1,5 @@
 # no conditionals here. If you include this file from a socket, then you get all the binaries.
-driver-y += model_10xxx_init.o
-obj-y += update_microcode.o
-obj-y += apic_timer.o
-obj-y += processor_name.o
+driver-y += model_10xxx_init.c
+ramstage-y += update_microcode.c
+ramstage-y += apic_timer.c
+ramstage-y += processor_name.c

src/cpu/amd/model_fxx/Makefile.inc

@@ -1,6 +1,6 @@
 # no conditionals here. If you include this file from a socket, then you get all the binaries.
-driver-y += model_fxx_init.o
-obj-y += apic_timer.o
-obj-y += model_fxx_update_microcode.o
-obj-y += processor_name.o
-obj-y += powernow_acpi.o
+driver-y += model_fxx_init.c
+ramstage-y += apic_timer.c
+ramstage-y += model_fxx_update_microcode.c
+ramstage-y += processor_name.c
+ramstage-y += powernow_acpi.c

src/cpu/amd/model_gx1/Makefile.inc

@@ -22,7 +22,7 @@ subdirs-y += ../../x86/tsc
 subdirs-y += ../../x86/lapic
 subdirs-y += ../../x86/cache
 subdirs-y += ../../x86/smm
-driver-y += model_gx1_init.o
+driver-y += model_gx1_init.c
 
 cpu_incs += $(src)/cpu/amd/model_gx1/cpu_setup.inc
 cpu_incs += $(src)/cpu/amd/model_gx1/gx_setup.inc

src/cpu/amd/model_gx2/Makefile.inc

@@ -3,7 +3,7 @@ subdirs-y += ../../x86/lapic
 subdirs-y += ../../x86/cache
 subdirs-y += ../../x86/smm
 
-driver-y += model_gx2_init.o
-obj-y += cpubug.o
+driver-y += model_gx2_init.c
+ramstage-y += cpubug.c
 
 cpu_incs += $(src)/cpu/amd/model_gx2/cache_as_ram.inc

src/cpu/amd/model_lx/Makefile.inc

@@ -3,7 +3,7 @@ subdirs-y += ../../x86/lapic
 subdirs-y += ../../x86/cache
 subdirs-y += ../../x86/smm
 
-driver-y += model_lx_init.o
-obj-y += cpubug.o
+driver-y += model_lx_init.c
+ramstage-y += cpubug.c
 
 cpu_incs += $(src)/cpu/amd/model_lx/cache_as_ram.inc

src/cpu/amd/mtrr/Makefile.inc

@@ -1 +1 @@
-obj-y += amd_mtrr.o
+ramstage-y += amd_mtrr.c

src/cpu/amd/quadcore/Makefile.inc

@@ -1 +1 @@
-obj-y += amd_sibling.o
+ramstage-y += amd_sibling.c

src/cpu/amd/sc520/Makefile.inc

@@ -1 +1 @@
-obj-y += sc520.o
+ramstage-y += sc520.c

src/cpu/amd/socket_754/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += socket_754.o
+ramstage-y += socket_754.c
 subdirs-y += ../model_fxx
 subdirs-y += ../dualcore
 subdirs-y += ../mtrr

src/cpu/amd/socket_939/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += socket_939.o
+ramstage-y += socket_939.c
 subdirs-y += ../model_fxx
 subdirs-y += ../dualcore
 subdirs-y += ../mtrr

src/cpu/amd/socket_940/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += socket_940.o
+ramstage-y += socket_940.c
 subdirs-y += ../model_fxx
 subdirs-y += ../dualcore
 subdirs-y += ../mtrr

src/cpu/amd/socket_AM2/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += socket_AM2.o
+ramstage-y += socket_AM2.c
 subdirs-y += ../model_fxx
 subdirs-y += ../dualcore
 subdirs-y += ../mtrr

src/cpu/amd/socket_AM2r2/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += socket_AM2r2.o
+ramstage-y += socket_AM2r2.c
 subdirs-y += ../model_10xxx
 subdirs-y += ../quadcore
 subdirs-y += ../mtrr

src/cpu/amd/socket_AM3/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += socket_AM3.o
+ramstage-y += socket_AM3.c
 subdirs-y += ../model_10xxx
 subdirs-y += ../quadcore
 subdirs-y += ../mtrr

src/cpu/amd/socket_ASB2/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += socket_ASB2.o
+ramstage-y += socket_ASB2.c
 subdirs-y += ../model_10xxx
 subdirs-y += ../quadcore
 subdirs-y += ../mtrr

src/cpu/amd/socket_F/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += socket_F.o
+ramstage-y += socket_F.c
 subdirs-y += ../model_fxx
 subdirs-y += ../dualcore
 subdirs-y += ../mtrr

src/cpu/amd/socket_F_1207/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += socket_F_1207.o
+ramstage-y += socket_F_1207.c
 subdirs-y += ../model_10xxx
 subdirs-y += ../quadcore
 subdirs-y += ../mtrr

src/cpu/amd/socket_S1G1/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += socket_S1G1.o
+ramstage-y += socket_S1G1.c
 subdirs-y += ../model_fxx
 subdirs-y += ../dualcore
 subdirs-y += ../mtrr

src/cpu/intel/bga956/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += bga956.o
+ramstage-y += bga956.c
 subdirs-y += ../model_1067x
 subdirs-y += ../../x86/tsc
 subdirs-y += ../../x86/mtrr

src/cpu/intel/ep80579/Makefile.inc

@@ -1,5 +1,5 @@
-obj-y += ep80579.o
-driver-y += ep80579_init.o
+ramstage-y += ep80579.c
+driver-y += ep80579_init.c
 subdirs-y += ../../x86/tsc
 subdirs-y += ../../x86/mtrr
 subdirs-y += ../../x86/lapic

src/cpu/intel/hyperthreading/Makefile.inc

@@ -1 +1 @@
-obj-y += intel_sibling.o
+ramstage-y += intel_sibling.c

src/cpu/intel/microcode/Makefile.inc

@@ -1 +1 @@
-obj-y += microcode.o
+ramstage-y += microcode.c

src/cpu/intel/model_1067x/Makefile.inc

@@ -1,3 +1,3 @@
-driver-y += model_1067x_init.o
+driver-y += model_1067x_init.c
 subdirs-y += ../../x86/name
 

src/cpu/intel/model_106cx/Makefile.inc

@@ -1,4 +1,4 @@
-driver-y += model_106cx_init.o
+driver-y += model_106cx_init.c
 subdirs-y += ../../x86/name
 
 cpu_incs += $(src)/cpu/intel/model_106cx/cache_as_ram.inc

src/cpu/intel/model_68x/Makefile.inc

@@ -18,6 +18,6 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-driver-y += model_68x_init.o
+driver-y += model_68x_init.c
 subdirs-y += ../../x86/name
 

src/cpu/intel/model_69x/Makefile.inc

@@ -1 +1 @@
-driver-y += model_69x_init.o
+driver-y += model_69x_init.c

src/cpu/intel/model_6bx/Makefile.inc

@@ -1,2 +1,2 @@
-driver-y += model_6bx_init.o
+driver-y += model_6bx_init.c
 subdirs-y += ../../x86/name

src/cpu/intel/model_6dx/Makefile.inc

@@ -1 +1 @@
-driver-y += model_6dx_init.o
+driver-y += model_6dx_init.c

src/cpu/intel/model_6ex/Makefile.inc

@@ -1,4 +1,4 @@
-driver-y += model_6ex_init.o
+driver-y += model_6ex_init.c
 subdirs-y += ../../x86/name
 
 cpu_incs += $(src)/cpu/intel/model_6ex/cache_as_ram.inc

src/cpu/intel/model_6fx/Makefile.inc

@@ -1,2 +1,2 @@
-driver-y += model_6fx_init.o
+driver-y += model_6fx_init.c
 subdirs-y += ../../x86/name

src/cpu/intel/model_6xx/Makefile.inc

@@ -1 +1 @@
-driver-y += model_6xx_init.o
+driver-y += model_6xx_init.c

src/cpu/intel/model_f0x/Makefile.inc

@@ -1 +1 @@
-driver-y += model_f0x_init.o
+driver-y += model_f0x_init.c

src/cpu/intel/model_f1x/Makefile.inc

@@ -1 +1 @@
-driver-y += model_f1x_init.o
+driver-y += model_f1x_init.c

src/cpu/intel/model_f2x/Makefile.inc

@@ -1 +1 @@
-driver-y += model_f2x_init.o
+driver-y += model_f2x_init.c

src/cpu/intel/model_f3x/Makefile.inc

@@ -1 +1 @@
-driver-y += model_f3x_init.o
+driver-y += model_f3x_init.c

src/cpu/intel/model_f4x/Makefile.inc

@@ -1 +1 @@
-driver-y += model_f4x_init.o
+driver-y += model_f4x_init.c

src/cpu/intel/slot_1/Makefile.inc

@@ -18,7 +18,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-obj-y += slot_1.o
+ramstage-y += slot_1.c
 subdirs-y += ../model_6xx
 subdirs-y += ../../x86/tsc
 subdirs-y += ../../x86/mtrr

src/cpu/intel/slot_2/Makefile.inc

@@ -18,7 +18,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-obj-y += slot_2.o
+ramstage-y += slot_2.c
 subdirs-y += ../model_6xx
 subdirs-y += ../../x86/tsc
 subdirs-y += ../../x86/mtrr

src/cpu/intel/socket_441/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += socket_441.o
+ramstage-y += socket_441.c
 subdirs-y += ../model_106cx
 subdirs-y += ../../x86/tsc
 subdirs-y += ../../x86/mtrr

src/cpu/intel/socket_FC_PGA370/Makefile.inc

@@ -18,7 +18,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-obj-y += socket_FC_PGA370.o
+ramstage-y += socket_FC_PGA370.c
 subdirs-y += ../model_68x
 subdirs-y += ../../x86/tsc
 subdirs-y += ../../x86/mtrr

src/cpu/intel/socket_PGA370/Makefile.inc

@@ -18,7 +18,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-obj-y += socket_PGA370.o
+ramstage-y += socket_PGA370.c
 subdirs-y += ../model_6xx
 subdirs-y += ../../x86/tsc
 subdirs-y += ../../x86/mtrr

src/cpu/intel/socket_mFCBGA479/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += socket_mFCBGA479.o
+ramstage-y += socket_mFCBGA479.c
 subdirs-y += ../model_6bx
 subdirs-y += ../../x86/tsc
 subdirs-y += ../../x86/mtrr

src/cpu/intel/socket_mFCPGA478/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += socket_mFCPGA478.o
+ramstage-y += socket_mFCPGA478.c
 subdirs-y += ../model_69x
 subdirs-y += ../model_6dx
 subdirs-y += ../model_6ex

src/cpu/intel/socket_mPGA478/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += socket_mPGA478.o
+ramstage-y += socket_mPGA478.c
 subdirs-y += ../model_69x
 subdirs-y += ../model_6dx
 subdirs-y += ../../x86/tsc

src/cpu/intel/socket_mPGA479M/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += socket_mPGA479M.o
+ramstage-y += socket_mPGA479M.c
 subdirs-y += ../model_69x
 subdirs-y += ../model_6dx
 subdirs-y += ../model_f2x
@@ -10,4 +10,4 @@ subdirs-y += ../../x86/smm
 subdirs-y += ../microcode
 subdirs-y += ../hyperthreading
 
-cpu_incs += $(src)/cpu/intel/car/cache_as_ram.inc
+cpu_incs += $(src)/cpu/intel/car/cache_as_ram.inc

src/cpu/intel/socket_mPGA603/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += socket_mPGA603_400Mhz.o
+ramstage-y += socket_mPGA603_400Mhz.c
 subdirs-y += ../model_f0x
 subdirs-y += ../model_f1x
 subdirs-y += ../model_f2x

src/cpu/intel/socket_mPGA604/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += socket_mPGA604.o
+ramstage-y += socket_mPGA604.c
 subdirs-y += ../model_f2x
 subdirs-y += ../model_f3x
 subdirs-y += ../model_f4x

src/cpu/intel/speedstep/Makefile.inc

@@ -1 +1 @@
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.o
+ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c

src/cpu/via/model_c3/Makefile.inc

@@ -5,4 +5,4 @@ subdirs-y += ../../x86/cache
 subdirs-y += ../../x86/smm
 subdirs-y += ../../intel/microcode
 
-driver-y += model_c3_init.o
+driver-y += model_c3_init.c

src/cpu/via/model_c7/Makefile.inc

@@ -5,6 +5,6 @@ subdirs-y += ../../x86/cache
 subdirs-y += ../../x86/smm
 subdirs-y += ../../intel/microcode
 
-driver-y += model_c7_init.o
+driver-y += model_c7_init.c
 
 cpu_incs += $(src)/cpu/via/car/cache_as_ram.inc

src/cpu/x86/cache/Makefile.inc

@@ -1 +1 @@
-obj-y += cache.o
+ramstage-y += cache.c

src/cpu/x86/lapic/Makefile.inc

@@ -1,4 +1,4 @@
-obj-y += lapic.o
-obj-y += lapic_cpu_init.o
-obj-y += secondary.o
-obj-$(CONFIG_UDELAY_LAPIC) += apic_timer.o
+ramstage-y += lapic.c
+ramstage-y += lapic_cpu_init.c
+ramstage-y += secondary.S
+ramstage-$(CONFIG_UDELAY_LAPIC) += apic_timer.c

src/cpu/x86/mtrr/Makefile.inc

@@ -1 +1 @@
-obj-y += mtrr.o
+ramstage-y += mtrr.c

src/cpu/x86/name/Makefile.inc

@@ -17,5 +17,5 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-obj-y += name.o
+ramstage-y += name.c
 

src/cpu/x86/pae/Makefile.inc

@@ -1 +1 @@
-obj-y += pgtbl.o
+ramstage-y += pgtbl.c

src/cpu/x86/smm/Makefile.inc

@@ -17,24 +17,26 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-obj-$(CONFIG_HAVE_SMI_HANDLER) += smmrelocate.o
-obj-$(CONFIG_HAVE_SMI_HANDLER) += smm_wrap.o
+ramstage-$(CONFIG_HAVE_SMI_HANDLER) += smmrelocate.S
+ifeq ($(CONFIG_HAVE_SMI_HANDLER),y)
+ramstage-srcs += $(obj)/cpu/x86/smm/smm_wrap
+endif
 
-smmobj-y += smmhandler.o
-smmobj-y += smihandler.o
-smmobj-y += smiutil.o
+smm-y += smmhandler.S
+smm-y += smihandler.c
+smm-y += smiutil.c
 
-$(obj)/cpu/x86/smm/smm.o: $$(smmobjs)
+$(obj)/cpu/x86/smm/smm.o: $$(smm-objs)
 	$(CC) $(LDFLAGS) -nostdlib -r -o $@ $^
 
-$(obj)/cpu/x86/smm/smm: $(obj)/cpu/x86/smm/smm.o $(src)/cpu/x86/smm/smm.ld $(obj)/ldoptions
+$(obj)/cpu/x86/smm/smm_wrap: $(obj)/cpu/x86/smm/smm.o $(src)/cpu/x86/smm/smm.ld $(obj)/ldoptions
 	$(CC) $(LDFLAGS) -nostdlib -nostartfiles -static -o $(obj)/cpu/x86/smm/smm.elf -T $(src)/cpu/x86/smm/smm.ld $(obj)/cpu/x86/smm/smm.o
 	$(NM) -n $(obj)/cpu/x86/smm/smm.elf | sort > $(obj)/cpu/x86/smm/smm.map
 	$(OBJCOPY) -O binary $(obj)/cpu/x86/smm/smm.elf $(obj)/cpu/x86/smm/smm
 
 # change to the target path because objcopy will use the path name in its
 # ELF symbol names.
-$(obj)/cpu/x86/smm/smm_wrap.o: $(obj)/cpu/x86/smm/smm
+$(obj)/cpu/x86/smm/smm_wrap.ramstage.o: $(obj)/cpu/x86/smm/smm_wrap
 	@printf "    OBJCOPY    $(subst $(obj)/,,$(@))\n"
-	cd $(obj)/cpu/x86/smm; $(OBJCOPY) -I binary smm -O elf32-i386 -B i386 smm_wrap.o
+	cd $(obj)/cpu/x86/smm; $(OBJCOPY) -I binary smm -O elf32-i386 -B i386 smm_wrap.ramstage.o
 

src/cpu/x86/tsc/Makefile.inc

@@ -1,2 +1,2 @@
-obj-$(CONFIG_UDELAY_TSC) += delay_tsc.o
+ramstage-$(CONFIG_UDELAY_TSC) += delay_tsc.c
 

src/devices/Makefile.inc

@@ -1,21 +1,21 @@
-obj-y += device.o
-obj-y += root_device.o
-obj-y += device_util.o
-obj-y += pci_device.o
-obj-$(CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT) += hypertransport.o
-obj-y += pcix_device.o
-obj-y += pciexp_device.o
-obj-y += agp_device.o
-obj-y += cardbus_device.o
-obj-y += pnp_device.o
-obj-y += pci_ops.o
-obj-y += smbus_ops.o
+ramstage-y += device.c
+ramstage-y += root_device.c
+ramstage-y += device_util.c
+ramstage-y += pci_device.c
+ramstage-$(CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT) += hypertransport.c
+ramstage-y += pcix_device.c
+ramstage-y += pciexp_device.c
+ramstage-y += agp_device.c
+ramstage-y += cardbus_device.c
+ramstage-y += pnp_device.c
+ramstage-y += pci_ops.c
+ramstage-y += smbus_ops.c
 
 subdirs-y += oprom
 
 ifeq ($(CONFIG_PCI_ROM_RUN),y)
-obj-y += pci_rom.o
+ramstage-y += pci_rom.c
 else
-obj-$(CONFIG_VGA_ROM_RUN) += pci_rom.o
+ramstage-$(CONFIG_VGA_ROM_RUN) += pci_rom.c
 endif
 

src/devices/oprom/Makefile.inc

@@ -17,9 +17,9 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-obj-$(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) += x86.o
-obj-$(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) += x86_asm.o
-obj-$(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) += x86_interrupts.o
+ramstage-$(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) += x86.c
+ramstage-$(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) += x86_asm.S
+ramstage-$(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) += x86_interrupts.c
 
 subdirs-$(CONFIG_PCI_OPTION_ROM_RUN_YABEL) += x86emu
 subdirs-$(CONFIG_PCI_OPTION_ROM_RUN_YABEL) += yabel

src/devices/oprom/x86emu/Makefile.inc

@@ -1,7 +1,7 @@
-obj-y += debug.o
-obj-y += decode.o
-obj-y += fpu.o
-obj-y += ops.o
-obj-y += ops2.o
-obj-y += prim_ops.o
-obj-y += sys.o
+ramstage-y += debug.c
+ramstage-y += decode.c
+ramstage-y += fpu.c
+ramstage-y += ops.c
+ramstage-y += ops2.c
+ramstage-y += prim_ops.c
+ramstage-y += sys.c

src/devices/oprom/yabel/Makefile.inc

@@ -1,9 +1,9 @@
-obj-y += biosemu.o
-obj-y += debug.o
-obj-y += device.o
-obj-y += interrupt.o
-obj-y += io.o
-obj-y += mem.o
-obj-y += pmm.o
-obj-y += vbe.o
+ramstage-y += biosemu.c
+ramstage-y += debug.c
+ramstage-y += device.c
+ramstage-y += interrupt.c
+ramstage-y += io.c
+ramstage-y += mem.c
+ramstage-y += pmm.c
+ramstage-y += vbe.c
 subdirs-y += compat

src/devices/oprom/yabel/compat/Makefile.inc

@@ -1 +1 @@
-obj-y += functions.o
+ramstage-y += functions.c

src/drivers/ati/ragexl/Makefile.inc

@@ -1 +1 @@
-driver-$(CONFIG_ATI_RAGE_XL) += xlinit.o
+driver-$(CONFIG_ATI_RAGE_XL) += xlinit.c

src/drivers/dec/21143/Makefile.inc

@@ -1,2 +1,2 @@
-driver-y += 21143.o
+driver-y += 21143.c
 

src/drivers/generic/debug/Makefile.inc

@@ -1 +1 @@
-obj-$(CONFIG_DRIVERS_GENERIC_DEBUG) += debug_dev.o
+ramstage-$(CONFIG_DRIVERS_GENERIC_DEBUG) += debug_dev.c

src/drivers/sil/3114/Makefile.inc

@@ -1 +1 @@
-driver-$(CONFIG_DRIVERS_SIL_3114) += sil_sata.o
+driver-$(CONFIG_DRIVERS_SIL_3114) += sil_sata.c

src/lib/Makefile.inc

@@ -1,37 +1,37 @@
-obj-y += clog2.o
-obj-y += uart8250.o
-obj-y += memset.o
-obj-y += memcpy.o
-obj-y += memcmp.o
-obj-y += memmove.o
-obj-y += malloc.o
-obj-y += delay.o
-obj-y += fallback_boot.o
-obj-y += compute_ip_checksum.o
-obj-y += version.o
-obj-y += cbfs.o
-obj-y += lzma.o
-#obj-y += lzmadecode.o
-obj-y += gcc.o
-obj-y += cbmem.o
+ramstage-y += clog2.c
+ramstage-y += uart8250.c
+ramstage-y += memset.c
+ramstage-y += memcpy.c
+ramstage-y += memcmp.c
+ramstage-y += memmove.c
+ramstage-y += malloc.c
+ramstage-y += delay.c
+ramstage-y += fallback_boot.c
+ramstage-y += compute_ip_checksum.c
+ramstage-y += version.c
+ramstage-y += cbfs.c
+ramstage-y += lzma.c
+#ramstage-y += lzmadecode.c
+ramstage-y += gcc.c
+ramstage-y += cbmem.c
 
-initobj-y += uart8250.o
-initobj-y += memset.o
-initobj-y += memcpy.o
-initobj-y += memcmp.o
-initobj-y += cbfs.o
-initobj-y += lzma.o
-#initobj-y += lzmadecode.o
-initobj-$(CONFIG_CONSOLE_NE2K) += ne2k.o
-initobj-$(CONFIG_CONSOLE_NE2K) += compute_ip_checksum.o
-driver-$(CONFIG_CONSOLE_NE2K) += ne2k.o
+romstage-y += uart8250.c
+romstage-y += memset.c
+romstage-y += memcpy.c
+romstage-y += memcmp.c
+romstage-y += cbfs.c
+romstage-y += lzma.c
+#romstage-y += lzmadecode.c
+romstage-$(CONFIG_CONSOLE_NE2K) += ne2k.c
+romstage-$(CONFIG_CONSOLE_NE2K) += compute_ip_checksum.c
+driver-$(CONFIG_CONSOLE_NE2K) += ne2k.c
 
-obj-$(CONFIG_USBDEBUG) += usbdebug.o
+ramstage-$(CONFIG_USBDEBUG) += usbdebug.c
 
-obj-$(CONFIG_COMPRESSED_PAYLOAD_LZMA) += lzma.o
+ramstage-$(CONFIG_COMPRESSED_PAYLOAD_LZMA) += lzma.c
 
-obj-$(CONFIG_BOOTSPLASH) += jpeg.o
+ramstage-$(CONFIG_BOOTSPLASH) += jpeg.c
 
-smmobj-y += memcpy.o
+smm-y += memcpy.c
 
-$(obj)/lib/version.o : $(obj)/build.h
+$(obj)/lib/version.ramstage.o : $(obj)/build.h

src/mainboard/amd/serengeti_cheetah/Makefile.inc

@@ -17,4 +17,4 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-obj-y += ../../../drivers/i2c/i2cmux/i2cmux.o
+ramstage-y += ../../../drivers/i2c/i2cmux/i2cmux.c

src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc

@@ -17,4 +17,4 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-obj-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o
+ramstage-y += ../../../drivers/i2c/i2cmux2/i2cmux2.c

src/mainboard/broadcom/blast/Makefile.inc

@@ -1,4 +1,4 @@
 
 # Needed by irq_tables and mptable and acpi_tables.
 
-obj-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o
+ramstage-y += ../../../drivers/i2c/i2cmux2/i2cmux2.c

src/mainboard/emulation/qemu-x86/Makefile.inc

@@ -1,3 +1,3 @@
 ROMCCFLAGS := -mcpu=i386 -O
 
-obj-y += northbridge.o
+ramstage-y += northbridge.c

src/mainboard/getac/p470/Makefile.inc

@@ -17,7 +17,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-driver-y += rtl8168.o
-obj-$(CONFIG_HAVE_ACPI_SLIC) += acpi_slic.o
+driver-y += rtl8168.c
+ramstage-$(CONFIG_HAVE_ACPI_SLIC) += acpi_slic.c
 
-smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o
+smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c

src/mainboard/gigabyte/m57sli/Makefile.inc

@@ -17,4 +17,4 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-obj-$(CONFIG_SUPERIO_ITE_IT8716F_OVERRIDE_FANCTL) += fanctl.o
+ramstage-$(CONFIG_SUPERIO_ITE_IT8716F_OVERRIDE_FANCTL) += fanctl.c

src/mainboard/hp/dl145_g1/Makefile.inc

@@ -1 +1 @@
-obj-y += ../../../drivers/i2c/i2cmux/i2cmux.o
+ramstage-y += ../../../drivers/i2c/i2cmux/i2cmux.c

src/mainboard/ibase/mb899/Makefile.inc

@@ -17,6 +17,6 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-obj-y += rtl8168.o
+ramstage-y += rtl8168.c
 
-smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o
+smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c

src/mainboard/intel/d945gclf/Makefile.inc

@@ -17,6 +17,6 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-driver-y += rtl8168.o
+driver-y += rtl8168.c
 
-smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o
+smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c

src/mainboard/kontron/986lcd-m/Makefile.inc

@@ -17,6 +17,6 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-driver-y += rtl8168.o
+driver-y += rtl8168.c
 
-smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o
+smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c

src/mainboard/msi/ms9282/Makefile.inc

@@ -18,6 +18,6 @@
 ##
 
 # FIXME drivers should be selected through Kconfig
-obj-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o
-obj-y += ../../../drivers/i2c/adm1027/adm1027.o
+ramstage-y += ../../../drivers/i2c/i2cmux2/i2cmux2.c
+ramstage-y += ../../../drivers/i2c/adm1027/adm1027.c
 

src/mainboard/rca/rm4100/Makefile.inc

@@ -1,2 +1,2 @@
-smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o
+smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c
 

src/mainboard/roda/rk886ex/Makefile.inc

@@ -17,8 +17,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-obj-y += m3885.o
-obj-y += ec.o
-driver-y += rtl8168.o
+ramstage-y += m3885.c
+ramstage-y += ec.c
+driver-y += rtl8168.c
 
-smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o
+smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c

src/mainboard/supermicro/h8dme/Makefile.inc

@@ -17,6 +17,6 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-obj-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o
+ramstage-y += ../../../drivers/i2c/i2cmux2/i2cmux2.c
 
 # Needed by irq_tables and mptable and acpi_tables.

src/mainboard/supermicro/x6dhe_g/Makefile.inc

@@ -19,4 +19,4 @@
 ##
 
 ROMCCFLAGS=-mcpu=p4 -O2
-obj-y += ../../../drivers/generic/debug/debug_dev.o
+ramstage-y += ../../../drivers/generic/debug/debug_dev.c

src/mainboard/supermicro/x6dhe_g2/Makefile.inc

@@ -19,4 +19,4 @@
 ##
 
 ROMCCFLAGS=-mcpu=p4 -O2
-obj-y += ../../../drivers/generic/debug/debug_dev.o
+ramstage-y += ../../../drivers/generic/debug/debug_dev.c

src/mainboard/technexion/tim5690/Makefile.inc

@@ -20,7 +20,7 @@
 # Needed by irq_tables and mptable and acpi_tables.
 
 # This is debug message for products of Technexion.
-obj-y += tn_post_code.o
+ramstage-y += tn_post_code.c
 
-obj-y += speaker.o
-obj-y += vgabios.o
+ramstage-y += speaker.c
+ramstage-y += vgabios.c

src/mainboard/thomson/ip1000/Makefile.inc

@@ -1,2 +1,2 @@
-smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o
+smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c
 

src/mainboard/tyan/s2881/Makefile.inc

@@ -1 +1 @@
-obj-y += ../../../drivers/i2c/adt7463/adt7463.o
+ramstage-y += ../../../drivers/i2c/adt7463/adt7463.c

src/mainboard/tyan/s2892/Makefile.inc

@@ -1,2 +1,2 @@
 
-obj-y += ../../../drivers/i2c/adm1027/adm1027.o
+ramstage-y += ../../../drivers/i2c/adm1027/adm1027.c

src/mainboard/via/epia-m700/Kconfig

@@ -8,7 +8,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SUPERIO_WINBOND_W83697HF
 	select BOARD_HAS_FADT
 	select HAVE_OPTION_TABLE
-	select HAVE_ACPI_TABLES
 	select BOARD_ROMSIZE_KB_512
 
 config MAINBOARD_DIR

src/mainboard/via/epia-m700/Makefile.inc

@@ -22,5 +22,5 @@
 # This code is unused and should be replaced by the generic resume code
 # completely. If anyone works on wakeup for this chipset/board, delete
 # wakeup.c when you are done.
-# obj-y += wakeup.o
+# ramstage-y += wakeup.c
 

src/mainboard/via/epia-m700/dsdt.c

@@ -1,24 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2009 One Laptop per Child, Association, Inc.
- *
- * 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
- */
-
-unsigned char AmlCode_dsdt[] = {
-	0x44, 0x53, 0x44, 0x54, 0x0F, 0x3C, 0x00, 0x00,
-	/* Removed for lincense issue. See get_dsdt script. */
-};

src/mainboard/via/epia-m700/ssdt.c

@@ -1,24 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2009 One Laptop per Child, Association, Inc.
- *
- * 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
- */
-
-unsigned char AmlCode_ssdt[] = {
-	0x53, 0x53, 0x44, 0x54, 0xA7, 0x01, 0x00, 0x00,
-	/* Removed for licese issue. */
-};