Unify crt0s setup to src/arch/i386/Makefile.inc. This variable

is not something users have to concern themselves with anymore.

Also fixes some wrong romstrap configs for boards, fixing a couple
of them.

Also add "make printcrt0s" target for debugging crt0s when updating
modified checkouts.

Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>


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

46 files changed, 0 insertions, 322 deletions

diff --git a/src/mainboard/Makefile.k8_CAR.inc b/src/mainboard/Makefile.k8_CAR.inc
index accde548d7..f50bcd334d 100644
--- a/src/mainboard/Makefile.k8_CAR.inc
+++ b/src/mainboard/Makefile.k8_CAR.inc
@@ -33,12 +33,6 @@ 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
 
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/cpu/amd/car/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds
diff --git a/src/mainboard/Makefile.k8_ck804.inc b/src/mainboard/Makefile.k8_ck804.inc
index 350d938052..56e0350b15 100644
--- a/src/mainboard/Makefile.k8_ck804.inc
+++ b/src/mainboard/Makefile.k8_ck804.inc
@@ -36,13 +36,6 @@ obj-$(CONFIG_GENERATE_ACPI_TABLES) +=  acpi_tables.o
 
 initobj-y += crt0.o
 
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/southbridge/nvidia/ck804/romstrap.inc
-crt0s += $(src)/cpu/amd/car/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds
diff --git a/src/mainboard/Makefile.romccboard.inc b/src/mainboard/Makefile.romccboard.inc
index a94fd75961..898c67d2fc 100644
--- a/src/mainboard/Makefile.romccboard.inc
+++ b/src/mainboard/Makefile.romccboard.inc
@@ -21,35 +21,6 @@
 
 initobj-y += crt0.o
 
