From patchwork Tue Feb 23 15:37:44 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: drivers vs. obj
Date: Tue, 23 Feb 2010 15:37:44 -0000
From: Patrick Georgi <patrick@georgi-clan.de>
X-Patchwork-Id: 961
Message-Id: <4B83F648.8090808@georgi-clan.de>
To: coreboot@coreboot.org

Am 24.09.2009 22:59, schrieb Myles Watson:
> Based on that, here's a patch that changes drivers that aren't console,
> pci, or cpu, to obj.
> 
> The most common one was mainboard.c as a driver.
> 
> Boot tested with Tyan s2895.
> 
> Signed-off-by: Myles Watson <mylesgw@gmail.com>
I updated the patch, with all the boards converted that appeared in
Kconfig after this patch was made, too. There's not a single driver in
src/mainboard left.

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


Index: src/mainboard/Makefile.k8_ck804.inc
===================================================================
--- src/mainboard/Makefile.k8_ck804.inc	(revision 5149)
+++ src/mainboard/Makefile.k8_ck804.inc	(working copy)
@@ -23,7 +23,7 @@
 ## This mainboard requires DCACHE_AS_RAM enabled. It won't work without.
 ##
 
-driver-y +=  mainboard.o
+obj-y +=  mainboard.o
 
 #needed by irq_tables and mptable and acpi_tables
 obj-y += get_bus_conf.o
Index: src/mainboard/iwill/dk8_htx/Makefile.inc
===================================================================
--- src/mainboard/iwill/dk8_htx/Makefile.inc	(revision 5149)
+++ src/mainboard/iwill/dk8_htx/Makefile.inc	(working copy)
@@ -17,7 +17,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-driver-y += mainboard.o
+obj-y += mainboard.o
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-y += get_bus_conf.o
Index: src/mainboard/broadcom/blast/Makefile.inc
===================================================================
--- src/mainboard/broadcom/blast/Makefile.inc	(revision 5149)
+++ src/mainboard/broadcom/blast/Makefile.inc	(working copy)
@@ -3,5 +3,5 @@
 # Needed by irq_tables and mptable and acpi_tables.
 obj-y += get_bus_conf.o
 
-driver-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o
+obj-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o
 
Index: src/mainboard/supermicro/h8dmr/Makefile.inc
===================================================================
--- src/mainboard/supermicro/h8dmr/Makefile.inc	(revision 5149)
+++ src/mainboard/supermicro/h8dmr/Makefile.inc	(working copy)
@@ -17,7 +17,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-driver-y += mainboard.o
+obj-y += mainboard.o
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-y += get_bus_conf.o
Index: src/mainboard/supermicro/x6dhe_g/Makefile.inc
===================================================================
--- src/mainboard/supermicro/x6dhe_g/Makefile.inc	(revision 5149)
+++ src/mainboard/supermicro/x6dhe_g/Makefile.inc	(working copy)
@@ -21,5 +21,5 @@
 ROMCCFLAGS=-mcpu=p4 -O2
 obj-$(CONFIG_HAVE_HARD_RESET) += reset.o
 include $(src)/mainboard/Makefile.romccboard.inc
-driver-y += ../../../drivers/generic/debug/debug_dev.o
+obj-y += ../../../drivers/generic/debug/debug_dev.o
 
Index: src/mainboard/supermicro/h8dme/Makefile.inc
===================================================================
--- src/mainboard/supermicro/h8dme/Makefile.inc	(revision 5149)
+++ src/mainboard/supermicro/h8dme/Makefile.inc	(working copy)
@@ -17,8 +17,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-driver-y += mainboard.o
-driver-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o
+obj-y += mainboard.o
+obj-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-y += get_bus_conf.o
Index: src/mainboard/supermicro/h8dmr_fam10/Makefile.inc
===================================================================
--- src/mainboard/supermicro/h8dmr_fam10/Makefile.inc	(revision 5149)
+++ src/mainboard/supermicro/h8dmr_fam10/Makefile.inc	(working copy)
@@ -17,7 +17,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-driver-y += mainboard.o
+obj-y += mainboard.o
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-y += get_bus_conf.o
Index: src/mainboard/supermicro/h8qme_fam10/Makefile.inc
===================================================================
--- src/mainboard/supermicro/h8qme_fam10/Makefile.inc	(revision 5149)
+++ src/mainboard/supermicro/h8qme_fam10/Makefile.inc	(working copy)
@@ -17,7 +17,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-driver-y += mainboard.o
+obj-y += mainboard.o
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-y += get_bus_conf.o
Index: src/mainboard/supermicro/x6dhe_g2/Makefile.inc
===================================================================
--- src/mainboard/supermicro/x6dhe_g2/Makefile.inc	(revision 5149)
+++ src/mainboard/supermicro/x6dhe_g2/Makefile.inc	(working copy)
@@ -21,5 +21,5 @@
 ROMCCFLAGS=-mcpu=p4 -O2
 obj-$(CONFIG_HAVE_HARD_RESET) += reset.o
 include $(src)/mainboard/Makefile.romccboard.inc
