Move files from src/cpu/x86/{fpu,mmx,sse}/ to x86/

Signed-off-by: Peter Stuge <peter@stuge.se> Acked-by: Myles Watson <mylesgw@gmail.com> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4803 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
2009-10-17 15:01:00 +00:00 · 2009-10-17 15:01:00 +00:00 · d08be7eecd
parent 0bc615482e
commit d08be7eecd
80 changed files with 153 additions and 153 deletions
--- a/src/cpu/x86/fpu/enable_fpu.inc
+++ b/src/cpu/x86/fpu/enable_fpu.inc
--- a/src/cpu/x86/mmx/disable_mmx.inc
+++ b/src/cpu/x86/mmx/disable_mmx.inc
--- a/src/cpu/x86/sse/disable_sse.inc
+++ b/src/cpu/x86/sse/disable_sse.inc
--- a/src/cpu/x86/sse/enable_sse.inc
+++ b/src/cpu/x86/sse/enable_sse.inc
--- a/src/mainboard/Makefile.romccboard.inc
+++ b/src/mainboard/Makefile.romccboard.inc
@ -24,15 +24,15 @@ crt0-y += ../../../../src/cpu/x86/32bit/entry32.inc
 crt0-y += ../../../../src/cpu/x86/16bit/reset16.inc
 crt0-y += ../../../../src/arch/i386/lib/cpu_reset.inc
 crt0-y += ../../../../src/arch/i386/lib/id.inc
-crt0-y += ../../../../src/cpu/x86/fpu/enable_fpu.inc
+crt0-y += ../../../../src/cpu/x86/fpu_enable.inc

 crt0-$(CONFIG_CPU_AMD_GX1) += ../../../../src/cpu/amd/model_gx1/cpu_setup.inc
 crt0-$(CONFIG_CPU_AMD_GX1) += ../../../../src/cpu/amd/model_gx1/gx_setup.inc
-crt0-$(CONFIG_SSE) += ../../../../src/cpu/x86/sse/enable_sse.inc
+crt0-$(CONFIG_SSE) += ../../../../src/cpu/x86/sse_enable.inc
 crt0-y += failover.inc
 crt0-y += auto.inc
-crt0-$(CONFIG_SSE) += ../../../../src/cpu/x86/sse/disable_sse.inc
-crt0-$(CONFIG_MMX) += ../../../../src/cpu/x86/mmx/disable_mmx.inc
+crt0-$(CONFIG_SSE) += ../../../../src/cpu/x86/sse_disable.inc
+crt0-$(CONFIG_MMX) += ../../../../src/cpu/x86/mmx_disable.inc

 ldscript-y += ../../../../src/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscript-y += ../../../../src/cpu/x86/16bit/entry16.lds
--- a/src/mainboard/a-trend/atc-6220/Config.lb
+++ b/src/mainboard/a-trend/atc-6220/Config.lb
@ -64,9 +64,9 @@ if CONFIG_USE_FALLBACK_IMAGE
 	ldscript /arch/i386/lib/failover.lds
 	mainboardinit ./failover.inc
 end
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/mmx_disable.inc

 dir /pc80
 config chip.h
--- a/src/mainboard/a-trend/atc-6240/Config.lb
+++ b/src/mainboard/a-trend/atc-6240/Config.lb
@ -64,9 +64,9 @@ if CONFIG_USE_FALLBACK_IMAGE
 	ldscript /arch/i386/lib/failover.lds
 	mainboardinit ./failover.inc
 end
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/mmx_disable.inc

 dir /pc80
 config chip.h
--- a/src/mainboard/abit/be6-ii_v2_0/Config.lb
+++ b/src/mainboard/abit/be6-ii_v2_0/Config.lb
@ -64,9 +64,9 @@ if CONFIG_USE_FALLBACK_IMAGE
 	ldscript /arch/i386/lib/failover.lds
 	mainboardinit ./failover.inc
 end
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/mmx_disable.inc

 dir /pc80
 config chip.h
--- a/src/mainboard/advantech/pcm-5820/Config.lb
+++ b/src/mainboard/advantech/pcm-5820/Config.lb
@ -63,7 +63,7 @@ if CONFIG_USE_FALLBACK_IMAGE
 	ldscript /arch/i386/lib/failover.lds
 	mainboardinit ./failover.inc
 end
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit cpu/amd/model_gx1/cpu_setup.inc
 mainboardinit cpu/amd/model_gx1/gx_setup.inc
 mainboardinit ./auto.inc
--- a/src/mainboard/amd/db800/Config.lb
+++ b/src/mainboard/amd/db800/Config.lb
@ -71,7 +71,7 @@ end
 ##
 ## Setup RAM
 ##
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc

 	mainboardinit cpu/amd/model_lx/cache_as_ram.inc
 	mainboardinit ./cache_as_ram_auto.inc