-crt0s :=
-ifeq ($(CONFIG_BIG_BOOTBLOCK),y)
-crt0s += $(src)/cpu/x86/16bit/entry16.inc
-endif
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-ifeq ($(CONFIG_BIG_BOOTBLOCK),y)
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/cpu_reset.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-endif
-crt0s += $(src)/cpu/x86/fpu_enable.inc
-ifeq ($(CONFIG_CPU_AMD_GX1),y)
-crt0s += $(src)/cpu/amd/model_gx1/cpu_setup.inc
-crt0s += $(src)/cpu/amd/model_gx1/gx_setup.inc
-endif
-ifeq ($(CONFIG_SSE),y)
-crt0s += $(src)/cpu/x86/sse_enable.inc
-endif
-ifeq ($(CONFIG_BIG_BOOTBLOCK),y)
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/failover.inc
-endif
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
-ifeq ($(CONFIG_SSE),y)
-crt0s += $(src)/cpu/x86/sse_disable.inc
-endif
-ifeq ($(CONFIG_MMX),y)
-crt0s += $(src)/cpu/x86/mmx_disable.inc
-endif
-
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ifeq ($(CONFIG_BIG_BOOTBLOCK),y)
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds
diff --git a/src/mainboard/amd/db800/Makefile.inc b/src/mainboard/amd/db800/Makefile.inc
index 5bace682ab..1ce4ced5a3 100644
--- a/src/mainboard/amd/db800/Makefile.inc
+++ b/src/mainboard/amd/db800/Makefile.inc
@@ -6,12 +6,6 @@ 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
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/cpu/amd/model_lx/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds
diff --git a/src/mainboard/amd/dbm690t/Makefile.inc b/src/mainboard/amd/dbm690t/Makefile.inc
index d8de19556c..c88b6329d7 100644
--- a/src/mainboard/amd/dbm690t/Makefile.inc
+++ b/src/mainboard/amd/dbm690t/Makefile.inc
@@ -31,12 +31,6 @@ obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
 
 initobj-y += crt0.o
 
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/cpu/amd/car/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds
diff --git a/src/mainboard/amd/norwich/Makefile.inc b/src/mainboard/amd/norwich/Makefile.inc
index 1327c63b3b..1ce4ced5a3 100644
--- a/src/mainboard/amd/norwich/Makefile.inc
+++ b/src/mainboard/amd/norwich/Makefile.inc
@@ -6,13 +6,6 @@ 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
-# FIXME in $(top)/Makefile
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/cpu/amd/model_lx/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds
diff --git a/src/mainboard/amd/pistachio/Makefile.inc b/src/mainboard/amd/pistachio/Makefile.inc
index 0077b008d5..b0a8420911 100644
--- a/src/mainboard/amd/pistachio/Makefile.inc
+++ b/src/mainboard/amd/pistachio/Makefile.inc
@@ -30,13 +30,6 @@ 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
-# FIXME in $(top)/Makefile
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/cpu/amd/car/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds
diff --git a/src/mainboard/amd/serengeti_cheetah/Makefile.inc b/src/mainboard/amd/serengeti_cheetah/Makefile.inc
index 5801d30836..80e009735e 100644
--- a/src/mainboard/amd/serengeti_cheetah/Makefile.inc
+++ b/src/mainboard/amd/serengeti_cheetah/Makefile.inc
@@ -35,13 +35,6 @@ 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
-# FIXME in $(top)/Makefile
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/cpu/amd/car/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc b/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc
index c8af83e148..4ee287679f 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc
@@ -38,10 +38,6 @@ 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
-# FIXME in $(top)/Makefile
-crt0s := $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/amd/car/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/32bit/entry32.lds
diff --git a/src/mainboard/artecgroup/dbe61/Makefile.inc b/src/mainboard/artecgroup/dbe61/Makefile.inc
index 1327c63b3b..1ce4ced5a3 100644
--- a/src/mainboard/artecgroup/dbe61/Makefile.inc
+++ b/src/mainboard/artecgroup/dbe61/Makefile.inc
@@ -6,13 +6,6 @@ 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
-# FIXME in $(top)/Makefile
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/cpu/amd/model_lx/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds
diff --git a/src/mainboard/asus/a8n_e/Makefile.inc b/src/mainboard/asus/a8n_e/Makefile.inc
index 7be885beda..ba21f0155c 100644
--- a/src/mainboard/asus/a8n_e/Makefile.inc
+++ b/src/mainboard/asus/a8n_e/Makefile.inc
@@ -27,13 +27,6 @@ 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
-# FIXME in $(top)/Makefile
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/cpu/amd/car/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds
diff --git a/src/mainboard/asus/a8v-e_se/Makefile.inc b/src/mainboard/asus/a8v-e_se/Makefile.inc
index 1eb7fe5880..1d696b2e83 100644
--- a/src/mainboard/asus/a8v-e_se/Makefile.inc
+++ b/src/mainboard/asus/a8v-e_se/Makefile.inc
@@ -9,14 +9,6 @@ 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
-# FIXME in $(top)/Makefile
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/southbridge/via/k8t890/romstrap.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/cpu/amd/car/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds
diff --git a/src/mainboard/asus/m2v-mx_se/Makefile.inc b/src/mainboard/asus/m2v-mx_se/Makefile.inc
index c537485f2f..45fe3942b2 100644
--- a/src/mainboard/asus/m2v-mx_se/Makefile.inc
+++ b/src/mainboard/asus/m2v-mx_se/Makefile.inc
@@ -27,10 +27,6 @@ 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
-# FIXME in $(top)/Makefile
-crt0s := $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/amd/car/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/32bit/entry32.lds
diff --git a/src/mainboard/bcom/winnetp680/Makefile.inc b/src/mainboard/bcom/winnetp680/Makefile.inc
index c290d7e4f0..5c9a32d3e8 100644
--- a/src/mainboard/bcom/winnetp680/Makefile.inc
+++ b/src/mainboard/bcom/winnetp680/Makefile.inc
@@ -34,11 +34,4 @@ ldscripts += $(src)/cpu/x86/16bit/reset16.lds
 ldscripts += $(src)/arch/i386/lib/id.lds
 ldscripts += $(src)/arch/i386/lib/failover.lds
 
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/cpu/x86/fpu_enable.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
-crt0s += $(src)/cpu/x86/mmx_disable.inc
 