-driver-y += ../../../drivers/generic/debug/debug_dev.o
+obj-y += ../../../drivers/generic/debug/debug_dev.o
 
Index: src/mainboard/kontron/986lcd-m/Makefile.inc
===================================================================
--- src/mainboard/kontron/986lcd-m/Makefile.inc	(revision 5149)
+++ src/mainboard/kontron/986lcd-m/Makefile.inc	(working copy)
@@ -21,8 +21,8 @@
 ## This mainboard requires DCACHE_AS_RAM enabled. It won't work without.
 ##
 
-driver-y += mainboard.o
-driver-y += rtl8168.o
+obj-y += mainboard.o
+obj-y += rtl8168.o
 
 obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
 obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
Index: src/mainboard/kontron/kt690/Makefile.inc
===================================================================
--- src/mainboard/kontron/kt690/Makefile.inc	(revision 5149)
+++ src/mainboard/kontron/kt690/Makefile.inc	(working copy)
@@ -17,7 +17,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-driver-y += mainboard.o
+obj-y += mainboard.o
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-y += get_bus_conf.o
Index: src/mainboard/gigabyte/m57sli/Makefile.inc
===================================================================
--- src/mainboard/gigabyte/m57sli/Makefile.inc	(revision 5149)
+++ src/mainboard/gigabyte/m57sli/Makefile.inc	(working copy)
@@ -17,7 +17,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-driver-y +=  mainboard.o
+obj-y +=  mainboard.o
 
 #needed by irq_tables and mptable and acpi_tables
 obj-y += get_bus_conf.o
Index: src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc
===================================================================
--- src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc	(revision 5149)
+++ src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc	(working copy)
@@ -17,7 +17,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-driver-y +=  mainboard.o
+obj-y +=  mainboard.o
 
 #needed by irq_tables and mptable and acpi_tables
 obj-y += get_bus_conf.o
Index: src/mainboard/digitallogic/msm800sev/Makefile.inc
===================================================================
--- src/mainboard/digitallogic/msm800sev/Makefile.inc	(revision 5149)
+++ src/mainboard/digitallogic/msm800sev/Makefile.inc	(working copy)
@@ -1,4 +1,4 @@
-driver-y += mainboard.o
+obj-y += mainboard.o
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
Index: src/mainboard/amd/pistachio/Makefile.inc
===================================================================
--- src/mainboard/amd/pistachio/Makefile.inc	(revision 5149)
+++ src/mainboard/amd/pistachio/Makefile.inc	(working copy)
@@ -17,7 +17,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-driver-y += mainboard.o
+obj-y += mainboard.o
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-y += get_bus_conf.o
Index: src/mainboard/amd/dbm690t/Makefile.inc
===================================================================
--- src/mainboard/amd/dbm690t/Makefile.inc	(revision 5149)
+++ src/mainboard/amd/dbm690t/Makefile.inc	(working copy)
@@ -17,7 +17,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-driver-y += mainboard.o
+obj-y += mainboard.o
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-y += get_bus_conf.o
Index: src/mainboard/amd/serengeti_cheetah/Makefile.inc
===================================================================
--- src/mainboard/amd/serengeti_cheetah/Makefile.inc	(revision 5149)
+++ src/mainboard/amd/serengeti_cheetah/Makefile.inc	(working copy)
@@ -17,7 +17,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-driver-y += mainboard.o
+obj-y += mainboard.o
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-y += get_bus_conf.o
@@ -30,7 +30,7 @@
 obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
 obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
 