--- a/src/mainboard/amd/norwich/Config.lb
+++ b/src/mainboard/amd/norwich/Config.lb
@ -73,7 +73,7 @@ end
 ##
 ## Setup RAM
 ##
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc

 	mainboardinit cpu/amd/model_lx/cache_as_ram.inc
 	mainboardinit ./cache_as_ram_auto.inc
--- a/src/mainboard/amd/rumba/Config.lb
+++ b/src/mainboard/amd/rumba/Config.lb
@ -84,7 +84,7 @@ end
 ##
 ## Setup RAM
 ##
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc

 ##
--- a/src/mainboard/artecgroup/dbe61/Config.lb
+++ b/src/mainboard/artecgroup/dbe61/Config.lb
@ -70,7 +70,7 @@ end
 ##
 ## Setup RAM
 ##
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc

 	mainboardinit cpu/amd/model_lx/cache_as_ram.inc
 	mainboardinit ./cache_as_ram_auto.inc
--- a/src/mainboard/asi/mb_5blgp/Config.lb
+++ b/src/mainboard/asi/mb_5blgp/Config.lb
@ -63,7 +63,7 @@ if CONFIG_USE_FALLBACK_IMAGE
 	ldscript /arch/i386/lib/failover.lds
 	mainboardinit ./failover.inc
 end
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit cpu/amd/model_gx1/cpu_setup.inc
 mainboardinit cpu/amd/model_gx1/gx_setup.inc
 mainboardinit ./auto.inc
--- a/src/mainboard/asi/mb_5blmp/Config.lb
+++ b/src/mainboard/asi/mb_5blmp/Config.lb
@ -85,7 +85,7 @@ ldscript /arch/i386/lib/id.lds
 ##
 ## Setup RAM
 ##
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit cpu/amd/model_gx1/cpu_setup.inc
 mainboardinit cpu/amd/model_gx1/gx_setup.inc
 mainboardinit ./auto.inc
--- a/src/mainboard/asus/mew-am/Config.lb
+++ b/src/mainboard/asus/mew-am/Config.lb
@ -65,9 +65,9 @@ if CONFIG_USE_FALLBACK_IMAGE
 	ldscript /arch/i386/lib/failover.lds
 	mainboardinit ./failover.inc
 end
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/mmx_disable.inc

 dir /pc80
 config chip.h
--- a/src/mainboard/asus/mew-vm/Config.lb
+++ b/src/mainboard/asus/mew-vm/Config.lb
@ -84,9 +84,9 @@ end
 ##
 ## Setup RAM
 ##
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/mmx_disable.inc

 ##
 ## Include the secondary Configuration files 
--- a/src/mainboard/asus/p2b-d/Config.lb
+++ b/src/mainboard/asus/p2b-d/Config.lb
@ -63,9 +63,9 @@ if CONFIG_USE_FALLBACK_IMAGE
 	ldscript /arch/i386/lib/failover.lds
 	mainboardinit ./failover.inc
 end
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/mmx_disable.inc

 dir /pc80
 config chip.h
--- a/src/mainboard/asus/p2b-ds/Config.lb
+++ b/src/mainboard/asus/p2b-ds/Config.lb
@ -63,9 +63,9 @@ if CONFIG_USE_FALLBACK_IMAGE
 	ldscript /arch/i386/lib/failover.lds
 	mainboardinit ./failover.inc
 end
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/mmx_disable.inc

 dir /pc80
 config chip.h
--- a/src/mainboard/asus/p2b-f/Config.lb
+++ b/src/mainboard/asus/p2b-f/Config.lb
@ -64,9 +64,9 @@ if CONFIG_USE_FALLBACK_IMAGE
 	ldscript /arch/i386/lib/failover.lds
 	mainboardinit ./failover.inc
 end
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/mmx_disable.inc

 dir /pc80
 config chip.h
--- a/src/mainboard/asus/p2b/Config.lb
+++ b/src/mainboard/asus/p2b/Config.lb
@ -64,9 +64,9 @@ if CONFIG_USE_FALLBACK_IMAGE
 	ldscript /arch/i386/lib/failover.lds
 	mainboardinit ./failover.inc
 end
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/mmx_disable.inc

 dir /pc80
 config chip.h
--- a/src/mainboard/asus/p3b-f/Config.lb
+++ b/src/mainboard/asus/p3b-f/Config.lb
@ -64,9 +64,9 @@ if CONFIG_USE_FALLBACK_IMAGE
 	ldscript /arch/i386/lib/failover.lds
 	mainboardinit ./failover.inc
 end
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/mmx_disable.inc

 dir /pc80
 config chip.h
