Move the ldscripts logic to src/arch/i386/Makefile.inc

Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Joseph Smith <joe@settoplinux.org>


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

47 files changed, 16 insertions, 259 deletions

diff --git a/src/arch/i386/Makefile.inc b/src/arch/i386/Makefile.inc
index 2b17671ee1..af9e4b17d4 100644
--- a/src/arch/i386/Makefile.inc
+++ b/src/arch/i386/Makefile.inc
@@ -63,16 +63,23 @@ $(obj)/coreboot.a: $(objs)
 # 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 @@ endif
 # 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 @@ ifeq ($(CONFIG_MMX),y)
 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
 
diff --git a/src/mainboard/Makefile.k8_CAR.inc b/src/mainboard/Makefile.k8_CAR.inc
index f50bcd334d..8de2908f5f 100644
--- a/src/mainboard/Makefile.k8_CAR.inc
+++ b/src/mainboard/Makefile.k8_CAR.inc
@@ -34,9 +34,4 @@ obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
 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
 
diff --git a/src/mainboard/Makefile.k8_ck804.inc b/src/mainboard/Makefile.k8_ck804.inc
index 56e0350b15..7ff8a6be8c 100644
--- a/src/mainboard/Makefile.k8_ck804.inc
+++ b/src/mainboard/Makefile.k8_ck804.inc
@@ -37,10 +37,4 @@ obj-$(CONFIG_GENERATE_ACPI_TABLES) +=  acpi_tables.o
 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
 
diff --git a/src/mainboard/Makefile.romccboard.inc b/src/mainboard/Makefile.romccboard.inc
index 898c67d2fc..aefcb6227a 100644
--- a/src/mainboard/Makefile.romccboard.inc
+++ b/src/mainboard/Makefile.romccboard.inc
@@ -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
diff --git a/src/mainboard/amd/db800/Makefile.inc b/src/mainboard/amd/db800/Makefile.inc
index 1ce4ced5a3..3e54d3be91 100644
--- a/src/mainboard/amd/db800/Makefile.inc
+++ b/src/mainboard/amd/db800/Makefile.inc
@@ -7,9 +7,4 @@ obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 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
 
diff --git a/src/mainboard/amd/dbm690t/Makefile.inc b/src/mainboard/amd/dbm690t/Makefile.inc
index c88b6329d7..a21fa9b0d5 100644
--- a/src/mainboard/amd/dbm690t/Makefile.inc
+++ b/src/mainboard/amd/dbm690t/Makefile.inc
@@ -32,9 +32,4 @@ obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
 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
 
diff --git a/src/mainboard/amd/norwich/Makefile.inc b/src/mainboard/amd/norwich/Makefile.inc
index 1ce4ced5a3..3e54d3be91 100644
--- a/src/mainboard/amd/norwich/Makefile.inc
+++ b/src/mainboard/amd/norwich/Makefile.inc
@@ -7,9 +7,4 @@ obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 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
 
diff --git a/src/mainboard/amd/pistachio/Makefile.inc b/src/mainboard/amd/pistachio/Makefile.inc
index b0a8420911..d365b75bb5 100644
--- a/src/mainboard/amd/pistachio/Makefile.inc
+++ b/src/mainboard/amd/pistachio/Makefile.inc
@@ -31,9 +31,4 @@ obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
 
 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
 
diff --git a/src/mainboard/amd/serengeti_cheetah/Makefile.inc b/src/mainboard/amd/serengeti_cheetah/Makefile.inc
index 80e009735e..0cbf6a5ee8 100644
--- a/src/mainboard/amd/serengeti_cheetah/Makefile.inc
+++ b/src/mainboard/amd/serengeti_cheetah/Makefile.inc
@@ -36,9 +36,4 @@ obj-y += ../../../drivers/i2c/i2cmux/i2cmux.o
 
 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
 
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc b/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc
index 4ee287679f..92bb9fd6ab 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc
@@ -39,7 +39,4 @@ obj-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o
 
 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
 
diff --git a/src/mainboard/artecgroup/dbe61/Makefile.inc b/src/mainboard/artecgroup/dbe61/Makefile.inc
index 1ce4ced5a3..3e54d3be91 100644
--- a/src/mainboard/artecgroup/dbe61/Makefile.inc
+++ b/src/mainboard/artecgroup/dbe61/Makefile.inc
@@ -7,9 +7,4 @@ obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 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
 
