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@secunet.com>
Reviewed-on: http://review.coreboot.org/1872
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>

Makefile.inc

@@ -58,7 +58,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__

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
 
 ################################################################################

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

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
 

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
 

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
 

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
 

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
 

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

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

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

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

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

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

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
 

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

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

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
 

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
 

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
 

src/cpu/intel/model_69x/Makefile.inc

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

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

src/cpu/intel/model_6dx/Makefile.inc

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

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
 

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

src/cpu/intel/model_6xx/Makefile.inc

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

src/cpu/intel/model_f0x/Makefile.inc

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

src/cpu/intel/model_f1x/Makefile.inc

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

src/cpu/intel/model_f2x/Makefile.inc

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

src/cpu/intel/model_f3x/Makefile.inc

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

src/cpu/intel/model_f4x/Makefile.inc

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

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

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

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

src/drivers/ati/ragexl/Makefile.inc

@@ -1 +1 @@
-driver-$(CONFIG_DRIVERS_ATI_RAGEXL) += xlinit.c
+ramstage-$(CONFIG_DRIVERS_ATI_RAGEXL) += xlinit.c

src/drivers/dec/21143/Makefile.inc

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

src/drivers/emulation/qemu/Makefile.inc

@@ -1 +1 @@
-driver-$(CONFIG_DRIVERS_EMULATION_QEMU) += init.c
+ramstage-$(CONFIG_DRIVERS_EMULATION_QEMU) += init.c

src/drivers/generic/ioapic/Makefile.inc

@@ -1 +1 @@
-driver-$(CONFIG_DRIVERS_GENERIC_IOAPIC) += ioapic.c
+ramstage-$(CONFIG_DRIVERS_GENERIC_IOAPIC) += ioapic.c

src/drivers/i2c/adm1026/Makefile.inc

@@ -1 +1 @@
-driver-$(CONFIG_DRIVERS_I2C_ADM1026) += adm1026.c
+ramstage-$(CONFIG_DRIVERS_I2C_ADM1026) += adm1026.c

src/drivers/i2c/adm1027/Makefile.inc

@@ -1 +1 @@
-driver-$(CONFIG_DRIVERS_I2C_ADM1027) += adm1027.c
+ramstage-$(CONFIG_DRIVERS_I2C_ADM1027) += adm1027.c

src/drivers/i2c/adt7463/Makefile.inc

@@ -1 +1 @@
-driver-$(CONFIG_DRIVERS_I2C_ADT7463) += adt7463.c
+ramstage-$(CONFIG_DRIVERS_I2C_ADT7463) += adt7463.c

src/drivers/i2c/i2cmux/Makefile.inc

@@ -1 +1 @@
-driver-$(CONFIG_DRIVERS_I2C_I2CMUX) += i2cmux.c
+ramstage-$(CONFIG_DRIVERS_I2C_I2CMUX) += i2cmux.c

src/drivers/i2c/i2cmux2/Makefile.inc

@@ -1 +1 @@
-driver-$(CONFIG_DRIVERS_I2C_I2CMUX2) += i2cmux2.c
+ramstage-$(CONFIG_DRIVERS_I2C_I2CMUX2) += i2cmux2.c

src/drivers/i2c/lm63/Makefile.inc

@@ -1 +1 @@
-driver-$(CONFIG_DRIVERS_I2C_LM63) += lm63.c
+ramstage-$(CONFIG_DRIVERS_I2C_LM63) += lm63.c

src/drivers/i2c/w83793/Makefile.inc

@@ -1 +1 @@
-driver-$(CONFIG_DRIVERS_I2C_W83793) += w83793.c
+ramstage-$(CONFIG_DRIVERS_I2C_W83793) += w83793.c

src/drivers/i2c/w83795/Makefile.inc

@@ -1 +1 @@
-driver-$(CONFIG_DRIVERS_I2C_W83795) += w83795.c
+ramstage-$(CONFIG_DRIVERS_I2C_W83795) += w83795.c

src/drivers/ics/954309/Makefile.inc

@@ -1 +1 @@
-driver-$(CONFIG_DRIVERS_ICS_954309) += ics954309.c
+ramstage-$(CONFIG_DRIVERS_ICS_954309) += ics954309.c

src/drivers/ipmi/Makefile.inc

@@ -1 +1 @@
-driver-$(CONFIG_IPMI_KCS) += ipmi_kcs.c
+ramstage-$(CONFIG_IPMI_KCS) += ipmi_kcs.c

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

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

src/drivers/sil/3114/Makefile.inc

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

src/drivers/trident/blade3d/Makefile.inc

@@ -1 +1 @@
-driver-$(CONFIG_DRIVERS_TRIDENT_BLADE3D) += blade3d.c
+ramstage-$(CONFIG_DRIVERS_TRIDENT_BLADE3D) += blade3d.c

src/ec/lenovo/h8/Makefile.inc

@@ -1 +1 @@
-driver-y += h8.c
+ramstage-y += h8.c

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

src/ec/smsc/mec1308/Makefile.inc

@@ -1,2 +1,2 @@
-driver-y += ec.c
+ramstage-y += ec.c
 smm-y += ec.c

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

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

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

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

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

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

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

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

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
 

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
 

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

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

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

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

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

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

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
 

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

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

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

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

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

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

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

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
 

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
 

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

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
 

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
 

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

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

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

src/southbridge/amd/amd8131/Makefile.inc

@@ -1 +1 @@
-driver-y += bridge.c
+ramstage-y += bridge.c

src/southbridge/amd/amd8132/Makefile.inc

@@ -1 +1 @@
-driver-y += bridge.c
+ramstage-y += bridge.c

src/southbridge/amd/amd8151/Makefile.inc

@@ -1 +1 @@
-driver-y += agp3.c
+ramstage-y += agp3.c

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
 
 

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

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
 
 

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

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

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

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

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

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

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