-driver-y += ../../../drivers/i2c/i2cmux/i2cmux.o
+obj-y += ../../../drivers/i2c/i2cmux/i2cmux.o
 
 # This is part of the conversion to init-obj and away from included code.
 
Index: src/mainboard/amd/norwich/Makefile.inc
===================================================================
--- src/mainboard/amd/norwich/Makefile.inc	(revision 5149)
+++ src/mainboard/amd/norwich/Makefile.inc	(working copy)
@@ -1,4 +1,4 @@
-driver-y += mainboard.o
+obj-y += mainboard.o
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
Index: src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc
===================================================================
--- src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc	(revision 5149)
+++ src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc	(working copy)
@@ -17,7 +17,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-driver-y += mainboard.o
+obj-y += mainboard.o
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-y += get_bus_conf.o
@@ -33,7 +33,7 @@
 obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt4.o
 obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt5.o
 
-driver-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o
+obj-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o
 
 # This is part of the conversion to init-obj and away from included code.
 
Index: src/mainboard/amd/db800/Makefile.inc
===================================================================
--- src/mainboard/amd/db800/Makefile.inc	(revision 5149)
+++ src/mainboard/amd/db800/Makefile.inc	(working copy)
@@ -1,4 +1,4 @@
-driver-y += mainboard.o
+obj-y += mainboard.o
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
Index: src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc
===================================================================
--- src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc	(revision 5149)
+++ src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc	(working copy)
@@ -1,4 +1,4 @@
-driver-y += mainboard.o
+obj-y += mainboard.o
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
Index: src/mainboard/tyan/s2912/Makefile.inc
===================================================================
--- src/mainboard/tyan/s2912/Makefile.inc	(revision 5149)
+++ src/mainboard/tyan/s2912/Makefile.inc	(working copy)
@@ -17,7 +17,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-driver-y +=  mainboard.o
+obj-y +=  mainboard.o
 
 #needed by irq_tables and mptable and acpi_tables
 obj-y += get_bus_conf.o
Index: src/mainboard/tyan/s2735/Makefile.inc
===================================================================
--- src/mainboard/tyan/s2735/Makefile.inc	(revision 5149)
+++ src/mainboard/tyan/s2735/Makefile.inc	(working copy)
@@ -21,13 +21,13 @@
 ## This mainboard requires DCACHE_AS_RAM enabled. It won't work without.
 ##
 
-driver-y +=  mainboard.o
+obj-y +=  mainboard.o
 
 obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
 obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 obj-$(CONFIG_HAVE_HARD_RESET) += reset.o
 
-#driver-y += ../../../drivers/i2c/i2cmux/i2cmux.o
+#obj-y += ../../../drivers/i2c/i2cmux/i2cmux.o
 
 # This is part of the conversion to init-obj and away from included code.
 
Index: src/mainboard/tyan/s2881/Makefile.inc
===================================================================
--- src/mainboard/tyan/s2881/Makefile.inc	(revision 5149)
+++ src/mainboard/tyan/s2881/Makefile.inc	(working copy)
@@ -1,3 +1,3 @@
 include $(src)/mainboard/Makefile.k8_CAR.inc
 obj-y += get_bus_conf.o
-driver-y += ../../../drivers/i2c/adm1027/adm1027.o
+obj-y += ../../../drivers/i2c/adm1027/adm1027.o
Index: src/mainboard/tyan/s2892/Makefile.inc
===================================================================
--- src/mainboard/tyan/s2892/Makefile.inc	(revision 5149)
+++ src/mainboard/tyan/s2892/Makefile.inc	(working copy)
@@ -1,3 +1,3 @@
 include $(src)/mainboard/Makefile.k8_ck804.inc
 