--- a/src/mainboard/axus/tc320/Config.lb
+++ b/src/mainboard/axus/tc320/Config.lb
@ -61,7 +61,7 @@ if CONFIG_USE_FALLBACK_IMAGE
 	ldscript /arch/i386/lib/failover.lds
 	mainboardinit ./failover.inc
 end
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit cpu/amd/model_gx1/cpu_setup.inc
 mainboardinit cpu/amd/model_gx1/gx_setup.inc
 mainboardinit ./auto.inc
--- a/src/mainboard/azza/pt-6ibd/Config.lb
+++ b/src/mainboard/azza/pt-6ibd/Config.lb
@ -63,9 +63,9 @@ if CONFIG_USE_FALLBACK_IMAGE
 	ldscript /arch/i386/lib/failover.lds
 	mainboardinit ./failover.inc
 end
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/mmx_disable.inc

 dir /pc80
 config chip.h
--- a/src/mainboard/bcom/winnet100/Config.lb
+++ b/src/mainboard/bcom/winnet100/Config.lb
@ -63,7 +63,7 @@ if CONFIG_USE_FALLBACK_IMAGE
 	ldscript /arch/i386/lib/failover.lds
 	mainboardinit ./failover.inc
 end
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit cpu/amd/model_gx1/cpu_setup.inc
 mainboardinit cpu/amd/model_gx1/gx_setup.inc
 mainboardinit ./auto.inc
--- a/src/mainboard/bcom/winnetp680/Config.lb
+++ b/src/mainboard/bcom/winnetp680/Config.lb
@ -66,9 +66,9 @@ if CONFIG_USE_FALLBACK_IMAGE
 	ldscript /arch/i386/lib/failover.lds
 	mainboardinit ./failover.inc
 end
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/mmx_disable.inc
 dir /pc80
 config chip.h

--- a/src/mainboard/bcom/winnetp680/Makefile.inc
+++ b/src/mainboard/bcom/winnetp680/Makefile.inc
@ -38,9 +38,9 @@ crt0-y += ../../../../src/cpu/x86/16bit/entry16.inc
 crt0-y += ../../../../src/cpu/x86/32bit/entry32.inc
 crt0-y += ../../../../src/cpu/x86/16bit/reset16.inc
 crt0-y += ../../../../src/arch/i386/lib/id.inc
-crt0-y += ../../../../src/cpu/x86/fpu/enable_fpu.inc
+crt0-y += ../../../../src/cpu/x86/fpu_enable.inc
 crt0-y += auto.inc
-crt0-y += ../../../../src/cpu/x86/mmx/disable_mmx.inc
+crt0-y += ../../../../src/cpu/x86/mmx_disable.inc

 ifdef POST_EVALUATION

--- a/src/mainboard/biostar/m6tba/Config.lb
+++ b/src/mainboard/biostar/m6tba/Config.lb
@ -64,9 +64,9 @@ if CONFIG_USE_FALLBACK_IMAGE
 	ldscript /arch/i386/lib/failover.lds
 	mainboardinit ./failover.inc
 end
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/mmx_disable.inc

 dir /pc80
 config chip.h
--- a/src/mainboard/compaq/deskpro_en_sff_p600/Config.lb
+++ b/src/mainboard/compaq/deskpro_en_sff_p600/Config.lb
@ -64,9 +64,9 @@ if CONFIG_USE_FALLBACK_IMAGE
 	ldscript /arch/i386/lib/failover.lds
 	mainboardinit ./failover.inc
 end
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/mmx_disable.inc

 dir /pc80
 config chip.h
--- a/src/mainboard/dell/s1850/Config.lb
+++ b/src/mainboard/dell/s1850/Config.lb
@ -89,11 +89,11 @@ end
 ##
 ## Setup RAM
 ##
-mainboardinit cpu/x86/fpu/enable_fpu.inc
-mainboardinit cpu/x86/sse/enable_sse.inc
+mainboardinit cpu/x86/fpu_enable.inc
+mainboardinit cpu/x86/sse_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/sse/disable_sse.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/sse_disable.inc
+mainboardinit cpu/x86/mmx_disable.inc

 ##
 ## Include the secondary Configuration files 
--- a/src/mainboard/dell/s1850/Makefile.inc
+++ b/src/mainboard/dell/s1850/Makefile.inc
@ -24,12 +24,12 @@ crt0-y += ../../../../src/cpu/x86/32bit/entry32.inc
 crt0-y += ../../../../src/cpu/x86/16bit/reset16.inc
 crt0-y += ../../../../src/arch/i386/lib/cpu_reset.inc
 crt0-y += ../../../../src/arch/i386/lib/id.inc
-crt0-y += ../../../../src/cpu/x86/fpu/enable_fpu.inc
-crt0-y += ../../../../src/cpu/x86/sse/enable_sse.inc
+crt0-y += ../../../../src/cpu/x86/fpu_enable.inc
+crt0-y += ../../../../src/cpu/x86/sse_enable.inc
 crt0-y += failover.inc
 crt0-y += auto.inc
