summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--src/Kconfig11
-rw-r--r--src/arch/i386/Makefile.inc17
-rw-r--r--src/mainboard/Makefile.k8_CAR.inc5
-rw-r--r--src/mainboard/Makefile.k8_ck804.inc5
-rw-r--r--src/mainboard/Makefile.romccboard.inc29
-rw-r--r--src/mainboard/a-trend/atc-6220/Makefile.inc22
-rw-r--r--src/mainboard/a-trend/atc-6240/Makefile.inc22
-rw-r--r--src/mainboard/abit/be6-ii_v2_0/Makefile.inc22
-rw-r--r--src/mainboard/advantech/pcm-5820/Makefile.inc2
-rw-r--r--src/mainboard/amd/db800/Makefile.inc10
-rw-r--r--src/mainboard/amd/dbm690t/Makefile.inc11
-rw-r--r--src/mainboard/amd/norwich/Makefile.inc10
-rw-r--r--src/mainboard/amd/pistachio/Makefile.inc10
-rw-r--r--src/mainboard/amd/rumba/Makefile.inc1
-rw-r--r--src/mainboard/amd/serengeti_cheetah/Makefile.inc10
-rw-r--r--src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc10
-rw-r--r--src/mainboard/artecgroup/dbe61/Makefile.inc10
-rw-r--r--src/mainboard/asi/mb_5blgp/Makefile.inc2
-rw-r--r--src/mainboard/asi/mb_5blmp/Makefile.inc2
-rw-r--r--src/mainboard/asus/a8n_e/Makefile.inc10
-rw-r--r--src/mainboard/asus/a8v-e_se/Makefile.inc10
-rw-r--r--src/mainboard/asus/m2v-mx_se/Makefile.inc8
-rw-r--r--src/mainboard/asus/mew-am/Makefile.inc22
-rw-r--r--src/mainboard/asus/mew-vm/Makefile.inc22
-rw-r--r--src/mainboard/asus/p2b-d/Makefile.inc22
-rw-r--r--src/mainboard/asus/p2b-ds/Makefile.inc22
-rw-r--r--src/mainboard/asus/p2b-f/Makefile.inc22
-rw-r--r--src/mainboard/asus/p2b/Makefile.inc22
-rw-r--r--src/mainboard/asus/p3b-f/Makefile.inc22
-rw-r--r--src/mainboard/axus/tc320/Makefile.inc2
-rw-r--r--src/mainboard/azza/pt-6ibd/Makefile.inc22
-rw-r--r--src/mainboard/bcom/winnet100/Makefile.inc2
-rw-r--r--src/mainboard/bcom/winnetp680/Makefile.inc8
-rw-r--r--src/mainboard/biostar/m6tba/Makefile.inc22
-rw-r--r--src/mainboard/broadcom/blast/Makefile.inc1
-rw-r--r--src/mainboard/compaq/deskpro_en_sff_p600/Makefile.inc22
-rw-r--r--src/mainboard/dell/s1850/Kconfig2
-rw-r--r--src/mainboard/dell/s1850/Makefile.inc2
-rw-r--r--src/mainboard/digitallogic/adl855pc/Makefile.inc2
-rw-r--r--src/mainboard/digitallogic/msm586seg/Makefile.inc2
-rw-r--r--src/mainboard/digitallogic/msm800sev/Makefile.inc10
-rw-r--r--src/mainboard/eaglelion/5bcm/Makefile.inc2
-rw-r--r--src/mainboard/emulation/qemu-x86/Makefile.inc2
-rw-r--r--src/mainboard/gigabyte/ga-6bxc/Makefile.inc22
-rw-r--r--src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc8
-rw-r--r--src/mainboard/gigabyte/m57sli/Makefile.inc8
-rw-r--r--src/mainboard/hp/e_vectra_p2706t/Makefile.inc22
-rw-r--r--src/mainboard/iei/juki-511p/Makefile.inc2
-rw-r--r--src/mainboard/iei/nova4899r/Makefile.inc2
-rw-r--r--src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc10
-rw-r--r--src/mainboard/intel/d945gclf/Kconfig1
-rw-r--r--src/mainboard/intel/d945gclf/Makefile.inc9
-rw-r--r--src/mainboard/intel/eagleheights/Kconfig2
-rw-r--r--src/mainboard/intel/eagleheights/Makefile.inc11
-rw-r--r--src/mainboard/intel/jarrell/Kconfig2
-rw-r--r--src/mainboard/intel/jarrell/Makefile.inc3
-rw-r--r--src/mainboard/intel/mtarvon/Kconfig1
-rw-r--r--src/mainboard/intel/mtarvon/Makefile.inc2
-rw-r--r--src/mainboard/intel/truxton/Kconfig1
-rw-r--r--src/mainboard/intel/truxton/Makefile.inc2
-rw-r--r--src/mainboard/intel/xe7501devkit/Kconfig2
-rw-r--r--src/mainboard/intel/xe7501devkit/Makefile.inc3
-rw-r--r--src/mainboard/iwill/dk8_htx/Makefile.inc10
-rw-r--r--src/mainboard/jetway/j7f24/Makefile.inc28
-rw-r--r--src/mainboard/kontron/986lcd-m/Kconfig1
-rw-r--r--src/mainboard/kontron/986lcd-m/Makefile.inc10
-rw-r--r--src/mainboard/kontron/kt690/Makefile.inc10
-rw-r--r--src/mainboard/lippert/frontrunner/Makefile.inc1
-rw-r--r--src/mainboard/lippert/roadrunner-lx/Makefile.inc10
-rw-r--r--src/mainboard/lippert/spacerunner-lx/Makefile.inc10
-rw-r--r--src/mainboard/mitac/6513wu/Makefile.inc22
-rw-r--r--src/mainboard/msi/ms6119/Makefile.inc22
-rw-r--r--src/mainboard/msi/ms6147/Makefile.inc22
-rw-r--r--src/mainboard/msi/ms6156/Makefile.inc22
-rw-r--r--src/mainboard/msi/ms6178/Makefile.inc22
-rw-r--r--src/mainboard/msi/ms7135/Kconfig1
-rw-r--r--src/mainboard/msi/ms7260/Makefile.inc8
-rw-r--r--src/mainboard/msi/ms9282/Makefile.inc7
-rw-r--r--src/mainboard/nec/powermate2000/Makefile.inc22
-rw-r--r--src/mainboard/nvidia/l1_2pvv/Makefile.inc8
-rw-r--r--src/mainboard/olpc/btest/Makefile.inc1
-rw-r--r--src/mainboard/olpc/rev_a/Makefile.inc1
-rw-r--r--src/mainboard/pcengines/alix1c/Makefile.inc10
-rw-r--r--src/mainboard/rca/rm4100/Makefile.inc3
-rw-r--r--src/mainboard/roda/rk886ex/Makefile.inc9
-rw-r--r--src/mainboard/soyo/sy-6ba-plus-iii/Makefile.inc22
-rw-r--r--src/mainboard/supermicro/h8dme/Makefile.inc9
-rw-r--r--src/mainboard/supermicro/h8dmr/Makefile.inc10
-rw-r--r--src/mainboard/supermicro/h8dmr_fam10/Makefile.inc10
-rw-r--r--src/mainboard/supermicro/h8qme_fam10/Makefile.inc10
-rw-r--r--src/mainboard/supermicro/x6dai_g/Kconfig2
-rw-r--r--src/mainboard/supermicro/x6dai_g/Makefile.inc3
-rw-r--r--src/mainboard/supermicro/x6dhe_g/Kconfig2
-rw-r--r--src/mainboard/supermicro/x6dhe_g/Makefile.inc3
-rw-r--r--src/mainboard/supermicro/x6dhe_g2/Kconfig2
-rw-r--r--src/mainboard/supermicro/x6dhe_g2/Makefile.inc3
-rw-r--r--src/mainboard/supermicro/x6dhr_ig/Kconfig2
-rw-r--r--src/mainboard/supermicro/x6dhr_ig/Makefile.inc3
-rw-r--r--src/mainboard/supermicro/x6dhr_ig2/Kconfig2
-rw-r--r--src/mainboard/supermicro/x6dhr_ig2/Makefile.inc3
-rw-r--r--src/mainboard/technexion/tim5690/Makefile.inc10
-rw-r--r--src/mainboard/technexion/tim8690/Makefile.inc10
-rw-r--r--src/mainboard/technologic/ts5300/Makefile.inc2
-rw-r--r--src/mainboard/televideo/tc7020/Makefile.inc2
-rw-r--r--src/mainboard/thomson/ip1000/Makefile.inc3
-rw-r--r--src/mainboard/tyan/s1846/Makefile.inc22
-rw-r--r--src/mainboard/tyan/s2735/Kconfig2
-rw-r--r--src/mainboard/tyan/s2735/Makefile.inc36
-rw-r--r--src/mainboard/tyan/s2850/Kconfig1
-rw-r--r--src/mainboard/tyan/s2875/Kconfig1
-rw-r--r--src/mainboard/tyan/s2880/Kconfig1
-rw-r--r--src/mainboard/tyan/s2881/Kconfig1
-rw-r--r--src/mainboard/tyan/s2882/Kconfig1
-rw-r--r--src/mainboard/tyan/s2885/Kconfig1
-rw-r--r--src/mainboard/tyan/s2891/Kconfig1
-rw-r--r--src/mainboard/tyan/s2892/Kconfig1
-rw-r--r--src/mainboard/tyan/s2895/Kconfig1
-rw-r--r--src/mainboard/tyan/s2912/Makefile.inc8
-rw-r--r--src/mainboard/tyan/s2912_fam10/Makefile.inc8
-rw-r--r--src/mainboard/via/epia-cn/Makefile.inc2
-rw-r--r--src/mainboard/via/epia-m/Makefile.inc6
-rw-r--r--src/mainboard/via/epia-m700/Makefile.inc7
-rw-r--r--src/mainboard/via/epia-n/Makefile.inc8
-rw-r--r--src/mainboard/via/epia/Makefile.inc27
-rw-r--r--src/mainboard/via/pc2500e/Makefile.inc2
-rw-r--r--src/mainboard/via/vt8454c/Kconfig1
-rw-r--r--src/mainboard/via/vt8454c/Makefile.inc8
-rw-r--r--src/mainboard/winent/pl6064/Makefile.inc10
129 files changed, 64 insertions, 1074 deletions
diff --git a/Makefile b/Makefile
index 56cab7b55f..4cc19e6381 100644
--- a/Makefile
+++ b/Makefile
@@ -119,7 +119,7 @@ smmobjs:=
crt0s:=
ldscripts:=
types:=obj initobj driver smmobj
-includemakefiles=$(foreach type,$(2), $(eval $(type)-y:=)) $(eval subdirs-y:=) $(eval include $(1)) $(if $(strip $(3)),$(foreach type,$(2),$(eval $(type)s+=$$(patsubst src/%,$(obj)/%,$$(addprefix $(dir $(1)),$$($(type)-y)))))) $(eval subdirs+=$$(subst $(PWD)/,,$$(abspath $$(addprefix $(dir $(1)),$$(subdirs-y)))))
+includemakefiles=$(foreach type,$(2), $(eval $(type)-y:=)) $(eval subdirs-y:=) $(eval -include $(1)) $(if $(strip $(3)),$(foreach type,$(2),$(eval $(type)s+=$$(patsubst src/%,$(obj)/%,$$(addprefix $(dir $(1)),$$($(type)-y)))))) $(eval subdirs+=$$(subst $(PWD)/,,$$(abspath $$(addprefix $(dir $(1)),$$(subdirs-y)))))
evaluate_subdirs=$(eval cursubdirs:=$(subdirs)) $(eval subdirs:=) $(foreach dir,$(cursubdirs),$(eval $(call includemakefiles,$(dir)/Makefile.inc,$(types),$(1)))) $(if $(subdirs),$(eval $(call evaluate_subdirs, $(1))))
# collect all object files eligible for building
diff --git a/src/Kconfig b/src/Kconfig
index 07bf9bb8e6..4cd8110377 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -173,7 +173,18 @@ config USE_FAILOVER_IMAGE
config HAVE_HARD_RESET
bool
+ default y if BOARD_HAS_HARD_RESET
default n
+ help
+ This variable specifies whether a given board has a hard_reset
+ function, no matter if it's provided by board code or chipset code.
+
+config BOARD_HAS_HARD_RESET
+ bool
+ default n
+ help
+ This variable specifies whether a given board has a reset.c
+ file containing a hard_reset() function.
config HAVE_INIT_TIMER
bool
diff --git a/src/arch/i386/Makefile.inc b/src/arch/i386/Makefile.inc
index af9e4b17d4..cd62bf100e 100644
--- a/src/arch/i386/Makefile.inc
+++ b/src/arch/i386/Makefile.inc
@@ -197,6 +197,23 @@ $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/
mv $@.tmp $@
rm -f $@.tmp1
endif
+
+else
+# Only in first pass
+
+# Things that appear in every board
+initobjs += $(obj)/mainboard/$(MAINBOARDDIR)/crt0.o
+objs += $(obj)/mainboard/$(MAINBOARDDIR)/mainboard.o
+ifeq ($(CONFIG_GENERATE_MP_TABLE),y)
+objs += $(obj)/mainboard/$(MAINBOARDDIR)/mptable.o
+endif
+ifeq ($(CONFIG_GENERATE_PIRQ_TABLE),y)
+objs += $(obj)/mainboard/$(MAINBOARDDIR)/irq_tables.o
+endif
+ifeq ($(CONFIG_BOARD_HAS_HARD_RESET),y)
+objs += $(obj)/mainboard/$(MAINBOARDDIR)/reset.o
+endif
+
endif
ifeq ($(CONFIG_TINY_BOOTBLOCK),y)
diff --git a/src/mainboard/Makefile.k8_CAR.inc b/src/mainboard/Makefile.k8_CAR.inc
index 8de2908f5f..7d8a0016ee 100644
--- a/src/mainboard/Makefile.k8_CAR.inc
+++ b/src/mainboard/Makefile.k8_CAR.inc
@@ -23,15 +23,10 @@
## This mainboard requires DCACHE_AS_RAM enabled. It won't work without.
##
-obj-y += mainboard.o
-obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
-# This is part of the conversion to init-obj and away from included code.
-initobj-y += crt0.o
diff --git a/src/mainboard/Makefile.k8_ck804.inc b/src/mainboard/Makefile.k8_ck804.inc
index 7ff8a6be8c..b9e1dcfe8e 100644
--- a/src/mainboard/Makefile.k8_ck804.inc
+++ b/src/mainboard/Makefile.k8_ck804.inc
@@ -23,18 +23,13 @@
## This mainboard requires DCACHE_AS_RAM enabled. It won't work without.
##
-obj-y += mainboard.o
#needed by irq_tables and mptable and acpi_tables
obj-y += get_bus_conf.o
-obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
-# This is part of the conversion to init-obj and away from included code.
-initobj-y += crt0.o
diff --git a/src/mainboard/Makefile.romccboard.inc b/src/mainboard/Makefile.romccboard.inc
deleted file mode 100644
index aefcb6227a..0000000000
--- a/src/mainboard/Makefile.romccboard.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
-## Copyright (C) 2010 coresystems GmbH
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-initobj-y += crt0.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
-
diff --git a/src/mainboard/a-trend/atc-6220/Makefile.inc b/src/mainboard/a-trend/atc-6220/Makefile.inc
deleted file mode 100644
index caa81b8b4e..0000000000
--- a/src/mainboard/a-trend/atc-6220/Makefile.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/a-trend/atc-6240/Makefile.inc b/src/mainboard/a-trend/atc-6240/Makefile.inc
deleted file mode 100644
index caa81b8b4e..0000000000
--- a/src/mainboard/a-trend/atc-6240/Makefile.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/abit/be6-ii_v2_0/Makefile.inc b/src/mainboard/abit/be6-ii_v2_0/Makefile.inc
deleted file mode 100644
index caa81b8b4e..0000000000
--- a/src/mainboard/abit/be6-ii_v2_0/Makefile.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/advantech/pcm-5820/Makefile.inc b/src/mainboard/advantech/pcm-5820/Makefile.inc
index 1050e61f81..21ae28e552 100644
--- a/src/mainboard/advantech/pcm-5820/Makefile.inc
+++ b/src/mainboard/advantech/pcm-5820/Makefile.inc
@@ -19,5 +19,3 @@
##
ROMCCFLAGS := -mcpu=i386 -O2
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/amd/db800/Makefile.inc b/src/mainboard/amd/db800/Makefile.inc
deleted file mode 100644
index 3e54d3be91..0000000000
--- a/src/mainboard/amd/db800/Makefile.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-obj-y += mainboard.o
-
-# Needed by irq_tables and mptable and acpi_tables.
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
-
-# This is part of the conversion to init-obj and away from included code.
-
-initobj-y += crt0.o
-
-
diff --git a/src/mainboard/amd/dbm690t/Makefile.inc b/src/mainboard/amd/dbm690t/Makefile.inc
index a21fa9b0d5..1a5d69b39f 100644
--- a/src/mainboard/amd/dbm690t/Makefile.inc
+++ b/src/mainboard/amd/dbm690t/Makefile.inc
@@ -17,19 +17,8 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-obj-y += mainboard.o
-
# Needed by irq_tables and mptable and acpi_tables.
obj-y += get_bus_conf.o
-obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
-
-# This is part of the conversion to init-obj and away from included code.
-
-initobj-y += crt0.o
-
-
-
diff --git a/src/mainboard/amd/norwich/Makefile.inc b/src/mainboard/amd/norwich/Makefile.inc
deleted file mode 100644
index 3e54d3be91..0000000000
--- a/src/mainboard/amd/norwich/Makefile.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-obj-y += mainboard.o
-
-# Needed by irq_tables and mptable and acpi_tables.
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
-
-# This is part of the conversion to init-obj and away from included code.
-
-initobj-y += crt0.o
-
-
diff --git a/src/mainboard/amd/pistachio/Makefile.inc b/src/mainboard/amd/pistachio/Makefile.inc
index d365b75bb5..1a5d69b39f 100644
--- a/src/mainboard/amd/pistachio/Makefile.inc
+++ b/src/mainboard/amd/pistachio/Makefile.inc
@@ -17,18 +17,8 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-obj-y += mainboard.o
-
# Needed by irq_tables and mptable and acpi_tables.
obj-y += get_bus_conf.o
-obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
-
-# This is part of the conversion to init-obj and away from included code.
-
-initobj-y += crt0.o
-
-
diff --git a/src/mainboard/amd/rumba/Makefile.inc b/src/mainboard/amd/rumba/Makefile.inc
deleted file mode 100644
index 6941719a6f..0000000000
--- a/src/mainboard/amd/rumba/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-include $(src)/mainboard/Makefile.romccboard.inc
diff --git a/src/mainboard/amd/serengeti_cheetah/Makefile.inc b/src/mainboard/amd/serengeti_cheetah/Makefile.inc
index 0cbf6a5ee8..f7dabdc428 100644
--- a/src/mainboard/amd/serengeti_cheetah/Makefile.inc
+++ b/src/mainboard/amd/serengeti_cheetah/Makefile.inc
@@ -17,12 +17,8 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-obj-y += mainboard.o
-
# Needed by irq_tables and mptable and acpi_tables.
obj-y += get_bus_conf.o
-obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt2.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt3.o
@@ -31,9 +27,3 @@ obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
obj-y += ../../../drivers/i2c/i2cmux/i2cmux.o
-
-# This is part of the conversion to init-obj and away from included code.
-
-initobj-y += crt0.o
-
-
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc b/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc
index 92bb9fd6ab..b3655ed3b6 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc
@@ -17,12 +17,8 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-obj-y += mainboard.o
-
# Needed by irq_tables and mptable and acpi_tables.
obj-y += get_bus_conf.o
-obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
@@ -34,9 +30,3 @@ obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt4.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt5.o
obj-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o
-
-# This is part of the conversion to init-obj and away from included code.
-
-initobj-y += crt0.o
-
-
diff --git a/src/mainboard/artecgroup/dbe61/Makefile.inc b/src/mainboard/artecgroup/dbe61/Makefile.inc
deleted file mode 100644
index 3e54d3be91..0000000000
--- a/src/mainboard/artecgroup/dbe61/Makefile.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-obj-y += mainboard.o
-
-# Needed by irq_tables and mptable and acpi_tables.
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
-
-# This is part of the conversion to init-obj and away from included code.
-
-initobj-y += crt0.o
-
-
diff --git a/src/mainboard/asi/mb_5blgp/Makefile.inc b/src/mainboard/asi/mb_5blgp/Makefile.inc
index 1050e61f81..21ae28e552 100644
--- a/src/mainboard/asi/mb_5blgp/Makefile.inc
+++ b/src/mainboard/asi/mb_5blgp/Makefile.inc
@@ -19,5 +19,3 @@
##
ROMCCFLAGS := -mcpu=i386 -O2
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/asi/mb_5blmp/Makefile.inc b/src/mainboard/asi/mb_5blmp/Makefile.inc
index 1050e61f81..21ae28e552 100644
--- a/src/mainboard/asi/mb_5blmp/Makefile.inc
+++ b/src/mainboard/asi/mb_5blmp/Makefile.inc
@@ -19,5 +19,3 @@
##
ROMCCFLAGS := -mcpu=i386 -O2
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/asus/a8n_e/Makefile.inc b/src/mainboard/asus/a8n_e/Makefile.inc
index 9b21a30295..5b1a13c211 100644
--- a/src/mainboard/asus/a8n_e/Makefile.inc
+++ b/src/mainboard/asus/a8n_e/Makefile.inc
@@ -17,15 +17,5 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-obj-y += mainboard.o
-
# Needed by irq_tables and mptable and acpi_tables.
obj-y += get_bus_conf.o
-obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
-
-# This is part of the conversion to init-obj and away from included code.
-
-initobj-y += crt0.o
-
-
diff --git a/src/mainboard/asus/a8v-e_se/Makefile.inc b/src/mainboard/asus/a8v-e_se/Makefile.inc
index 2422d4bfa9..ceff472b03 100644
--- a/src/mainboard/asus/a8v-e_se/Makefile.inc
+++ b/src/mainboard/asus/a8v-e_se/Makefile.inc
@@ -1,13 +1,3 @@
-obj-y += mainboard.o
-
# Needed by irq_tables and mptable and acpi_tables.
-obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
-
-# This is part of the conversion to init-obj and away from included code.
-
-initobj-y += crt0.o
-
-
diff --git a/src/mainboard/asus/m2v-mx_se/Makefile.inc b/src/mainboard/asus/m2v-mx_se/Makefile.inc
index 9af0a377ab..bd6760a8bf 100644
--- a/src/mainboard/asus/m2v-mx_se/Makefile.inc
+++ b/src/mainboard/asus/m2v-mx_se/Makefile.inc
@@ -18,14 +18,6 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-obj-y += mainboard.o
-
#needed by irq_tables and mptable and acpi_tables
obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
-
-# This is part of the conversion to init-obj and away from included code.
-
-initobj-y += crt0.o
-
-
diff --git a/src/mainboard/asus/mew-am/Makefile.inc b/src/mainboard/asus/mew-am/Makefile.inc
deleted file mode 100644
index caa81b8b4e..0000000000
--- a/src/mainboard/asus/mew-am/Makefile.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/asus/mew-vm/Makefile.inc b/src/mainboard/asus/mew-vm/Makefile.inc
deleted file mode 100644
index caa81b8b4e..0000000000
--- a/src/mainboard/asus/mew-vm/Makefile.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/asus/p2b-d/Makefile.inc b/src/mainboard/asus/p2b-d/Makefile.inc
deleted file mode 100644
index caa81b8b4e..0000000000
--- a/src/mainboard/asus/p2b-d/Makefile.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/asus/p2b-ds/Makefile.inc b/src/mainboard/asus/p2b-ds/Makefile.inc
deleted file mode 100644
index caa81b8b4e..0000000000
--- a/src/mainboard/asus/p2b-ds/Makefile.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/asus/p2b-f/Makefile.inc b/src/mainboard/asus/p2b-f/Makefile.inc
deleted file mode 100644
index caa81b8b4e..0000000000
--- a/src/mainboard/asus/p2b-f/Makefile.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/asus/p2b/Makefile.inc b/src/mainboard/asus/p2b/Makefile.inc
deleted file mode 100644
index caa81b8b4e..0000000000
--- a/src/mainboard/asus/p2b/Makefile.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/asus/p3b-f/Makefile.inc b/src/mainboard/asus/p3b-f/Makefile.inc
deleted file mode 100644
index caa81b8b4e..0000000000
--- a/src/mainboard/asus/p3b-f/Makefile.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/axus/tc320/Makefile.inc b/src/mainboard/axus/tc320/Makefile.inc
index 1050e61f81..21ae28e552 100644
--- a/src/mainboard/axus/tc320/Makefile.inc
+++ b/src/mainboard/axus/tc320/Makefile.inc
@@ -19,5 +19,3 @@
##
ROMCCFLAGS := -mcpu=i386 -O2
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/azza/pt-6ibd/Makefile.inc b/src/mainboard/azza/pt-6ibd/Makefile.inc
deleted file mode 100644
index caa81b8b4e..0000000000
--- a/src/mainboard/azza/pt-6ibd/Makefile.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/bcom/winnet100/Makefile.inc b/src/mainboard/bcom/winnet100/Makefile.inc
index 1050e61f81..21ae28e552 100644
--- a/src/mainboard/bcom/winnet100/Makefile.inc
+++ b/src/mainboard/bcom/winnet100/Makefile.inc
@@ -19,5 +19,3 @@
##
ROMCCFLAGS := -mcpu=i386 -O2
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/bcom/winnetp680/Makefile.inc b/src/mainboard/bcom/winnetp680/Makefile.inc
index 30212b7c31..757bf4bfc1 100644
--- a/src/mainboard/bcom/winnetp680/Makefile.inc
+++ b/src/mainboard/bcom/winnetp680/Makefile.inc
@@ -19,14 +19,6 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-initobj-y += crt0.o
-obj-y += mainboard.o
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
-obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
-
obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
-
-
-
diff --git a/src/mainboard/biostar/m6tba/Makefile.inc b/src/mainboard/biostar/m6tba/Makefile.inc
deleted file mode 100644
index caa81b8b4e..0000000000
--- a/src/mainboard/biostar/m6tba/Makefile.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/broadcom/blast/Makefile.inc b/src/mainboard/broadcom/blast/Makefile.inc
index 27a2d53ebe..93efa1ec7c 100644
--- a/src/mainboard/broadcom/blast/Makefile.inc
+++ b/src/mainboard/broadcom/blast/Makefile.inc
@@ -4,4 +4,3 @@ include $(src)/mainboard/Makefile.k8_CAR.inc
obj-y += get_bus_conf.o
obj-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o
-
diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/Makefile.inc b/src/mainboard/compaq/deskpro_en_sff_p600/Makefile.inc
deleted file mode 100644
index caa81b8b4e..0000000000
--- a/src/mainboard/compaq/deskpro_en_sff_p600/Makefile.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/dell/s1850/Kconfig b/src/mainboard/dell/s1850/Kconfig
index aeb14a008a..853e2ab7a5 100644
--- a/src/mainboard/dell/s1850/Kconfig
+++ b/src/mainboard/dell/s1850/Kconfig
@@ -7,6 +7,8 @@ config BOARD_DELL_S1850
select SOUTHBRIDGE_INTEL_PXHD
select SUPERIO_NSC_PC8374
select ROMCC
+ select HAVE_HARD_RESET
+ select BOARD_HAS_HARD_RESET
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select BOARD_ROMSIZE_KB_1024
diff --git a/src/mainboard/dell/s1850/Makefile.inc b/src/mainboard/dell/s1850/Makefile.inc
index 8e216dd277..0f285cdfed 100644
--- a/src/mainboard/dell/s1850/Makefile.inc
+++ b/src/mainboard/dell/s1850/Makefile.inc
@@ -1,3 +1 @@
ROMCCFLAGS := -mcpu=p4 -O2
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/digitallogic/adl855pc/Makefile.inc b/src/mainboard/digitallogic/adl855pc/Makefile.inc
index 33d10100d7..accacee2ee 100644
--- a/src/mainboard/digitallogic/adl855pc/Makefile.inc
+++ b/src/mainboard/digitallogic/adl855pc/Makefile.inc
@@ -1,3 +1 @@
ROMCCFLAGS := -mcpu=p3 -O
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/digitallogic/msm586seg/Makefile.inc b/src/mainboard/digitallogic/msm586seg/Makefile.inc
index b46377a206..76784015ba 100644
--- a/src/mainboard/digitallogic/msm586seg/Makefile.inc
+++ b/src/mainboard/digitallogic/msm586seg/Makefile.inc
@@ -1,3 +1 @@
ROMCCFLAGS := -mcpu=i386 -O
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/digitallogic/msm800sev/Makefile.inc b/src/mainboard/digitallogic/msm800sev/Makefile.inc
deleted file mode 100644
index 3e54d3be91..0000000000
--- a/src/mainboard/digitallogic/msm800sev/Makefile.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-obj-y += mainboard.o
-
-# Needed by irq_tables and mptable and acpi_tables.
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
-
-# This is part of the conversion to init-obj and away from included code.
-
-initobj-y += crt0.o
-
-
diff --git a/src/mainboard/eaglelion/5bcm/Makefile.inc b/src/mainboard/eaglelion/5bcm/Makefile.inc
index 1050e61f81..21ae28e552 100644
--- a/src/mainboard/eaglelion/5bcm/Makefile.inc
+++ b/src/mainboard/eaglelion/5bcm/Makefile.inc
@@ -19,5 +19,3 @@
##
ROMCCFLAGS := -mcpu=i386 -O2
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/emulation/qemu-x86/Makefile.inc b/src/mainboard/emulation/qemu-x86/Makefile.inc
index b46377a206..76784015ba 100644
--- a/src/mainboard/emulation/qemu-x86/Makefile.inc
+++ b/src/mainboard/emulation/qemu-x86/Makefile.inc
@@ -1,3 +1 @@
ROMCCFLAGS := -mcpu=i386 -O
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/gigabyte/ga-6bxc/Makefile.inc b/src/mainboard/gigabyte/ga-6bxc/Makefile.inc
deleted file mode 100644
index caa81b8b4e..0000000000
--- a/src/mainboard/gigabyte/ga-6bxc/Makefile.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc b/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc
index 95aeeead41..271e9fe547 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc
+++ b/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc
@@ -17,15 +17,7 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-obj-y += mainboard.o
-
#needed by irq_tables and mptable and acpi_tables
obj-y += get_bus_conf.o
-obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
obj-$(CONFIG_USE_INIT) += romstage.o
obj-$(CONFIG_AP_CODE_IN_CAR) += ap_romstage.o
-
-# This is part of the conversion to init-obj and away from included code.
-initobj-y += crt0.o
-
diff --git a/src/mainboard/gigabyte/m57sli/Makefile.inc b/src/mainboard/gigabyte/m57sli/Makefile.inc
index 246fef75b3..a824f44494 100644
--- a/src/mainboard/gigabyte/m57sli/Makefile.inc
+++ b/src/mainboard/gigabyte/m57sli/Makefile.inc
@@ -17,18 +17,10 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-obj-y += mainboard.o
-
#needed by irq_tables and mptable and acpi_tables
obj-y += get_bus_conf.o
-obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
obj-$(CONFIG_USE_INIT) += romstage.o
obj-$(CONFIG_AP_CODE_IN_CAR) += ap_romstage.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
obj-$(CONFIG_SUPERIO_ITE_IT8716F_OVERRIDE_FANCTL) += fanctl.o
-
-# This is part of the conversion to init-obj and away from included code.
-initobj-y += crt0.o
-
diff --git a/src/mainboard/hp/e_vectra_p2706t/Makefile.inc b/src/mainboard/hp/e_vectra_p2706t/Makefile.inc
deleted file mode 100644
index caa81b8b4e..0000000000
--- a/src/mainboard/hp/e_vectra_p2706t/Makefile.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/iei/juki-511p/Makefile.inc b/src/mainboard/iei/juki-511p/Makefile.inc
index 1050e61f81..21ae28e552 100644
--- a/src/mainboard/iei/juki-511p/Makefile.inc
+++ b/src/mainboard/iei/juki-511p/Makefile.inc
@@ -19,5 +19,3 @@
##
ROMCCFLAGS := -mcpu=i386 -O2
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/iei/nova4899r/Makefile.inc b/src/mainboard/iei/nova4899r/Makefile.inc
index 1050e61f81..21ae28e552 100644
--- a/src/mainboard/iei/nova4899r/Makefile.inc
+++ b/src/mainboard/iei/nova4899r/Makefile.inc
@@ -19,5 +19,3 @@
##
ROMCCFLAGS := -mcpu=i386 -O2
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc b/src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc
deleted file mode 100644
index 3e54d3be91..0000000000
--- a/src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-obj-y += mainboard.o
-
-# Needed by irq_tables and mptable and acpi_tables.
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
-
-# This is part of the conversion to init-obj and away from included code.
-
-initobj-y += crt0.o
-
-
diff --git a/src/mainboard/intel/d945gclf/Kconfig b/src/mainboard/intel/d945gclf/Kconfig
index fefeaf6c52..261989a4a1 100644
--- a/src/mainboard/intel/d945gclf/Kconfig
+++ b/src/mainboard/intel/d945gclf/Kconfig
@@ -25,6 +25,7 @@ config BOARD_INTEL_D945GCLF
select NORTHBRIDGE_INTEL_I945
select SOUTHBRIDGE_INTEL_I82801GX
select SUPERIO_SMSC_LPC47M15X
+ select HAVE_HARD_RESET
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select HAVE_ACPI_TABLES
diff --git a/src/mainboard/intel/d945gclf/Makefile.inc b/src/mainboard/intel/d945gclf/Makefile.inc
index 95f2f65af7..9516e9ea21 100644
--- a/src/mainboard/intel/d945gclf/Makefile.inc
+++ b/src/mainboard/intel/d945gclf/Makefile.inc
@@ -21,19 +21,10 @@
## This mainboard requires DCACHE_AS_RAM enabled. It won't work without.
##
-obj-y += mainboard.o
obj-y += rtl8168.o
-obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o
-
-# This is part of the conversion to init-obj and away from included code.
-
-initobj-y += crt0.o
-
-
diff --git a/src/mainboard/intel/eagleheights/Kconfig b/src/mainboard/intel/eagleheights/Kconfig
index c336863d66..45b173f1bb 100644
--- a/src/mainboard/intel/eagleheights/Kconfig
+++ b/src/mainboard/intel/eagleheights/Kconfig
@@ -6,6 +6,8 @@ config BOARD_INTEL_EAGLEHEIGHTS
select SOUTHBRIDGE_INTEL_I3100
select SUPERIO_INTEL_I3100
select SUPERIO_SMSC_SMSCSUPERIO
+ select HAVE_HARD_RESET
+ select BOARD_HAS_HARD_RESET
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select MMCONF_SUPPORT
diff --git a/src/mainboard/intel/eagleheights/Makefile.inc b/src/mainboard/intel/eagleheights/Makefile.inc
index e17be314f0..3eaf840d9c 100644
--- a/src/mainboard/intel/eagleheights/Makefile.inc
+++ b/src/mainboard/intel/eagleheights/Makefile.inc
@@ -1,14 +1,3 @@
-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
obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
-obj-$(CONFIG_HAVE_HARD_RESET) += reset.o
-
-# This is part of the conversion to init-obj and away from included code.
-
-initobj-y += crt0.o
-# Use Intel Core (not Core 2) code for CAR init, any CPU might be used.
-
-
diff --git a/src/mainboard/intel/jarrell/Kconfig b/src/mainboard/intel/jarrell/Kconfig
index fc70befafa..042e1de362 100644
--- a/src/mainboard/intel/jarrell/Kconfig
+++ b/src/mainboard/intel/jarrell/Kconfig
@@ -7,6 +7,8 @@ config BOARD_INTEL_JARRELL
select SOUTHBRIDGE_INTEL_I82801EX
select SUPERIO_NSC_PC87427
select ROMCC
+ select HAVE_HARD_RESET
+ select BOARD_HAS_HARD_RESET
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select UDELAY_TSC
diff --git a/src/mainboard/intel/jarrell/Makefile.inc b/src/mainboard/intel/jarrell/Makefile.inc
index 80249df044..0f285cdfed 100644
--- a/src/mainboard/intel/jarrell/Makefile.inc
+++ b/src/mainboard/intel/jarrell/Makefile.inc
@@ -1,4 +1 @@
-obj-$(CONFIG_HAVE_HARD_RESET) += reset.o
ROMCCFLAGS := -mcpu=p4 -O2
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/intel/mtarvon/Kconfig b/src/mainboard/intel/mtarvon/Kconfig
index 693914da5b..785c6b4ea2 100644
--- a/src/mainboard/intel/mtarvon/Kconfig
+++ b/src/mainboard/intel/mtarvon/Kconfig
@@ -6,6 +6,7 @@ config BOARD_INTEL_MTARVON
select SOUTHBRIDGE_INTEL_I3100
select SUPERIO_INTEL_I3100
select ROMCC
+ select HAVE_HARD_RESET
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select UDELAY_TSC
diff --git a/src/mainboard/intel/mtarvon/Makefile.inc b/src/mainboard/intel/mtarvon/Makefile.inc
index 8e216dd277..0f285cdfed 100644
--- a/src/mainboard/intel/mtarvon/Makefile.inc
+++ b/src/mainboard/intel/mtarvon/Makefile.inc
@@ -1,3 +1 @@
ROMCCFLAGS := -mcpu=p4 -O2
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/intel/truxton/Kconfig b/src/mainboard/intel/truxton/Kconfig
index fbc577fffa..22c898326f 100644
--- a/src/mainboard/intel/truxton/Kconfig
+++ b/src/mainboard/intel/truxton/Kconfig
@@ -7,6 +7,7 @@ config BOARD_INTEL_TRUXTON
select SUPERIO_INTEL_I3100
select SUPERIO_SMSC_SMSCSUPERIO
select ROMCC
+ select HAVE_HARD_RESET
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select UDELAY_TSC
diff --git a/src/mainboard/intel/truxton/Makefile.inc b/src/mainboard/intel/truxton/Makefile.inc
index 4a5d4f7bb2..6ef4fc9d50 100644
--- a/src/mainboard/intel/truxton/Makefile.inc
+++ b/src/mainboard/intel/truxton/Makefile.inc
@@ -1,3 +1 @@
ROMCCFLAGS := -mcpu=p4 -fno-simplify-phi -O2
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/intel/xe7501devkit/Kconfig b/src/mainboard/intel/xe7501devkit/Kconfig
index d2a9f4779f..5024013294 100644
--- a/src/mainboard/intel/xe7501devkit/Kconfig
+++ b/src/mainboard/intel/xe7501devkit/Kconfig
@@ -7,6 +7,8 @@ config BOARD_INTEL_XE7501DEVKIT
select SOUTHBRIDGE_INTEL_I82801CX
select SUPERIO_SMSC_LPC47B272
select ROMCC
+ select HAVE_HARD_RESET
+ select BOARD_HAS_HARD_RESET
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select UDELAY_TSC
diff --git a/src/mainboard/intel/xe7501devkit/Makefile.inc b/src/mainboard/intel/xe7501devkit/Makefile.inc
index 0b1acdc242..4878dc3ff9 100644
--- a/src/mainboard/intel/xe7501devkit/Makefile.inc
+++ b/src/mainboard/intel/xe7501devkit/Makefile.inc
@@ -1,5 +1,2 @@
ROMCCFLAGS := -mcpu=p4 -O2
obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
-obj-$(CONFIG_HAVE_HARD_RESET) += reset.o
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/iwill/dk8_htx/Makefile.inc b/src/mainboard/iwill/dk8_htx/Makefile.inc
index a62c467167..ec879c6bb5 100644
--- a/src/mainboard/iwill/dk8_htx/Makefile.inc
+++ b/src/mainboard/iwill/dk8_htx/Makefile.inc
@@ -17,12 +17,8 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-obj-y += mainboard.o
-
# Needed by irq_tables and mptable and acpi_tables.
obj-y += get_bus_conf.o
-obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt2.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt3.o
@@ -30,9 +26,3 @@ obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt4.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt5.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
-
-# This is part of the conversion to init-obj and away from included code.
-
-initobj-y += crt0.o
-
-
diff --git a/src/mainboard/jetway/j7f24/Makefile.inc b/src/mainboard/jetway/j7f24/Makefile.inc
deleted file mode 100644
index 8b86403f06..0000000000
--- a/src/mainboard/jetway/j7f24/Makefile.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2008 VIA Technologies, Inc.
-## (Written by Aaron Lwe <aaron.lwe@gmail.com> for VIA)
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-initobj-y += crt0.o
-obj-y += mainboard.o
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
-obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
-
-
-
diff --git a/src/mainboard/kontron/986lcd-m/Kconfig b/src/mainboard/kontron/986lcd-m/Kconfig
index ecdc7f5b64..6ff5c556dd 100644
--- a/src/mainboard/kontron/986lcd-m/Kconfig
+++ b/src/mainboard/kontron/986lcd-m/Kconfig
@@ -9,6 +9,7 @@ config BOARD_KONTRON_986LCD_M
select GENERATE_ACPI_TABLES
select GENERATE_PIRQ_TABLE
select GENERATE_MP_TABLE
+ select HAVE_HARD_RESET
select HAVE_ACPI_RESUME
select HAVE_MAINBOARD_RESOURCES
select MMCONF_SUPPORT
diff --git a/src/mainboard/kontron/986lcd-m/Makefile.inc b/src/mainboard/kontron/986lcd-m/Makefile.inc
index 57f6e73a60..5bd9a895b9 100644
--- a/src/mainboard/kontron/986lcd-m/Makefile.inc
+++ b/src/mainboard/kontron/986lcd-m/Makefile.inc
@@ -21,20 +21,10 @@
## This mainboard requires DCACHE_AS_RAM enabled. It won't work without.
##
-obj-y += mainboard.o
obj-y += rtl8168.o
-obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o
-
-# This is part of the conversion to init-obj and away from included code.
-
-initobj-y += crt0.o
-
-
-
diff --git a/src/mainboard/kontron/kt690/Makefile.inc b/src/mainboard/kontron/kt690/Makefile.inc
index d365b75bb5..1a5d69b39f 100644
--- a/src/mainboard/kontron/kt690/Makefile.inc
+++ b/src/mainboard/kontron/kt690/Makefile.inc
@@ -17,18 +17,8 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-obj-y += mainboard.o
-
# Needed by irq_tables and mptable and acpi_tables.
obj-y += get_bus_conf.o
-obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
-
-# This is part of the conversion to init-obj and away from included code.
-
-initobj-y += crt0.o
-
-
diff --git a/src/mainboard/lippert/frontrunner/Makefile.inc b/src/mainboard/lippert/frontrunner/Makefile.inc
index 377edf51f5..1286e6347c 100644
--- a/src/mainboard/lippert/frontrunner/Makefile.inc
+++ b/src/mainboard/lippert/frontrunner/Makefile.inc
@@ -1,2 +1 @@
ROMCCFLAGS=-mcpu=i386 -O
-include $(src)/mainboard/Makefile.romccboard.inc
diff --git a/src/mainboard/lippert/roadrunner-lx/Makefile.inc b/src/mainboard/lippert/roadrunner-lx/Makefile.inc
deleted file mode 100644
index 3e54d3be91..0000000000
--- a/src/mainboard/lippert/roadrunner-lx/Makefile.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-obj-y += mainboard.o
-
-# Needed by irq_tables and mptable and acpi_tables.
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
-
-# This is part of the conversion to init-obj and away from included code.
-
-initobj-y += crt0.o
-
-
diff --git a/src/mainboard/lippert/spacerunner-lx/Makefile.inc b/src/mainboard/lippert/spacerunner-lx/Makefile.inc
deleted file mode 100644
index 3e54d3be91..0000000000
--- a/src/mainboard/lippert/spacerunner-lx/Makefile.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-obj-y += mainboard.o
-
-# Needed by irq_tables and mptable and acpi_tables.
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
-
-# This is part of the conversion to init-obj and away from included code.
-
-initobj-y += crt0.o
-
-
diff --git a/src/mainboard/mitac/6513wu/Makefile.inc b/src/mainboard/mitac/6513wu/Makefile.inc
deleted file mode 100644
index caa81b8b4e..0000000000
--- a/src/mainboard/mitac/6513wu/Makefile.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/msi/ms6119/Makefile.inc b/src/mainboard/msi/ms6119/Makefile.inc
deleted file mode 100644
index caa81b8b4e..0000000000
--- a/src/mainboard/msi/ms6119/Makefile.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/msi/ms6147/Makefile.inc b/src/mainboard/msi/ms6147/Makefile.inc
deleted file mode 100644
index caa81b8b4e..0000000000
--- a/src/mainboard/msi/ms6147/Makefile.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/msi/ms6156/Makefile.inc b/src/mainboard/msi/ms6156/Makefile.inc
deleted file mode 100644
index caa81b8b4e..0000000000
--- a/src/mainboard/msi/ms6156/Makefile.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/msi/ms6178/Makefile.inc b/src/mainboard/msi/ms6178/Makefile.inc
deleted file mode 100644
index caa81b8b4e..0000000000
--- a/src/mainboard/msi/ms6178/Makefile.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/msi/ms7135/Kconfig b/src/mainboard/msi/ms7135/Kconfig
index 1123df727f..81e4bbb4a6 100644
--- a/src/mainboard/msi/ms7135/Kconfig
+++ b/src/mainboard/msi/ms7135/Kconfig
@@ -6,6 +6,7 @@ config BOARD_MSI_MS7135
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
select SOUTHBRIDGE_NVIDIA_CK804
select SUPERIO_WINBOND_W83627THF
+ select HAVE_HARD_RESET
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select USE_DCACHE_RAM
diff --git a/src/mainboard/msi/ms7260/Makefile.inc b/src/mainboard/msi/ms7260/Makefile.inc
index 95aeeead41..271e9fe547 100644
--- a/src/mainboard/msi/ms7260/Makefile.inc
+++ b/src/mainboard/msi/ms7260/Makefile.inc
@@ -17,15 +17,7 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-obj-y += mainboard.o
-
#needed by irq_tables and mptable and acpi_tables
obj-y += get_bus_conf.o
-obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
obj-$(CONFIG_USE_INIT) += romstage.o
obj-$(CONFIG_AP_CODE_IN_CAR) += ap_romstage.o
-
-# This is part of the conversion to init-obj and away from included code.
-initobj-y += crt0.o
-
diff --git a/src/mainboard/msi/ms9282/Makefile.inc b/src/mainboard/msi/ms9282/Makefile.inc
index fa2f5145bc..b8eab48927 100644
--- a/src/mainboard/msi/ms9282/Makefile.inc
+++ b/src/mainboard/msi/ms9282/Makefile.inc
@@ -17,17 +17,10 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-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
-obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
obj-$(CONFIG_USE_INIT) += romstage.o
obj-$(CONFIG_AP_CODE_IN_CAR) += ap_romstage.o
-
-# This is part of the conversion to init-obj and away from included code.
-initobj-y += crt0.o
-
diff --git a/src/mainboard/nec/powermate2000/Makefile.inc b/src/mainboard/nec/powermate2000/Makefile.inc
deleted file mode 100644
index caa81b8b4e..0000000000
--- a/src/mainboard/nec/powermate2000/Makefile.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/nvidia/l1_2pvv/Makefile.inc b/src/mainboard/nvidia/l1_2pvv/Makefile.inc
index 95aeeead41..271e9fe547 100644
--- a/src/mainboard/nvidia/l1_2pvv/Makefile.inc
+++ b/src/mainboard/nvidia/l1_2pvv/Makefile.inc
@@ -17,15 +17,7 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-obj-y += mainboard.o
-
#needed by irq_tables and mptable and acpi_tables
obj-y += get_bus_conf.o
-obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
obj-$(CONFIG_USE_INIT) += romstage.o
obj-$(CONFIG_AP_CODE_IN_CAR) += ap_romstage.o
-
-# This is part of the conversion to init-obj and away from included code.
-initobj-y += crt0.o
-
diff --git a/src/mainboard/olpc/btest/Makefile.inc b/src/mainboard/olpc/btest/Makefile.inc
index 3e1aee5038..aa29c17dc1 100644
--- a/src/mainboard/olpc/btest/Makefile.inc
+++ b/src/mainboard/olpc/btest/Makefile.inc
@@ -1,2 +1 @@
ROMCCFLAGS=-mcpu=p2 -O
-include $(src)/mainboard/Makefile.romccboard.inc
diff --git a/src/mainboard/olpc/rev_a/Makefile.inc b/src/mainboard/olpc/rev_a/Makefile.inc
index 3e1aee5038..aa29c17dc1 100644
--- a/src/mainboard/olpc/rev_a/Makefile.inc
+++ b/src/mainboard/olpc/rev_a/Makefile.inc
@@ -1,2 +1 @@
ROMCCFLAGS=-mcpu=p2 -O
-include $(src)/mainboard/Makefile.romccboard.inc
diff --git a/src/mainboard/pcengines/alix1c/Makefile.inc b/src/mainboard/pcengines/alix1c/Makefile.inc
deleted file mode 100644
index 3e54d3be91..0000000000
--- a/src/mainboard/pcengines/alix1c/Makefile.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-obj-y += mainboard.o
-
-# Needed by irq_tables and mptable and acpi_tables.
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
-
-# This is part of the conversion to init-obj and away from included code.
-
-initobj-y += crt0.o
-
-
diff --git a/src/mainboard/rca/rm4100/Makefile.inc b/src/mainboard/rca/rm4100/Makefile.inc
index b94711e01e..5688262e62 100644
--- a/src/mainboard/rca/rm4100/Makefile.inc
+++ b/src/mainboard/rca/rm4100/Makefile.inc
@@ -1,4 +1 @@
ROMCCFLAGS=-mcpu=p3 -O
-
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/roda/rk886ex/Makefile.inc b/src/mainboard/roda/rk886ex/Makefile.inc
index c21cd5aa8c..7da49f700a 100644
--- a/src/mainboard/roda/rk886ex/Makefile.inc
+++ b/src/mainboard/roda/rk886ex/Makefile.inc
@@ -21,21 +21,12 @@
## This mainboard requires DCACHE_AS_RAM enabled. It won't work without.
##
-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
obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o
-
-# This is part of the conversion to init-obj and away from included code.
-
-initobj-y += crt0.o
-
-
diff --git a/src/mainboard/soyo/sy-6ba-plus-iii/Makefile.inc b/src/mainboard/soyo/sy-6ba-plus-iii/Makefile.inc
deleted file mode 100644
index caa81b8b4e..0000000000
--- a/src/mainboard/soyo/sy-6ba-plus-iii/Makefile.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/supermicro/h8dme/Makefile.inc b/src/mainboard/supermicro/h8dme/Makefile.inc
index 22ce20d0b0..15fca9e73c 100644
--- a/src/mainboard/supermicro/h8dme/Makefile.inc
+++ b/src/mainboard/supermicro/h8dme/Makefile.inc
@@ -17,16 +17,7 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-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
-obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
-
-# This is part of the conversion to init-obj and away from included code.
-
-initobj-y += crt0.o
-
-
diff --git a/src/mainboard/supermicro/h8dmr/Makefile.inc b/src/mainboard/supermicro/h8dmr/Makefile.inc
index 9b21a30295..5b1a13c211 100644
--- a/src/mainboard/supermicro/h8dmr/Makefile.inc
+++ b/src/mainboard/supermicro/h8dmr/Makefile.inc
@@ -17,15 +17,5 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-obj-y += mainboard.o
-
# Needed by irq_tables and mptable and acpi_tables.
obj-y += get_bus_conf.o
-obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
-
-# This is part of the conversion to init-obj and away from included code.
-
-initobj-y += crt0.o
-
-
diff --git a/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc b/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc
index 9b21a30295..5b1a13c211 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc
+++ b/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc
@@ -17,15 +17,5 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-obj-y += mainboard.o
-
# Needed by irq_tables and mptable and acpi_tables.
obj-y += get_bus_conf.o
-obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
-
-# This is part of the conversion to init-obj and away from included code.
-
-initobj-y += crt0.o
-
-
diff --git a/src/mainboard/supermicro/h8qme_fam10/Makefile.inc b/src/mainboard/supermicro/h8qme_fam10/Makefile.inc
index 9b21a30295..5b1a13c211 100644
--- a/src/mainboard/supermicro/h8qme_fam10/Makefile.inc
+++ b/src/mainboard/supermicro/h8qme_fam10/Makefile.inc
@@ -17,15 +17,5 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-obj-y += mainboard.o
-
# Needed by irq_tables and mptable and acpi_tables.
obj-y += get_bus_conf.o
-obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
-
-# This is part of the conversion to init-obj and away from included code.
-
-initobj-y += crt0.o
-
-
diff --git a/src/mainboard/supermicro/x6dai_g/Kconfig b/src/mainboard/supermicro/x6dai_g/Kconfig
index d79ca567f5..908e8974bf 100644
--- a/src/mainboard/supermicro/x6dai_g/Kconfig
+++ b/src/mainboard/supermicro/x6dai_g/Kconfig
@@ -6,6 +6,8 @@ config BOARD_SUPERMICRO_X6DAI_G
select SOUTHBRIDGE_INTEL_ESB6300
select SUPERIO_WINBOND_W83627HF
select ROMCC
+ select HAVE_HARD_RESET
+ select BOARD_HAS_HARD_RESET
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select BOARD_ROMSIZE_KB_1024
diff --git a/src/mainboard/supermicro/x6dai_g/Makefile.inc b/src/mainboard/supermicro/x6dai_g/Makefile.inc
index 455da185cf..495602d94b 100644
--- a/src/mainboard/supermicro/x6dai_g/Makefile.inc
+++ b/src/mainboard/supermicro/x6dai_g/Makefile.inc
@@ -19,6 +19,3 @@
##
ROMCCFLAGS=-mcpu=p4 -O2
-obj-$(CONFIG_HAVE_HARD_RESET) += reset.o
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/supermicro/x6dhe_g/Kconfig b/src/mainboard/supermicro/x6dhe_g/Kconfig
index 95b0c74096..4abac9ad67 100644
--- a/src/mainboard/supermicro/x6dhe_g/Kconfig
+++ b/src/mainboard/supermicro/x6dhe_g/Kconfig
@@ -7,6 +7,8 @@ config BOARD_SUPERMICRO_X6DHE_G
select SOUTHBRIDGE_INTEL_PXHD
select SUPERIO_WINBOND_W83627HF
select ROMCC
+ select HAVE_HARD_RESET
+ select BOARD_HAS_HARD_RESET
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select BOARD_ROMSIZE_KB_1024
diff --git a/src/mainboard/supermicro/x6dhe_g/Makefile.inc b/src/mainboard/supermicro/x6dhe_g/Makefile.inc
index f900af66dc..3c5bdbde53 100644
--- a/src/mainboard/supermicro/x6dhe_g/Makefile.inc
+++ b/src/mainboard/supermicro/x6dhe_g/Makefile.inc
@@ -19,7 +19,4 @@
##
ROMCCFLAGS=-mcpu=p4 -O2
-obj-$(CONFIG_HAVE_HARD_RESET) += reset.o
-include $(src)/mainboard/Makefile.romccboard.inc
obj-y += ../../../drivers/generic/debug/debug_dev.o
-
diff --git a/src/mainboard/supermicro/x6dhe_g2/Kconfig b/src/mainboard/supermicro/x6dhe_g2/Kconfig
index a456abea8a..6ad223aafb 100644
--- a/src/mainboard/supermicro/x6dhe_g2/Kconfig
+++ b/src/mainboard/supermicro/x6dhe_g2/Kconfig
@@ -7,6 +7,8 @@ config BOARD_SUPERMICRO_X6DHE_G2
select SOUTHBRIDGE_INTEL_PXHD
select SUPERIO_NSC_PC87427
select ROMCC
+ select HAVE_HARD_RESET
+ select BOARD_HAS_HARD_RESET
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select BOARD_ROMSIZE_KB_1024
diff --git a/src/mainboard/supermicro/x6dhe_g2/Makefile.inc b/src/mainboard/supermicro/x6dhe_g2/Makefile.inc
index f900af66dc..3c5bdbde53 100644
--- a/src/mainboard/supermicro/x6dhe_g2/Makefile.inc
+++ b/src/mainboard/supermicro/x6dhe_g2/Makefile.inc
@@ -19,7 +19,4 @@
##
ROMCCFLAGS=-mcpu=p4 -O2
-obj-$(CONFIG_HAVE_HARD_RESET) += reset.o
-include $(src)/mainboard/Makefile.romccboard.inc
obj-y += ../../../drivers/generic/debug/debug_dev.o
-
diff --git a/src/mainboard/supermicro/x6dhr_ig/Kconfig b/src/mainboard/supermicro/x6dhr_ig/Kconfig
index 56653adc9b..26aaeda1c6 100644
--- a/src/mainboard/supermicro/x6dhr_ig/Kconfig
+++ b/src/mainboard/supermicro/x6dhr_ig/Kconfig
@@ -7,6 +7,8 @@ config BOARD_SUPERMICRO_X6DHR_IG
select SOUTHBRIDGE_INTEL_PXHD
select SUPERIO_WINBOND_W83627HF
select ROMCC
+ select HAVE_HARD_RESET
+ select BOARD_HAS_HARD_RESET
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select BOARD_ROMSIZE_KB_1024
diff --git a/src/mainboard/supermicro/x6dhr_ig/Makefile.inc b/src/mainboard/supermicro/x6dhr_ig/Makefile.inc
index 455da185cf..495602d94b 100644
--- a/src/mainboard/supermicro/x6dhr_ig/Makefile.inc
+++ b/src/mainboard/supermicro/x6dhr_ig/Makefile.inc
@@ -19,6 +19,3 @@
##
ROMCCFLAGS=-mcpu=p4 -O2
-obj-$(CONFIG_HAVE_HARD_RESET) += reset.o
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/supermicro/x6dhr_ig2/Kconfig b/src/mainboard/supermicro/x6dhr_ig2/Kconfig
index 126739be10..3702d16782 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/Kconfig
+++ b/src/mainboard/supermicro/x6dhr_ig2/Kconfig
@@ -7,6 +7,8 @@ config BOARD_SUPERMICRO_X6DHR_IG2
select SOUTHBRIDGE_INTEL_PXHD
select SUPERIO_WINBOND_W83627HF
select ROMCC
+ select HAVE_HARD_RESET
+ select BOARD_HAS_HARD_RESET
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select BOARD_ROMSIZE_KB_1024
diff --git a/src/mainboard/supermicro/x6dhr_ig2/Makefile.inc b/src/mainboard/supermicro/x6dhr_ig2/Makefile.inc
index 455da185cf..495602d94b 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/Makefile.inc
+++ b/src/mainboard/supermicro/x6dhr_ig2/Makefile.inc
@@ -19,6 +19,3 @@
##
ROMCCFLAGS=-mcpu=p4 -O2
-obj-$(CONFIG_HAVE_HARD_RESET) += reset.o
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/technexion/tim5690/Makefile.inc b/src/mainboard/technexion/tim5690/Makefile.inc
index 15b4911efc..c72c5ee269 100644
--- a/src/mainboard/technexion/tim5690/Makefile.inc
+++ b/src/mainboard/technexion/tim5690/Makefile.inc
@@ -17,12 +17,8 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-obj-y += mainboard.o
-
# Needed by irq_tables and mptable and acpi_tables.
obj-y += get_bus_conf.o
-obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
@@ -32,9 +28,3 @@ obj-y += tn_post_code.o
obj-y += speaker.o
obj-y += vgabios.o
-
-# This is part of the conversion to init-obj and away from included code.
-
-initobj-y += crt0.o
-
-
diff --git a/src/mainboard/technexion/tim8690/Makefile.inc b/src/mainboard/technexion/tim8690/Makefile.inc
index d365b75bb5..1a5d69b39f 100644
--- a/src/mainboard/technexion/tim8690/Makefile.inc
+++ b/src/mainboard/technexion/tim8690/Makefile.inc
@@ -17,18 +17,8 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-obj-y += mainboard.o
-
# Needed by irq_tables and mptable and acpi_tables.
obj-y += get_bus_conf.o
-obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
-
-# This is part of the conversion to init-obj and away from included code.
-
-initobj-y += crt0.o
-
-
diff --git a/src/mainboard/technologic/ts5300/Makefile.inc b/src/mainboard/technologic/ts5300/Makefile.inc
index b46377a206..76784015ba 100644
--- a/src/mainboard/technologic/ts5300/Makefile.inc
+++ b/src/mainboard/technologic/ts5300/Makefile.inc
@@ -1,3 +1 @@
ROMCCFLAGS := -mcpu=i386 -O
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/televideo/tc7020/Makefile.inc b/src/mainboard/televideo/tc7020/Makefile.inc
index 1050e61f81..21ae28e552 100644
--- a/src/mainboard/televideo/tc7020/Makefile.inc
+++ b/src/mainboard/televideo/tc7020/Makefile.inc
@@ -19,5 +19,3 @@
##
ROMCCFLAGS := -mcpu=i386 -O2
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/thomson/ip1000/Makefile.inc b/src/mainboard/thomson/ip1000/Makefile.inc
index b94711e01e..5688262e62 100644
--- a/src/mainboard/thomson/ip1000/Makefile.inc
+++ b/src/mainboard/thomson/ip1000/Makefile.inc
@@ -1,4 +1 @@
ROMCCFLAGS=-mcpu=p3 -O
-
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/tyan/s1846/Makefile.inc b/src/mainboard/tyan/s1846/Makefile.inc
deleted file mode 100644
index caa81b8b4e..0000000000
--- a/src/mainboard/tyan/s1846/Makefile.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/tyan/s2735/Kconfig b/src/mainboard/tyan/s2735/Kconfig
index 0c3f8a573d..73b9c1bfc9 100644
--- a/src/mainboard/tyan/s2735/Kconfig
+++ b/src/mainboard/tyan/s2735/Kconfig
@@ -6,6 +6,8 @@ config BOARD_TYAN_S2735
select SOUTHBRIDGE_INTEL_I82870
select SOUTHBRIDGE_INTEL_I82801EX
select SUPERIO_WINBOND_W83627HF
+ select HAVE_HARD_RESET
+ select BOARD_HAS_HARD_RESET
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select UDELAY_TSC
diff --git a/src/mainboard/tyan/s2735/Makefile.inc b/src/mainboard/tyan/s2735/Makefile.inc
deleted file mode 100644
index 757b115bc9..0000000000
--- a/src/mainboard/tyan/s2735/Makefile.inc
+++ /dev/null
@@ -1,36 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2007-2008 coresystems GmbH
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; version 2 of the License.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-##
-## This mainboard requires DCACHE_AS_RAM enabled. It won't work without.
-##
-
-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
-
-#obj-y += ../../../drivers/i2c/i2cmux/i2cmux.o
-
-# This is part of the conversion to init-obj and away from included code.
-
-initobj-y += crt0.o
-
-
diff --git a/src/mainboard/tyan/s2850/Kconfig b/src/mainboard/tyan/s2850/Kconfig
index 090aa79e07..0cfe1cd88f 100644
--- a/src/mainboard/tyan/s2850/Kconfig
+++ b/src/mainboard/tyan/s2850/Kconfig
@@ -6,6 +6,7 @@ config BOARD_TYAN_S2850
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
select SOUTHBRIDGE_AMD_AMD8111
select SUPERIO_WINBOND_W83627HF
+ select HAVE_HARD_RESET
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select BOARD_ROMSIZE_KB_512
diff --git a/src/mainboard/tyan/s2875/Kconfig b/src/mainboard/tyan/s2875/Kconfig
index 17750f2de6..5b6ff9053f 100644
--- a/src/mainboard/tyan/s2875/Kconfig
+++ b/src/mainboard/tyan/s2875/Kconfig
@@ -7,6 +7,7 @@ config BOARD_TYAN_S2875
select SOUTHBRIDGE_AMD_AMD8151
select SOUTHBRIDGE_AMD_AMD8111
select SUPERIO_WINBOND_W83627HF
+ select HAVE_HARD_RESET
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select BOARD_ROMSIZE_KB_512
diff --git a/src/mainboard/tyan/s2880/Kconfig b/src/mainboard/tyan/s2880/Kconfig
index 0581862342..93005479a4 100644
--- a/src/mainboard/tyan/s2880/Kconfig
+++ b/src/mainboard/tyan/s2880/Kconfig
@@ -7,6 +7,7 @@ config BOARD_TYAN_S2880
select SOUTHBRIDGE_AMD_AMD8131
select SOUTHBRIDGE_AMD_AMD8111
select SUPERIO_WINBOND_W83627HF
+ select HAVE_HARD_RESET
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select BOARD_ROMSIZE_KB_512
diff --git a/src/mainboard/tyan/s2881/Kconfig b/src/mainboard/tyan/s2881/Kconfig
index 4ea0ea1605..017c6227f6 100644
--- a/src/mainboard/tyan/s2881/Kconfig
+++ b/src/mainboard/tyan/s2881/Kconfig
@@ -7,6 +7,7 @@ config BOARD_TYAN_S2881
select SOUTHBRIDGE_AMD_AMD8131
select SOUTHBRIDGE_AMD_AMD8111
select SUPERIO_WINBOND_W83627HF
+ select HAVE_HARD_RESET
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select BOARD_ROMSIZE_KB_512
diff --git a/src/mainboard/tyan/s2882/Kconfig b/src/mainboard/tyan/s2882/Kconfig
index fdc735318c..c5fd812325 100644
--- a/src/mainboard/tyan/s2882/Kconfig
+++ b/src/mainboard/tyan/s2882/Kconfig
@@ -7,6 +7,7 @@ config BOARD_TYAN_S2882
select SOUTHBRIDGE_AMD_AMD8131
select SOUTHBRIDGE_AMD_AMD8111
select SUPERIO_WINBOND_W83627HF
+ select HAVE_HARD_RESET
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select BOARD_ROMSIZE_KB_512
diff --git a/src/mainboard/tyan/s2885/Kconfig b/src/mainboard/tyan/s2885/Kconfig
index 0b8d5aca36..bd66b609b0 100644
--- a/src/mainboard/tyan/s2885/Kconfig
+++ b/src/mainboard/tyan/s2885/Kconfig
@@ -7,6 +7,7 @@ config BOARD_TYAN_S2885
select SOUTHBRIDGE_AMD_AMD8131
select SOUTHBRIDGE_AMD_AMD8111
select SUPERIO_WINBOND_W83627HF
+ select HAVE_HARD_RESET
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select BOARD_ROMSIZE_KB_512
diff --git a/src/mainboard/tyan/s2891/Kconfig b/src/mainboard/tyan/s2891/Kconfig
index ef609bce64..028934b508 100644
--- a/src/mainboard/tyan/s2891/Kconfig
+++ b/src/mainboard/tyan/s2891/Kconfig
@@ -7,6 +7,7 @@ config BOARD_TYAN_S2891
select SOUTHBRIDGE_NVIDIA_CK804
select SOUTHBRIDGE_AMD_AMD8131
select SUPERIO_WINBOND_W83627HF
+ select HAVE_HARD_RESET
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select SERIAL_CPU_INIT
diff --git a/src/mainboard/tyan/s2892/Kconfig b/src/mainboard/tyan/s2892/Kconfig
index 47a6274873..39a5cb9c54 100644
--- a/src/mainboard/tyan/s2892/Kconfig
+++ b/src/mainboard/tyan/s2892/Kconfig
@@ -7,6 +7,7 @@ config BOARD_TYAN_S2892
select SOUTHBRIDGE_NVIDIA_CK804
select SOUTHBRIDGE_AMD_AMD8131
select SUPERIO_WINBOND_W83627HF
+ select HAVE_HARD_RESET
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select SERIAL_CPU_INIT
diff --git a/src/mainboard/tyan/s2895/Kconfig b/src/mainboard/tyan/s2895/Kconfig
index a99f9d3ead..c411e9b575 100644
--- a/src/mainboard/tyan/s2895/Kconfig
+++ b/src/mainboard/tyan/s2895/Kconfig
@@ -7,6 +7,7 @@ config BOARD_TYAN_S2895
select SOUTHBRIDGE_NVIDIA_CK804
select SOUTHBRIDGE_AMD_AMD8131
select SUPERIO_SMSC_LPC47B397
+ select HAVE_HARD_RESET
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select SERIAL_CPU_INIT
diff --git a/src/mainboard/tyan/s2912/Makefile.inc b/src/mainboard/tyan/s2912/Makefile.inc
index 95aeeead41..271e9fe547 100644
--- a/src/mainboard/tyan/s2912/Makefile.inc
+++ b/src/mainboard/tyan/s2912/Makefile.inc
@@ -17,15 +17,7 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-obj-y += mainboard.o
-
#needed by irq_tables and mptable and acpi_tables
obj-y += get_bus_conf.o
-obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
obj-$(CONFIG_USE_INIT) += romstage.o
obj-$(CONFIG_AP_CODE_IN_CAR) += ap_romstage.o
-
-# This is part of the conversion to init-obj and away from included code.
-initobj-y += crt0.o
-
diff --git a/src/mainboard/tyan/s2912_fam10/Makefile.inc b/src/mainboard/tyan/s2912_fam10/Makefile.inc
index 95aeeead41..271e9fe547 100644
--- a/src/mainboard/tyan/s2912_fam10/Makefile.inc
+++ b/src/mainboard/tyan/s2912_fam10/Makefile.inc
@@ -17,15 +17,7 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-obj-y += mainboard.o
-
#needed by irq_tables and mptable and acpi_tables
obj-y += get_bus_conf.o
-obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
obj-$(CONFIG_USE_INIT) += romstage.o
obj-$(CONFIG_AP_CODE_IN_CAR) += ap_romstage.o
-
-# This is part of the conversion to init-obj and away from included code.
-initobj-y += crt0.o
-
diff --git a/src/mainboard/via/epia-cn/Makefile.inc b/src/mainboard/via/epia-cn/Makefile.inc
index 572af6f80c..691b3d55e3 100644
--- a/src/mainboard/via/epia-cn/Makefile.inc
+++ b/src/mainboard/via/epia-cn/Makefile.inc
@@ -1,3 +1 @@
ROMCCFLAGS := -mcpu=c3 -O
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/via/epia-m/Makefile.inc b/src/mainboard/via/epia-m/Makefile.inc
index 3f02ca68e0..490ba505c4 100644
--- a/src/mainboard/via/epia-m/Makefile.inc
+++ b/src/mainboard/via/epia-m/Makefile.inc
@@ -19,14 +19,8 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-initobj-y += crt0.o
-obj-y += mainboard.o
obj-y += vgabios.o
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
-
-
-
diff --git a/src/mainboard/via/epia-m700/Makefile.inc b/src/mainboard/via/epia-m700/Makefile.inc
index 8bae6614a1..462c1dcbe5 100644
--- a/src/mainboard/via/epia-m700/Makefile.inc
+++ b/src/mainboard/via/epia-m700/Makefile.inc
@@ -19,15 +19,8 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-initobj-y += crt0.o
-obj-y += mainboard.o
obj-y += wakeup.o
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
-obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
-
-
-
diff --git a/src/mainboard/via/epia-n/Makefile.inc b/src/mainboard/via/epia-n/Makefile.inc
index e8c0510dd2..c8aab2f66d 100644
--- a/src/mainboard/via/epia-n/Makefile.inc
+++ b/src/mainboard/via/epia-n/Makefile.inc
@@ -19,13 +19,5 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-initobj-y += crt0.o
-obj-y += mainboard.o
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
-obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
-
obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
-
-
-
diff --git a/src/mainboard/via/epia/Makefile.inc b/src/mainboard/via/epia/Makefile.inc
deleted file mode 100644
index aadc736d2e..0000000000
--- a/src/mainboard/via/epia/Makefile.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2008 VIA Technologies, Inc.
-## (Written by Aaron Lwe <aaron.lwe@gmail.com> for VIA)
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-initobj-y += crt0.o
-obj-y += mainboard.o
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
-
-
-
diff --git a/src/mainboard/via/pc2500e/Makefile.inc b/src/mainboard/via/pc2500e/Makefile.inc
index c02dce811c..8d32f8797a 100644
--- a/src/mainboard/via/pc2500e/Makefile.inc
+++ b/src/mainboard/via/pc2500e/Makefile.inc
@@ -19,5 +19,3 @@
##
ROMCCFLAGS ?= -mcpu=c3
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/via/vt8454c/Kconfig b/src/mainboard/via/vt8454c/Kconfig
index 40a5fd818d..74c3fe1e36 100644
--- a/src/mainboard/via/vt8454c/Kconfig
+++ b/src/mainboard/via/vt8454c/Kconfig
@@ -8,6 +8,7 @@ config BOARD_VIA_VT8454C
select HAVE_MP_TABLE
# select MMCONF_SUPPORT
select USE_PRINTK_IN_CAR
+ select HAVE_HARD_RESET
select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_512
select USE_DCACHE_RAM
diff --git a/src/mainboard/via/vt8454c/Makefile.inc b/src/mainboard/via/vt8454c/Makefile.inc
index 578d0e541b..23410507c0 100644
--- a/src/mainboard/via/vt8454c/Makefile.inc
+++ b/src/mainboard/via/vt8454c/Makefile.inc
@@ -17,14 +17,6 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-obj-y += mainboard.o
-
-obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
-
-initobj-y += crt0.o
-
-
diff --git a/src/mainboard/winent/pl6064/Makefile.inc b/src/mainboard/winent/pl6064/Makefile.inc
deleted file mode 100644
index 7cdf2c93c6..0000000000
--- a/src/mainboard/winent/pl6064/Makefile.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-driver-y += mainboard.o
-
-# Needed by irq_tables and mptable and acpi_tables.
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
-
-# This is part of the conversion to init-obj and away from included code.
-
-initobj-y += crt0.o
-
-