diff --git a/src/mainboard/asus/a8n_e/Makefile.inc b/src/mainboard/asus/a8n_e/Makefile.inc
index ba21f0155c..9b21a30295 100644
--- a/src/mainboard/asus/a8n_e/Makefile.inc
+++ b/src/mainboard/asus/a8n_e/Makefile.inc
@@ -28,9 +28,4 @@ obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 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
 
diff --git a/src/mainboard/asus/a8v-e_se/Makefile.inc b/src/mainboard/asus/a8v-e_se/Makefile.inc
index 1d696b2e83..2422d4bfa9 100644
--- a/src/mainboard/asus/a8v-e_se/Makefile.inc
+++ b/src/mainboard/asus/a8v-e_se/Makefile.inc
@@ -10,10 +10,4 @@ obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
 
 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
 
diff --git a/src/mainboard/asus/m2v-mx_se/Makefile.inc b/src/mainboard/asus/m2v-mx_se/Makefile.inc
index 45fe3942b2..9af0a377ab 100644
--- a/src/mainboard/asus/m2v-mx_se/Makefile.inc
+++ b/src/mainboard/asus/m2v-mx_se/Makefile.inc
@@ -28,6 +28,4 @@ obj-$(CONFIG_GENERATE_ACPI_TABLES) +=  acpi_tables.o
 
 initobj-y += crt0.o
 
-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 5c9a32d3e8..30212b7c31 100644
--- a/src/mainboard/bcom/winnetp680/Makefile.inc
+++ b/src/mainboard/bcom/winnetp680/Makefile.inc
@@ -28,10 +28,5 @@ obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
 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
 
 
diff --git a/src/mainboard/digitallogic/msm800sev/Makefile.inc b/src/mainboard/digitallogic/msm800sev/Makefile.inc
index 1ce4ced5a3..3e54d3be91 100644
--- a/src/mainboard/digitallogic/msm800sev/Makefile.inc
+++ b/src/mainboard/digitallogic/msm800sev/Makefile.inc
@@ -7,9 +7,4 @@ obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 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
 
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc b/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc
index 1941173e61..95aeeead41 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc
+++ b/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc
@@ -29,12 +29,3 @@ 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
 
-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
-
diff --git a/src/mainboard/gigabyte/m57sli/Makefile.inc b/src/mainboard/gigabyte/m57sli/Makefile.inc
index 50202d937a..246fef75b3 100644
--- a/src/mainboard/gigabyte/m57sli/Makefile.inc
+++ b/src/mainboard/gigabyte/m57sli/Makefile.inc
@@ -32,13 +32,3 @@ 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
 
-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
-
diff --git a/src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc b/src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc
index 1ce4ced5a3..3e54d3be91 100644
--- a/src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc
+++ b/src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc
@@ -7,9 +7,4 @@ obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 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
 
diff --git a/src/mainboard/intel/d945gclf/Makefile.inc b/src/mainboard/intel/d945gclf/Makefile.inc
index 1fba00169e..95f2f65af7 100644
--- a/src/mainboard/intel/d945gclf/Makefile.inc
+++ b/src/mainboard/intel/d945gclf/Makefile.inc
@@ -36,9 +36,4 @@ smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o
 
 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
 
diff --git a/src/mainboard/intel/eagleheights/Makefile.inc b/src/mainboard/intel/eagleheights/Makefile.inc
index ec85f29252..e17be314f0 100644
--- a/src/mainboard/intel/eagleheights/Makefile.inc
+++ b/src/mainboard/intel/eagleheights/Makefile.inc
@@ -11,9 +11,4 @@ obj-$(CONFIG_HAVE_HARD_RESET) += reset.o
 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
 
diff --git a/src/mainboard/iwill/dk8_htx/Makefile.inc b/src/mainboard/iwill/dk8_htx/Makefile.inc
index dc2b7e6dc1..a62c467167 100644
--- a/src/mainboard/iwill/dk8_htx/Makefile.inc
+++ b/src/mainboard/iwill/dk8_htx/Makefile.inc
@@ -35,9 +35,4 @@ obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
 
 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
 
diff --git a/src/mainboard/jetway/j7f24/Makefile.inc b/src/mainboard/jetway/j7f24/Makefile.inc
index 78a2a4b4bc..8b86403f06 100644
--- a/src/mainboard/jetway/j7f24/Makefile.inc
+++ b/src/mainboard/jetway/j7f24/Makefile.inc
@@ -24,10 +24,5 @@ obj-y += mainboard.o
 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
 
 
diff --git a/src/mainboard/kontron/986lcd-m/Makefile.inc b/src/mainboard/kontron/986lcd-m/Makefile.inc
index 489a74dc17..57f6e73a60 100644
--- a/src/mainboard/kontron/986lcd-m/Makefile.inc
+++ b/src/mainboard/kontron/986lcd-m/Makefile.inc
@@ -37,6 +37,4 @@ smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o
 initobj-y += crt0.o
 
 