-crt0-y += ../../../../src/cpu/x86/sse/disable_sse.inc
-crt0-y += ../../../../src/cpu/x86/mmx/disable_mmx.inc
+crt0-y += ../../../../src/cpu/x86/sse_disable.inc
+crt0-y += ../../../../src/cpu/x86/mmx_disable.inc

 ldscript-y += ../../../../src/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscript-y += ../../../../src/cpu/x86/16bit/entry16.lds
--- a/src/mainboard/digitallogic/adl855pc/Config.lb
+++ b/src/mainboard/digitallogic/adl855pc/Config.lb
@ -83,11 +83,11 @@ end
 ##
 ## Setup RAM
 ##
-mainboardinit cpu/x86/fpu/enable_fpu.inc
-mainboardinit cpu/x86/sse/enable_sse.inc
+mainboardinit cpu/x86/fpu_enable.inc
+mainboardinit cpu/x86/sse_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/sse/disable_sse.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/sse_disable.inc
+mainboardinit cpu/x86/mmx_disable.inc

 ##
 ## Include the secondary Configuration files 
--- a/src/mainboard/digitallogic/msm586seg/Config.lb
+++ b/src/mainboard/digitallogic/msm586seg/Config.lb
@ -90,7 +90,7 @@ end
 ##
 ## Setup RAM
 ##
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc

 ##
--- a/src/mainboard/digitallogic/msm800sev/Config.lb
+++ b/src/mainboard/digitallogic/msm800sev/Config.lb
@ -71,7 +71,7 @@ end
 ##
 ## Setup RAM
 ##
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc

 	mainboardinit cpu/amd/model_lx/cache_as_ram.inc
 	mainboardinit ./cache_as_ram_auto.inc
--- a/src/mainboard/eaglelion/5bcm/Config.lb
+++ b/src/mainboard/eaglelion/5bcm/Config.lb
@ -84,7 +84,7 @@ end
 ##
 ## Setup RAM
 ##
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit cpu/amd/model_gx1/cpu_setup.inc
 mainboardinit cpu/amd/model_gx1/gx_setup.inc
 mainboardinit ./auto.inc
--- a/src/mainboard/emulation/qemu-x86/Config.lb
+++ b/src/mainboard/emulation/qemu-x86/Config.lb
@ -94,7 +94,7 @@ else
 	##
 	## Setup RAM
 	##
-	mainboardinit cpu/x86/fpu/enable_fpu.inc
+	mainboardinit cpu/x86/fpu_enable.inc
 	mainboardinit ./auto.inc
 	
 	## the id string will be in cbfs. We will expect flashrom to parse cbfs for the idstring in future. 
--- a/src/mainboard/gigabyte/ga-6bxc/Config.lb
+++ b/src/mainboard/gigabyte/ga-6bxc/Config.lb
@ -64,9 +64,9 @@ if CONFIG_USE_FALLBACK_IMAGE
 	ldscript /arch/i386/lib/failover.lds
 	mainboardinit ./failover.inc
 end
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/mmx_disable.inc

 dir /pc80
 config chip.h
--- a/src/mainboard/iei/juki-511p/Config.lb
+++ b/src/mainboard/iei/juki-511p/Config.lb
@ -86,7 +86,7 @@ ldscript /arch/i386/lib/id.lds
 ##
 ## Setup RAM
 ##
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit cpu/amd/model_gx1/cpu_setup.inc
 mainboardinit cpu/amd/model_gx1/gx_setup.inc
 mainboardinit ./auto.inc
--- a/src/mainboard/iei/nova4899r/Config.lb
+++ b/src/mainboard/iei/nova4899r/Config.lb
@ -85,7 +85,7 @@ end
 ##
 ## Setup RAM
 ##
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit cpu/amd/model_gx1/cpu_setup.inc
 mainboardinit cpu/amd/model_gx1/gx_setup.inc
 mainboardinit ./auto.inc
--- a/src/mainboard/iei/pcisa-lx-800-r10/Config.lb
+++ b/src/mainboard/iei/pcisa-lx-800-r10/Config.lb
@ -52,7 +52,7 @@ if CONFIG_USE_FALLBACK_IMAGE
 	ldscript /arch/i386/lib/failover.lds
 #	mainboardinit ./failover.inc
 end
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 	mainboardinit cpu/amd/model_lx/cache_as_ram.inc
 	mainboardinit ./cache_as_ram_auto.inc
 dir /pc80
--- a/src/mainboard/intel/jarrell/Config.lb
+++ b/src/mainboard/intel/jarrell/Config.lb
@ -89,11 +89,11 @@ end
 ##
 ## Setup RAM
 ##
-mainboardinit cpu/x86/fpu/enable_fpu.inc
-mainboardinit cpu/x86/sse/enable_sse.inc
+mainboardinit cpu/x86/fpu_enable.inc
+mainboardinit cpu/x86/sse_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/sse/disable_sse.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/sse_disable.inc
+mainboardinit cpu/x86/mmx_disable.inc

 ##
 ## Include the secondary Configuration files 