diff --git a/src/mainboard/digitallogic/msm800sev/Makefile.inc b/src/mainboard/digitallogic/msm800sev/Makefile.inc
index 1327c63b3b..1ce4ced5a3 100644
--- a/src/mainboard/digitallogic/msm800sev/Makefile.inc
+++ b/src/mainboard/digitallogic/msm800sev/Makefile.inc
@@ -6,13 +6,6 @@ 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
-# FIXME in $(top)/Makefile
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/cpu/amd/model_lx/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc b/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc
index 92bd0a88a8..1941173e61 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc
+++ b/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc
@@ -28,12 +28,6 @@ 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
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/cpu/amd/car/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds
diff --git a/src/mainboard/gigabyte/m57sli/Makefile.inc b/src/mainboard/gigabyte/m57sli/Makefile.inc
index cc2ea04ff5..50202d937a 100644
--- a/src/mainboard/gigabyte/m57sli/Makefile.inc
+++ b/src/mainboard/gigabyte/m57sli/Makefile.inc
@@ -31,13 +31,6 @@ 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
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/southbridge/nvidia/mcp55/romstrap.inc
-crt0s += $(src)/cpu/amd/car/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds
diff --git a/src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc b/src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc
index 1327c63b3b..1ce4ced5a3 100644
--- a/src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc
+++ b/src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc
@@ -6,13 +6,6 @@ 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
-# FIXME in $(top)/Makefile
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/cpu/amd/model_lx/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds
diff --git a/src/mainboard/intel/d945gclf/Makefile.inc b/src/mainboard/intel/d945gclf/Makefile.inc
index 7f817de061..1fba00169e 100644
--- a/src/mainboard/intel/d945gclf/Makefile.inc
+++ b/src/mainboard/intel/d945gclf/Makefile.inc
@@ -35,13 +35,6 @@ 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
-# FIXME in $(top)/Makefile
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/cpu/intel/model_6ex/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds
diff --git a/src/mainboard/intel/eagleheights/Makefile.inc b/src/mainboard/intel/eagleheights/Makefile.inc
index 9e17a56a12..ec85f29252 100644
--- a/src/mainboard/intel/eagleheights/Makefile.inc
+++ b/src/mainboard/intel/eagleheights/Makefile.inc
@@ -9,14 +9,7 @@ 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
-# FIXME in $(top)/Makefile
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
 # Use Intel Core (not Core 2) code for CAR init, any CPU might be used.
-crt0s += $(src)/cpu/intel/model_6ex/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds
diff --git a/src/mainboard/iwill/dk8_htx/Makefile.inc b/src/mainboard/iwill/dk8_htx/Makefile.inc
index ecf24c0733..dc2b7e6dc1 100644
--- a/src/mainboard/iwill/dk8_htx/Makefile.inc
+++ b/src/mainboard/iwill/dk8_htx/Makefile.inc
@@ -34,13 +34,6 @@ 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
-# FIXME in $(top)/Makefile
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/cpu/amd/car/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds
diff --git a/src/mainboard/jetway/j7f24/Makefile.inc b/src/mainboard/jetway/j7f24/Makefile.inc
index 858a39bc73..78a2a4b4bc 100644
--- a/src/mainboard/jetway/j7f24/Makefile.inc
+++ b/src/mainboard/jetway/j7f24/Makefile.inc
@@ -30,11 +30,4 @@ ldscripts += $(src)/cpu/x86/16bit/reset16.lds
 ldscripts += $(src)/arch/i386/lib/id.lds
 ldscripts += $(src)/arch/i386/lib/failover.lds
 
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/cpu/x86/fpu_enable.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
-crt0s += $(src)/cpu/x86/mmx_disable.inc
 
diff --git a/src/mainboard/kontron/986lcd-m/Makefile.inc b/src/mainboard/kontron/986lcd-m/Makefile.inc
index d1a1dedfe7..489a74dc17 100644
--- a/src/mainboard/kontron/986lcd-m/Makefile.inc
+++ b/src/mainboard/kontron/986lcd-m/Makefile.inc
@@ -36,9 +36,6 @@ smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o
 
 initobj-y += crt0.o
 
