[commit] r5162 - in trunk: . src/arch/i386 src/cpu/via/model_c3 src/cpu/via/model_c7 src/mainboard src/mainboard/amd/db800 src/mainboard/amd/dbm690t src/mainboard/amd/norwich src/mainboard/amd/pist...

[repository service]

Author: oxygene
Date: Thu Feb 25 18:03:17 2010
New Revision: 5162
URL: http://tracker.coreboot.org/trac/coreboot/changeset/5162

Log:
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 
Acked-by: Uwe Hermann

Modified:
   trunk/Makefile
   trunk/src/arch/i386/Makefile.inc
   trunk/src/cpu/via/model_c3/Kconfig
   trunk/src/cpu/via/model_c7/Kconfig
   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/Makefile
==============================================================================
--- trunk/Makefile	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/Makefile	Thu Feb 25 18:03:17 2010	(r5162)
@@ -219,6 +219,9 @@
    @echo alldirs:=$(alldirs)
    @echo allsrc=$(allsrc)

+printcrt0s:
+	@echo $(patsubst $(top)/%,%,$(crt0s))
+
 OBJS     := $(patsubst %,$(obj)/%,$(TARGETS-y))
 INCLUDES := -I$(top)/src -I$(top)/src/include -I$(obj) -I$(top)/src/arch/$(ARCHDIR-y)/include 
 INCLUDES += -I$(shell $(CC) -print-search-dirs | head -n 1 | cut -d' ' -f2)include

Modified: trunk/src/arch/i386/Makefile.inc
==============================================================================
--- trunk/src/arch/i386/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/arch/i386/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -62,9 +62,98 @@
 #######################################################################
 # done

-# crt0s should be set by now
-ifeq ($(crt0s),)
-$(error crt0s are empty. If your board still uses crt0-y and ldscript-y: It shouldn't, we moved away from that in r5065)
+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
+ifeq ($(CONFIG_ROMCC),y)
+crt0s += $(src)/arch/i386/lib/cpu_reset.inc
+endif
+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_CPU_AMD_LX),y)
+crt0s += $(src)/cpu/amd/model_lx/cache_as_ram.inc
+endif
+ifeq ($(CONFIG_CPU_AMD_SOCKET_F),y)
+crt0s += $(src)/cpu/amd/car/cache_as_ram.inc
+endif
+ifeq ($(CONFIG_CPU_AMD_SOCKET_F_1207),y)
+crt0s += $(src)/cpu/amd/car/cache_as_ram.inc
+endif
+ifeq ($(CONFIG_CPU_AMD_SOCKET_AM2),y)
+crt0s += $(src)/cpu/amd/car/cache_as_ram.inc
+endif
+ifeq ($(CONFIG_CPU_AMD_SOCKET_S1G1),y)
+crt0s += $(src)/cpu/amd/car/cache_as_ram.inc
+endif
+ifeq ($(CONFIG_CPU_AMD_SOCKET_754),y)
+crt0s += $(src)/cpu/amd/car/cache_as_ram.inc
+endif
+ifeq ($(CONFIG_CPU_AMD_SOCKET_939),y)
+crt0s += $(src)/cpu/amd/car/cache_as_ram.inc
+endif
+ifeq ($(CONFIG_CPU_AMD_SOCKET_940),y)
+crt0s += $(src)/cpu/amd/car/cache_as_ram.inc
+endif
+ifeq ($(CONFIG_CPU_INTEL_CORE),y)
+crt0s += $(src)/cpu/intel/model_6ex/cache_as_ram.inc
+endif
+# Use Intel Core (not Core 2) code for CAR init, any CPU might be used.
+ifeq ($(CONFIG_CPU_INTEL_SOCKET_BGA956),y)
+crt0s += $(src)/cpu/intel/model_6ex/cache_as_ram.inc
+endif
+# should be CONFIG_CPU_VIA_C7, but bcom/winnetp680, jetway/j7f24, via/epia-cn, via/pc2500e don't use CAR yet
+ifeq ($(CONFIG_BOARD_VIA_VT8454C),y)
+crt0s += $(src)/cpu/via/car/cache_as_ram.inc
+endif
+ifeq ($(CONFIG_BOARD_VIA_EPIA_M700),y)
+crt0s += $(src)/cpu/via/car/cache_as_ram.inc
+endif
+# who else could use this?
+ifeq ($(CONFIG_BOARD_TYAN_S2735),y)
+crt0s += $(src)/cpu/x86/car/cache_as_ram.inc
+endif
+
+ifeq ($(CONFIG_BIG_BOOTBLOCK),y)
+ifeq ($(CONFIG_ROMCC),y)
+crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/failover.inc
+endif
+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
+
+ifeq ($(CONFIG_BIG_BOOTBLOCK),y)
+ifeq ($(CONFIG_SOUTHBRIDGE_NVIDIA_CK804),y)
+crt0s += $(src)/southbridge/nvidia/ck804/romstrap.inc
+endif
+ifeq ($(CONFIG_SOUTHBRIDGE_NVIDIA_MCP55),y)
+crt0s += $(src)/southbridge/nvidia/mcp55/romstrap.inc
+endif
+ifeq ($(CONFIG_SOUTHBRIDGE_VIA_K8T890),y)
+crt0s += $(src)/southbridge/via/k8t890/romstrap.inc
+endif
+ifeq ($(CONFIG_NORTHBRIDGE_VIA_VX800),y)
+crt0s += $(src)/northbridge/via/vx800/romstrap.inc
+endif
 endif