--- a/src/mainboard/intel/mtarvon/Config.lb
+++ b/src/mainboard/intel/mtarvon/Config.lb
@ -102,11 +102,11 @@ end
 ##
 ## Setup RAM
 ##
-mainboardinit cpu/x86/fpu/enable_fpu.inc
-mainboardinit cpu/x86/sse/enable_sse.inc
+mainboardinit cpu/x86/fpu_enable.inc
+mainboardinit cpu/x86/sse_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/sse/disable_sse.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/sse_disable.inc
+mainboardinit cpu/x86/mmx_disable.inc

 ##
 ## Include the secondary Configuration files
--- a/src/mainboard/intel/truxton/Config.lb
+++ b/src/mainboard/intel/truxton/Config.lb
@ -102,11 +102,11 @@ end
 ##
 ## Setup RAM
 ##
-mainboardinit cpu/x86/fpu/enable_fpu.inc
-mainboardinit cpu/x86/sse/enable_sse.inc
+mainboardinit cpu/x86/fpu_enable.inc
+mainboardinit cpu/x86/sse_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/sse/disable_sse.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/sse_disable.inc
+mainboardinit cpu/x86/mmx_disable.inc

 ##
 ## Include the secondary Configuration files
--- a/src/mainboard/intel/xe7501devkit/Config.lb
+++ b/src/mainboard/intel/xe7501devkit/Config.lb
@ -86,11 +86,11 @@ end
 ##
 ## Setup RAM
 ##
-mainboardinit cpu/x86/fpu/enable_fpu.inc
-mainboardinit cpu/x86/sse/enable_sse.inc
+mainboardinit cpu/x86/fpu_enable.inc
+mainboardinit cpu/x86/sse_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/sse/disable_sse.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/sse_disable.inc
+mainboardinit cpu/x86/mmx_disable.inc

 ##
 ## Include the secondary Configuration files 
--- a/src/mainboard/jetway/j7f24/Config.lb
+++ b/src/mainboard/jetway/j7f24/Config.lb
@ -66,9 +66,9 @@ if CONFIG_USE_FALLBACK_IMAGE
 	ldscript /arch/i386/lib/failover.lds
 	mainboardinit ./failover.inc
 end
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/mmx_disable.inc
 dir /pc80
 config chip.h

--- a/src/mainboard/jetway/j7f24/Makefile.inc
+++ b/src/mainboard/jetway/j7f24/Makefile.inc
@ -34,9 +34,9 @@ crt0-y += ../../../../src/cpu/x86/16bit/entry16.inc
 crt0-y += ../../../../src/cpu/x86/32bit/entry32.inc
 crt0-y += ../../../../src/cpu/x86/16bit/reset16.inc
 crt0-y += ../../../../src/arch/i386/lib/id.inc
-crt0-y += ../../../../src/cpu/x86/fpu/enable_fpu.inc
+crt0-y += ../../../../src/cpu/x86/fpu_enable.inc
 crt0-y += auto.inc
-crt0-y += ../../../../src/cpu/x86/mmx/disable_mmx.inc
+crt0-y += ../../../../src/cpu/x86/mmx_disable.inc

 ifdef POST_EVALUATION

--- a/src/mainboard/lippert/frontrunner/Config.lb
+++ b/src/mainboard/lippert/frontrunner/Config.lb
@ -84,7 +84,7 @@ end
 ##
 ## Setup RAM
 ##
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc

 ##
--- a/src/mainboard/lippert/roadrunner-lx/Config.lb
+++ b/src/mainboard/lippert/roadrunner-lx/Config.lb
@ -93,7 +93,7 @@ end
 ##
 ## Setup RAM
 ##
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc

 	mainboardinit cpu/amd/model_lx/cache_as_ram.inc
 	mainboardinit ./cache_as_ram_auto.inc
--- a/src/mainboard/lippert/spacerunner-lx/Config.lb
+++ b/src/mainboard/lippert/spacerunner-lx/Config.lb
@ -92,7 +92,7 @@ end
 ##
 ## Setup RAM
 ##
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc

 	mainboardinit cpu/amd/model_lx/cache_as_ram.inc
 	mainboardinit ./cache_as_ram_auto.inc
--- a/src/mainboard/mitac/6513wu/Config.lb
+++ b/src/mainboard/mitac/6513wu/Config.lb
@ -65,9 +65,9 @@ if CONFIG_USE_FALLBACK_IMAGE
 	ldscript /arch/i386/lib/failover.lds
 	mainboardinit ./failover.inc
 end
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/mmx_disable.inc

 dir /pc80
 config chip.h