-crt0s := $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/intel/model_6ex/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/32bit/entry32.lds
diff --git a/src/mainboard/kontron/kt690/Makefile.inc b/src/mainboard/kontron/kt690/Makefile.inc
index 0077b008d5..b0a8420911 100644
--- a/src/mainboard/kontron/kt690/Makefile.inc
+++ b/src/mainboard/kontron/kt690/Makefile.inc
@@ -30,13 +30,6 @@ 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
-# FIXME in $(top)/Makefile
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/cpu/amd/car/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds
diff --git a/src/mainboard/lippert/roadrunner-lx/Makefile.inc b/src/mainboard/lippert/roadrunner-lx/Makefile.inc
index 1327c63b3b..1ce4ced5a3 100644
--- a/src/mainboard/lippert/roadrunner-lx/Makefile.inc
+++ b/src/mainboard/lippert/roadrunner-lx/Makefile.inc
@@ -6,13 +6,6 @@ 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
-# FIXME in $(top)/Makefile
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/cpu/amd/model_lx/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds
diff --git a/src/mainboard/lippert/spacerunner-lx/Makefile.inc b/src/mainboard/lippert/spacerunner-lx/Makefile.inc
index 1327c63b3b..1ce4ced5a3 100644
--- a/src/mainboard/lippert/spacerunner-lx/Makefile.inc
+++ b/src/mainboard/lippert/spacerunner-lx/Makefile.inc
@@ -6,13 +6,6 @@ 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
-# FIXME in $(top)/Makefile
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/cpu/amd/model_lx/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds
diff --git a/src/mainboard/msi/ms7260/Makefile.inc b/src/mainboard/msi/ms7260/Makefile.inc
index 92bd0a88a8..1941173e61 100644
--- a/src/mainboard/msi/ms7260/Makefile.inc
+++ b/src/mainboard/msi/ms7260/Makefile.inc
@@ -28,12 +28,6 @@ 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
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/cpu/amd/car/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds
diff --git a/src/mainboard/msi/ms9282/Makefile.inc b/src/mainboard/msi/ms9282/Makefile.inc
index 2a4889c9b3..ae7ede2453 100644
--- a/src/mainboard/msi/ms9282/Makefile.inc
+++ b/src/mainboard/msi/ms9282/Makefile.inc
@@ -30,12 +30,6 @@ 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
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/cpu/amd/car/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds
diff --git a/src/mainboard/nvidia/l1_2pvv/Makefile.inc b/src/mainboard/nvidia/l1_2pvv/Makefile.inc
index 3187526b84..acbdbd1fb6 100644
--- a/src/mainboard/nvidia/l1_2pvv/Makefile.inc
+++ b/src/mainboard/nvidia/l1_2pvv/Makefile.inc
@@ -28,13 +28,6 @@ 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
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/southbridge/nvidia/mcp55/romstrap.inc
-crt0s += $(src)/cpu/amd/car/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds
diff --git a/src/mainboard/pcengines/alix1c/Makefile.inc b/src/mainboard/pcengines/alix1c/Makefile.inc
index 1327c63b3b..1ce4ced5a3 100644
--- a/src/mainboard/pcengines/alix1c/Makefile.inc
+++ b/src/mainboard/pcengines/alix1c/Makefile.inc
@@ -6,13 +6,6 @@ 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
-# FIXME in $(top)/Makefile
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/cpu/amd/model_lx/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds
diff --git a/src/mainboard/roda/rk886ex/Makefile.inc b/src/mainboard/roda/rk886ex/Makefile.inc
index 93fbb13100..f5ccad05b0 100644
--- a/src/mainboard/roda/rk886ex/Makefile.inc
+++ b/src/mainboard/roda/rk886ex/Makefile.inc
@@ -37,13 +37,6 @@ 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
-# FIXME in $(top)/Makefile
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/cpu/intel/model_6ex/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds
diff --git a/src/mainboard/supermicro/h8dme/Makefile.inc b/src/mainboard/supermicro/h8dme/Makefile.inc
index eb6bafadf6..806bcafc89 100644
--- a/src/mainboard/supermicro/h8dme/Makefile.inc
+++ b/src/mainboard/supermicro/h8dme/Makefile.inc
@@ -28,14 +28,6 @@ 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
-# FIXME in $(top)/Makefile
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/southbridge/nvidia/mcp55/romstrap.inc
-crt0s += $(src)/cpu/amd/car/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds
diff --git a/src/mainboard/supermicro/h8dmr/Makefile.inc b/src/mainboard/supermicro/h8dmr/Makefile.inc
index f72360a50d..c4ec5851ad 100644
--- a/src/mainboard/supermicro/h8dmr/Makefile.inc
+++ b/src/mainboard/supermicro/h8dmr/Makefile.inc
@@ -27,14 +27,6 @@ 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
-# FIXME in $(top)/Makefile
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/southbridge/nvidia/mcp55/romstrap.inc
-crt0s += $(src)/cpu/amd/car/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds
diff --git a/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc b/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc
index 3ac7ef4443..c14d7ee98a 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc
+++ b/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc
@@ -27,10 +27,6 @@ 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
-# FIXME in $(top)/Makefile
-crt0s := $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/amd/car/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/32bit/entry32.lds
diff --git a/src/mainboard/supermicro/h8qme_fam10/Makefile.inc b/src/mainboard/supermicro/h8qme_fam10/Makefile.inc
index 3ac7ef4443..c14d7ee98a 100644
--- a/src/mainboard/supermicro/h8qme_fam10/Makefile.inc
+++ b/src/mainboard/supermicro/h8qme_fam10/Makefile.inc
@@ -27,10 +27,6 @@ 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
-# FIXME in $(top)/Makefile
-crt0s := $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/amd/car/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/32bit/entry32.lds
diff --git a/src/mainboard/technexion/tim5690/Makefile.inc b/src/mainboard/technexion/tim5690/Makefile.inc
index b739f71249..b3fd30a4bd 100644
--- a/src/mainboard/technexion/tim5690/Makefile.inc
+++ b/src/mainboard/technexion/tim5690/Makefile.inc
@@ -36,13 +36,6 @@ obj-y += vgabios.o
 # This is part of the conversion to init-obj and away from included code.
 
 initobj-y += crt0.o