OPTION_TABLE_H:=

Modified: trunk/src/cpu/via/model_c3/Kconfig
==============================================================================
--- trunk/src/cpu/via/model_c3/Kconfig	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/cpu/via/model_c3/Kconfig	Thu Feb 25 18:03:17 2010	(r5162)
@@ -1,3 +1,4 @@
 config CPU_VIA_C3
    bool
    select UDELAY_TSC
+	select MMX

Modified: trunk/src/cpu/via/model_c7/Kconfig
==============================================================================
--- trunk/src/cpu/via/model_c7/Kconfig	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/cpu/via/model_c7/Kconfig	Thu Feb 25 18:03:17 2010	(r5162)
@@ -1,4 +1,5 @@
 config CPU_VIA_C7
    bool
    select UDELAY_TSC
+	select MMX
    select SSE2

Modified: trunk/src/mainboard/Makefile.k8_CAR.inc
==============================================================================
--- trunk/src/mainboard/Makefile.k8_CAR.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/Makefile.k8_CAR.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -33,12 +33,6 @@
 # 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

Modified: trunk/src/mainboard/Makefile.k8_ck804.inc
==============================================================================
--- trunk/src/mainboard/Makefile.k8_ck804.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/Makefile.k8_ck804.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -36,13 +36,6 @@

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

Modified: trunk/src/mainboard/Makefile.romccboard.inc
==============================================================================
--- trunk/src/mainboard/Makefile.romccboard.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/Makefile.romccboard.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -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

Modified: trunk/src/mainboard/amd/db800/Makefile.inc
==============================================================================
--- trunk/src/mainboard/amd/db800/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/amd/db800/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -6,12 +6,6 @@
 # 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

Modified: trunk/src/mainboard/amd/dbm690t/Makefile.inc
==============================================================================
--- trunk/src/mainboard/amd/dbm690t/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/amd/dbm690t/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -31,12 +31,6 @@

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

Modified: trunk/src/mainboard/amd/norwich/Makefile.inc
==============================================================================
--- trunk/src/mainboard/amd/norwich/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/amd/norwich/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -6,13 +6,6 @@
 # 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

Modified: trunk/src/mainboard/amd/pistachio/Makefile.inc
==============================================================================
--- trunk/src/mainboard/amd/pistachio/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/amd/pistachio/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -30,13 +30,6 @@
 # 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

Modified: trunk/src/mainboard/amd/serengeti_cheetah/Makefile.inc
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/amd/serengeti_cheetah/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -35,13 +35,6 @@
 # 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

Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -38,10 +38,6 @@
 # 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

Modified: trunk/src/mainboard/artecgroup/dbe61/Makefile.inc
==============================================================================
--- trunk/src/mainboard/artecgroup/dbe61/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/artecgroup/dbe61/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -6,13 +6,6 @@
 # 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

