Index: src/mainboard/Makefile.k8_ck804.inc
===================================================================
--- src/mainboard/Makefile.k8_ck804.inc	(revision 5163)
+++ src/mainboard/Makefile.k8_ck804.inc	(working copy)
@@ -37,10 +37,4 @@
 initobj-y += crt0.o
 
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/southbridge/nvidia/ck804/romstrap.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
 
Index: src/mainboard/iwill/dk8_htx/Makefile.inc
===================================================================
--- src/mainboard/iwill/dk8_htx/Makefile.inc	(revision 5163)
+++ src/mainboard/iwill/dk8_htx/Makefile.inc	(working copy)
@@ -35,9 +35,4 @@
 
 initobj-y += crt0.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
 
Index: src/mainboard/bcom/winnetp680/Makefile.inc
===================================================================
--- src/mainboard/bcom/winnetp680/Makefile.inc	(revision 5163)
+++ src/mainboard/bcom/winnetp680/Makefile.inc	(working copy)
@@ -28,10 +28,5 @@
 obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
 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)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
 
 
Index: src/mainboard/supermicro/h8dmr/Makefile.inc
===================================================================
--- src/mainboard/supermicro/h8dmr/Makefile.inc	(revision 5163)
+++ src/mainboard/supermicro/h8dmr/Makefile.inc	(working copy)
@@ -28,10 +28,4 @@
 
 initobj-y += crt0.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/southbridge/nvidia/mcp55/romstrap.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
 
Index: src/mainboard/supermicro/h8dme/Makefile.inc
===================================================================
--- src/mainboard/supermicro/h8dme/Makefile.inc	(revision 5163)
+++ src/mainboard/supermicro/h8dme/Makefile.inc	(working copy)
@@ -29,10 +29,4 @@
 
 initobj-y += crt0.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/southbridge/nvidia/mcp55/romstrap.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
 
Index: src/mainboard/supermicro/h8dmr_fam10/Makefile.inc
===================================================================
--- src/mainboard/supermicro/h8dmr_fam10/Makefile.inc	(revision 5163)
+++ src/mainboard/supermicro/h8dmr_fam10/Makefile.inc	(working copy)
@@ -28,7 +28,4 @@
 
 initobj-y += crt0.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/32bit/entry32.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
 
Index: src/mainboard/supermicro/h8qme_fam10/Makefile.inc
===================================================================
--- src/mainboard/supermicro/h8qme_fam10/Makefile.inc	(revision 5163)
+++ src/mainboard/supermicro/h8qme_fam10/Makefile.inc	(working copy)
@@ -28,7 +28,4 @@
 
 initobj-y += crt0.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/32bit/entry32.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
 
Index: src/mainboard/kontron/986lcd-m/Makefile.inc
===================================================================
--- src/mainboard/kontron/986lcd-m/Makefile.inc	(revision 5163)
+++ src/mainboard/kontron/986lcd-m/Makefile.inc	(working copy)
@@ -37,6 +37,4 @@
 initobj-y += crt0.o
 
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/32bit/entry32.lds
 
Index: src/mainboard/kontron/kt690/Makefile.inc
===================================================================
--- src/mainboard/kontron/kt690/Makefile.inc	(revision 5163)
+++ src/mainboard/kontron/kt690/Makefile.inc	(working copy)
@@ -31,9 +31,4 @@
 
 initobj-y += crt0.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
 
Index: src/mainboard/gigabyte/m57sli/Makefile.inc
===================================================================
--- src/mainboard/gigabyte/m57sli/Makefile.inc	(revision 5163)
+++ src/mainboard/gigabyte/m57sli/Makefile.inc	(working copy)
@@ -32,13 +32,3 @@
 # This is part of the conversion to init-obj and away from included code. 
 initobj-y += crt0.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/southbridge/nvidia/mcp55/romstrap.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
-ifeq ($(CONFIG_AP_CODE_IN_CAR),y)
-ldscripts += $(src)/arch/i386/init/ldscript_apc.lb
-endif
-
Index: src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc
===================================================================
--- src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc	(revision 5163)
+++ src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc	(working copy)
@@ -29,12 +29,3 @@
 # This is part of the conversion to init-obj and away from included code. 
 initobj-y += crt0.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