-# FIXME in $(top)/Makefile
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/cpu/amd/car/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds
diff --git a/src/mainboard/technexion/tim8690/Makefile.inc b/src/mainboard/technexion/tim8690/Makefile.inc
index 0077b008d5..b0a8420911 100644
--- a/src/mainboard/technexion/tim8690/Makefile.inc
+++ b/src/mainboard/technexion/tim8690/Makefile.inc
@@ -30,13 +30,6 @@ 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
-# FIXME in $(top)/Makefile
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/cpu/amd/car/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds
diff --git a/src/mainboard/tyan/s2735/Makefile.inc b/src/mainboard/tyan/s2735/Makefile.inc
index 9dcb8a517b..d4eefc3c9b 100644
--- a/src/mainboard/tyan/s2735/Makefile.inc
+++ b/src/mainboard/tyan/s2735/Makefile.inc
@@ -32,13 +32,6 @@ 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
-# FIXME in $(top)/Makefile
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/cpu/x86/car/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds
diff --git a/src/mainboard/tyan/s2912/Makefile.inc b/src/mainboard/tyan/s2912/Makefile.inc
index 3187526b84..acbdbd1fb6 100644
--- a/src/mainboard/tyan/s2912/Makefile.inc
+++ b/src/mainboard/tyan/s2912/Makefile.inc
@@ -28,13 +28,6 @@ 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
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/southbridge/nvidia/mcp55/romstrap.inc
-crt0s += $(src)/cpu/amd/car/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds
diff --git a/src/mainboard/tyan/s2912_fam10/Makefile.inc b/src/mainboard/tyan/s2912_fam10/Makefile.inc
index 08a9ee5520..a551b104a7 100644
--- a/src/mainboard/tyan/s2912_fam10/Makefile.inc
+++ b/src/mainboard/tyan/s2912_fam10/Makefile.inc
@@ -28,9 +28,6 @@ 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
-crt0s := $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/amd/car/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/32bit/entry32.lds
diff --git a/src/mainboard/via/epia-m/Makefile.inc b/src/mainboard/via/epia-m/Makefile.inc
index 66318c603b..251adbe37e 100644
--- a/src/mainboard/via/epia-m/Makefile.inc
+++ b/src/mainboard/via/epia-m/Makefile.inc
@@ -30,17 +30,8 @@ obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-ldscripts += $(src)/northbridge/via/vx800/romstrap.lds
 ldscripts += $(src)/cpu/x86/16bit/reset16.lds
 ldscripts += $(src)/arch/i386/lib/id.lds
 ldscripts += $(src)/arch/i386/lib/failover.lds
 
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/northbridge/via/vx800/romstrap.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/cpu/x86/fpu_enable.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
-crt0s += $(src)/cpu/x86/mmx_disable.inc
 
