11 files changed, 21 insertions, 21 deletions
diff --git a/src/mainboard/via/epia-cn/Config.lb b/src/mainboard/via/epia-cn/Config.lb
index 054aa11162..42d62cbacf 100644
--- 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
 
diff --git a/src/mainboard/via/epia-cn/Makefile.inc b/src/mainboard/via/epia-cn/Makefile.inc
index 5bb104fdb4..380f246efb 100644
--- 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
 
diff --git a/src/mainboard/via/epia-m/Config.lb b/src/mainboard/via/epia-m/Config.lb
index 31622ee46b..d6924bd782 100644
--- 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 
diff --git a/src/mainboard/via/epia-m/Makefile.inc b/src/mainboard/via/epia-m/Makefile.inc
index bca63f05f7..f31056a370 100644
--- 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
 
diff --git a/src/mainboard/via/epia-m700/Config.lb b/src/mainboard/via/epia-m700/Config.lb
index a2ffcebe95..d7d7cbedc8 100644
--- 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
diff --git a/src/mainboard/via/epia-n/Config.lb b/src/mainboard/via/epia-n/Config.lb
index 3028809ac6..ac0ef8bde9 100644
--- 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
diff --git a/src/mainboard/via/epia-n/Makefile.inc b/src/mainboard/via/epia-n/Makefile.inc
index 3478f46245..ce2254583d 100644
--- 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
 
diff --git a/src/mainboard/via/epia/Config.lb b/src/mainboard/via/epia/Config.lb
index 85ec8b9344..d32b39b982 100644
--- 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 
diff --git a/src/mainboard/via/epia/Makefile.inc b/src/mainboard/via/epia/Makefile.inc
index e61844d7ea..cff7134b33 100644
--- 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
 
diff --git a/src/mainboard/via/pc2500e/Config.lb b/src/mainboard/via/pc2500e/Config.lb
index 3d878a1c60..01c226670e 100644
--- 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
 
diff --git a/src/mainboard/via/vt8454c/Config.lb b/src/mainboard/via/vt8454c/Config.lb
index ab4fc3cdbb..f685ddd3e4 100644
--- 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
 
 ##