-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 b0a8420911..d365b75bb5 100644
--- a/src/mainboard/kontron/kt690/Makefile.inc
+++ b/src/mainboard/kontron/kt690/Makefile.inc
@@ -31,9 +31,4 @@ obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
 
 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
 
diff --git a/src/mainboard/lippert/roadrunner-lx/Makefile.inc b/src/mainboard/lippert/roadrunner-lx/Makefile.inc
index 1ce4ced5a3..3e54d3be91 100644
--- a/src/mainboard/lippert/roadrunner-lx/Makefile.inc
+++ b/src/mainboard/lippert/roadrunner-lx/Makefile.inc
@@ -7,9 +7,4 @@ obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 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
 
diff --git a/src/mainboard/lippert/spacerunner-lx/Makefile.inc b/src/mainboard/lippert/spacerunner-lx/Makefile.inc
index 1ce4ced5a3..3e54d3be91 100644
--- a/src/mainboard/lippert/spacerunner-lx/Makefile.inc
+++ b/src/mainboard/lippert/spacerunner-lx/Makefile.inc
@@ -7,9 +7,4 @@ obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 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
 
diff --git a/src/mainboard/msi/ms7260/Makefile.inc b/src/mainboard/msi/ms7260/Makefile.inc
index 1941173e61..95aeeead41 100644
--- a/src/mainboard/msi/ms7260/Makefile.inc
+++ b/src/mainboard/msi/ms7260/Makefile.inc
@@ -29,12 +29,3 @@ 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
 
-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
-
diff --git a/src/mainboard/msi/ms9282/Makefile.inc b/src/mainboard/msi/ms9282/Makefile.inc
index ae7ede2453..fa2f5145bc 100644
--- a/src/mainboard/msi/ms9282/Makefile.inc
+++ b/src/mainboard/msi/ms9282/Makefile.inc
@@ -31,12 +31,3 @@ 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
 
-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
-
diff --git a/src/mainboard/nvidia/l1_2pvv/Makefile.inc b/src/mainboard/nvidia/l1_2pvv/Makefile.inc
index acbdbd1fb6..95aeeead41 100644
--- a/src/mainboard/nvidia/l1_2pvv/Makefile.inc
+++ b/src/mainboard/nvidia/l1_2pvv/Makefile.inc
@@ -29,13 +29,3 @@ 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
 
-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
-
diff --git a/src/mainboard/pcengines/alix1c/Makefile.inc b/src/mainboard/pcengines/alix1c/Makefile.inc
index 1ce4ced5a3..3e54d3be91 100644
--- a/src/mainboard/pcengines/alix1c/Makefile.inc
+++ b/src/mainboard/pcengines/alix1c/Makefile.inc
@@ -7,9 +7,4 @@ obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 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
 
diff --git a/src/mainboard/roda/rk886ex/Makefile.inc b/src/mainboard/roda/rk886ex/Makefile.inc
index f5ccad05b0..c21cd5aa8c 100644
--- a/src/mainboard/roda/rk886ex/Makefile.inc
+++ b/src/mainboard/roda/rk886ex/Makefile.inc
@@ -38,9 +38,4 @@ smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o
 
 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
 
diff --git a/src/mainboard/supermicro/h8dme/Makefile.inc b/src/mainboard/supermicro/h8dme/Makefile.inc
index 806bcafc89..22ce20d0b0 100644
--- a/src/mainboard/supermicro/h8dme/Makefile.inc
+++ b/src/mainboard/supermicro/h8dme/Makefile.inc
@@ -29,10 +29,4 @@ obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 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
 
diff --git a/src/mainboard/supermicro/h8dmr/Makefile.inc b/src/mainboard/supermicro/h8dmr/Makefile.inc
index c4ec5851ad..9b21a30295 100644
--- a/src/mainboard/supermicro/h8dmr/Makefile.inc
+++ b/src/mainboard/supermicro/h8dmr/Makefile.inc
@@ -28,10 +28,4 @@ obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 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
 
diff --git a/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc b/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc
index c14d7ee98a..9b21a30295 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc
+++ b/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc
@@ -28,7 +28,4 @@ obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 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
 
diff --git a/src/mainboard/supermicro/h8qme_fam10/Makefile.inc b/src/mainboard/supermicro/h8qme_fam10/Makefile.inc
index c14d7ee98a..9b21a30295 100644
--- a/src/mainboard/supermicro/h8qme_fam10/Makefile.inc
+++ b/src/mainboard/supermicro/h8qme_fam10/Makefile.inc
@@ -28,7 +28,4 @@ obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 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
 