diff --git a/src/mainboard/via/epia-m700/Makefile.inc b/src/mainboard/via/epia-m700/Makefile.inc
index 159f2cfd13..6cfa852ded 100644
--- a/src/mainboard/via/epia-m700/Makefile.inc
+++ b/src/mainboard/via/epia-m700/Makefile.inc
@@ -36,11 +36,4 @@ ldscripts += $(src)/cpu/x86/16bit/reset16.lds
 ldscripts += $(src)/arch/i386/lib/id.lds
 ldscripts += $(src)/arch/i386/lib/failover.lds
 
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/northbridge/via/vx800/romstrap.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/cpu/via/car/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
diff --git a/src/mainboard/via/epia-n/Makefile.inc b/src/mainboard/via/epia-n/Makefile.inc
index 2515f15149..131eab3676 100644
--- a/src/mainboard/via/epia-n/Makefile.inc
+++ b/src/mainboard/via/epia-n/Makefile.inc
@@ -33,11 +33,4 @@ ldscripts += $(src)/cpu/x86/16bit/reset16.lds
 ldscripts += $(src)/arch/i386/lib/id.lds
 ldscripts += $(src)/arch/i386/lib/failover.lds
 
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/cpu/x86/fpu_enable.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
-crt0s += $(src)/cpu/x86/mmx_disable.inc
 
diff --git a/src/mainboard/via/epia/Makefile.inc b/src/mainboard/via/epia/Makefile.inc
index 4680e435af..5e475ae92b 100644
--- a/src/mainboard/via/epia/Makefile.inc
+++ b/src/mainboard/via/epia/Makefile.inc
@@ -29,11 +29,4 @@ ldscripts += $(src)/cpu/x86/16bit/reset16.lds
 ldscripts += $(src)/arch/i386/lib/id.lds
 ldscripts += $(src)/arch/i386/lib/failover.lds
 
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/cpu/x86/fpu_enable.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
-crt0s += $(src)/cpu/x86/mmx_disable.inc
 
diff --git a/src/mainboard/via/vt8454c/Makefile.inc b/src/mainboard/via/vt8454c/Makefile.inc
index 25d541c71e..d5d96e61ff 100644
--- a/src/mainboard/via/vt8454c/Makefile.inc
+++ b/src/mainboard/via/vt8454c/Makefile.inc
@@ -26,13 +26,6 @@ obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
 obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
 
 initobj-y += crt0.o
-# FIXME in $(top)/Makefile
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/cpu/via/car/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds
diff --git a/src/mainboard/winent/pl6064/Makefile.inc b/src/mainboard/winent/pl6064/Makefile.inc
index f91c98550e..091d0482e4 100644
--- a/src/mainboard/winent/pl6064/Makefile.inc
+++ b/src/mainboard/winent/pl6064/Makefile.inc
@@ -6,12 +6,6 @@ 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
-crt0s := $(src)/cpu/x86/16bit/entry16.inc
-crt0s += $(src)/cpu/x86/32bit/entry32.inc
-crt0s += $(src)/cpu/x86/16bit/reset16.inc
-crt0s += $(src)/arch/i386/lib/id.inc
-crt0s += $(src)/cpu/amd/model_lx/cache_as_ram.inc
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds