[coreboot] Patch set updated for coreboot: 445c681 Get rid of drivers class
Patrick Georgi (patrick@georgi-clan.de)
gerrit at coreboot.org
Sun Nov 25 18:13:59 CET 2012
Patrick Georgi (patrick at georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1872
-gerrit
commit 445c6814ca7a8e57b39d41bcf5c71adeaf8c1646
Author: Patrick Georgi <patrick.georgi at secunet.com>
Date: Fri Nov 16 14:50:32 2012 +0100
Get rid of drivers class
The use of ramstage.a required the build system to handle some
object files in a special way, which were put in the drivers
class.
These object files didn't provide any symbols that were used
directly (but only via linker magic), and so the linker never
considered them for inclusion.
With ramstage.a gone, we can drop this special class, too.
Change-Id: I6f1369e08d7d12266b506a5597c3a139c5c41a55
Signed-off-by: Patrick Georgi <patrick.georgi at secunet.com>
---
Makefile.inc | 2 +-
src/arch/x86/Makefile.inc | 6 +++---
src/console/Makefile.inc | 12 +++++------
src/cpu/amd/agesa/family10/Makefile.inc | 2 +-
src/cpu/amd/agesa/family12/Makefile.inc | 2 +-
src/cpu/amd/agesa/family14/Makefile.inc | 2 +-
src/cpu/amd/agesa/family15/Makefile.inc | 2 +-
src/cpu/amd/agesa/family15tn/Makefile.inc | 2 +-
src/cpu/amd/geode_gx1/Makefile.inc | 2 +-
src/cpu/amd/geode_gx2/Makefile.inc | 2 +-
src/cpu/amd/geode_lx/Makefile.inc | 2 +-
src/cpu/amd/model_10xxx/Makefile.inc | 2 +-
src/cpu/amd/model_fxx/Makefile.inc | 2 +-
src/cpu/intel/ep80579/Makefile.inc | 2 +-
src/cpu/intel/model_1067x/Makefile.inc | 2 +-
src/cpu/intel/model_106cx/Makefile.inc | 2 +-
src/cpu/intel/model_206ax/Makefile.inc | 2 +-
src/cpu/intel/model_65x/Makefile.inc | 2 +-
src/cpu/intel/model_67x/Makefile.inc | 2 +-
src/cpu/intel/model_68x/Makefile.inc | 2 +-
src/cpu/intel/model_69x/Makefile.inc | 2 +-
src/cpu/intel/model_6bx/Makefile.inc | 2 +-
src/cpu/intel/model_6dx/Makefile.inc | 2 +-
src/cpu/intel/model_6ex/Makefile.inc | 2 +-
src/cpu/intel/model_6fx/Makefile.inc | 2 +-
src/cpu/intel/model_6xx/Makefile.inc | 2 +-
src/cpu/intel/model_f0x/Makefile.inc | 2 +-
src/cpu/intel/model_f1x/Makefile.inc | 2 +-
src/cpu/intel/model_f2x/Makefile.inc | 2 +-
src/cpu/intel/model_f3x/Makefile.inc | 2 +-
src/cpu/intel/model_f4x/Makefile.inc | 2 +-
src/cpu/via/c3/Makefile.inc | 2 +-
src/cpu/via/c7/Makefile.inc | 2 +-
src/cpu/via/nano/Makefile.inc | 2 +-
src/drivers/ati/ragexl/Makefile.inc | 2 +-
src/drivers/dec/21143/Makefile.inc | 2 +-
src/drivers/emulation/qemu/Makefile.inc | 2 +-
src/drivers/generic/ioapic/Makefile.inc | 2 +-
src/drivers/i2c/adm1026/Makefile.inc | 2 +-
src/drivers/i2c/adm1027/Makefile.inc | 2 +-
src/drivers/i2c/adt7463/Makefile.inc | 2 +-
src/drivers/i2c/i2cmux/Makefile.inc | 2 +-
src/drivers/i2c/i2cmux2/Makefile.inc | 2 +-
src/drivers/i2c/lm63/Makefile.inc | 2 +-
src/drivers/i2c/w83793/Makefile.inc | 2 +-
src/drivers/i2c/w83795/Makefile.inc | 2 +-
src/drivers/ics/954309/Makefile.inc | 2 +-
src/drivers/ipmi/Makefile.inc | 2 +-
src/drivers/oxford/oxpcie/Makefile.inc | 2 +-
src/drivers/realtek/Makefile.inc | 2 +-
src/drivers/sil/3114/Makefile.inc | 2 +-
src/drivers/trident/blade3d/Makefile.inc | 2 +-
src/ec/lenovo/h8/Makefile.inc | 2 +-
src/ec/lenovo/pmh7/Makefile.inc | 2 +-
src/ec/smsc/mec1308/Makefile.inc | 2 +-
src/lib/Makefile.inc | 2 +-
src/mainboard/ibase/mb899/Makefile.inc | 2 +-
src/northbridge/amd/agesa/family10/Makefile.inc | 2 +-
src/northbridge/amd/agesa/family12/Makefile.inc | 2 +-
src/northbridge/amd/agesa/family14/Makefile.inc | 2 +-
src/northbridge/amd/agesa/family15/Makefile.inc | 2 +-
src/northbridge/amd/agesa/family15tn/Makefile.inc | 2 +-
src/northbridge/amd/amdfam10/Makefile.inc | 4 ++--
src/northbridge/amd/amdk8/Makefile.inc | 4 ++--
src/northbridge/amd/gx1/Makefile.inc | 2 +-
src/northbridge/amd/gx2/Makefile.inc | 2 +-
src/northbridge/amd/lx/Makefile.inc | 2 +-
src/northbridge/intel/e7520/Makefile.inc | 10 ++++-----
src/northbridge/intel/e7525/Makefile.inc | 10 ++++-----
src/northbridge/intel/i3100/Makefile.inc | 6 +++---
src/northbridge/intel/i440bx/Makefile.inc | 2 +-
src/northbridge/intel/i440lx/Makefile.inc | 2 +-
src/northbridge/intel/i5000/Makefile.inc | 2 +-
src/northbridge/intel/i82810/Makefile.inc | 2 +-
src/northbridge/intel/i82830/Makefile.inc | 4 ++--
src/northbridge/intel/i945/Makefile.inc | 4 ++--
src/northbridge/intel/sandybridge/Makefile.inc | 4 ++--
src/northbridge/intel/sch/Makefile.inc | 6 +++---
src/northbridge/rdc/r8610/Makefile.inc | 2 +-
src/northbridge/via/cn400/Makefile.inc | 8 +++----
src/northbridge/via/cn700/Makefile.inc | 6 +++---
src/northbridge/via/cx700/Makefile.inc | 8 +++----
src/northbridge/via/vt8601/Makefile.inc | 2 +-
src/northbridge/via/vt8623/Makefile.inc | 4 ++--
src/northbridge/via/vx800/Makefile.inc | 8 +++----
src/southbridge/amd/agesa/hudson/Makefile.inc | 18 ++++++++--------
src/southbridge/amd/amd8111/Makefile.inc | 20 ++++++++---------
src/southbridge/amd/amd8131/Makefile.inc | 2 +-
src/southbridge/amd/amd8132/Makefile.inc | 2 +-
src/southbridge/amd/amd8151/Makefile.inc | 2 +-
src/southbridge/amd/cimx/sb700/Makefile.inc | 4 ++--
src/southbridge/amd/cimx/sb800/Makefile.inc | 4 ++--
src/southbridge/amd/cimx/sb900/Makefile.inc | 4 ++--
src/southbridge/amd/cs5530/Makefile.inc | 10 ++++-----
src/southbridge/amd/cs5535/Makefile.inc | 6 +++---
src/southbridge/amd/cs5536/Makefile.inc | 8 +++----
src/southbridge/amd/rs690/Makefile.inc | 10 ++++-----
src/southbridge/amd/rs780/Makefile.inc | 10 ++++-----
src/southbridge/amd/sb600/Makefile.inc | 18 ++++++++--------
src/southbridge/amd/sb700/Makefile.inc | 18 ++++++++--------
src/southbridge/amd/sb800/Makefile.inc | 18 ++++++++--------
src/southbridge/amd/sr5650/Makefile.inc | 6 +++---
src/southbridge/broadcom/bcm21000/Makefile.inc | 2 +-
src/southbridge/broadcom/bcm5780/Makefile.inc | 6 +++---
src/southbridge/broadcom/bcm5785/Makefile.inc | 12 +++++------
src/southbridge/intel/bd82x6x/Makefile.inc | 20 ++++++++---------
src/southbridge/intel/esb6300/Makefile.inc | 24 ++++++++++-----------
src/southbridge/intel/i3100/Makefile.inc | 16 +++++++-------
src/southbridge/intel/i82371eb/Makefile.inc | 18 ++++++++--------
src/southbridge/intel/i82801ax/Makefile.inc | 14 ++++++------
src/southbridge/intel/i82801bx/Makefile.inc | 16 +++++++-------
src/southbridge/intel/i82801cx/Makefile.inc | 14 ++++++------
src/southbridge/intel/i82801dx/Makefile.inc | 14 ++++++------
src/southbridge/intel/i82801ex/Makefile.inc | 18 ++++++++--------
src/southbridge/intel/i82801gx/Makefile.inc | 24 ++++++++++-----------
src/southbridge/intel/i82870/Makefile.inc | 6 +++---
src/southbridge/intel/pxhd/Makefile.inc | 2 +-
src/southbridge/intel/sch/Makefile.inc | 20 ++++++++---------
src/southbridge/nvidia/ck804/Makefile.inc | 24 ++++++++++-----------
src/southbridge/nvidia/mcp55/Makefile.inc | 26 +++++++++++------------
src/southbridge/rdc/r8610/Makefile.inc | 2 +-
src/southbridge/ricoh/rl5c476/Makefile.inc | 2 +-
src/southbridge/sis/sis966/Makefile.inc | 20 ++++++++---------
src/southbridge/ti/pci1x2x/Makefile.inc | 2 +-
src/southbridge/ti/pci7420/Makefile.inc | 4 ++--
src/southbridge/ti/pcixx12/Makefile.inc | 2 +-
src/southbridge/via/k8t890/Makefile.inc | 18 ++++++++--------
src/southbridge/via/vt8231/Makefile.inc | 12 +++++------
src/southbridge/via/vt8235/Makefile.inc | 10 ++++-----
src/southbridge/via/vt8237r/Makefile.inc | 14 ++++++------
130 files changed, 382 insertions(+), 382 deletions(-)
diff --git a/Makefile.inc b/Makefile.inc
index 4c0a53f..0fa3b8e 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -59,7 +59,7 @@ subdirs-y += site-local
#######################################################################
# Add source classes and their build options
-classes-y := ramstage romstage driver smm cpu_microcode
+classes-y := ramstage romstage smm cpu_microcode
romstage-c-ccopts:=-D__PRE_RAM__
romstage-S-ccopts:=-D__PRE_RAM__
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index fe74959..a7446df 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -161,12 +161,12 @@ else
$(CC) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(src)/arch/x86/coreboot_ram.ld $<
endif
-$(objgenerated)/coreboot_ram.o: $(obj)/arch/x86/lib/c_start.ramstage.o $$(driver-objs) $$(ramstage-objs) $(LIBGCC_FILE_NAME)
+$(objgenerated)/coreboot_ram.o: $(obj)/arch/x86/lib/c_start.ramstage.o $$(ramstage-objs) $(LIBGCC_FILE_NAME)
@printf " CC $(subst $(obj)/,,$(@))\n"
ifeq ($(CONFIG_COMPILER_LLVM_CLANG),y)
- $(LD) -m elf_i386 -r -o $@ $(obj)/arch/x86/lib/c_start.ramstage.o $(driver-objs) --wrap __divdi3 --wrap __udivdi3 --wrap __moddi3 --wrap __umoddi3 --start-group $(filter-out $(obj)/arch/x86/lib/c_start.ramstage.o,$(ramstage-objs)) $(LIBGCC_FILE_NAME) --end-group
+ $(LD) -m elf_i386 -r -o $@ $(obj)/arch/x86/lib/c_start.ramstage.o --wrap __divdi3 --wrap __udivdi3 --wrap __moddi3 --wrap __umoddi3 --start-group $(filter-out $(obj)/arch/x86/lib/c_start.ramstage.o,$(ramstage-objs)) $(LIBGCC_FILE_NAME) --end-group
else
- $(CC) -nostdlib -r -o $@ $(obj)/arch/x86/lib/c_start.ramstage.o $(driver-objs) -Wl,--wrap,__divdi3 -Wl,--wrap,__udivdi3 -Wl,--wrap,__moddi3 -Wl,--wrap,__umoddi3 -Wl,--start-group $(filter-out $(obj)/arch/x86/lib/c_start.ramstage.o,$(ramstage-objs)) $(LIBGCC_FILE_NAME) -Wl,--end-group
+ $(CC) -nostdlib -r -o $@ $(obj)/arch/x86/lib/c_start.ramstage.o -Wl,--wrap,__divdi3 -Wl,--wrap,__udivdi3 -Wl,--wrap,__moddi3 -Wl,--wrap,__umoddi3 -Wl,--start-group $(filter-out $(obj)/arch/x86/lib/c_start.ramstage.o,$(ramstage-objs)) $(LIBGCC_FILE_NAME) -Wl,--end-group
endif
################################################################################
diff --git a/src/console/Makefile.inc b/src/console/Makefile.inc
index f8928ad..a712486 100644
--- a/src/console/Makefile.inc
+++ b/src/console/Makefile.inc
@@ -14,12 +14,12 @@ romstage-$(CONFIG_CACHE_AS_RAM) += console.c
romstage-y += post.c
romstage-y += die.c
-driver-$(CONFIG_CONSOLE_SERIAL8250) += uart8250_console.c
-driver-$(CONFIG_CONSOLE_SERIAL8250MEM) += uart8250mem_console.c
-driver-$(CONFIG_USBDEBUG) += usbdebug_console.c
-driver-$(CONFIG_CONSOLE_LOGBUF) += logbuf_console.c
-driver-$(CONFIG_CONSOLE_NE2K) += ne2k_console.c
-driver-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c
+ramstage-$(CONFIG_CONSOLE_SERIAL8250) += uart8250_console.c
+ramstage-$(CONFIG_CONSOLE_SERIAL8250MEM) += uart8250mem_console.c
+ramstage-$(CONFIG_USBDEBUG) += usbdebug_console.c
+ramstage-$(CONFIG_CONSOLE_LOGBUF) += logbuf_console.c
+ramstage-$(CONFIG_CONSOLE_NE2K) += ne2k_console.c
+ramstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c
$(obj)/console/console.ramstage.o : $(obj)/build.h
diff --git a/src/cpu/amd/agesa/family10/Makefile.inc b/src/cpu/amd/agesa/family10/Makefile.inc
index 6981a47..068cbfe 100755
--- a/src/cpu/amd/agesa/family10/Makefile.inc
+++ b/src/cpu/amd/agesa/family10/Makefile.inc
@@ -18,7 +18,7 @@
#
ramstage-y += chip_name.c
-driver-y += model_10_init.c
+ramstage-y += model_10_init.c
AGESA_ROOT = ../../../../vendorcode/amd/agesa/f10
diff --git a/src/cpu/amd/agesa/family12/Makefile.inc b/src/cpu/amd/agesa/family12/Makefile.inc
index 4c7b2fd..10d64dd 100755
--- a/src/cpu/amd/agesa/family12/Makefile.inc
+++ b/src/cpu/amd/agesa/family12/Makefile.inc
@@ -28,7 +28,7 @@
#*****************************************************************************
ramstage-y += chip_name.c
-driver-y += model_12_init.c
+ramstage-y += model_12_init.c
AGESA_ROOT = ../../../../vendorcode/amd/agesa/f12
diff --git a/src/cpu/amd/agesa/family14/Makefile.inc b/src/cpu/amd/agesa/family14/Makefile.inc
index b08ceeb..97959b3 100644
--- a/src/cpu/amd/agesa/family14/Makefile.inc
+++ b/src/cpu/amd/agesa/family14/Makefile.inc
@@ -18,7 +18,7 @@
#
ramstage-y += chip_name.c
-driver-y += model_14_init.c
+ramstage-y += model_14_init.c
AGESA_ROOT = ../../../../vendorcode/amd/agesa/f14
diff --git a/src/cpu/amd/agesa/family15/Makefile.inc b/src/cpu/amd/agesa/family15/Makefile.inc
index 936d3c8..2d413ac 100644
--- a/src/cpu/amd/agesa/family15/Makefile.inc
+++ b/src/cpu/amd/agesa/family15/Makefile.inc
@@ -26,5 +26,5 @@ subdirs-y += ../../../x86/pae
subdirs-y += ../../../x86/smm
ramstage-y += chip_name.c
-driver-y += model_15_init.c
+ramstage-y += model_15_init.c
diff --git a/src/cpu/amd/agesa/family15tn/Makefile.inc b/src/cpu/amd/agesa/family15tn/Makefile.inc
index b4d213e..5474571 100644
--- a/src/cpu/amd/agesa/family15tn/Makefile.inc
+++ b/src/cpu/amd/agesa/family15tn/Makefile.inc
@@ -18,7 +18,7 @@
#
ramstage-y += chip_name.c
-driver-y += model_15_init.c
+ramstage-y += model_15_init.c
AGESA_ROOT = ../../../../vendorcode/amd/agesa/f15tn
diff --git a/src/cpu/amd/geode_gx1/Makefile.inc b/src/cpu/amd/geode_gx1/Makefile.inc
index d5bb1ef..4b3aff1 100644
--- a/src/cpu/amd/geode_gx1/Makefile.inc
+++ b/src/cpu/amd/geode_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 += geode_gx1_init.c
+ramstage-y += geode_gx1_init.c
cpu_incs += $(src)/cpu/amd/geode_gx1/cpu_setup.inc
cpu_incs += $(src)/cpu/amd/geode_gx1/gx_setup.inc
diff --git a/src/cpu/amd/geode_gx2/Makefile.inc b/src/cpu/amd/geode_gx2/Makefile.inc
index d3777a6..b3f3de9 100644
--- a/src/cpu/amd/geode_gx2/Makefile.inc
+++ b/src/cpu/amd/geode_gx2/Makefile.inc
@@ -3,7 +3,7 @@ subdirs-y += ../../x86/lapic
subdirs-y += ../../x86/cache
subdirs-y += ../../x86/smm
-driver-y += geode_gx2_init.c
+ramstage-y += geode_gx2_init.c
ramstage-y += cpubug.c
cpu_incs += $(src)/cpu/amd/geode_gx2/cache_as_ram.inc
diff --git a/src/cpu/amd/geode_lx/Makefile.inc b/src/cpu/amd/geode_lx/Makefile.inc
index 4b2b37c..c9df888 100644
--- a/src/cpu/amd/geode_lx/Makefile.inc
+++ b/src/cpu/amd/geode_lx/Makefile.inc
@@ -3,7 +3,7 @@ subdirs-y += ../../x86/lapic
subdirs-y += ../../x86/cache
subdirs-y += ../../x86/smm
-driver-y += geode_lx_init.c
+ramstage-y += geode_lx_init.c
ramstage-y += cpubug.c
cpu_incs += $(src)/cpu/amd/geode_lx/cache_as_ram.inc
diff --git a/src/cpu/amd/model_10xxx/Makefile.inc b/src/cpu/amd/model_10xxx/Makefile.inc
index 35f32c2..c9becbd 100644
--- a/src/cpu/amd/model_10xxx/Makefile.inc
+++ b/src/cpu/amd/model_10xxx/Makefile.inc
@@ -1,4 +1,4 @@
-driver-y += model_10xxx_init.c
+ramstage-y += model_10xxx_init.c
ramstage-$(CONFIG_UPDATE_CPU_MICROCODE) += update_microcode.c
ramstage-y += apic_timer.c
ramstage-y += processor_name.c
diff --git a/src/cpu/amd/model_fxx/Makefile.inc b/src/cpu/amd/model_fxx/Makefile.inc
index 50b6f61..99c09c8 100644
--- a/src/cpu/amd/model_fxx/Makefile.inc
+++ b/src/cpu/amd/model_fxx/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_fxx_init.c
+ramstage-y += model_fxx_init.c
ramstage-y += apic_timer.c
ramstage-y += model_fxx_update_microcode.c
ramstage-y += processor_name.c
diff --git a/src/cpu/intel/ep80579/Makefile.inc b/src/cpu/intel/ep80579/Makefile.inc
index 7aaedba..080e2ee 100644
--- a/src/cpu/intel/ep80579/Makefile.inc
+++ b/src/cpu/intel/ep80579/Makefile.inc
@@ -1,5 +1,5 @@
ramstage-y += ep80579.c
-driver-y += ep80579_init.c
+ramstage-y += ep80579_init.c
subdirs-y += ../../x86/tsc
subdirs-y += ../../x86/mtrr
subdirs-y += ../../x86/lapic
diff --git a/src/cpu/intel/model_1067x/Makefile.inc b/src/cpu/intel/model_1067x/Makefile.inc
index b2b7606..c0e98bc 100644
--- a/src/cpu/intel/model_1067x/Makefile.inc
+++ b/src/cpu/intel/model_1067x/Makefile.inc
@@ -1,3 +1,3 @@
-driver-y += model_1067x_init.c
+ramstage-y += model_1067x_init.c
subdirs-y += ../../x86/name
diff --git a/src/cpu/intel/model_106cx/Makefile.inc b/src/cpu/intel/model_106cx/Makefile.inc
index 0b506b3..1f217fe 100644
--- a/src/cpu/intel/model_106cx/Makefile.inc
+++ b/src/cpu/intel/model_106cx/Makefile.inc
@@ -1,4 +1,4 @@
-driver-y += model_106cx_init.c
+ramstage-y += model_106cx_init.c
subdirs-y += ../../x86/name
cpu_incs += $(src)/cpu/intel/car/cache_as_ram_ht.inc
diff --git a/src/cpu/intel/model_206ax/Makefile.inc b/src/cpu/intel/model_206ax/Makefile.inc
index 6ab4840..a324b64 100644
--- a/src/cpu/intel/model_206ax/Makefile.inc
+++ b/src/cpu/intel/model_206ax/Makefile.inc
@@ -1,4 +1,4 @@
-driver-y += model_206ax_init.c
+ramstage-y += model_206ax_init.c
subdirs-y += ../../x86/name
ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c
diff --git a/src/cpu/intel/model_65x/Makefile.inc b/src/cpu/intel/model_65x/Makefile.inc
index 52c8fef..b0b6f0f 100644
--- a/src/cpu/intel/model_65x/Makefile.inc
+++ b/src/cpu/intel/model_65x/Makefile.inc
@@ -18,5 +18,5 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-driver-y += model_65x_init.c
+ramstage-y += model_65x_init.c
diff --git a/src/cpu/intel/model_67x/Makefile.inc b/src/cpu/intel/model_67x/Makefile.inc
index 44085d9..d7d7f31 100644
--- a/src/cpu/intel/model_67x/Makefile.inc
+++ b/src/cpu/intel/model_67x/Makefile.inc
@@ -18,5 +18,5 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-driver-y += model_67x_init.c
+ramstage-y += model_67x_init.c
diff --git a/src/cpu/intel/model_68x/Makefile.inc b/src/cpu/intel/model_68x/Makefile.inc
index 5b5f166..64869db 100644
--- a/src/cpu/intel/model_68x/Makefile.inc
+++ b/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.c
+ramstage-y += model_68x_init.c
subdirs-y += ../../x86/name
diff --git a/src/cpu/intel/model_69x/Makefile.inc b/src/cpu/intel/model_69x/Makefile.inc
index 329bfeb..927bfeb 100644
--- a/src/cpu/intel/model_69x/Makefile.inc
+++ b/src/cpu/intel/model_69x/Makefile.inc
@@ -1 +1 @@
-driver-y += model_69x_init.c
+ramstage-y += model_69x_init.c
diff --git a/src/cpu/intel/model_6bx/Makefile.inc b/src/cpu/intel/model_6bx/Makefile.inc
index 4632815..2d33f85 100644
--- a/src/cpu/intel/model_6bx/Makefile.inc
+++ b/src/cpu/intel/model_6bx/Makefile.inc
@@ -1,2 +1,2 @@
-driver-y += model_6bx_init.c
+ramstage-y += model_6bx_init.c
subdirs-y += ../../x86/name
diff --git a/src/cpu/intel/model_6dx/Makefile.inc b/src/cpu/intel/model_6dx/Makefile.inc
index 47525be..cc88a2c 100644
--- a/src/cpu/intel/model_6dx/Makefile.inc
+++ b/src/cpu/intel/model_6dx/Makefile.inc
@@ -1 +1 @@
-driver-y += model_6dx_init.c
+ramstage-y += model_6dx_init.c
diff --git a/src/cpu/intel/model_6ex/Makefile.inc b/src/cpu/intel/model_6ex/Makefile.inc
index cc4dc7b..b515c4f 100644
--- a/src/cpu/intel/model_6ex/Makefile.inc
+++ b/src/cpu/intel/model_6ex/Makefile.inc
@@ -1,3 +1,3 @@
-driver-y += model_6ex_init.c
+ramstage-y += model_6ex_init.c
subdirs-y += ../../x86/name
diff --git a/src/cpu/intel/model_6fx/Makefile.inc b/src/cpu/intel/model_6fx/Makefile.inc
index 3743547..b75cde3 100644
--- a/src/cpu/intel/model_6fx/Makefile.inc
+++ b/src/cpu/intel/model_6fx/Makefile.inc
@@ -1,2 +1,2 @@
-driver-y += model_6fx_init.c
+ramstage-y += model_6fx_init.c
subdirs-y += ../../x86/name
diff --git a/src/cpu/intel/model_6xx/Makefile.inc b/src/cpu/intel/model_6xx/Makefile.inc
index 157ca90..5fdd71c 100644
--- a/src/cpu/intel/model_6xx/Makefile.inc
+++ b/src/cpu/intel/model_6xx/Makefile.inc
@@ -1 +1 @@
-driver-y += model_6xx_init.c
+ramstage-y += model_6xx_init.c
diff --git a/src/cpu/intel/model_f0x/Makefile.inc b/src/cpu/intel/model_f0x/Makefile.inc
index 55efa14..79ea2a0 100644
--- a/src/cpu/intel/model_f0x/Makefile.inc
+++ b/src/cpu/intel/model_f0x/Makefile.inc
@@ -1 +1 @@
-driver-y += model_f0x_init.c
+ramstage-y += model_f0x_init.c
diff --git a/src/cpu/intel/model_f1x/Makefile.inc b/src/cpu/intel/model_f1x/Makefile.inc
index e3a02e9..6449ae9 100644
--- a/src/cpu/intel/model_f1x/Makefile.inc
+++ b/src/cpu/intel/model_f1x/Makefile.inc
@@ -1 +1 @@
-driver-y += model_f1x_init.c
+ramstage-y += model_f1x_init.c
diff --git a/src/cpu/intel/model_f2x/Makefile.inc b/src/cpu/intel/model_f2x/Makefile.inc
index c393343..9b366d6 100644
--- a/src/cpu/intel/model_f2x/Makefile.inc
+++ b/src/cpu/intel/model_f2x/Makefile.inc
@@ -1 +1 @@
-driver-y += model_f2x_init.c
+ramstage-y += model_f2x_init.c
diff --git a/src/cpu/intel/model_f3x/Makefile.inc b/src/cpu/intel/model_f3x/Makefile.inc
index b2f2138..cf8f918 100644
--- a/src/cpu/intel/model_f3x/Makefile.inc
+++ b/src/cpu/intel/model_f3x/Makefile.inc
@@ -1 +1 @@
-driver-y += model_f3x_init.c
+ramstage-y += model_f3x_init.c
diff --git a/src/cpu/intel/model_f4x/Makefile.inc b/src/cpu/intel/model_f4x/Makefile.inc
index 0a38adf..ac99095 100644
--- a/src/cpu/intel/model_f4x/Makefile.inc
+++ b/src/cpu/intel/model_f4x/Makefile.inc
@@ -1 +1 @@
-driver-y += model_f4x_init.c
+ramstage-y += model_f4x_init.c
diff --git a/src/cpu/via/c3/Makefile.inc b/src/cpu/via/c3/Makefile.inc
index e6b889a..d5e02a9 100644
--- a/src/cpu/via/c3/Makefile.inc
+++ b/src/cpu/via/c3/Makefile.inc
@@ -5,4 +5,4 @@ subdirs-y += ../../x86/cache
subdirs-y += ../../x86/smm
subdirs-y += ../../intel/microcode
-driver-y += c3_init.c
+ramstage-y += c3_init.c
diff --git a/src/cpu/via/c7/Makefile.inc b/src/cpu/via/c7/Makefile.inc
index 5300f5d..417d762 100644
--- a/src/cpu/via/c7/Makefile.inc
+++ b/src/cpu/via/c7/Makefile.inc
@@ -5,6 +5,6 @@ subdirs-y += ../../x86/cache
subdirs-y += ../../x86/smm
subdirs-y += ../../intel/microcode
-driver-y += c7_init.c
+ramstage-y += c7_init.c
cpu_incs += $(src)/cpu/via/car/cache_as_ram.inc
diff --git a/src/cpu/via/nano/Makefile.inc b/src/cpu/via/nano/Makefile.inc
index 6b0c1e9..f08b482 100644
--- a/src/cpu/via/nano/Makefile.inc
+++ b/src/cpu/via/nano/Makefile.inc
@@ -23,7 +23,7 @@ subdirs-y += ../../x86/lapic
subdirs-y += ../../x86/cache
subdirs-y += ../../x86/smm
-driver-y += nano_init.c
+ramstage-y += nano_init.c
ramstage-y += update_ucode.c
# We need to hear from VIA to get permission to include this file in the
diff --git a/src/drivers/ati/ragexl/Makefile.inc b/src/drivers/ati/ragexl/Makefile.inc
index 8b59597..fbec414 100644
--- a/src/drivers/ati/ragexl/Makefile.inc
+++ b/src/drivers/ati/ragexl/Makefile.inc
@@ -1 +1 @@
-driver-$(CONFIG_DRIVERS_ATI_RAGEXL) += xlinit.c
+ramstage-$(CONFIG_DRIVERS_ATI_RAGEXL) += xlinit.c
diff --git a/src/drivers/dec/21143/Makefile.inc b/src/drivers/dec/21143/Makefile.inc
index f1e24f2..f768918 100644
--- a/src/drivers/dec/21143/Makefile.inc
+++ b/src/drivers/dec/21143/Makefile.inc
@@ -1,2 +1,2 @@
-driver-y += 21143.c
+ramstage-y += 21143.c
diff --git a/src/drivers/emulation/qemu/Makefile.inc b/src/drivers/emulation/qemu/Makefile.inc
index ce7b224..8bd3e57 100644
--- a/src/drivers/emulation/qemu/Makefile.inc
+++ b/src/drivers/emulation/qemu/Makefile.inc
@@ -1 +1 @@
-driver-$(CONFIG_DRIVERS_EMULATION_QEMU) += init.c
+ramstage-$(CONFIG_DRIVERS_EMULATION_QEMU) += init.c
diff --git a/src/drivers/generic/ioapic/Makefile.inc b/src/drivers/generic/ioapic/Makefile.inc
index 35d0934..d34542b 100644
--- a/src/drivers/generic/ioapic/Makefile.inc
+++ b/src/drivers/generic/ioapic/Makefile.inc
@@ -1 +1 @@
-driver-$(CONFIG_DRIVERS_GENERIC_IOAPIC) += ioapic.c
+ramstage-$(CONFIG_DRIVERS_GENERIC_IOAPIC) += ioapic.c
diff --git a/src/drivers/i2c/adm1026/Makefile.inc b/src/drivers/i2c/adm1026/Makefile.inc
index 15b07c3..7652a75 100644
--- a/src/drivers/i2c/adm1026/Makefile.inc
+++ b/src/drivers/i2c/adm1026/Makefile.inc
@@ -1 +1 @@
-driver-$(CONFIG_DRIVERS_I2C_ADM1026) += adm1026.c
+ramstage-$(CONFIG_DRIVERS_I2C_ADM1026) += adm1026.c
diff --git a/src/drivers/i2c/adm1027/Makefile.inc b/src/drivers/i2c/adm1027/Makefile.inc
index 942fbd2..2eb1038 100644
--- a/src/drivers/i2c/adm1027/Makefile.inc
+++ b/src/drivers/i2c/adm1027/Makefile.inc
@@ -1 +1 @@
-driver-$(CONFIG_DRIVERS_I2C_ADM1027) += adm1027.c
+ramstage-$(CONFIG_DRIVERS_I2C_ADM1027) += adm1027.c
diff --git a/src/drivers/i2c/adt7463/Makefile.inc b/src/drivers/i2c/adt7463/Makefile.inc
index 4a6dc0d..d75981b 100644
--- a/src/drivers/i2c/adt7463/Makefile.inc
+++ b/src/drivers/i2c/adt7463/Makefile.inc
@@ -1 +1 @@
-driver-$(CONFIG_DRIVERS_I2C_ADT7463) += adt7463.c
+ramstage-$(CONFIG_DRIVERS_I2C_ADT7463) += adt7463.c
diff --git a/src/drivers/i2c/i2cmux/Makefile.inc b/src/drivers/i2c/i2cmux/Makefile.inc
index 0645b15..64bbdce 100644
--- a/src/drivers/i2c/i2cmux/Makefile.inc
+++ b/src/drivers/i2c/i2cmux/Makefile.inc
@@ -1 +1 @@
-driver-$(CONFIG_DRIVERS_I2C_I2CMUX) += i2cmux.c
+ramstage-$(CONFIG_DRIVERS_I2C_I2CMUX) += i2cmux.c
diff --git a/src/drivers/i2c/i2cmux2/Makefile.inc b/src/drivers/i2c/i2cmux2/Makefile.inc
index df6b2d3..34e3613 100644
--- a/src/drivers/i2c/i2cmux2/Makefile.inc
+++ b/src/drivers/i2c/i2cmux2/Makefile.inc
@@ -1 +1 @@
-driver-$(CONFIG_DRIVERS_I2C_I2CMUX2) += i2cmux2.c
+ramstage-$(CONFIG_DRIVERS_I2C_I2CMUX2) += i2cmux2.c
diff --git a/src/drivers/i2c/lm63/Makefile.inc b/src/drivers/i2c/lm63/Makefile.inc
index 782d63d..bd1c7ef 100644
--- a/src/drivers/i2c/lm63/Makefile.inc
+++ b/src/drivers/i2c/lm63/Makefile.inc
@@ -1 +1 @@
-driver-$(CONFIG_DRIVERS_I2C_LM63) += lm63.c
+ramstage-$(CONFIG_DRIVERS_I2C_LM63) += lm63.c
diff --git a/src/drivers/i2c/w83793/Makefile.inc b/src/drivers/i2c/w83793/Makefile.inc
index c25ddd5..f7843a5 100644
--- a/src/drivers/i2c/w83793/Makefile.inc
+++ b/src/drivers/i2c/w83793/Makefile.inc
@@ -1 +1 @@
-driver-$(CONFIG_DRIVERS_I2C_W83793) += w83793.c
+ramstage-$(CONFIG_DRIVERS_I2C_W83793) += w83793.c
diff --git a/src/drivers/i2c/w83795/Makefile.inc b/src/drivers/i2c/w83795/Makefile.inc
index 708a170..330f6a7 100644
--- a/src/drivers/i2c/w83795/Makefile.inc
+++ b/src/drivers/i2c/w83795/Makefile.inc
@@ -1 +1 @@
-driver-$(CONFIG_DRIVERS_I2C_W83795) += w83795.c
+ramstage-$(CONFIG_DRIVERS_I2C_W83795) += w83795.c
diff --git a/src/drivers/ics/954309/Makefile.inc b/src/drivers/ics/954309/Makefile.inc
index ede9639..1c66a8c 100644
--- a/src/drivers/ics/954309/Makefile.inc
+++ b/src/drivers/ics/954309/Makefile.inc
@@ -1 +1 @@
-driver-$(CONFIG_DRIVERS_ICS_954309) += ics954309.c
+ramstage-$(CONFIG_DRIVERS_ICS_954309) += ics954309.c
diff --git a/src/drivers/ipmi/Makefile.inc b/src/drivers/ipmi/Makefile.inc
index ecee28f..e9e7ff3 100644
--- a/src/drivers/ipmi/Makefile.inc
+++ b/src/drivers/ipmi/Makefile.inc
@@ -1 +1 @@
-driver-$(CONFIG_IPMI_KCS) += ipmi_kcs.c
+ramstage-$(CONFIG_IPMI_KCS) += ipmi_kcs.c
diff --git a/src/drivers/oxford/oxpcie/Makefile.inc b/src/drivers/oxford/oxpcie/Makefile.inc
index 7f4aa58..6cc29c4 100644
--- a/src/drivers/oxford/oxpcie/Makefile.inc
+++ b/src/drivers/oxford/oxpcie/Makefile.inc
@@ -1,4 +1,4 @@
-driver-$(CONFIG_DRIVERS_OXFORD_OXPCIE) += oxpcie.c
+ramstage-$(CONFIG_DRIVERS_OXFORD_OXPCIE) += oxpcie.c
ifeq ($(CONFIG_CONSOLE_SERIAL8250MEM),y)
romstage-$(CONFIG_DRIVERS_OXFORD_OXPCIE) += oxpcie_early.c
diff --git a/src/drivers/realtek/Makefile.inc b/src/drivers/realtek/Makefile.inc
index 910d4b4..c583b9e 100644
--- a/src/drivers/realtek/Makefile.inc
+++ b/src/drivers/realtek/Makefile.inc
@@ -17,4 +17,4 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-driver-$(CONFIG_RTL8168_ROM_DISABLE) += rtl8168.c
+ramstage-$(CONFIG_RTL8168_ROM_DISABLE) += rtl8168.c
diff --git a/src/drivers/sil/3114/Makefile.inc b/src/drivers/sil/3114/Makefile.inc
index 77c348f..a3f3ffb 100644
--- a/src/drivers/sil/3114/Makefile.inc
+++ b/src/drivers/sil/3114/Makefile.inc
@@ -1 +1 @@
-driver-$(CONFIG_DRIVERS_SIL_3114) += sil_sata.c
+ramstage-$(CONFIG_DRIVERS_SIL_3114) += sil_sata.c
diff --git a/src/drivers/trident/blade3d/Makefile.inc b/src/drivers/trident/blade3d/Makefile.inc
index 390ae13..c4a8c8c 100644
--- a/src/drivers/trident/blade3d/Makefile.inc
+++ b/src/drivers/trident/blade3d/Makefile.inc
@@ -1 +1 @@
-driver-$(CONFIG_DRIVERS_TRIDENT_BLADE3D) += blade3d.c
+ramstage-$(CONFIG_DRIVERS_TRIDENT_BLADE3D) += blade3d.c
diff --git a/src/ec/lenovo/h8/Makefile.inc b/src/ec/lenovo/h8/Makefile.inc
index 86bc663..9fef94c 100644
--- a/src/ec/lenovo/h8/Makefile.inc
+++ b/src/ec/lenovo/h8/Makefile.inc
@@ -1 +1 @@
-driver-y += h8.c
+ramstage-y += h8.c
diff --git a/src/ec/lenovo/pmh7/Makefile.inc b/src/ec/lenovo/pmh7/Makefile.inc
index e441980..f42e0e4 100644
--- a/src/ec/lenovo/pmh7/Makefile.inc
+++ b/src/ec/lenovo/pmh7/Makefile.inc
@@ -1,3 +1,3 @@
-driver-y += pmh7.c
+ramstage-y += pmh7.c
smm-$(CONFIG_HAVE_SMI_HANDLER) += pmh7.c
romstage-y += pmh7.c
diff --git a/src/ec/smsc/mec1308/Makefile.inc b/src/ec/smsc/mec1308/Makefile.inc
index 95c6c03..0accda3 100644
--- a/src/ec/smsc/mec1308/Makefile.inc
+++ b/src/ec/smsc/mec1308/Makefile.inc
@@ -1,2 +1,2 @@
-driver-y += ec.c
+ramstage-y += ec.c
smm-y += ec.c
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index ec57bc2..5becc42 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -52,7 +52,7 @@ ramstage-$(CONFIG_BOOTSPLASH) += jpeg.c
ramstage-$(CONFIG_TRACE) += trace.c
ramstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
-driver-$(CONFIG_CONSOLE_NE2K) += ne2k.c
+ramstage-$(CONFIG_CONSOLE_NE2K) += ne2k.c
ifneq ($(CONFIG_HAVE_ARCH_MEMSET),y)
smm-y += memset.c
diff --git a/src/mainboard/ibase/mb899/Makefile.inc b/src/mainboard/ibase/mb899/Makefile.inc
index c2c861d..4fb55f5 100644
--- a/src/mainboard/ibase/mb899/Makefile.inc
+++ b/src/mainboard/ibase/mb899/Makefile.inc
@@ -17,4 +17,4 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-driver-y += mv88e8053.c
+ramstage-y += mv88e8053.c
diff --git a/src/northbridge/amd/agesa/family10/Makefile.inc b/src/northbridge/amd/agesa/family10/Makefile.inc
index 8f0fe0d..ea1a146 100755
--- a/src/northbridge/amd/agesa/family10/Makefile.inc
+++ b/src/northbridge/amd/agesa/family10/Makefile.inc
@@ -17,6 +17,6 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-driver-y += northbridge.c
+ramstage-y += northbridge.c
ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt.asl
diff --git a/src/northbridge/amd/agesa/family12/Makefile.inc b/src/northbridge/amd/agesa/family12/Makefile.inc
index 8f0fe0d..ea1a146 100755
--- a/src/northbridge/amd/agesa/family12/Makefile.inc
+++ b/src/northbridge/amd/agesa/family12/Makefile.inc
@@ -17,6 +17,6 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-driver-y += northbridge.c
+ramstage-y += northbridge.c
ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt.asl
diff --git a/src/northbridge/amd/agesa/family14/Makefile.inc b/src/northbridge/amd/agesa/family14/Makefile.inc
index d3a125c..8cdd0a0 100644
--- a/src/northbridge/amd/agesa/family14/Makefile.inc
+++ b/src/northbridge/amd/agesa/family14/Makefile.inc
@@ -17,4 +17,4 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-driver-y += northbridge.c
+ramstage-y += northbridge.c
diff --git a/src/northbridge/amd/agesa/family15/Makefile.inc b/src/northbridge/amd/agesa/family15/Makefile.inc
index 255fe10..121bf22 100644
--- a/src/northbridge/amd/agesa/family15/Makefile.inc
+++ b/src/northbridge/amd/agesa/family15/Makefile.inc
@@ -17,4 +17,4 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-driver-y += northbridge.c
+ramstage-y += northbridge.c
diff --git a/src/northbridge/amd/agesa/family15tn/Makefile.inc b/src/northbridge/amd/agesa/family15tn/Makefile.inc
index 255fe10..121bf22 100644
--- a/src/northbridge/amd/agesa/family15tn/Makefile.inc
+++ b/src/northbridge/amd/agesa/family15tn/Makefile.inc
@@ -17,4 +17,4 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-driver-y += northbridge.c
+ramstage-y += northbridge.c
diff --git a/src/northbridge/amd/amdfam10/Makefile.inc b/src/northbridge/amd/amdfam10/Makefile.inc
index 2ab9c0f..a24783b 100644
--- a/src/northbridge/amd/amdfam10/Makefile.inc
+++ b/src/northbridge/amd/amdfam10/Makefile.inc
@@ -1,5 +1,5 @@
-driver-y += northbridge.c
-driver-y += misc_control.c
+ramstage-y += northbridge.c
+ramstage-y += misc_control.c
ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c
ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt.asl
diff --git a/src/northbridge/amd/amdk8/Makefile.inc b/src/northbridge/amd/amdk8/Makefile.inc
index e35b9ed..38b0201 100644
--- a/src/northbridge/amd/amdk8/Makefile.inc
+++ b/src/northbridge/amd/amdk8/Makefile.inc
@@ -1,5 +1,5 @@
-driver-y += northbridge.c
-driver-y += misc_control.c
+ramstage-y += northbridge.c
+ramstage-y += misc_control.c
ramstage-y += get_sblk_pci1234.c
ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c
diff --git a/src/northbridge/amd/gx1/Makefile.inc b/src/northbridge/amd/gx1/Makefile.inc
index 16d702a..ab619fc 100644
--- a/src/northbridge/amd/gx1/Makefile.inc
+++ b/src/northbridge/amd/gx1/Makefile.inc
@@ -18,5 +18,5 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-driver-y += northbridge.c
+ramstage-y += northbridge.c
diff --git a/src/northbridge/amd/gx2/Makefile.inc b/src/northbridge/amd/gx2/Makefile.inc
index 482aff9..ad904c4 100644
--- a/src/northbridge/amd/gx2/Makefile.inc
+++ b/src/northbridge/amd/gx2/Makefile.inc
@@ -1,3 +1,3 @@
-driver-y += northbridge.c
+ramstage-y += northbridge.c
ramstage-y += northbridgeinit.c
ramstage-y += grphinit.c
diff --git a/src/northbridge/amd/lx/Makefile.inc b/src/northbridge/amd/lx/Makefile.inc
index 482aff9..ad904c4 100644
--- a/src/northbridge/amd/lx/Makefile.inc
+++ b/src/northbridge/amd/lx/Makefile.inc
@@ -1,3 +1,3 @@
-driver-y += northbridge.c
+ramstage-y += northbridge.c
ramstage-y += northbridgeinit.c
ramstage-y += grphinit.c
diff --git a/src/northbridge/intel/e7520/Makefile.inc b/src/northbridge/intel/e7520/Makefile.inc
index 32c6836..370477b 100644
--- a/src/northbridge/intel/e7520/Makefile.inc
+++ b/src/northbridge/intel/e7520/Makefile.inc
@@ -1,5 +1,5 @@
-driver-y += northbridge.c
-driver-y += pciexp_porta.c
-driver-y += pciexp_porta1.c
-driver-y += pciexp_portb.c
-driver-y += pciexp_portc.c
+ramstage-y += northbridge.c
+ramstage-y += pciexp_porta.c
+ramstage-y += pciexp_porta1.c
+ramstage-y += pciexp_portb.c
+ramstage-y += pciexp_portc.c
diff --git a/src/northbridge/intel/e7525/Makefile.inc b/src/northbridge/intel/e7525/Makefile.inc
index 32c6836..370477b 100644
--- a/src/northbridge/intel/e7525/Makefile.inc
+++ b/src/northbridge/intel/e7525/Makefile.inc
@@ -1,5 +1,5 @@
-driver-y += northbridge.c
-driver-y += pciexp_porta.c
-driver-y += pciexp_porta1.c
-driver-y += pciexp_portb.c
-driver-y += pciexp_portc.c
+ramstage-y += northbridge.c
+ramstage-y += pciexp_porta.c
+ramstage-y += pciexp_porta1.c
+ramstage-y += pciexp_portb.c
+ramstage-y += pciexp_portc.c
diff --git a/src/northbridge/intel/i3100/Makefile.inc b/src/northbridge/intel/i3100/Makefile.inc
index c2de0fc..3ad40f5 100644
--- a/src/northbridge/intel/i3100/Makefile.inc
+++ b/src/northbridge/intel/i3100/Makefile.inc
@@ -1,3 +1,3 @@
-driver-y += northbridge.c
-driver-y += pciexp_porta.c
-driver-y += pciexp_porta_ep80579.c
+ramstage-y += northbridge.c
+ramstage-y += pciexp_porta.c
+ramstage-y += pciexp_porta_ep80579.c
diff --git a/src/northbridge/intel/i440bx/Makefile.inc b/src/northbridge/intel/i440bx/Makefile.inc
index 0c0a3c8..ef4be2e 100644
--- a/src/northbridge/intel/i440bx/Makefile.inc
+++ b/src/northbridge/intel/i440bx/Makefile.inc
@@ -18,7 +18,7 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-driver-y += northbridge.c
+ramstage-y += northbridge.c
romstage-y += raminit.c
romstage-y += debug.c
diff --git a/src/northbridge/intel/i440lx/Makefile.inc b/src/northbridge/intel/i440lx/Makefile.inc
index 16d702a..ab619fc 100644
--- a/src/northbridge/intel/i440lx/Makefile.inc
+++ b/src/northbridge/intel/i440lx/Makefile.inc
@@ -18,5 +18,5 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-driver-y += northbridge.c
+ramstage-y += northbridge.c
diff --git a/src/northbridge/intel/i5000/Makefile.inc b/src/northbridge/intel/i5000/Makefile.inc
index 5e75159..e3ab0bb 100644
--- a/src/northbridge/intel/i5000/Makefile.inc
+++ b/src/northbridge/intel/i5000/Makefile.inc
@@ -17,6 +17,6 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-driver-y += northbridge.c
+ramstage-y += northbridge.c
romstage-y += raminit.c udelay.c
cpu_incs += src/northbridge/intel/i5000/halt_second_bsp.S
diff --git a/src/northbridge/intel/i82810/Makefile.inc b/src/northbridge/intel/i82810/Makefile.inc
index 0c0a3c8..ef4be2e 100644
--- a/src/northbridge/intel/i82810/Makefile.inc
+++ b/src/northbridge/intel/i82810/Makefile.inc
@@ -18,7 +18,7 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-driver-y += northbridge.c
+ramstage-y += northbridge.c
romstage-y += raminit.c
romstage-y += debug.c
diff --git a/src/northbridge/intel/i82830/Makefile.inc b/src/northbridge/intel/i82830/Makefile.inc
index c8cf0f4..2394570 100644
--- a/src/northbridge/intel/i82830/Makefile.inc
+++ b/src/northbridge/intel/i82830/Makefile.inc
@@ -1,4 +1,4 @@
-driver-y += northbridge.c
-driver-y += vga.c
+ramstage-y += northbridge.c
+ramstage-y += vga.c
smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
diff --git a/src/northbridge/intel/i945/Makefile.inc b/src/northbridge/intel/i945/Makefile.inc
index 7d7cb5d..89b0308 100644
--- a/src/northbridge/intel/i945/Makefile.inc
+++ b/src/northbridge/intel/i945/Makefile.inc
@@ -17,8 +17,8 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-driver-y += northbridge.c
-driver-y += gma.c
+ramstage-y += northbridge.c
+ramstage-y += gma.c
ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c
romstage-y += udelay.c
diff --git a/src/northbridge/intel/sandybridge/Makefile.inc b/src/northbridge/intel/sandybridge/Makefile.inc
index 6193abe..bef3da5 100644
--- a/src/northbridge/intel/sandybridge/Makefile.inc
+++ b/src/northbridge/intel/sandybridge/Makefile.inc
@@ -17,8 +17,8 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-driver-y += northbridge.c
-driver-y += gma.c
+ramstage-y += northbridge.c
+ramstage-y += gma.c
ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c
ramstage-y += mrccache.c
diff --git a/src/northbridge/intel/sch/Makefile.inc b/src/northbridge/intel/sch/Makefile.inc
index ecd2a27..2e26450 100644
--- a/src/northbridge/intel/sch/Makefile.inc
+++ b/src/northbridge/intel/sch/Makefile.inc
@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-driver-y += northbridge.c
-driver-y += gma.c
-driver-y += port_access.c
+ramstage-y += northbridge.c
+ramstage-y += gma.c
+ramstage-y += port_access.c
ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c
diff --git a/src/northbridge/rdc/r8610/Makefile.inc b/src/northbridge/rdc/r8610/Makefile.inc
index c976967..2bc7c57 100644
--- a/src/northbridge/rdc/r8610/Makefile.inc
+++ b/src/northbridge/rdc/r8610/Makefile.inc
@@ -18,4 +18,4 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-driver-y += northbridge.c
+ramstage-y += northbridge.c
diff --git a/src/northbridge/via/cn400/Makefile.inc b/src/northbridge/via/cn400/Makefile.inc
index 64eab38..d5d06cf 100644
--- a/src/northbridge/via/cn400/Makefile.inc
+++ b/src/northbridge/via/cn400/Makefile.inc
@@ -18,8 +18,8 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-driver-y += northbridge.c
-driver-y += agp.c
-driver-y += vga.c
-driver-y += vlink.c
+ramstage-y += northbridge.c
+ramstage-y += agp.c
+ramstage-y += vga.c
+ramstage-y += vlink.c
diff --git a/src/northbridge/via/cn700/Makefile.inc b/src/northbridge/via/cn700/Makefile.inc
index 1654111..3ccdd5e 100644
--- a/src/northbridge/via/cn700/Makefile.inc
+++ b/src/northbridge/via/cn700/Makefile.inc
@@ -18,7 +18,7 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-driver-y += northbridge.c
-driver-y += agp.c
-driver-y += vga.c
+ramstage-y += northbridge.c
+ramstage-y += agp.c
+ramstage-y += vga.c
diff --git a/src/northbridge/via/cx700/Makefile.inc b/src/northbridge/via/cx700/Makefile.inc
index b833013..a4172bb 100644
--- a/src/northbridge/via/cx700/Makefile.inc
+++ b/src/northbridge/via/cx700/Makefile.inc
@@ -20,7 +20,7 @@
ramstage-y += reset.c
ramstage-y += northbridge.c
-driver-y += agp.c
-driver-y += lpc.c
-driver-y += sata.c
-driver-y += vga.c
+ramstage-y += agp.c
+ramstage-y += lpc.c
+ramstage-y += sata.c
+ramstage-y += vga.c
diff --git a/src/northbridge/via/vt8601/Makefile.inc b/src/northbridge/via/vt8601/Makefile.inc
index 126fe91..4a14320 100644
--- a/src/northbridge/via/vt8601/Makefile.inc
+++ b/src/northbridge/via/vt8601/Makefile.inc
@@ -18,5 +18,5 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-driver-y += northbridge.c
+ramstage-y += northbridge.c
diff --git a/src/northbridge/via/vt8623/Makefile.inc b/src/northbridge/via/vt8623/Makefile.inc
index 7f6f77d..084e4e0 100644
--- a/src/northbridge/via/vt8623/Makefile.inc
+++ b/src/northbridge/via/vt8623/Makefile.inc
@@ -18,6 +18,6 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-driver-y += northbridge.c
-driver-y += vga.c
+ramstage-y += northbridge.c
+ramstage-y += vga.c
diff --git a/src/northbridge/via/vx800/Makefile.inc b/src/northbridge/via/vx800/Makefile.inc
index 670a3e9..188db46 100644
--- a/src/northbridge/via/vx800/Makefile.inc
+++ b/src/northbridge/via/vx800/Makefile.inc
@@ -18,10 +18,10 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-driver-y += northbridge.c
-driver-y += vga.c
-driver-y += lpc.c
-driver-y += ide.c
+ramstage-y += northbridge.c
+ramstage-y += vga.c
+ramstage-y += lpc.c
+ramstage-y += ide.c
chipset_bootblock_inc += $(src)/northbridge/via/vx800/romstrap.inc
chipset_bootblock_lds += $(src)/northbridge/via/vx800/romstrap.lds
diff --git a/src/southbridge/amd/agesa/hudson/Makefile.inc b/src/southbridge/amd/agesa/hudson/Makefile.inc
index 4bd1523..9d61b59 100644
--- a/src/southbridge/amd/agesa/hudson/Makefile.inc
+++ b/src/southbridge/amd/agesa/hudson/Makefile.inc
@@ -1,12 +1,12 @@
-driver-y += hudson.c
-driver-y += usb.c
-driver-y += lpc.c
-driver-y += sm.c
-driver-y += ide.c
-driver-y += sata.c
-driver-y += hda.c
-driver-y += pci.c
-driver-y += pcie.c
+ramstage-y += hudson.c
+ramstage-y += usb.c
+ramstage-y += lpc.c
+ramstage-y += sm.c
+ramstage-y += ide.c
+ramstage-y += sata.c
+ramstage-y += hda.c
+ramstage-y += pci.c
+ramstage-y += pcie.c
ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.c
ramstage-y += reset.c
romstage-y += enable_usbdebug.c
diff --git a/src/southbridge/amd/amd8111/Makefile.inc b/src/southbridge/amd/amd8111/Makefile.inc
index cdad4a6..c5b2688 100644
--- a/src/southbridge/amd/amd8111/Makefile.inc
+++ b/src/southbridge/amd/amd8111/Makefile.inc
@@ -1,11 +1,11 @@
-driver-y += amd8111.c
-driver-y += usb.c
-driver-y += lpc.c
-driver-y += ide.c
-driver-y += acpi.c
-driver-y += usb2.c
-driver-y += ac97.c
-driver-y += nic.c
-driver-y += pci.c
-driver-y += smbus.c
+ramstage-y += amd8111.c
+ramstage-y += usb.c
+ramstage-y += lpc.c
+ramstage-y += ide.c
+ramstage-y += acpi.c
+ramstage-y += usb2.c
+ramstage-y += ac97.c
+ramstage-y += nic.c
+ramstage-y += pci.c
+ramstage-y += smbus.c
ramstage-y += reset.c
diff --git a/src/southbridge/amd/amd8131/Makefile.inc b/src/southbridge/amd/amd8131/Makefile.inc
index d5b3a5f..ce96c97 100644
--- a/src/southbridge/amd/amd8131/Makefile.inc
+++ b/src/southbridge/amd/amd8131/Makefile.inc
@@ -1 +1 @@
-driver-y += bridge.c
+ramstage-y += bridge.c
diff --git a/src/southbridge/amd/amd8132/Makefile.inc b/src/southbridge/amd/amd8132/Makefile.inc
index d5b3a5f..ce96c97 100644
--- a/src/southbridge/amd/amd8132/Makefile.inc
+++ b/src/southbridge/amd/amd8132/Makefile.inc
@@ -1 +1 @@
-driver-y += bridge.c
+ramstage-y += bridge.c
diff --git a/src/southbridge/amd/amd8151/Makefile.inc b/src/southbridge/amd/amd8151/Makefile.inc
index b251391..dcb3c73 100644
--- a/src/southbridge/amd/amd8151/Makefile.inc
+++ b/src/southbridge/amd/amd8151/Makefile.inc
@@ -1 +1 @@
-driver-y += agp3.c
+ramstage-y += agp3.c
diff --git a/src/southbridge/amd/cimx/sb700/Makefile.inc b/src/southbridge/amd/cimx/sb700/Makefile.inc
index 7929cf7..465fa9e 100644
--- a/src/southbridge/amd/cimx/sb700/Makefile.inc
+++ b/src/southbridge/amd/cimx/sb700/Makefile.inc
@@ -25,7 +25,7 @@ romstage-y += smbus.c
ramstage-y += late.c
-driver-y += smbus.c
-driver-y += lpc.c
+ramstage-y += smbus.c
+ramstage-y += lpc.c
diff --git a/src/southbridge/amd/cimx/sb800/Makefile.inc b/src/southbridge/amd/cimx/sb800/Makefile.inc
index f02f0f7..bea9763 100644
--- a/src/southbridge/amd/cimx/sb800/Makefile.inc
+++ b/src/southbridge/amd/cimx/sb800/Makefile.inc
@@ -30,8 +30,8 @@ ramstage-y += late.c
ramstage-$(CONFIG_HAVE_ACPI_RESUME) += spi.c
ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.c
-driver-y += smbus.c
-driver-y += lpc.c
+ramstage-y += smbus.c
+ramstage-y += lpc.c
ifeq ($(CONFIG_SB800_SATA_AHCI), y)
ifdef CONFIG_SB800_AHCI_ROM
diff --git a/src/southbridge/amd/cimx/sb900/Makefile.inc b/src/southbridge/amd/cimx/sb900/Makefile.inc
index 49eb604..737c354 100755
--- a/src/southbridge/amd/cimx/sb900/Makefile.inc
+++ b/src/southbridge/amd/cimx/sb900/Makefile.inc
@@ -28,7 +28,7 @@ ramstage-y += cfg.c
ramstage-y += early.c
ramstage-y += late.c
-driver-y += smbus.c
-driver-y += lpc.c
+ramstage-y += smbus.c
+ramstage-y += lpc.c
diff --git a/src/southbridge/amd/cs5530/Makefile.inc b/src/southbridge/amd/cs5530/Makefile.inc
index 4bde476..9013611 100644
--- a/src/southbridge/amd/cs5530/Makefile.inc
+++ b/src/southbridge/amd/cs5530/Makefile.inc
@@ -18,8 +18,8 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-driver-y += cs5530.c
-driver-y += isa.c
-driver-y += ide.c
-driver-y += vga.c
-driver-y += pirq.c
+ramstage-y += cs5530.c
+ramstage-y += isa.c
+ramstage-y += ide.c
+ramstage-y += vga.c
+ramstage-y += pirq.c
diff --git a/src/southbridge/amd/cs5535/Makefile.inc b/src/southbridge/amd/cs5535/Makefile.inc
index 5fecea8..6f65e2e 100644
--- a/src/southbridge/amd/cs5535/Makefile.inc
+++ b/src/southbridge/amd/cs5535/Makefile.inc
@@ -1,4 +1,4 @@
-driver-y += cs5535.c
-#driver-y += pci.c
-#driver-y += ide.c
+ramstage-y += cs5535.c
+#ramstage-y += pci.c
+#ramstage-y += ide.c
ramstage-y += chipsetinit.c
diff --git a/src/southbridge/amd/cs5536/Makefile.inc b/src/southbridge/amd/cs5536/Makefile.inc
index 3d2613b..fb8e547 100644
--- a/src/southbridge/amd/cs5536/Makefile.inc
+++ b/src/southbridge/amd/cs5536/Makefile.inc
@@ -17,8 +17,8 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-driver-y += cs5536.c
-driver-y += ide.c
-driver-y += pirq.c
-driver-y += smbus.c
+ramstage-y += cs5536.c
+ramstage-y += ide.c
+ramstage-y += pirq.c
+ramstage-y += smbus.c
romstage-y += smbus.c
\ No newline at end of file
diff --git a/src/southbridge/amd/rs690/Makefile.inc b/src/southbridge/amd/rs690/Makefile.inc
index 5849340..e0cf927 100644
--- a/src/southbridge/amd/rs690/Makefile.inc
+++ b/src/southbridge/amd/rs690/Makefile.inc
@@ -1,5 +1,5 @@
-driver-y += rs690.c
-driver-y += cmn.c
-driver-y += pcie.c
-driver-y += ht.c
-driver-y += gfx.c
+ramstage-y += rs690.c
+ramstage-y += cmn.c
+ramstage-y += pcie.c
+ramstage-y += ht.c
+ramstage-y += gfx.c
diff --git a/src/southbridge/amd/rs780/Makefile.inc b/src/southbridge/amd/rs780/Makefile.inc
index db42570..bf51d83 100644
--- a/src/southbridge/amd/rs780/Makefile.inc
+++ b/src/southbridge/amd/rs780/Makefile.inc
@@ -1,5 +1,5 @@
-driver-y += rs780.c
-driver-y += cmn.c
-driver-y += pcie.c
-driver-y += ht.c
-driver-y += gfx.c
+ramstage-y += rs780.c
+ramstage-y += cmn.c
+ramstage-y += pcie.c
+ramstage-y += ht.c
+ramstage-y += gfx.c
diff --git a/src/southbridge/amd/sb600/Makefile.inc b/src/southbridge/amd/sb600/Makefile.inc
index d7451d2..57ef4de 100644
--- a/src/southbridge/amd/sb600/Makefile.inc
+++ b/src/southbridge/amd/sb600/Makefile.inc
@@ -1,12 +1,12 @@
-driver-y += sb600.c
-driver-y += usb.c
-driver-y += lpc.c
-driver-y += sm.c
-driver-y += ide.c
-driver-y += sata.c
-driver-y += hda.c
-driver-y += ac97.c
-driver-y += pci.c
+ramstage-y += sb600.c
+ramstage-y += usb.c
+ramstage-y += lpc.c
+ramstage-y += sm.c
+ramstage-y += ide.c
+ramstage-y += sata.c
+ramstage-y += hda.c
+ramstage-y += ac97.c
+ramstage-y += pci.c
ramstage-y += reset.c
romstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c
ramstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c
diff --git a/src/southbridge/amd/sb700/Makefile.inc b/src/southbridge/amd/sb700/Makefile.inc
index 49caedf..6f699f0 100644
--- a/src/southbridge/amd/sb700/Makefile.inc
+++ b/src/southbridge/amd/sb700/Makefile.inc
@@ -1,12 +1,12 @@
-driver-y += sb700.c
-driver-y += usb.c
-driver-y += lpc.c
-driver-y += smbus.c
-driver-y += sm.c
-driver-y += ide.c
-driver-y += sata.c
-driver-y += hda.c
-driver-y += pci.c
+ramstage-y += sb700.c
+ramstage-y += usb.c
+ramstage-y += lpc.c
+ramstage-y += smbus.c
+ramstage-y += sm.c
+ramstage-y += ide.c
+ramstage-y += sata.c
+ramstage-y += hda.c
+ramstage-y += pci.c
ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.c
romstage-y += reset.c
ramstage-y += reset.c
diff --git a/src/southbridge/amd/sb800/Makefile.inc b/src/southbridge/amd/sb800/Makefile.inc
index 38b7d50..3e7bf11 100644
--- a/src/southbridge/amd/sb800/Makefile.inc
+++ b/src/southbridge/amd/sb800/Makefile.inc
@@ -1,12 +1,12 @@
-driver-y += sb800.c
-driver-y += usb.c
-driver-y += lpc.c
-driver-y += sm.c
-driver-y += ide.c
-driver-y += sata.c
-driver-y += hda.c
-driver-y += pci.c
-driver-y += pcie.c
+ramstage-y += sb800.c
+ramstage-y += usb.c
+ramstage-y += lpc.c
+ramstage-y += sm.c
+ramstage-y += ide.c
+ramstage-y += sata.c
+ramstage-y += hda.c
+ramstage-y += pci.c
+ramstage-y += pcie.c
ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.c
ramstage-y += reset.c
romstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c
diff --git a/src/southbridge/amd/sr5650/Makefile.inc b/src/southbridge/amd/sr5650/Makefile.inc
index 0a4ce39..3c17be0 100644
--- a/src/southbridge/amd/sr5650/Makefile.inc
+++ b/src/southbridge/amd/sr5650/Makefile.inc
@@ -1,5 +1,5 @@
-driver-y += sr5650.c
-driver-y += pcie.c
-driver-y += ht.c
+ramstage-y += sr5650.c
+ramstage-y += pcie.c
+ramstage-y += ht.c
romstage-y += early_setup.c
diff --git a/src/southbridge/broadcom/bcm21000/Makefile.inc b/src/southbridge/broadcom/bcm21000/Makefile.inc
index 8e5ba74..f85aeb1 100644
--- a/src/southbridge/broadcom/bcm21000/Makefile.inc
+++ b/src/southbridge/broadcom/bcm21000/Makefile.inc
@@ -1 +1 @@
-driver-y += pcie.c
+ramstage-y += pcie.c
diff --git a/src/southbridge/broadcom/bcm5780/Makefile.inc b/src/southbridge/broadcom/bcm5780/Makefile.inc
index b8a1b96..4eb834a 100644
--- a/src/southbridge/broadcom/bcm5780/Makefile.inc
+++ b/src/southbridge/broadcom/bcm5780/Makefile.inc
@@ -1,3 +1,3 @@
-driver-y += nic.c
-driver-y += pcix.c
-driver-y += pcie.c
+ramstage-y += nic.c
+ramstage-y += pcix.c
+ramstage-y += pcie.c
diff --git a/src/southbridge/broadcom/bcm5785/Makefile.inc b/src/southbridge/broadcom/bcm5785/Makefile.inc
index 9ad67cc..b8427c4 100644
--- a/src/southbridge/broadcom/bcm5785/Makefile.inc
+++ b/src/southbridge/broadcom/bcm5785/Makefile.inc
@@ -1,7 +1,7 @@
-driver-y += bcm5785.c
-driver-y += usb.c
-driver-y += lpc.c
-driver-y += sb_pci_main.c
-driver-y += ide.c
-driver-y += sata.c
+ramstage-y += bcm5785.c
+ramstage-y += usb.c
+ramstage-y += lpc.c
+ramstage-y += sb_pci_main.c
+ramstage-y += ide.c
+ramstage-y += sata.c
ramstage-y += reset.c
diff --git a/src/southbridge/intel/bd82x6x/Makefile.inc b/src/southbridge/intel/bd82x6x/Makefile.inc
index 7fd6ca8..bc067ca 100644
--- a/src/southbridge/intel/bd82x6x/Makefile.inc
+++ b/src/southbridge/intel/bd82x6x/Makefile.inc
@@ -22,16 +22,16 @@
# image outside of CBFS
INTERMEDIATE+=bd82x6x_add_me
-driver-y += pch.c
-driver-y += azalia.c
-driver-y += lpc.c
-driver-y += pci.c
-driver-y += pcie.c
-driver-y += sata.c
-driver-y += usb_ehci.c
-driver-y += me.c
-driver-y += me_8.x.c
-driver-y += smbus.c
+ramstage-y += pch.c
+ramstage-y += azalia.c
+ramstage-y += lpc.c
+ramstage-y += pci.c
+ramstage-y += pcie.c
+ramstage-y += sata.c
+ramstage-y += usb_ehci.c
+ramstage-y += me.c
+ramstage-y += me_8.x.c
+ramstage-y += smbus.c
ramstage-y += me_status.c
ramstage-y += reset.c
diff --git a/src/southbridge/intel/esb6300/Makefile.inc b/src/southbridge/intel/esb6300/Makefile.inc
index 004ff13..bb70fdc 100644
--- a/src/southbridge/intel/esb6300/Makefile.inc
+++ b/src/southbridge/intel/esb6300/Makefile.inc
@@ -1,12 +1,12 @@
-driver-y += esb6300.c
-driver-y += reset.c
-driver-y += uhci.c
-driver-y += lpc.c
-driver-y += ide.c
-driver-y += sata.c
-driver-y += ehci.c
-driver-y += smbus.c
-driver-y += pci.c
-driver-y += pic.c
-driver-y += bridge1c.c
-driver-y += ac97.c
+ramstage-y += esb6300.c
+ramstage-y += reset.c
+ramstage-y += uhci.c
+ramstage-y += lpc.c
+ramstage-y += ide.c
+ramstage-y += sata.c
+ramstage-y += ehci.c
+ramstage-y += smbus.c
+ramstage-y += pci.c
+ramstage-y += pic.c
+ramstage-y += bridge1c.c
+ramstage-y += ac97.c
diff --git a/src/southbridge/intel/i3100/Makefile.inc b/src/southbridge/intel/i3100/Makefile.inc
index ddcb0f9..dc3d039 100644
--- a/src/southbridge/intel/i3100/Makefile.inc
+++ b/src/southbridge/intel/i3100/Makefile.inc
@@ -1,10 +1,10 @@
-driver-y += i3100.c
-driver-y += uhci.c
-driver-y += lpc.c
-driver-y += sata.c
-driver-y += ehci.c
-driver-y += smbus.c
-driver-y += pci.c
-driver-y += ioapic.c
+ramstage-y += i3100.c
+ramstage-y += uhci.c
+ramstage-y += lpc.c
+ramstage-y += sata.c
+ramstage-y += ehci.c
+ramstage-y += smbus.c
+ramstage-y += pci.c
+ramstage-y += ioapic.c
ramstage-y += reset.c
ramstage-y += pciexp_portb.c
diff --git a/src/southbridge/intel/i82371eb/Makefile.inc b/src/southbridge/intel/i82371eb/Makefile.inc
index 9e2c3eb..af4c705 100644
--- a/src/southbridge/intel/i82371eb/Makefile.inc
+++ b/src/southbridge/intel/i82371eb/Makefile.inc
@@ -18,15 +18,15 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-driver-y += i82371eb.c
-driver-y += isa.c
-driver-y += ide.c
-driver-y += usb.c
-driver-y += smbus.c
-driver-y += reset.c
-driver-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.c
-driver-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.c
-driver-$(CONFIG_HAVE_ACPI_RESUME) += wakeup.c
+ramstage-y += i82371eb.c
+ramstage-y += isa.c
+ramstage-y += ide.c
+ramstage-y += usb.c
+ramstage-y += smbus.c
+ramstage-y += reset.c
+ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.c
+ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.c
+ramstage-$(CONFIG_HAVE_ACPI_RESUME) += wakeup.c
romstage-y += early_pm.c
romstage-y += early_smbus.c
diff --git a/src/southbridge/intel/i82801ax/Makefile.inc b/src/southbridge/intel/i82801ax/Makefile.inc
index de0c722..6396650 100644
--- a/src/southbridge/intel/i82801ax/Makefile.inc
+++ b/src/southbridge/intel/i82801ax/Makefile.inc
@@ -18,13 +18,13 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-driver-y += i82801ax.c
-driver-y += ac97.c
-driver-y += ide.c
-driver-y += lpc.c
-driver-y += pci.c
-driver-y += smbus.c
-driver-y += usb.c
+ramstage-y += i82801ax.c
+ramstage-y += ac97.c
+ramstage-y += ide.c
+ramstage-y += lpc.c
+ramstage-y += pci.c
+ramstage-y += smbus.c
+ramstage-y += usb.c
ramstage-y += reset.c
ramstage-y += watchdog.c
diff --git a/src/southbridge/intel/i82801bx/Makefile.inc b/src/southbridge/intel/i82801bx/Makefile.inc
index b3587f2..2b368bb 100644
--- a/src/southbridge/intel/i82801bx/Makefile.inc
+++ b/src/southbridge/intel/i82801bx/Makefile.inc
@@ -18,14 +18,14 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-driver-y += i82801bx.c
-driver-y += ac97.c
-driver-y += ide.c
-driver-y += lpc.c
-driver-y += nic.c
-driver-y += pci.c
-driver-y += smbus.c
-driver-y += usb.c
+ramstage-y += i82801bx.c
+ramstage-y += ac97.c
+ramstage-y += ide.c
+ramstage-y += lpc.c
+ramstage-y += nic.c
+ramstage-y += pci.c
+ramstage-y += smbus.c
+ramstage-y += usb.c
ramstage-y += reset.c
ramstage-y += watchdog.c
diff --git a/src/southbridge/intel/i82801cx/Makefile.inc b/src/southbridge/intel/i82801cx/Makefile.inc
index 9c5c7fb..c375476 100644
--- a/src/southbridge/intel/i82801cx/Makefile.inc
+++ b/src/southbridge/intel/i82801cx/Makefile.inc
@@ -1,8 +1,8 @@
-driver-y += i82801cx.c
-driver-y += usb.c
-driver-y += lpc.c
-driver-y += ide.c
-driver-y += ac97.c
-#driver-y += nic.c
-driver-y += pci.c
+ramstage-y += i82801cx.c
+ramstage-y += usb.c
+ramstage-y += lpc.c
+ramstage-y += ide.c
+ramstage-y += ac97.c
+#ramstage-y += nic.c
+ramstage-y += pci.c
ramstage-y += reset.c
diff --git a/src/southbridge/intel/i82801dx/Makefile.inc b/src/southbridge/intel/i82801dx/Makefile.inc
index 9644210..e412ef9 100644
--- a/src/southbridge/intel/i82801dx/Makefile.inc
+++ b/src/southbridge/intel/i82801dx/Makefile.inc
@@ -19,13 +19,13 @@
## MA 02110-1301 USA
##
-driver-y += i82801dx.c
-driver-y += ac97.c
-driver-y += ide.c
-driver-y += lpc.c
-#driver-y += pci.c
-driver-y += usb.c
-driver-y += usb2.c
+ramstage-y += i82801dx.c
+ramstage-y += ac97.c
+ramstage-y += ide.c
+ramstage-y += lpc.c
+#ramstage-y += pci.c
+ramstage-y += usb.c
+ramstage-y += usb2.c
ramstage-y += reset.c
ramstage-$(CONFIG_HAVE_SMI_HANDLER) += smi.c
diff --git a/src/southbridge/intel/i82801ex/Makefile.inc b/src/southbridge/intel/i82801ex/Makefile.inc
index e0d3148..fb76a98 100644
--- a/src/southbridge/intel/i82801ex/Makefile.inc
+++ b/src/southbridge/intel/i82801ex/Makefile.inc
@@ -1,11 +1,11 @@
-driver-y += i82801ex.c
-driver-y += uhci.c
-driver-y += lpc.c
-driver-y += ide.c
-driver-y += sata.c
-driver-y += ehci.c
-driver-y += smbus.c
-driver-y += pci.c
-driver-y += ac97.c
+ramstage-y += i82801ex.c
+ramstage-y += uhci.c
+ramstage-y += lpc.c
+ramstage-y += ide.c
+ramstage-y += sata.c
+ramstage-y += ehci.c
+ramstage-y += smbus.c
+ramstage-y += pci.c
+ramstage-y += ac97.c
ramstage-y += watchdog.c
ramstage-y += reset.c
diff --git a/src/southbridge/intel/i82801gx/Makefile.inc b/src/southbridge/intel/i82801gx/Makefile.inc
index c23a314..b286576 100644
--- a/src/southbridge/intel/i82801gx/Makefile.inc
+++ b/src/southbridge/intel/i82801gx/Makefile.inc
@@ -17,18 +17,18 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-driver-y += i82801gx.c
-driver-y += ac97.c
-driver-y += azalia.c
-driver-y += ide.c
-driver-y += lpc.c
-driver-y += nic.c
-driver-y += pci.c
-driver-y += pcie.c
-driver-y += sata.c
-driver-y += smbus.c
-driver-y += usb.c
-driver-y += usb_ehci.c
+ramstage-y += i82801gx.c
+ramstage-y += ac97.c
+ramstage-y += azalia.c
+ramstage-y += ide.c
+ramstage-y += lpc.c
+ramstage-y += nic.c
+ramstage-y += pci.c
+ramstage-y += pcie.c
+ramstage-y += sata.c
+ramstage-y += smbus.c
+ramstage-y += usb.c
+ramstage-y += usb_ehci.c
ramstage-y += reset.c
ramstage-y += watchdog.c
diff --git a/src/southbridge/intel/i82870/Makefile.inc b/src/southbridge/intel/i82870/Makefile.inc
index 7ca6fb5..190aa4f 100644
--- a/src/southbridge/intel/i82870/Makefile.inc
+++ b/src/southbridge/intel/i82870/Makefile.inc
@@ -1,3 +1,3 @@
-driver-y += ioapic.c
-driver-y += pcibridge.c
-#driver-y += pci_parity.c
+ramstage-y += ioapic.c
+ramstage-y += pcibridge.c
+#ramstage-y += pci_parity.c
diff --git a/src/southbridge/intel/pxhd/Makefile.inc b/src/southbridge/intel/pxhd/Makefile.inc
index d5b3a5f..ce96c97 100644
--- a/src/southbridge/intel/pxhd/Makefile.inc
+++ b/src/southbridge/intel/pxhd/Makefile.inc
@@ -1 +1 @@
-driver-y += bridge.c
+ramstage-y += bridge.c
diff --git a/src/southbridge/intel/sch/Makefile.inc b/src/southbridge/intel/sch/Makefile.inc
index 42ff877..d7c245a 100644
--- a/src/southbridge/intel/sch/Makefile.inc
+++ b/src/southbridge/intel/sch/Makefile.inc
@@ -17,16 +17,16 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-driver-y += south.c
-driver-y += audio.c
-driver-y += lpc.c
-driver-y += ide.c
-driver-y += pcie.c
-driver-y += usb.c
-driver-y += usb_ehci.c
-driver-y += usb_client.c
-driver-y += mmc.c
-driver-y += smbus.c
+ramstage-y += south.c
+ramstage-y += audio.c
+ramstage-y += lpc.c
+ramstage-y += ide.c
+ramstage-y += pcie.c
+ramstage-y += usb.c
+ramstage-y += usb_ehci.c
+ramstage-y += usb_client.c
+ramstage-y += mmc.c
+ramstage-y += smbus.c
ramstage-y += reset.c
diff --git a/src/southbridge/nvidia/ck804/Makefile.inc b/src/southbridge/nvidia/ck804/Makefile.inc
index debe227..bfafa23 100644
--- a/src/southbridge/nvidia/ck804/Makefile.inc
+++ b/src/southbridge/nvidia/ck804/Makefile.inc
@@ -1,15 +1,15 @@
-driver-y += ck804.c
-driver-y += usb.c
-driver-y += lpc.c
-driver-y += smbus.c
-driver-y += ide.c
-driver-y += sata.c
-driver-y += usb2.c
-driver-y += ac97.c
-driver-y += nic.c
-driver-y += pci.c
-driver-y += pcie.c
-driver-y += ht.c
+ramstage-y += ck804.c
+ramstage-y += usb.c
+ramstage-y += lpc.c
+ramstage-y += smbus.c
+ramstage-y += ide.c
+ramstage-y += sata.c
+ramstage-y += usb2.c
+ramstage-y += ac97.c
+ramstage-y += nic.c
+ramstage-y += pci.c
+ramstage-y += pcie.c
+ramstage-y += ht.c
ramstage-y += reset.c
diff --git a/src/southbridge/nvidia/mcp55/Makefile.inc b/src/southbridge/nvidia/mcp55/Makefile.inc
index 26844da..b20804a 100644
--- a/src/southbridge/nvidia/mcp55/Makefile.inc
+++ b/src/southbridge/nvidia/mcp55/Makefile.inc
@@ -1,17 +1,17 @@
-driver-y += mcp55.c
-driver-y += azalia.c
-driver-y += ht.c
-driver-y += ide.c
-driver-y += lpc.c
-driver-y += nic.c
-driver-y += pci.c
-driver-y += pcie.c
-driver-y += sata.c
-driver-y += smbus.c
-driver-y += usb2.c
-driver-y += usb.c
+ramstage-y += mcp55.c
+ramstage-y += azalia.c
+ramstage-y += ht.c
+ramstage-y += ide.c
+ramstage-y += lpc.c
+ramstage-y += nic.c
+ramstage-y += pci.c
+ramstage-y += pcie.c
+ramstage-y += sata.c
+ramstage-y += smbus.c
+ramstage-y += usb2.c
+ramstage-y += usb.c
-driver-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.c
+ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.c
ramstage-y += reset.c
diff --git a/src/southbridge/rdc/r8610/Makefile.inc b/src/southbridge/rdc/r8610/Makefile.inc
index 24d76a8..8820b09 100644
--- a/src/southbridge/rdc/r8610/Makefile.inc
+++ b/src/southbridge/rdc/r8610/Makefile.inc
@@ -17,4 +17,4 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-driver-y += r8610.c
+ramstage-y += r8610.c
diff --git a/src/southbridge/ricoh/rl5c476/Makefile.inc b/src/southbridge/ricoh/rl5c476/Makefile.inc
index 71604b7..3156706 100644
--- a/src/southbridge/ricoh/rl5c476/Makefile.inc
+++ b/src/southbridge/ricoh/rl5c476/Makefile.inc
@@ -1 +1 @@
-driver-y += rl5c476.c
+ramstage-y += rl5c476.c
diff --git a/src/southbridge/sis/sis966/Makefile.inc b/src/southbridge/sis/sis966/Makefile.inc
index 76dd31a..b25aa9e 100644
--- a/src/southbridge/sis/sis966/Makefile.inc
+++ b/src/southbridge/sis/sis966/Makefile.inc
@@ -1,13 +1,13 @@
-driver-y += sis761.c
-driver-y += sis966.c
-driver-y += lpc.c
-driver-y += ide.c
-driver-y += usb.c
-driver-y += usb2.c
-driver-y += nic.c
-driver-y += sata.c
-driver-y += pcie.c
-driver-y += aza.c
+ramstage-y += sis761.c
+ramstage-y += sis966.c
+ramstage-y += lpc.c
+ramstage-y += ide.c
+ramstage-y += usb.c
+ramstage-y += usb2.c
+ramstage-y += nic.c
+ramstage-y += sata.c
+ramstage-y += pcie.c
+ramstage-y += aza.c
ramstage-y += reset.c
romstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c
diff --git a/src/southbridge/ti/pci1x2x/Makefile.inc b/src/southbridge/ti/pci1x2x/Makefile.inc
index d6a9c0c..7c0e4aa 100644
--- a/src/southbridge/ti/pci1x2x/Makefile.inc
+++ b/src/southbridge/ti/pci1x2x/Makefile.inc
@@ -1 +1 @@
-driver-$(CONFIG_SOUTHBRIDGE_TI_PCI1X2X) += pci1x2x.c
+ramstage-$(CONFIG_SOUTHBRIDGE_TI_PCI1X2X) += pci1x2x.c
diff --git a/src/southbridge/ti/pci7420/Makefile.inc b/src/southbridge/ti/pci7420/Makefile.inc
index 5081694..7d27b96 100644
--- a/src/southbridge/ti/pci7420/Makefile.inc
+++ b/src/southbridge/ti/pci7420/Makefile.inc
@@ -17,6 +17,6 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-driver-y += cardbus.c
-driver-y += firewire.c
+ramstage-y += cardbus.c
+ramstage-y += firewire.c
diff --git a/src/southbridge/ti/pcixx12/Makefile.inc b/src/southbridge/ti/pcixx12/Makefile.inc
index a14ad0e..99ef4dd 100644
--- a/src/southbridge/ti/pcixx12/Makefile.inc
+++ b/src/southbridge/ti/pcixx12/Makefile.inc
@@ -17,5 +17,5 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-driver-y += pcixx12.c
+ramstage-y += pcixx12.c
diff --git a/src/southbridge/via/k8t890/Makefile.inc b/src/southbridge/via/k8t890/Makefile.inc
index 972ff70..6d9407d 100644
--- a/src/southbridge/via/k8t890/Makefile.inc
+++ b/src/southbridge/via/k8t890/Makefile.inc
@@ -1,12 +1,12 @@
-driver-y += ctrl.c
-driver-y += dram.c
-driver-y += bridge.c
-driver-y += host.c
-driver-y += host_ctrl.c
-driver-y += pcie.c
-driver-y += traf_ctrl.c
-driver-y += error.c
-driver-y += chrome.c
+ramstage-y += ctrl.c
+ramstage-y += dram.c
+ramstage-y += bridge.c
+ramstage-y += host.c
+ramstage-y += host_ctrl.c
+ramstage-y += pcie.c
+ramstage-y += traf_ctrl.c
+ramstage-y += error.c
+ramstage-y += chrome.c
chipset_bootblock_inc += $(src)/southbridge/via/k8t890/romstrap.inc
chipset_bootblock_lds += $(src)/southbridge/via/k8t890/romstrap.lds
diff --git a/src/southbridge/via/vt8231/Makefile.inc b/src/southbridge/via/vt8231/Makefile.inc
index b9e7ef6..0f5f507 100644
--- a/src/southbridge/via/vt8231/Makefile.inc
+++ b/src/southbridge/via/vt8231/Makefile.inc
@@ -17,9 +17,9 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-driver-y += vt8231.c
-driver-y += lpc.c
-driver-y += acpi.c
-driver-y += ide.c
-driver-y += nic.c
-#driver-y += usb.c
+ramstage-y += vt8231.c
+ramstage-y += lpc.c
+ramstage-y += acpi.c
+ramstage-y += ide.c
+ramstage-y += nic.c
+#ramstage-y += usb.c
diff --git a/src/southbridge/via/vt8235/Makefile.inc b/src/southbridge/via/vt8235/Makefile.inc
index 02e2264..a5469c9 100644
--- a/src/southbridge/via/vt8235/Makefile.inc
+++ b/src/southbridge/via/vt8235/Makefile.inc
@@ -17,8 +17,8 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-driver-y += vt8235.c
-driver-y += ide.c
-driver-y += lpc.c
-driver-y += nic.c
-driver-y += usb.c
+ramstage-y += vt8235.c
+ramstage-y += ide.c
+ramstage-y += lpc.c
+ramstage-y += nic.c
+ramstage-y += usb.c
diff --git a/src/southbridge/via/vt8237r/Makefile.inc b/src/southbridge/via/vt8237r/Makefile.inc
index 6474e58..73d8f5a 100644
--- a/src/southbridge/via/vt8237r/Makefile.inc
+++ b/src/southbridge/via/vt8237r/Makefile.inc
@@ -17,13 +17,13 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-driver-y += vt8237r.c
-driver-y += ctrl.c
-driver-y += ide.c
-driver-y += lpc.c
-driver-y += sata.c
-driver-y += usb.c
-driver-$(CONFIG_PIRQ_ROUTE) += pirq.c
+ramstage-y += vt8237r.c
+ramstage-y += ctrl.c
+ramstage-y += ide.c
+ramstage-y += lpc.c
+ramstage-y += sata.c
+ramstage-y += usb.c
+ramstage-$(CONFIG_PIRQ_ROUTE) += pirq.c
ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.c
ramstage-$(CONFIG_HAVE_SMI_HANDLER) += smi.c
smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
More information about the coreboot
mailing list