-ifeq ($(CONFIG_AP_CODE_IN_CAR),y)
-ldscripts += $(src)/arch/i386/init/ldscript_apc.lb
-endif
-
Index: src/mainboard/digitallogic/msm800sev/Makefile.inc
===================================================================
--- src/mainboard/digitallogic/msm800sev/Makefile.inc	(revision 5163)
+++ src/mainboard/digitallogic/msm800sev/Makefile.inc	(working copy)
@@ -7,9 +7,4 @@
 
 initobj-y += crt0.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
 
Index: src/mainboard/amd/pistachio/Makefile.inc
===================================================================
--- src/mainboard/amd/pistachio/Makefile.inc	(revision 5163)
+++ src/mainboard/amd/pistachio/Makefile.inc	(working copy)
@@ -31,9 +31,4 @@
 
 initobj-y += crt0.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
 
Index: src/mainboard/amd/dbm690t/Makefile.inc
===================================================================
--- src/mainboard/amd/dbm690t/Makefile.inc	(revision 5163)
+++ src/mainboard/amd/dbm690t/Makefile.inc	(working copy)
@@ -32,9 +32,4 @@
 initobj-y += crt0.o
 
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
 
Index: src/mainboard/amd/serengeti_cheetah/Makefile.inc
===================================================================
--- src/mainboard/amd/serengeti_cheetah/Makefile.inc	(revision 5163)
+++ src/mainboard/amd/serengeti_cheetah/Makefile.inc	(working copy)
@@ -36,9 +36,4 @@
 
 initobj-y += crt0.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
 
Index: src/mainboard/amd/norwich/Makefile.inc
===================================================================
--- src/mainboard/amd/norwich/Makefile.inc	(revision 5163)
+++ src/mainboard/amd/norwich/Makefile.inc	(working copy)
@@ -7,9 +7,4 @@
 
 initobj-y += crt0.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
 
Index: src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc
===================================================================
--- src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc	(revision 5163)
+++ src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc	(working copy)
@@ -39,7 +39,4 @@
 
 initobj-y += crt0.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/32bit/entry32.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
 
Index: src/mainboard/amd/db800/Makefile.inc
===================================================================
--- src/mainboard/amd/db800/Makefile.inc	(revision 5163)
+++ src/mainboard/amd/db800/Makefile.inc	(working copy)
@@ -7,9 +7,4 @@
 
 initobj-y += crt0.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
 
Index: src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc
===================================================================
--- src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc	(revision 5163)
+++ src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc	(working copy)
@@ -7,9 +7,4 @@
 
 initobj-y += crt0.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
 
Index: src/mainboard/tyan/s2912/Makefile.inc
===================================================================
--- src/mainboard/tyan/s2912/Makefile.inc	(revision 5163)
+++ src/mainboard/tyan/s2912/Makefile.inc	(working copy)
@@ -29,13 +29,3 @@
 # This is part of the conversion to init-obj and away from included code. 
 initobj-y += crt0.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/southbridge/nvidia/mcp55/romstrap.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
-ifeq ($(CONFIG_AP_CODE_IN_CAR),y)
-ldscripts += $(src)/arch/i386/init/ldscript_apc.lb
-endif
-
Index: src/mainboard/tyan/s2735/Makefile.inc
===================================================================
--- src/mainboard/tyan/s2735/Makefile.inc	(revision 5163)
+++ src/mainboard/tyan/s2735/Makefile.inc	(working copy)
@@ -33,10 +33,4 @@
 
 initobj-y += crt0.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
-ldscripts += $(src)/cpu/x86/car/cache_as_ram.lds
 
Index: src/mainboard/tyan/s2912_fam10/Makefile.inc
===================================================================
--- src/mainboard/tyan/s2912_fam10/Makefile.inc	(revision 5163)
+++ src/mainboard/tyan/s2912_fam10/Makefile.inc	(working copy)
@@ -29,10 +29,3 @@
 # This is part of the conversion to init-obj and away from included code. 
 initobj-y += crt0.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/32bit/entry32.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