Modified: trunk/src/mainboard/asus/a8n_e/Makefile.inc
==============================================================================
--- trunk/src/mainboard/asus/a8n_e/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/asus/a8n_e/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -27,13 +27,6 @@
 # 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

Modified: trunk/src/mainboard/asus/a8v-e_se/Makefile.inc
==============================================================================
--- trunk/src/mainboard/asus/a8v-e_se/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/asus/a8v-e_se/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -9,14 +9,6 @@
 # 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

Modified: trunk/src/mainboard/asus/m2v-mx_se/Makefile.inc
==============================================================================
--- trunk/src/mainboard/asus/m2v-mx_se/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/asus/m2v-mx_se/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -27,10 +27,6 @@
 # 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

Modified: trunk/src/mainboard/bcom/winnetp680/Makefile.inc
==============================================================================
--- trunk/src/mainboard/bcom/winnetp680/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/bcom/winnetp680/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -34,11 +34,4 @@
 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

Modified: trunk/src/mainboard/digitallogic/msm800sev/Makefile.inc
==============================================================================
--- trunk/src/mainboard/digitallogic/msm800sev/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/digitallogic/msm800sev/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -6,13 +6,6 @@
 # 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

Modified: trunk/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc
==============================================================================
--- trunk/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -28,12 +28,6 @@

# 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

Modified: trunk/src/mainboard/gigabyte/m57sli/Makefile.inc
==============================================================================
--- trunk/src/mainboard/gigabyte/m57sli/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/gigabyte/m57sli/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -31,13 +31,6 @@

# 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

Modified: trunk/src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc
==============================================================================
--- trunk/src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -6,13 +6,6 @@
 # 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

Modified: trunk/src/mainboard/intel/d945gclf/Makefile.inc
==============================================================================
--- trunk/src/mainboard/intel/d945gclf/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/intel/d945gclf/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -35,13 +35,6 @@
 # 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

Modified: trunk/src/mainboard/intel/eagleheights/Makefile.inc
==============================================================================
--- trunk/src/mainboard/intel/eagleheights/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/intel/eagleheights/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -9,14 +9,7 @@
 # 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

Modified: trunk/src/mainboard/iwill/dk8_htx/Makefile.inc
==============================================================================
--- trunk/src/mainboard/iwill/dk8_htx/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/iwill/dk8_htx/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -34,13 +34,6 @@
 # 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

Modified: trunk/src/mainboard/jetway/j7f24/Makefile.inc
==============================================================================
--- trunk/src/mainboard/jetway/j7f24/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/jetway/j7f24/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -30,11 +30,4 @@
 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

Modified: trunk/src/mainboard/kontron/986lcd-m/Makefile.inc
==============================================================================
--- trunk/src/mainboard/kontron/986lcd-m/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/kontron/986lcd-m/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -36,9 +36,6 @@

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

Modified: trunk/src/mainboard/kontron/kt690/Makefile.inc
==============================================================================
--- trunk/src/mainboard/kontron/kt690/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/kontron/kt690/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -30,13 +30,6 @@
 # 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

Modified: trunk/src/mainboard/lippert/roadrunner-lx/Makefile.inc
==============================================================================
--- trunk/src/mainboard/lippert/roadrunner-lx/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/lippert/roadrunner-lx/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -6,13 +6,6 @@
 # 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

Modified: trunk/src/mainboard/lippert/spacerunner-lx/Makefile.inc
==============================================================================
--- trunk/src/mainboard/lippert/spacerunner-lx/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/lippert/spacerunner-lx/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -6,13 +6,6 @@
 # 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

Modified: trunk/src/mainboard/msi/ms7260/Makefile.inc
==============================================================================
--- trunk/src/mainboard/msi/ms7260/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/msi/ms7260/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -28,12 +28,6 @@

# 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

Modified: trunk/src/mainboard/msi/ms9282/Makefile.inc
==============================================================================
--- trunk/src/mainboard/msi/ms9282/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/msi/ms9282/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -30,12 +30,6 @@

# 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