--- a/src/mainboard/msi/ms6119/Config.lb
+++ b/src/mainboard/msi/ms6119/Config.lb
@ -64,9 +64,9 @@ if CONFIG_USE_FALLBACK_IMAGE
 	ldscript /arch/i386/lib/failover.lds
 	mainboardinit ./failover.inc
 end
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/mmx_disable.inc

 dir /pc80
 config chip.h
--- a/src/mainboard/msi/ms6147/Config.lb
+++ b/src/mainboard/msi/ms6147/Config.lb
@ -72,9 +72,9 @@ if CONFIG_USE_FALLBACK_IMAGE
 	mainboardinit ./failover.inc
 end

-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/mmx_disable.inc

 dir /pc80
 config chip.h
--- a/src/mainboard/msi/ms6156/Config.lb
+++ b/src/mainboard/msi/ms6156/Config.lb
@ -64,9 +64,9 @@ if CONFIG_USE_FALLBACK_IMAGE
 	ldscript /arch/i386/lib/failover.lds
 	mainboardinit ./failover.inc
 end
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/mmx_disable.inc

 dir /pc80
 config chip.h
--- a/src/mainboard/msi/ms6178/Config.lb
+++ b/src/mainboard/msi/ms6178/Config.lb
@ -62,9 +62,9 @@ if CONFIG_USE_FALLBACK_IMAGE
 	ldscript /arch/i386/lib/failover.lds
 	mainboardinit ./failover.inc
 end
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/mmx_disable.inc
 dir /pc80
 config chip.h

--- a/src/mainboard/nec/powermate2000/Config.lb
+++ b/src/mainboard/nec/powermate2000/Config.lb
@ -62,9 +62,9 @@ if CONFIG_USE_FALLBACK_IMAGE
 	ldscript /arch/i386/lib/failover.lds
 	mainboardinit ./failover.inc
 end
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/mmx_disable.inc
 dir /pc80
 config chip.h

--- a/src/mainboard/olpc/btest/Config.lb
+++ b/src/mainboard/olpc/btest/Config.lb
@ -84,7 +84,7 @@ end
 ##
 ## Setup RAM
 ##
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc

 ##
--- a/src/mainboard/olpc/rev_a/Config.lb
+++ b/src/mainboard/olpc/rev_a/Config.lb
@ -84,7 +84,7 @@ end
 ##
 ## Setup RAM
 ##
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc

 ##
--- a/src/mainboard/pcengines/alix1c/Config.lb
+++ b/src/mainboard/pcengines/alix1c/Config.lb
@ -91,7 +91,7 @@ end
 ##
 ## Setup RAM
 ##
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc

 	mainboardinit cpu/amd/model_lx/cache_as_ram.inc
 	mainboardinit ./cache_as_ram_auto.inc
--- a/src/mainboard/rca/rm4100/Config.lb
+++ b/src/mainboard/rca/rm4100/Config.lb
@ -67,9 +67,9 @@ if CONFIG_USE_FALLBACK_IMAGE
 	ldscript /arch/i386/lib/failover.lds
 	mainboardinit ./failover.inc
 end
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/mmx_disable.inc
 dir /pc80
 config chip.h

--- a/src/mainboard/soyo/sy-6ba-plus-iii/Config.lb
+++ b/src/mainboard/soyo/sy-6ba-plus-iii/Config.lb
@ -64,9 +64,9 @@ if CONFIG_USE_FALLBACK_IMAGE
 	ldscript /arch/i386/lib/failover.lds
 	mainboardinit ./failover.inc
 end
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/mmx_disable.inc

 dir /pc80
 config chip.h
--- a/src/mainboard/supermicro/x6dai_g/Config.lb
+++ b/src/mainboard/supermicro/x6dai_g/Config.lb
@ -89,11 +89,11 @@ end
 ##
 ## Setup RAM
 ##
-mainboardinit cpu/x86/fpu/enable_fpu.inc
-mainboardinit cpu/x86/sse/enable_sse.inc
+mainboardinit cpu/x86/fpu_enable.inc
+mainboardinit cpu/x86/sse_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/sse/disable_sse.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/sse_disable.inc
+mainboardinit cpu/x86/mmx_disable.inc

 ##
 ## Include the secondary Configuration files 
--- a/src/mainboard/supermicro/x6dhe_g/Config.lb
+++ b/src/mainboard/supermicro/x6dhe_g/Config.lb
@ -89,11 +89,11 @@ end
 ##
 ## Setup RAM
 ##
-mainboardinit cpu/x86/fpu/enable_fpu.inc
-mainboardinit cpu/x86/sse/enable_sse.inc
+mainboardinit cpu/x86/fpu_enable.inc
+mainboardinit cpu/x86/sse_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/sse/disable_sse.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/sse_disable.inc
+mainboardinit cpu/x86/mmx_disable.inc


 ##