-driver-y += ../../../drivers/i2c/adm1027/adm1027.o
+obj-y += ../../../drivers/i2c/adm1027/adm1027.o
Index: src/mainboard/tyan/s2912_fam10/Makefile.inc
===================================================================
--- src/mainboard/tyan/s2912_fam10/Makefile.inc	(revision 5149)
+++ src/mainboard/tyan/s2912_fam10/Makefile.inc	(working copy)
@@ -17,7 +17,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-driver-y +=  mainboard.o
+obj-y +=  mainboard.o
 
 #needed by irq_tables and mptable and acpi_tables
 obj-y += get_bus_conf.o
Index: src/mainboard/pcengines/alix1c/Makefile.inc
===================================================================
--- src/mainboard/pcengines/alix1c/Makefile.inc	(revision 5149)
+++ src/mainboard/pcengines/alix1c/Makefile.inc	(working copy)
@@ -1,4 +1,4 @@
-driver-y += mainboard.o
+obj-y += mainboard.o
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
Index: src/mainboard/artecgroup/dbe61/Makefile.inc
===================================================================
--- src/mainboard/artecgroup/dbe61/Makefile.inc	(revision 5149)
+++ src/mainboard/artecgroup/dbe61/Makefile.inc	(working copy)
@@ -1,4 +1,4 @@
-driver-y += mainboard.o
+obj-y += mainboard.o
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
Index: src/mainboard/lippert/roadrunner-lx/Makefile.inc
===================================================================
--- src/mainboard/lippert/roadrunner-lx/Makefile.inc	(revision 5149)
+++ src/mainboard/lippert/roadrunner-lx/Makefile.inc	(working copy)
@@ -1,4 +1,4 @@
-driver-y += mainboard.o
+obj-y += mainboard.o
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
Index: src/mainboard/lippert/spacerunner-lx/Makefile.inc
===================================================================
--- src/mainboard/lippert/spacerunner-lx/Makefile.inc	(revision 5149)
+++ src/mainboard/lippert/spacerunner-lx/Makefile.inc	(working copy)
@@ -1,4 +1,4 @@
-driver-y += mainboard.o
+obj-y += mainboard.o
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
Index: src/mainboard/via/vt8454c/Makefile.inc
===================================================================
--- src/mainboard/via/vt8454c/Makefile.inc	(revision 5149)
+++ src/mainboard/via/vt8454c/Makefile.inc	(working copy)
@@ -17,7 +17,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-driver-y += mainboard.o
+obj-y += mainboard.o
 
 obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
 obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
Index: src/mainboard/roda/rk886ex/Makefile.inc
===================================================================
--- src/mainboard/roda/rk886ex/Makefile.inc	(revision 5149)
+++ src/mainboard/roda/rk886ex/Makefile.inc	(working copy)
@@ -21,10 +21,10 @@
 ## This mainboard requires DCACHE_AS_RAM enabled. It won't work without.
 ##
 
-driver-y += mainboard.o
-driver-y += m3885.o
-driver-y += ec.o
-driver-y += rtl8168.o
+obj-y += mainboard.o
+obj-y += m3885.o
+obj-y += ec.o
+obj-y += rtl8168.o
 
 obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
 obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
Index: src/mainboard/msi/ms9282/Makefile.inc
===================================================================
--- src/mainboard/msi/ms9282/Makefile.inc	(revision 5149)
+++ src/mainboard/msi/ms9282/Makefile.inc	(working copy)
@@ -17,9 +17,9 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-driver-y +=  mainboard.o
-driver-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o
-driver-y += ../../../drivers/i2c/adm1027/adm1027.o
+obj-y +=  mainboard.o
+obj-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o
+obj-y += ../../../drivers/i2c/adm1027/adm1027.o
 
 #needed by irq_tables and mptable and acpi_tables
 obj-y += get_bus_conf.o
Index: src/mainboard/msi/ms7260/Makefile.inc
===================================================================
--- src/mainboard/msi/ms7260/Makefile.inc	(revision 5149)
+++ src/mainboard/msi/ms7260/Makefile.inc	(working copy)
@@ -17,7 +17,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-driver-y +=  mainboard.o
+obj-y +=  mainboard.o
 
 #needed by irq_tables and mptable and acpi_tables
 obj-y += get_bus_conf.o
Index: src/mainboard/Makefile.k8_CAR.inc
===================================================================
--- src/mainboard/Makefile.k8_CAR.inc	(revision 5149)
+++ src/mainboard/Makefile.k8_CAR.inc	(working copy)
@@ -23,7 +23,7 @@
 ## This mainboard requires DCACHE_AS_RAM enabled. It won't work without.
 ##
 
