Author: oxygene Date: Thu Feb 25 22:50:26 2010 New Revision: 5164 URL: http://tracker.coreboot.org/trac/coreboot/changeset/5164
Log: 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
Modified: trunk/src/arch/i386/Makefile.inc trunk/src/mainboard/Makefile.k8_CAR.inc trunk/src/mainboard/Makefile.k8_ck804.inc trunk/src/mainboard/Makefile.romccboard.inc trunk/src/mainboard/amd/db800/Makefile.inc trunk/src/mainboard/amd/dbm690t/Makefile.inc trunk/src/mainboard/amd/norwich/Makefile.inc trunk/src/mainboard/amd/pistachio/Makefile.inc trunk/src/mainboard/amd/serengeti_cheetah/Makefile.inc trunk/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc trunk/src/mainboard/artecgroup/dbe61/Makefile.inc trunk/src/mainboard/asus/a8n_e/Makefile.inc trunk/src/mainboard/asus/a8v-e_se/Makefile.inc trunk/src/mainboard/asus/m2v-mx_se/Makefile.inc trunk/src/mainboard/bcom/winnetp680/Makefile.inc trunk/src/mainboard/digitallogic/msm800sev/Makefile.inc trunk/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc trunk/src/mainboard/gigabyte/m57sli/Makefile.inc trunk/src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc trunk/src/mainboard/intel/d945gclf/Makefile.inc trunk/src/mainboard/intel/eagleheights/Makefile.inc trunk/src/mainboard/iwill/dk8_htx/Makefile.inc trunk/src/mainboard/jetway/j7f24/Makefile.inc trunk/src/mainboard/kontron/986lcd-m/Makefile.inc trunk/src/mainboard/kontron/kt690/Makefile.inc trunk/src/mainboard/lippert/roadrunner-lx/Makefile.inc trunk/src/mainboard/lippert/spacerunner-lx/Makefile.inc trunk/src/mainboard/msi/ms7260/Makefile.inc trunk/src/mainboard/msi/ms9282/Makefile.inc trunk/src/mainboard/nvidia/l1_2pvv/Makefile.inc trunk/src/mainboard/pcengines/alix1c/Makefile.inc trunk/src/mainboard/roda/rk886ex/Makefile.inc trunk/src/mainboard/supermicro/h8dme/Makefile.inc trunk/src/mainboard/supermicro/h8dmr/Makefile.inc trunk/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc trunk/src/mainboard/supermicro/h8qme_fam10/Makefile.inc trunk/src/mainboard/technexion/tim5690/Makefile.inc trunk/src/mainboard/technexion/tim8690/Makefile.inc trunk/src/mainboard/tyan/s2735/Makefile.inc trunk/src/mainboard/tyan/s2912/Makefile.inc trunk/src/mainboard/tyan/s2912_fam10/Makefile.inc trunk/src/mainboard/via/epia-m/Makefile.inc trunk/src/mainboard/via/epia-m700/Makefile.inc trunk/src/mainboard/via/epia-n/Makefile.inc trunk/src/mainboard/via/epia/Makefile.inc trunk/src/mainboard/via/vt8454c/Makefile.inc trunk/src/mainboard/winent/pl6064/Makefile.inc
Modified: trunk/src/arch/i386/Makefile.inc ============================================================================== --- trunk/src/arch/i386/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/arch/i386/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/Makefile.k8_CAR.inc ============================================================================== --- trunk/src/mainboard/Makefile.k8_CAR.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/Makefile.k8_CAR.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/Makefile.k8_ck804.inc ============================================================================== --- trunk/src/mainboard/Makefile.k8_ck804.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/Makefile.k8_ck804.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/Makefile.romccboard.inc ============================================================================== --- trunk/src/mainboard/Makefile.romccboard.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/Makefile.romccboard.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/amd/db800/Makefile.inc ============================================================================== --- trunk/src/mainboard/amd/db800/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/amd/db800/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/amd/dbm690t/Makefile.inc ============================================================================== --- trunk/src/mainboard/amd/dbm690t/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/amd/dbm690t/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/amd/norwich/Makefile.inc ============================================================================== --- trunk/src/mainboard/amd/norwich/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/amd/norwich/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/amd/pistachio/Makefile.inc ============================================================================== --- trunk/src/mainboard/amd/pistachio/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/amd/pistachio/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/amd/serengeti_cheetah/Makefile.inc ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/amd/serengeti_cheetah/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/artecgroup/dbe61/Makefile.inc ============================================================================== --- trunk/src/mainboard/artecgroup/dbe61/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/artecgroup/dbe61/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/asus/a8n_e/Makefile.inc ============================================================================== --- trunk/src/mainboard/asus/a8n_e/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/asus/a8n_e/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/asus/a8v-e_se/Makefile.inc ============================================================================== --- trunk/src/mainboard/asus/a8v-e_se/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/asus/a8v-e_se/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/asus/m2v-mx_se/Makefile.inc ============================================================================== --- trunk/src/mainboard/asus/m2v-mx_se/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/asus/m2v-mx_se/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -28,6 +28,4 @@
initobj-y += crt0.o
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb -ldscripts += $(src)/cpu/x86/32bit/entry32.lds
Modified: trunk/src/mainboard/bcom/winnetp680/Makefile.inc ============================================================================== --- trunk/src/mainboard/bcom/winnetp680/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/bcom/winnetp680/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/digitallogic/msm800sev/Makefile.inc ============================================================================== --- trunk/src/mainboard/digitallogic/msm800sev/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/digitallogic/msm800sev/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc ============================================================================== --- trunk/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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 -
Modified: trunk/src/mainboard/gigabyte/m57sli/Makefile.inc ============================================================================== --- trunk/src/mainboard/gigabyte/m57sli/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/gigabyte/m57sli/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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 -
Modified: trunk/src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc ============================================================================== --- trunk/src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/intel/d945gclf/Makefile.inc ============================================================================== --- trunk/src/mainboard/intel/d945gclf/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/intel/d945gclf/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/intel/eagleheights/Makefile.inc ============================================================================== --- trunk/src/mainboard/intel/eagleheights/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/intel/eagleheights/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/iwill/dk8_htx/Makefile.inc ============================================================================== --- trunk/src/mainboard/iwill/dk8_htx/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/iwill/dk8_htx/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/jetway/j7f24/Makefile.inc ============================================================================== --- trunk/src/mainboard/jetway/j7f24/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/jetway/j7f24/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/kontron/986lcd-m/Makefile.inc ============================================================================== --- trunk/src/mainboard/kontron/986lcd-m/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/kontron/986lcd-m/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -37,6 +37,4 @@ initobj-y += crt0.o
-ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb -ldscripts += $(src)/cpu/x86/32bit/entry32.lds
Modified: trunk/src/mainboard/kontron/kt690/Makefile.inc ============================================================================== --- trunk/src/mainboard/kontron/kt690/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/kontron/kt690/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/lippert/roadrunner-lx/Makefile.inc ============================================================================== --- trunk/src/mainboard/lippert/roadrunner-lx/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/lippert/roadrunner-lx/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/lippert/spacerunner-lx/Makefile.inc ============================================================================== --- trunk/src/mainboard/lippert/spacerunner-lx/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/lippert/spacerunner-lx/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/msi/ms7260/Makefile.inc ============================================================================== --- trunk/src/mainboard/msi/ms7260/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/msi/ms7260/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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 -
Modified: trunk/src/mainboard/msi/ms9282/Makefile.inc ============================================================================== --- trunk/src/mainboard/msi/ms9282/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/msi/ms9282/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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 -
Modified: trunk/src/mainboard/nvidia/l1_2pvv/Makefile.inc ============================================================================== --- trunk/src/mainboard/nvidia/l1_2pvv/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/nvidia/l1_2pvv/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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 -
Modified: trunk/src/mainboard/pcengines/alix1c/Makefile.inc ============================================================================== --- trunk/src/mainboard/pcengines/alix1c/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/pcengines/alix1c/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/roda/rk886ex/Makefile.inc ============================================================================== --- trunk/src/mainboard/roda/rk886ex/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/roda/rk886ex/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/supermicro/h8dme/Makefile.inc ============================================================================== --- trunk/src/mainboard/supermicro/h8dme/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/supermicro/h8dme/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/supermicro/h8dmr/Makefile.inc ============================================================================== --- trunk/src/mainboard/supermicro/h8dmr/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/supermicro/h8dmr/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc ============================================================================== --- trunk/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/supermicro/h8qme_fam10/Makefile.inc ============================================================================== --- trunk/src/mainboard/supermicro/h8qme_fam10/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/supermicro/h8qme_fam10/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/technexion/tim5690/Makefile.inc ============================================================================== --- trunk/src/mainboard/technexion/tim5690/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/technexion/tim5690/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/technexion/tim8690/Makefile.inc ============================================================================== --- trunk/src/mainboard/technexion/tim8690/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/technexion/tim8690/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/tyan/s2735/Makefile.inc ============================================================================== --- trunk/src/mainboard/tyan/s2735/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/tyan/s2735/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/tyan/s2912/Makefile.inc ============================================================================== --- trunk/src/mainboard/tyan/s2912/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/tyan/s2912/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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 -
Modified: trunk/src/mainboard/tyan/s2912_fam10/Makefile.inc ============================================================================== --- trunk/src/mainboard/tyan/s2912_fam10/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/tyan/s2912_fam10/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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 -
Modified: trunk/src/mainboard/via/epia-m/Makefile.inc ============================================================================== --- trunk/src/mainboard/via/epia-m/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/via/epia-m/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/via/epia-m700/Makefile.inc ============================================================================== --- trunk/src/mainboard/via/epia-m700/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/via/epia-m700/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/via/epia-n/Makefile.inc ============================================================================== --- trunk/src/mainboard/via/epia-n/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/via/epia-n/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/via/epia/Makefile.inc ============================================================================== --- trunk/src/mainboard/via/epia/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/via/epia/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/via/vt8454c/Makefile.inc ============================================================================== --- trunk/src/mainboard/via/vt8454c/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/via/vt8454c/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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
Modified: trunk/src/mainboard/winent/pl6064/Makefile.inc ============================================================================== --- trunk/src/mainboard/winent/pl6064/Makefile.inc Thu Feb 25 19:23:23 2010 (r5163) +++ trunk/src/mainboard/winent/pl6064/Makefile.inc Thu Feb 25 22:50:26 2010 (r5164) @@ -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