Modified: trunk/src/mainboard/nvidia/l1_2pvv/Makefile.inc
==============================================================================
--- trunk/src/mainboard/nvidia/l1_2pvv/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/nvidia/l1_2pvv/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -28,13 +28,6 @@

# 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

Modified: trunk/src/mainboard/pcengines/alix1c/Makefile.inc
==============================================================================
--- trunk/src/mainboard/pcengines/alix1c/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/pcengines/alix1c/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -6,13 +6,6 @@
 # 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

Modified: trunk/src/mainboard/roda/rk886ex/Makefile.inc
==============================================================================
--- trunk/src/mainboard/roda/rk886ex/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/roda/rk886ex/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -37,13 +37,6 @@
 # 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

Modified: trunk/src/mainboard/supermicro/h8dme/Makefile.inc
==============================================================================
--- trunk/src/mainboard/supermicro/h8dme/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/supermicro/h8dme/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -28,14 +28,6 @@
 # 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

Modified: trunk/src/mainboard/supermicro/h8dmr/Makefile.inc
==============================================================================
--- trunk/src/mainboard/supermicro/h8dmr/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/supermicro/h8dmr/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -27,14 +27,6 @@
 # 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

Modified: trunk/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc
==============================================================================
--- trunk/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -27,10 +27,6 @@
 # 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

Modified: trunk/src/mainboard/supermicro/h8qme_fam10/Makefile.inc
==============================================================================
--- trunk/src/mainboard/supermicro/h8qme_fam10/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/supermicro/h8qme_fam10/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -27,10 +27,6 @@
 # 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

Modified: trunk/src/mainboard/technexion/tim5690/Makefile.inc
==============================================================================
--- trunk/src/mainboard/technexion/tim5690/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/technexion/tim5690/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -36,13 +36,6 @@
 # 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

Modified: trunk/src/mainboard/technexion/tim8690/Makefile.inc
==============================================================================
--- trunk/src/mainboard/technexion/tim8690/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/technexion/tim8690/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -30,13 +30,6 @@
 # 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

Modified: trunk/src/mainboard/tyan/s2735/Makefile.inc
==============================================================================
--- trunk/src/mainboard/tyan/s2735/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/tyan/s2735/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -32,13 +32,6 @@
 # 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

Modified: trunk/src/mainboard/tyan/s2912/Makefile.inc
==============================================================================
--- trunk/src/mainboard/tyan/s2912/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/tyan/s2912/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -28,13 +28,6 @@

# 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

Modified: trunk/src/mainboard/tyan/s2912_fam10/Makefile.inc
==============================================================================
--- trunk/src/mainboard/tyan/s2912_fam10/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/tyan/s2912_fam10/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -28,9 +28,6 @@

# 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

Modified: trunk/src/mainboard/via/epia-m/Makefile.inc
==============================================================================
--- trunk/src/mainboard/via/epia-m/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/via/epia-m/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -30,17 +30,8 @@

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

Modified: trunk/src/mainboard/via/epia-m700/Makefile.inc
==============================================================================
--- trunk/src/mainboard/via/epia-m700/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/via/epia-m700/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -36,11 +36,4 @@
 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

Modified: trunk/src/mainboard/via/epia-n/Makefile.inc
==============================================================================
--- trunk/src/mainboard/via/epia-n/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/via/epia-n/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -33,11 +33,4 @@
 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

Modified: trunk/src/mainboard/via/epia/Makefile.inc
==============================================================================
--- trunk/src/mainboard/via/epia/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/via/epia/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -29,11 +29,4 @@
 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

Modified: trunk/src/mainboard/via/vt8454c/Makefile.inc
==============================================================================
--- trunk/src/mainboard/via/vt8454c/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/via/vt8454c/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -26,13 +26,6 @@
 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

Modified: trunk/src/mainboard/winent/pl6064/Makefile.inc
==============================================================================
--- trunk/src/mainboard/winent/pl6064/Makefile.inc	Thu Feb 25 17:09:53 2010	(r5161)
+++ trunk/src/mainboard/winent/pl6064/Makefile.inc	Thu Feb 25 18:03:17 2010	(r5162)
@@ -6,12 +6,6 @@
 # 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