--- a/src/mainboard/supermicro/x6dhe_g2/Config.lb
+++ b/src/mainboard/supermicro/x6dhe_g2/Config.lb
@ -89,11 +89,11 @@ end
 ##
 ## Setup RAM
 ##
-mainboardinit cpu/x86/fpu/enable_fpu.inc
-mainboardinit cpu/x86/sse/enable_sse.inc
+mainboardinit cpu/x86/fpu_enable.inc
+mainboardinit cpu/x86/sse_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/sse/disable_sse.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/sse_disable.inc
+mainboardinit cpu/x86/mmx_disable.inc


 ##
--- a/src/mainboard/supermicro/x6dhr_ig/Config.lb
+++ b/src/mainboard/supermicro/x6dhr_ig/Config.lb
@ -89,11 +89,11 @@ end
 ##
 ## Setup RAM
 ##
-mainboardinit cpu/x86/fpu/enable_fpu.inc
-mainboardinit cpu/x86/sse/enable_sse.inc
+mainboardinit cpu/x86/fpu_enable.inc
+mainboardinit cpu/x86/sse_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/sse/disable_sse.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/sse_disable.inc
+mainboardinit cpu/x86/mmx_disable.inc

 ##
 ## Include the secondary Configuration files 
--- a/src/mainboard/supermicro/x6dhr_ig2/Config.lb
+++ b/src/mainboard/supermicro/x6dhr_ig2/Config.lb
@ -89,11 +89,11 @@ end
 ##
 ## Setup RAM
 ##
-mainboardinit cpu/x86/fpu/enable_fpu.inc
-mainboardinit cpu/x86/sse/enable_sse.inc
+mainboardinit cpu/x86/fpu_enable.inc
+mainboardinit cpu/x86/sse_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/sse/disable_sse.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/sse_disable.inc
+mainboardinit cpu/x86/mmx_disable.inc

 ##
 ## Include the secondary Configuration files 
--- a/src/mainboard/technologic/ts5300/Config.lb
+++ b/src/mainboard/technologic/ts5300/Config.lb
@ -91,7 +91,7 @@ end
 ##
 ## Setup RAM
 ##
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc

 ##
--- a/src/mainboard/televideo/tc7020/Config.lb
+++ b/src/mainboard/televideo/tc7020/Config.lb
@ -63,7 +63,7 @@ if CONFIG_USE_FALLBACK_IMAGE
 	ldscript /arch/i386/lib/failover.lds
 	mainboardinit ./failover.inc
 end
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit cpu/amd/model_gx1/cpu_setup.inc
 mainboardinit cpu/amd/model_gx1/gx_setup.inc
 mainboardinit ./auto.inc
--- a/src/mainboard/thomson/ip1000/Config.lb
+++ b/src/mainboard/thomson/ip1000/Config.lb
@ -67,9 +67,9 @@ if CONFIG_USE_FALLBACK_IMAGE
 	ldscript /arch/i386/lib/failover.lds
 	mainboardinit ./failover.inc
 end
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/mmx_disable.inc
 dir /pc80
 config chip.h

--- a/src/mainboard/tyan/s1846/Config.lb
+++ b/src/mainboard/tyan/s1846/Config.lb
@ -64,9 +64,9 @@ if CONFIG_USE_FALLBACK_IMAGE
 	ldscript /arch/i386/lib/failover.lds
 	mainboardinit ./failover.inc
 end
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/mmx_disable.inc

 dir /pc80
 config chip.h
--- a/src/mainboard/via/epia-cn/Config.lb
+++ b/src/mainboard/via/epia-cn/Config.lb
@ -66,9 +66,9 @@ if CONFIG_USE_FALLBACK_IMAGE
 	ldscript /arch/i386/lib/failover.lds
 	mainboardinit ./failover.inc
 end
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/mmx_disable.inc
 dir /pc80
 config chip.h

--- a/src/mainboard/via/epia-cn/Makefile.inc
+++ b/src/mainboard/via/epia-cn/Makefile.inc
@ -38,9 +38,9 @@ crt0-y += ../../../../src/cpu/x86/16bit/entry16.inc
 crt0-y += ../../../../src/cpu/x86/32bit/entry32.inc
 crt0-y += ../../../../src/cpu/x86/16bit/reset16.inc
 crt0-y += ../../../../src/arch/i386/lib/id.inc
-crt0-y += ../../../../src/cpu/x86/fpu/enable_fpu.inc
+crt0-y += ../../../../src/cpu/x86/fpu_enable.inc
 crt0-y += auto.inc
-crt0-y += ../../../../src/cpu/x86/mmx/disable_mmx.inc
+crt0-y += ../../../../src/cpu/x86/mmx_disable.inc

 ifdef POST_EVALUATION

--- a/src/mainboard/via/epia-m/Config.lb
+++ b/src/mainboard/via/epia-m/Config.lb
@ -91,9 +91,9 @@ end
 ##
 ## Setup RAM
 ##
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/mmx_disable.inc

 ##
 ## Include the secondary Configuration files 