-ifeq ($(CONFIG_AP_CODE_IN_CAR),y)
-ldscripts += $(src)/arch/i386/init/ldscript_apc.lb
-endif
-
Index: src/mainboard/pcengines/alix1c/Makefile.inc
===================================================================
--- src/mainboard/pcengines/alix1c/Makefile.inc	(revision 5163)
+++ src/mainboard/pcengines/alix1c/Makefile.inc	(working copy)
@@ -7,9 +7,4 @@
 
 initobj-y += crt0.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
 
Index: src/mainboard/artecgroup/dbe61/Makefile.inc
===================================================================
--- src/mainboard/artecgroup/dbe61/Makefile.inc	(revision 5163)
+++ src/mainboard/artecgroup/dbe61/Makefile.inc	(working copy)
@@ -7,9 +7,4 @@
 
 initobj-y += crt0.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
 
Index: src/mainboard/lippert/roadrunner-lx/Makefile.inc
===================================================================
--- src/mainboard/lippert/roadrunner-lx/Makefile.inc	(revision 5163)
+++ src/mainboard/lippert/roadrunner-lx/Makefile.inc	(working copy)
@@ -7,9 +7,4 @@
 
 initobj-y += crt0.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
 
Index: src/mainboard/lippert/spacerunner-lx/Makefile.inc
===================================================================
--- src/mainboard/lippert/spacerunner-lx/Makefile.inc	(revision 5163)
+++ src/mainboard/lippert/spacerunner-lx/Makefile.inc	(working copy)
@@ -7,9 +7,4 @@
 
 initobj-y += crt0.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
 
Index: src/mainboard/via/epia-m700/Makefile.inc
===================================================================
--- src/mainboard/via/epia-m700/Makefile.inc	(revision 5163)
+++ src/mainboard/via/epia-m700/Makefile.inc	(working copy)
@@ -29,11 +29,5 @@
 obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
 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
 
 
Index: src/mainboard/via/vt8454c/Makefile.inc
===================================================================
--- src/mainboard/via/vt8454c/Makefile.inc	(revision 5163)
+++ src/mainboard/via/vt8454c/Makefile.inc	(working copy)
@@ -27,9 +27,4 @@
 
 initobj-y += crt0.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
 
Index: src/mainboard/via/epia-m/Makefile.inc
===================================================================
--- src/mainboard/via/epia-m/Makefile.inc	(revision 5163)
+++ src/mainboard/via/epia-m/Makefile.inc	(working copy)
@@ -28,10 +28,5 @@
 obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
 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)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
 
 
Index: src/mainboard/via/epia-n/Makefile.inc
===================================================================
--- src/mainboard/via/epia-n/Makefile.inc	(revision 5163)
+++ src/mainboard/via/epia-n/Makefile.inc	(working copy)
@@ -27,10 +27,5 @@
 obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
 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)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
 
 
Index: src/mainboard/via/epia/Makefile.inc
===================================================================
--- src/mainboard/via/epia/Makefile.inc	(revision 5163)
+++ src/mainboard/via/epia/Makefile.inc	(working copy)
@@ -23,10 +23,5 @@
 obj-y += mainboard.o
 obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
 
 
Index: src/mainboard/roda/rk886ex/Makefile.inc
===================================================================
--- src/mainboard/roda/rk886ex/Makefile.inc	(revision 5163)
+++ src/mainboard/roda/rk886ex/Makefile.inc	(working copy)
@@ -38,9 +38,4 @@
 
 initobj-y += crt0.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
 
Index: src/mainboard/msi/ms9282/Makefile.inc
===================================================================
--- src/mainboard/msi/ms9282/Makefile.inc	(revision 5163)
+++ src/mainboard/msi/ms9282/Makefile.inc	(working copy)
@@ -31,12 +31,3 @@
 # This is part of the conversion to init-obj and away from included code. 
 initobj-y += crt0.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
-ifeq ($(CONFIG_AP_CODE_IN_CAR),y)
-ldscripts += $(src)/arch/i386/init/ldscript_apc.lb
-endif
-
Index: src/mainboard/msi/ms7260/Makefile.inc
===================================================================
--- src/mainboard/msi/ms7260/Makefile.inc	(revision 5163)
+++ src/mainboard/msi/ms7260/Makefile.inc	(working copy)
@@ -29,12 +29,3 @@
 # This is part of the conversion to init-obj and away from included code. 
 initobj-y += crt0.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
