Index: src/cpu/via/model_c3/Kconfig =================================================================== --- src/cpu/via/model_c3/Kconfig (revision 5158) +++ src/cpu/via/model_c3/Kconfig (working copy) @@ -1,3 +1,4 @@ config CPU_VIA_C3 bool select UDELAY_TSC + select MMX Index: src/cpu/via/model_c7/Kconfig =================================================================== --- src/cpu/via/model_c7/Kconfig (revision 5158) +++ src/cpu/via/model_c7/Kconfig (working copy) @@ -1,3 +1,4 @@ config CPU_VIA_C7 bool select UDELAY_TSC + select MMX Index: src/mainboard/Makefile.k8_ck804.inc =================================================================== --- src/mainboard/Makefile.k8_ck804.inc (revision 5158) +++ src/mainboard/Makefile.k8_ck804.inc (working copy) @@ -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 Index: src/mainboard/iwill/dk8_htx/Makefile.inc =================================================================== --- src/mainboard/iwill/dk8_htx/Makefile.inc (revision 5158) +++ src/mainboard/iwill/dk8_htx/Makefile.inc (working copy) @@ -35,12 +35,6 @@ 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 Index: src/mainboard/bcom/winnetp680/Makefile.inc =================================================================== --- src/mainboard/bcom/winnetp680/Makefile.inc (revision 5158) +++ src/mainboard/bcom/winnetp680/Makefile.inc (working copy) @@ -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 Index: src/mainboard/supermicro/h8dmr/Makefile.inc =================================================================== --- src/mainboard/supermicro/h8dmr/Makefile.inc (revision 5158) +++ src/mainboard/supermicro/h8dmr/Makefile.inc (working copy) @@ -28,13 +28,6 @@ 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 Index: src/mainboard/supermicro/h8dme/Makefile.inc =================================================================== --- src/mainboard/supermicro/h8dme/Makefile.inc (revision 5158) +++ src/mainboard/supermicro/h8dme/Makefile.inc (working copy) @@ -29,13 +29,6 @@ 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 Index: src/mainboard/supermicro/h8dmr_fam10/Makefile.inc =================================================================== --- src/mainboard/supermicro/h8dmr_fam10/Makefile.inc (revision 5158) +++ src/mainboard/supermicro/h8dmr_fam10/Makefile.inc (working copy) @@ -28,9 +28,6 @@ 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 Index: src/mainboard/supermicro/h8qme_fam10/Makefile.inc =================================================================== --- src/mainboard/supermicro/h8qme_fam10/Makefile.inc (revision 5158) +++ src/mainboard/supermicro/h8qme_fam10/Makefile.inc (working copy) @@ -28,9 +28,6 @@ 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 Index: src/mainboard/kontron/986lcd-m/Makefile.inc =================================================================== --- src/mainboard/kontron/986lcd-m/Makefile.inc (revision 5158) +++ src/mainboard/kontron/986lcd-m/Makefile.inc (working copy) @@ -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 Index: src/mainboard/kontron/kt690/Makefile.inc =================================================================== --- src/mainboard/kontron/kt690/Makefile.inc (revision 5158) +++ src/mainboard/kontron/kt690/Makefile.inc (working copy) @@ -31,12 +31,6 @@ 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 Index: src/mainboard/gigabyte/m57sli/Makefile.inc =================================================================== --- src/mainboard/gigabyte/m57sli/Makefile.inc (revision 5158) +++ src/mainboard/gigabyte/m57sli/Makefile.inc (working copy) @@ -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 Index: src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc =================================================================== --- src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc (revision 5158) +++ src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc (working copy) @@ -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 Index: src/mainboard/digitallogic/msm800sev/Makefile.inc =================================================================== --- src/mainboard/digitallogic/msm800sev/Makefile.inc (revision 5158) +++ src/mainboard/digitallogic/msm800sev/Makefile.inc (working copy) @@ -7,12 +7,6 @@ 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 Index: src/mainboard/amd/pistachio/Makefile.inc =================================================================== --- src/mainboard/amd/pistachio/Makefile.inc (revision 5158) +++ src/mainboard/amd/pistachio/Makefile.inc (working copy) @@ -31,12 +31,6 @@ 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 Index: src/mainboard/amd/dbm690t/Makefile.inc =================================================================== --- src/mainboard/amd/dbm690t/Makefile.inc (revision 5158) +++ src/mainboard/amd/dbm690t/Makefile.inc (working copy) @@ -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 Index: src/mainboard/amd/serengeti_cheetah/Makefile.inc =================================================================== --- src/mainboard/amd/serengeti_cheetah/Makefile.inc (revision 5158) +++ src/mainboard/amd/serengeti_cheetah/Makefile.inc (working copy) @@ -36,12 +36,6 @@ 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 Index: src/mainboard/amd/norwich/Makefile.inc =================================================================== --- src/mainboard/amd/norwich/Makefile.inc (revision 5158) +++ src/mainboard/amd/norwich/Makefile.inc (working copy) @@ -7,12 +7,6 @@ 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 Index: src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc =================================================================== --- src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc (revision 5158) +++ src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc (working copy) @@ -39,9 +39,6 @@ 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 Index: src/mainboard/amd/db800/Makefile.inc =================================================================== --- src/mainboard/amd/db800/Makefile.inc (revision 5158) +++ src/mainboard/amd/db800/Makefile.inc (working copy) @@ -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 Index: src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc =================================================================== --- src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc (revision 5158) +++ src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc (working copy) @@ -7,12 +7,6 @@ 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 Index: src/mainboard/tyan/s2912/Makefile.inc =================================================================== --- src/mainboard/tyan/s2912/Makefile.inc (revision 5158) +++ src/mainboard/tyan/s2912/Makefile.inc (working copy) @@ -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 Index: src/mainboard/tyan/s2735/Makefile.inc =================================================================== --- src/mainboard/tyan/s2735/Makefile.inc (revision 5158) +++ src/mainboard/tyan/s2735/Makefile.inc (working copy) @@ -33,12 +33,6 @@ 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 Index: src/mainboard/tyan/s2912_fam10/Makefile.inc =================================================================== --- src/mainboard/tyan/s2912_fam10/Makefile.inc (revision 5158) +++ src/mainboard/tyan/s2912_fam10/Makefile.inc (working copy) @@ -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 Index: src/mainboard/pcengines/alix1c/Makefile.inc =================================================================== --- src/mainboard/pcengines/alix1c/Makefile.inc (revision 5158) +++ src/mainboard/pcengines/alix1c/Makefile.inc (working copy) @@ -7,12 +7,6 @@ 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 Index: src/mainboard/artecgroup/dbe61/Makefile.inc =================================================================== --- src/mainboard/artecgroup/dbe61/Makefile.inc (revision 5158) +++ src/mainboard/artecgroup/dbe61/Makefile.inc (working copy) @@ -7,12 +7,6 @@ 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 Index: src/mainboard/lippert/roadrunner-lx/Makefile.inc =================================================================== --- src/mainboard/lippert/roadrunner-lx/Makefile.inc (revision 5158) +++ src/mainboard/lippert/roadrunner-lx/Makefile.inc (working copy) @@ -7,12 +7,6 @@ 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 Index: src/mainboard/lippert/spacerunner-lx/Makefile.inc =================================================================== --- src/mainboard/lippert/spacerunner-lx/Makefile.inc (revision 5158) +++ src/mainboard/lippert/spacerunner-lx/Makefile.inc (working copy) @@ -7,12 +7,6 @@ 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 Index: src/mainboard/via/epia-m700/Makefile.inc =================================================================== --- src/mainboard/via/epia-m700/Makefile.inc (revision 5158) +++ src/mainboard/via/epia-m700/Makefile.inc (working copy) @@ -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 Index: src/mainboard/via/vt8454c/Makefile.inc =================================================================== --- src/mainboard/via/vt8454c/Makefile.inc (revision 5158) +++ src/mainboard/via/vt8454c/Makefile.inc (working copy) @@ -27,12 +27,6 @@ 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 Index: src/mainboard/via/epia-m/Makefile.inc =================================================================== --- src/mainboard/via/epia-m/Makefile.inc (revision 5158) +++ src/mainboard/via/epia-m/Makefile.inc (working copy) @@ -35,12 +35,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/x86/fpu_enable.inc -crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc -crt0s += $(src)/cpu/x86/mmx_disable.inc Index: src/mainboard/via/epia-n/Makefile.inc =================================================================== --- src/mainboard/via/epia-n/Makefile.inc (revision 5158) +++ src/mainboard/via/epia-n/Makefile.inc (working copy) @@ -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 Index: src/mainboard/via/epia/Makefile.inc =================================================================== --- src/mainboard/via/epia/Makefile.inc (revision 5158) +++ src/mainboard/via/epia/Makefile.inc (working copy) @@ -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 Index: src/mainboard/roda/rk886ex/Makefile.inc =================================================================== --- src/mainboard/roda/rk886ex/Makefile.inc (revision 5158) +++ src/mainboard/roda/rk886ex/Makefile.inc (working copy) @@ -38,12 +38,6 @@ 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 Index: src/mainboard/msi/ms9282/Makefile.inc =================================================================== --- src/mainboard/msi/ms9282/Makefile.inc (revision 5158) +++ src/mainboard/msi/ms9282/Makefile.inc (working copy) @@ -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 Index: src/mainboard/msi/ms7260/Makefile.inc =================================================================== --- src/mainboard/msi/ms7260/Makefile.inc (revision 5158) +++ src/mainboard/msi/ms7260/Makefile.inc (working copy) @@ -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 Index: src/mainboard/Makefile.k8_CAR.inc =================================================================== --- src/mainboard/Makefile.k8_CAR.inc (revision 5158) +++ src/mainboard/Makefile.k8_CAR.inc (working copy) @@ -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 Index: src/mainboard/Makefile.romccboard.inc =================================================================== --- src/mainboard/Makefile.romccboard.inc (revision 5158) +++ src/mainboard/Makefile.romccboard.inc (working copy) @@ -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 Index: src/mainboard/jetway/j7f24/Makefile.inc =================================================================== --- src/mainboard/jetway/j7f24/Makefile.inc (revision 5158) +++ src/mainboard/jetway/j7f24/Makefile.inc (working copy) @@ -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 Index: src/mainboard/technexion/tim8690/Makefile.inc =================================================================== --- src/mainboard/technexion/tim8690/Makefile.inc (revision 5158) +++ src/mainboard/technexion/tim8690/Makefile.inc (working copy) @@ -31,12 +31,6 @@ 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 Index: src/mainboard/technexion/tim5690/Makefile.inc =================================================================== --- src/mainboard/technexion/tim5690/Makefile.inc (revision 5158) +++ src/mainboard/technexion/tim5690/Makefile.inc (working copy) @@ -37,12 +37,6 @@ 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 Index: src/mainboard/winent/pl6064/Makefile.inc =================================================================== --- src/mainboard/winent/pl6064/Makefile.inc (revision 5158) +++ src/mainboard/winent/pl6064/Makefile.inc (working copy) @@ -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 Index: src/mainboard/nvidia/l1_2pvv/Makefile.inc =================================================================== --- src/mainboard/nvidia/l1_2pvv/Makefile.inc (revision 5158) +++ src/mainboard/nvidia/l1_2pvv/Makefile.inc (working copy) @@ -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 Index: src/mainboard/intel/d945gclf/Makefile.inc =================================================================== --- src/mainboard/intel/d945gclf/Makefile.inc (revision 5158) +++ src/mainboard/intel/d945gclf/Makefile.inc (working copy) @@ -36,12 +36,6 @@ 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 Index: src/mainboard/intel/eagleheights/Makefile.inc =================================================================== --- src/mainboard/intel/eagleheights/Makefile.inc (revision 5158) +++ src/mainboard/intel/eagleheights/Makefile.inc (working copy) @@ -10,13 +10,7 @@ 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 Index: src/mainboard/asus/a8v-e_se/Makefile.inc =================================================================== --- src/mainboard/asus/a8v-e_se/Makefile.inc (revision 5158) +++ src/mainboard/asus/a8v-e_se/Makefile.inc (working copy) @@ -10,13 +10,6 @@ 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 Index: src/mainboard/asus/a8n_e/Makefile.inc =================================================================== --- src/mainboard/asus/a8n_e/Makefile.inc (revision 5158) +++ src/mainboard/asus/a8n_e/Makefile.inc (working copy) @@ -28,12 +28,6 @@ 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 Index: src/mainboard/asus/m2v-mx_se/Makefile.inc =================================================================== --- src/mainboard/asus/m2v-mx_se/Makefile.inc (revision 5158) +++ src/mainboard/asus/m2v-mx_se/Makefile.inc (working copy) @@ -28,9 +28,6 @@ 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 Index: src/arch/i386/Makefile.inc =================================================================== --- src/arch/i386/Makefile.inc (revision 5158) +++ src/arch/i386/Makefile.inc (working copy) @@ -62,11 +62,99 @@ ####################################################################### # 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 +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:= ifeq ($(CONFIG_HAVE_OPTION_TABLE),y) OPTION_TABLE_H:=$(obj)/option_table.h Index: Makefile =================================================================== --- Makefile (revision 5158) +++ Makefile (working copy) @@ -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