--- a/src/mainboard/via/epia-m/Makefile.inc
+++ b/src/mainboard/via/epia-m/Makefile.inc
@ -40,9 +40,9 @@ crt0-y += ../../../../src/cpu/x86/32bit/entry32.inc
 crt0-y += ../../../../src/cpu/x86/16bit/reset16.inc
 crt0-y += ../../../../src/northbridge/via/vx800/romstrap.inc
 crt0-y += ../../../../src/arch/i386/lib/id.inc
-crt0-y += ../../../../src/cpu/x86/fpu/enable_fpu.inc
+crt0-y += ../../../../src/cpu/x86/fpu_enable.inc
 crt0-y += auto.inc
-crt0-y += ../../../../src/cpu/x86/mmx/disable_mmx.inc
+crt0-y += ../../../../src/cpu/x86/mmx_disable.inc

 ifdef POST_EVALUATION

--- a/src/mainboard/via/epia-m700/Config.lb
+++ b/src/mainboard/via/epia-m700/Config.lb
@ -91,7 +91,7 @@ if CONFIG_USE_FALLBACK_IMAGE
  # cpu_reset.inc,so ...
  # mainboardinit ./failover.inc
 end
-# mainboardinit cpu/x86/fpu/enable_fpu.inc
+# mainboardinit cpu/x86/fpu_enable.inc

 if CONFIG_USE_DCACHE_RAM
  if CONFIG_USE_INIT
@ -101,7 +101,7 @@ if CONFIG_USE_DCACHE_RAM
  end
 end

-# mainboardinit cpu/x86/mmx/disable_mmx.inc
+# mainboardinit cpu/x86/mmx_disable.inc
 dir /pc80

 config chip.h
--- a/src/mainboard/via/epia-n/Config.lb
+++ b/src/mainboard/via/epia-n/Config.lb
@ -113,9 +113,9 @@ end
 ## Setup RAM
 ##

-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/mmx_disable.inc

 dir /pc80
 config chip.h
--- a/src/mainboard/via/epia-n/Makefile.inc
+++ b/src/mainboard/via/epia-n/Makefile.inc
@ -37,9 +37,9 @@ crt0-y += ../../../../src/cpu/x86/16bit/entry16.inc
 crt0-y += ../../../../src/cpu/x86/32bit/entry32.inc
 crt0-y += ../../../../src/cpu/x86/16bit/reset16.inc
 crt0-y += ../../../../src/arch/i386/lib/id.inc
-crt0-y += ../../../../src/cpu/x86/fpu/enable_fpu.inc
+crt0-y += ../../../../src/cpu/x86/fpu_enable.inc
 crt0-y += auto.inc
-crt0-y += ../../../../src/cpu/x86/mmx/disable_mmx.inc
+crt0-y += ../../../../src/cpu/x86/mmx_disable.inc

 ifdef POST_EVALUATION

--- a/src/mainboard/via/epia/Config.lb
+++ b/src/mainboard/via/epia/Config.lb
@ -83,9 +83,9 @@ end
 ##
 ## Setup RAM
 ##
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/mmx_disable.inc

 ##
 ## Include the secondary Configuration files 
--- a/src/mainboard/via/epia/Makefile.inc
+++ b/src/mainboard/via/epia/Makefile.inc
@ -33,9 +33,9 @@ crt0-y += ../../../../src/cpu/x86/16bit/entry16.inc
 crt0-y += ../../../../src/cpu/x86/32bit/entry32.inc
 crt0-y += ../../../../src/cpu/x86/16bit/reset16.inc
 crt0-y += ../../../../src/arch/i386/lib/id.inc
-crt0-y += ../../../../src/cpu/x86/fpu/enable_fpu.inc
+crt0-y += ../../../../src/cpu/x86/fpu_enable.inc
 crt0-y += auto.inc
-crt0-y += ../../../../src/cpu/x86/mmx/disable_mmx.inc
+crt0-y += ../../../../src/cpu/x86/mmx_disable.inc

 ifdef POST_EVALUATION

--- a/src/mainboard/via/pc2500e/Config.lb
+++ b/src/mainboard/via/pc2500e/Config.lb
@ -65,9 +65,9 @@ if CONFIG_USE_FALLBACK_IMAGE
 	ldscript /arch/i386/lib/failover.lds
 	mainboardinit ./failover.inc
 end
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit cpu/x86/mmx_disable.inc
 dir /pc80
 config chip.h

--- a/src/mainboard/via/vt8454c/Config.lb
+++ b/src/mainboard/via/vt8454c/Config.lb
@ -98,7 +98,7 @@ ldscript /arch/i386/lib/id.lds
 ##
 ## Setup RAM
 ##
-mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/fpu_enable.inc
 mainboardinit ./auto.inc

 ##