-driver-y +=  mainboard.o
+obj-y +=  mainboard.o
 
 obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
 obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
Index: src/mainboard/Makefile.romccboard.inc
===================================================================
--- src/mainboard/Makefile.romccboard.inc	(revision 5149)
+++ src/mainboard/Makefile.romccboard.inc	(working copy)
@@ -61,7 +61,7 @@
 ldscripts += $(src)/arch/i386/lib/failover.lds
 endif
 
-driver-y += mainboard.o
+obj-y += mainboard.o
 
 obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
 obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
Index: src/mainboard/technexion/tim8690/Makefile.inc
===================================================================
--- src/mainboard/technexion/tim8690/Makefile.inc	(revision 5149)
+++ src/mainboard/technexion/tim8690/Makefile.inc	(working copy)
@@ -17,7 +17,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-driver-y += mainboard.o
+obj-y += mainboard.o
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-y += get_bus_conf.o
Index: src/mainboard/technexion/tim5690/Makefile.inc
===================================================================
--- src/mainboard/technexion/tim5690/Makefile.inc	(revision 5149)
+++ src/mainboard/technexion/tim5690/Makefile.inc	(working copy)
@@ -17,7 +17,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-driver-y += mainboard.o
+obj-y += mainboard.o
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-y += get_bus_conf.o
Index: src/mainboard/nvidia/l1_2pvv/Makefile.inc
===================================================================
--- src/mainboard/nvidia/l1_2pvv/Makefile.inc	(revision 5149)
+++ src/mainboard/nvidia/l1_2pvv/Makefile.inc	(working copy)
@@ -17,7 +17,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-driver-y +=  mainboard.o
+obj-y +=  mainboard.o
 
 #needed by irq_tables and mptable and acpi_tables
 obj-y += get_bus_conf.o
Index: src/mainboard/intel/d945gclf/Makefile.inc
===================================================================
--- src/mainboard/intel/d945gclf/Makefile.inc	(revision 5149)
+++ src/mainboard/intel/d945gclf/Makefile.inc	(working copy)
@@ -21,8 +21,8 @@
 ## This mainboard requires DCACHE_AS_RAM enabled. It won't work without.
 ##
 
-driver-y += mainboard.o
-driver-y += rtl8168.o
+obj-y += mainboard.o
+obj-y += rtl8168.o
 
 obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
 obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
Index: src/mainboard/intel/eagleheights/Makefile.inc
===================================================================
--- src/mainboard/intel/eagleheights/Makefile.inc	(revision 5149)
+++ src/mainboard/intel/eagleheights/Makefile.inc	(working copy)
@@ -1,4 +1,4 @@
-driver-y += mainboard.o
+obj-y += mainboard.o
 obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
 obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
Index: src/mainboard/asus/a8v-e_se/Makefile.inc
===================================================================
--- src/mainboard/asus/a8v-e_se/Makefile.inc	(revision 5149)
+++ src/mainboard/asus/a8v-e_se/Makefile.inc	(working copy)
@@ -1,4 +1,4 @@
-driver-y += mainboard.o
+obj-y += mainboard.o
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
Index: src/mainboard/asus/a8n_e/Makefile.inc
===================================================================
--- src/mainboard/asus/a8n_e/Makefile.inc	(revision 5149)
+++ src/mainboard/asus/a8n_e/Makefile.inc	(working copy)
@@ -17,7 +17,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-driver-y += mainboard.o
+obj-y += mainboard.o
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-y += get_bus_conf.o
Index: src/mainboard/asus/m2v-mx_se/Makefile.inc
===================================================================
--- src/mainboard/asus/m2v-mx_se/Makefile.inc	(revision 5149)
+++ src/mainboard/asus/m2v-mx_se/Makefile.inc	(working copy)
@@ -18,7 +18,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-driver-y +=  mainboard.o
+obj-y +=  mainboard.o
 
 #needed by irq_tables and mptable and acpi_tables
 obj-$(CONFIG_GENERATE_ACPI_TABLES) +=  dsdt.o