diff --git a/src/mainboard/technexion/tim5690/Makefile.inc b/src/mainboard/technexion/tim5690/Makefile.inc
index b3fd30a4bd..15b4911efc 100644
--- a/src/mainboard/technexion/tim5690/Makefile.inc
+++ b/src/mainboard/technexion/tim5690/Makefile.inc
@@ -37,9 +37,4 @@ obj-y += vgabios.o
 
 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
 
diff --git a/src/mainboard/technexion/tim8690/Makefile.inc b/src/mainboard/technexion/tim8690/Makefile.inc
index b0a8420911..d365b75bb5 100644
--- a/src/mainboard/technexion/tim8690/Makefile.inc
+++ b/src/mainboard/technexion/tim8690/Makefile.inc
@@ -31,9 +31,4 @@ obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
 
 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
 
diff --git a/src/mainboard/tyan/s2735/Makefile.inc b/src/mainboard/tyan/s2735/Makefile.inc
index d4eefc3c9b..757b115bc9 100644
--- a/src/mainboard/tyan/s2735/Makefile.inc
+++ b/src/mainboard/tyan/s2735/Makefile.inc
@@ -33,10 +33,4 @@ obj-$(CONFIG_HAVE_HARD_RESET) += reset.o
 
 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
 
diff --git a/src/mainboard/tyan/s2912/Makefile.inc b/src/mainboard/tyan/s2912/Makefile.inc
index acbdbd1fb6..95aeeead41 100644
--- a/src/mainboard/tyan/s2912/Makefile.inc
+++ b/src/mainboard/tyan/s2912/Makefile.inc
@@ -29,13 +29,3 @@ 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
 
-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
-
diff --git a/src/mainboard/tyan/s2912_fam10/Makefile.inc b/src/mainboard/tyan/s2912_fam10/Makefile.inc
index a551b104a7..95aeeead41 100644
--- a/src/mainboard/tyan/s2912_fam10/Makefile.inc
+++ b/src/mainboard/tyan/s2912_fam10/Makefile.inc
@@ -29,10 +29,3 @@ 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
 
-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
-
diff --git a/src/mainboard/via/epia-m/Makefile.inc b/src/mainboard/via/epia-m/Makefile.inc
index 251adbe37e..3f02ca68e0 100644
--- a/src/mainboard/via/epia-m/Makefile.inc
+++ b/src/mainboard/via/epia-m/Makefile.inc
@@ -28,10 +28,5 @@ obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
 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
 
 
diff --git a/src/mainboard/via/epia-m700/Makefile.inc b/src/mainboard/via/epia-m700/Makefile.inc
index 6cfa852ded..8bae6614a1 100644
--- a/src/mainboard/via/epia-m700/Makefile.inc
+++ b/src/mainboard/via/epia-m700/Makefile.inc
@@ -29,11 +29,5 @@ obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
 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
 
 
diff --git a/src/mainboard/via/epia-n/Makefile.inc b/src/mainboard/via/epia-n/Makefile.inc
index 131eab3676..e8c0510dd2 100644
--- a/src/mainboard/via/epia-n/Makefile.inc
+++ b/src/mainboard/via/epia-n/Makefile.inc
@@ -27,10 +27,5 @@ obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
 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
 
 
diff --git a/src/mainboard/via/epia/Makefile.inc b/src/mainboard/via/epia/Makefile.inc
index 5e475ae92b..aadc736d2e 100644
--- a/src/mainboard/via/epia/Makefile.inc
+++ b/src/mainboard/via/epia/Makefile.inc
@@ -23,10 +23,5 @@ initobj-y += crt0.o
 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
 
 
diff --git a/src/mainboard/via/vt8454c/Makefile.inc b/src/mainboard/via/vt8454c/Makefile.inc
index d5d96e61ff..578d0e541b 100644
--- a/src/mainboard/via/vt8454c/Makefile.inc
+++ b/src/mainboard/via/vt8454c/Makefile.inc
@@ -27,9 +27,4 @@ obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
 
 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
 
diff --git a/src/mainboard/winent/pl6064/Makefile.inc b/src/mainboard/winent/pl6064/Makefile.inc
index 091d0482e4..7cdf2c93c6 100644
--- a/src/mainboard/winent/pl6064/Makefile.inc
+++ b/src/mainboard/winent/pl6064/Makefile.inc
@@ -7,9 +7,4 @@ obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 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