-ifeq ($(CONFIG_AP_CODE_IN_CAR),y)
-ldscripts += $(src)/arch/i386/init/ldscript_apc.lb
-endif
-
Index: src/mainboard/Makefile.k8_CAR.inc
===================================================================
--- src/mainboard/Makefile.k8_CAR.inc	(revision 5163)
+++ src/mainboard/Makefile.k8_CAR.inc	(working copy)
@@ -34,9 +34,4 @@
 initobj-y += crt0.o
 
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
 
Index: src/mainboard/Makefile.romccboard.inc
===================================================================
--- src/mainboard/Makefile.romccboard.inc	(revision 5163)
+++ src/mainboard/Makefile.romccboard.inc	(working copy)
@@ -21,17 +21,6 @@
 
 initobj-y += crt0.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ifeq ($(CONFIG_BIG_BOOTBLOCK),y)
-ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-endif
-ldscripts += $(src)/cpu/x86/32bit/entry32.lds
-ifeq ($(CONFIG_BIG_BOOTBLOCK),y)
-ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
-endif
-
 obj-y += mainboard.o
 
 obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
Index: src/mainboard/jetway/j7f24/Makefile.inc
===================================================================
--- src/mainboard/jetway/j7f24/Makefile.inc	(revision 5163)
+++ src/mainboard/jetway/j7f24/Makefile.inc	(working copy)
@@ -24,10 +24,5 @@
 obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
 
 
Index: src/mainboard/technexion/tim8690/Makefile.inc
===================================================================
--- src/mainboard/technexion/tim8690/Makefile.inc	(revision 5163)
+++ src/mainboard/technexion/tim8690/Makefile.inc	(working copy)
@@ -31,9 +31,4 @@
 
 initobj-y += crt0.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
 
Index: src/mainboard/technexion/tim5690/Makefile.inc
===================================================================
--- src/mainboard/technexion/tim5690/Makefile.inc	(revision 5163)
+++ src/mainboard/technexion/tim5690/Makefile.inc	(working copy)
@@ -37,9 +37,4 @@
 
 initobj-y += crt0.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
 
Index: src/mainboard/winent/pl6064/Makefile.inc
===================================================================
--- src/mainboard/winent/pl6064/Makefile.inc	(revision 5163)
+++ src/mainboard/winent/pl6064/Makefile.inc	(working copy)
@@ -7,9 +7,4 @@
 
 initobj-y += crt0.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
 
Index: src/mainboard/nvidia/l1_2pvv/Makefile.inc
===================================================================
--- src/mainboard/nvidia/l1_2pvv/Makefile.inc	(revision 5163)
+++ src/mainboard/nvidia/l1_2pvv/Makefile.inc	(working copy)
@@ -29,13 +29,3 @@
 # This is part of the conversion to init-obj and away from included code. 
 initobj-y += crt0.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/southbridge/nvidia/mcp55/romstrap.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
-ifeq ($(CONFIG_AP_CODE_IN_CAR),y)
-ldscripts += $(src)/arch/i386/init/ldscript_apc.lb
-endif
-
Index: src/mainboard/intel/d945gclf/Makefile.inc
===================================================================
--- src/mainboard/intel/d945gclf/Makefile.inc	(revision 5163)
+++ src/mainboard/intel/d945gclf/Makefile.inc	(working copy)
@@ -36,9 +36,4 @@
 
 initobj-y += crt0.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
 
Index: src/mainboard/intel/eagleheights/Makefile.inc
===================================================================
--- src/mainboard/intel/eagleheights/Makefile.inc	(revision 5163)
+++ src/mainboard/intel/eagleheights/Makefile.inc	(working copy)
@@ -11,9 +11,4 @@
 initobj-y += crt0.o
 # Use Intel Core (not Core 2) code for CAR init, any CPU might be used.
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
 
Index: src/mainboard/asus/a8v-e_se/Makefile.inc
===================================================================
--- src/mainboard/asus/a8v-e_se/Makefile.inc	(revision 5163)
+++ src/mainboard/asus/a8v-e_se/Makefile.inc	(working copy)
@@ -10,10 +10,4 @@
 
 initobj-y += crt0.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-ldscripts += $(src)/southbridge/via/k8t890/romstrap.lds
-ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
 
Index: src/mainboard/asus/a8n_e/Makefile.inc
===================================================================
--- src/mainboard/asus/a8n_e/Makefile.inc	(revision 5163)
+++ src/mainboard/asus/a8n_e/Makefile.inc	(working copy)
@@ -28,9 +28,4 @@
 
 initobj-y += crt0.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/16bit/entry16.lds
-ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ldscripts += $(src)/arch/i386/lib/id.lds
-ldscripts += $(src)/arch/i386/lib/failover.lds
 
Index: src/mainboard/asus/m2v-mx_se/Makefile.inc
===================================================================
--- src/mainboard/asus/m2v-mx_se/Makefile.inc	(revision 5163)
+++ src/mainboard/asus/m2v-mx_se/Makefile.inc	(working copy)
@@ -28,6 +28,4 @@
 
 initobj-y += crt0.o
 
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/cpu/x86/32bit/entry32.lds
 
Index: src/arch/i386/Makefile.inc
===================================================================
--- src/arch/i386/Makefile.inc	(revision 5163)
+++ src/arch/i386/Makefile.inc	(working copy)
@@ -63,16 +63,23 @@
 # done
 
 crt0s :=
+ldscripts :=
+ldscripts += $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
+ldscripts += $(src)/arch/i386/lib/failover.lds
 ifeq ($(CONFIG_BIG_BOOTBLOCK),y)
 crt0s += $(src)/cpu/x86/16bit/entry16.inc
+ldscripts += $(src)/cpu/x86/16bit/entry16.lds
 endif
 crt0s += $(src)/cpu/x86/32bit/entry32.inc
+ldscripts += $(src)/cpu/x86/32bit/entry32.lds
 ifeq ($(CONFIG_BIG_BOOTBLOCK),y)
 crt0s += $(src)/cpu/x86/16bit/reset16.inc
+ldscripts += $(src)/cpu/x86/16bit/reset16.lds
 ifeq ($(CONFIG_ROMCC),y)
 crt0s += $(src)/arch/i386/lib/cpu_reset.inc
 endif
 crt0s += $(src)/arch/i386/lib/id.inc
+ldscripts += $(src)/arch/i386/lib/id.lds
 endif
 
 crt0s += $(src)/cpu/x86/fpu_enable.inc
@@ -125,6 +132,7 @@
 # who else could use this?
 ifeq ($(CONFIG_BOARD_TYAN_S2735),y)
 crt0s += $(src)/cpu/x86/car/cache_as_ram.inc
+ldscripts += $(src)/cpu/x86/car/cache_as_ram.lds
 endif
 
 ifeq ($(CONFIG_BIG_BOOTBLOCK),y)
@@ -141,18 +149,26 @@
 crt0s += $(src)/cpu/x86/mmx_disable.inc
 endif
 
+ifeq ($(CONFIG_AP_CODE_IN_CAR),y)
+ldscripts += $(src)/arch/i386/init/ldscript_apc.lb
+endif
+
 ifeq ($(CONFIG_BIG_BOOTBLOCK),y)
 ifeq ($(CONFIG_SOUTHBRIDGE_NVIDIA_CK804),y)
 crt0s += $(src)/southbridge/nvidia/ck804/romstrap.inc
+ldscripts += $(src)/southbridge/nvidia/ck804/romstrap.lds
 endif
 ifeq ($(CONFIG_SOUTHBRIDGE_NVIDIA_MCP55),y)
 crt0s += $(src)/southbridge/nvidia/mcp55/romstrap.inc
+ldscripts += $(src)/southbridge/nvidia/mcp55/romstrap.lds
 endif
 ifeq ($(CONFIG_SOUTHBRIDGE_VIA_K8T890),y)
 crt0s += $(src)/southbridge/via/k8t890/romstrap.inc
+ldscripts += $(src)/southbridge/via/k8t890/romstrap.lds
 endif
 ifeq ($(CONFIG_NORTHBRIDGE_VIA_VX800),y)
 crt0s += $(src)/northbridge/via/vx800/romstrap.inc
+ldscripts += $(src)/northbridge/via/vx800/romstrap.lds
 endif
 endif
 
