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

diff --git a/src/cpu/x86/fpu/enable_fpu.inc b/src/cpu/x86/fpu/enable_fpu.inc
deleted file mode 100644 (file)
index bd7a7ff..0000000
--- a/src/cpu/x86/fpu/enable_fpu.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-       /* preserve BIST in %eax */
-__fpu_start:
-       movl %eax, %ebp
-
-       /* Disable floating point emulation */
-       movl    %cr0, %eax
-       andl    $~(1<<2), %eax
-       movl    %eax, %cr0
-
-       movl %ebp, %eax

diff --git a/src/cpu/x86/fpu_enable.inc b/src/cpu/x86/fpu_enable.inc
new file mode 100644 (file)
index 0000000..bd7a7ff
--- /dev/null
+++ b/src/cpu/x86/fpu_enable.inc
@@ -0,0 +1,10 @@
+       /* preserve BIST in %eax */
+__fpu_start:
+       movl %eax, %ebp
+
+       /* Disable floating point emulation */
+       movl    %cr0, %eax
+       andl    $~(1<<2), %eax
+       movl    %eax, %cr0
+
+       movl %ebp, %eax

diff --git a/src/cpu/x86/mmx/disable_mmx.inc b/src/cpu/x86/mmx/disable_mmx.inc
deleted file mode 100644 (file)
index 97d62d6..0000000
--- a/src/cpu/x86/mmx/disable_mmx.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-       /* Clear out an mmx state */
-       emms

diff --git a/src/cpu/x86/mmx_disable.inc b/src/cpu/x86/mmx_disable.inc
new file mode 100644 (file)
index 0000000..97d62d6
--- /dev/null
+++ b/src/cpu/x86/mmx_disable.inc
@@ -0,0 +1,2 @@
+       /* Clear out an mmx state */
+       emms

diff --git a/src/cpu/x86/sse/disable_sse.inc b/src/cpu/x86/sse/disable_sse.inc
deleted file mode 100644 (file)
index a18ea18..0000000
--- a/src/cpu/x86/sse/disable_sse.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-       /*
-        * Put the processor back into a reset state
-        * with respect to the xmm registers.
-        */
-       
-       xorps %xmm0, %xmm0
-       xorps %xmm1, %xmm1
-       xorps %xmm2, %xmm2
-       xorps %xmm3, %xmm3
-       xorps %xmm4, %xmm4
-       xorps %xmm5, %xmm5
-       xorps %xmm6, %xmm6
-       xorps %xmm7, %xmm7
-
-       /* Disable sse instructions */
-       movl    %cr4, %eax
-       andl    $~(3<<9), %eax
-       movl    %eax, %cr4

diff --git a/src/cpu/x86/sse/enable_sse.inc b/src/cpu/x86/sse/enable_sse.inc
deleted file mode 100644 (file)
index 95724b7..0000000
--- a/src/cpu/x86/sse/enable_sse.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-       /* preserve BIST in %eax */
-       movl %eax, %ebp
-
-       /*
-        * Enable the use of the xmm registers
-        */
-
-       /* Enable sse instructions */
-       movl    %cr4, %eax
-       orl     $(1<<9), %eax
-       movl    %eax, %cr4
-
-       movl    %ebp, %eax
-

diff --git a/src/cpu/x86/sse_disable.inc b/src/cpu/x86/sse_disable.inc
new file mode 100644 (file)
index 0000000..a18ea18
--- /dev/null
+++ b/src/cpu/x86/sse_disable.inc
@@ -0,0 +1,18 @@
+       /*
+        * Put the processor back into a reset state
+        * with respect to the xmm registers.
+        */
+       
+       xorps %xmm0, %xmm0
+       xorps %xmm1, %xmm1
+       xorps %xmm2, %xmm2
+       xorps %xmm3, %xmm3
+       xorps %xmm4, %xmm4
+       xorps %xmm5, %xmm5
+       xorps %xmm6, %xmm6
+       xorps %xmm7, %xmm7
+
+       /* Disable sse instructions */
+       movl    %cr4, %eax
+       andl    $~(3<<9), %eax
+       movl    %eax, %cr4

diff --git a/src/cpu/x86/sse_enable.inc b/src/cpu/x86/sse_enable.inc
new file mode 100644 (file)
index 0000000..95724b7
--- /dev/null
+++ b/src/cpu/x86/sse_enable.inc
@@ -0,0 +1,14 @@
+       /* preserve BIST in %eax */
+       movl %eax, %ebp
+
+       /*
+        * Enable the use of the xmm registers
+        */
+
+       /* Enable sse instructions */
+       movl    %cr4, %eax
+       orl     $(1<<9), %eax
+       movl    %eax, %cr4
+
+       movl    %ebp, %eax
+

diff --git a/src/mainboard/Makefile.romccboard.inc b/src/mainboard/Makefile.romccboard.inc
index 21abc6f1160061af216d0a894ce34e7b92819602..717f511f8d2339b9ba2fa2c532f17597e93318a7 100644 (file)
--- 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

diff --git a/src/mainboard/a-trend/atc-6220/Config.lb b/src/mainboard/a-trend/atc-6220/Config.lb
index b9e6404235227d013ee34b2568b7c07be5ebe8b1..da9f349ac25d4aa4693b1f39a1bb63153870754a 100644 (file)
--- 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

diff --git a/src/mainboard/a-trend/atc-6240/Config.lb b/src/mainboard/a-trend/atc-6240/Config.lb
index 90dc6db3da5a6821fcfa5cb7fbce88c4629781a6..1f8a889d277751398441cace9a1d857cae215f32 100644 (file)
--- 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

diff --git a/src/mainboard/abit/be6-ii_v2_0/Config.lb b/src/mainboard/abit/be6-ii_v2_0/Config.lb
index a680b2d18b4cc4aeaafd2237f6b3aa4b3ca4188d..58193b8fe877595238609707216e4a3f4eda44b8 100644 (file)
--- 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

diff --git a/src/mainboard/advantech/pcm-5820/Config.lb b/src/mainboard/advantech/pcm-5820/Config.lb
index 96349a6d370c7bba121d0f71c5a90fb0d54d1543..44ec55dec7fffbcd798fb75d3b001adb37d255b8 100644 (file)
--- 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

diff --git a/src/mainboard/amd/db800/Config.lb b/src/mainboard/amd/db800/Config.lb
index 23da49ee0a11f4b333cad8666a942b814cfed619..de229062f739c4eb88e1a43fd8f9a48bbd3d3464 100644 (file)
--- 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

diff --git a/src/mainboard/amd/norwich/Config.lb b/src/mainboard/amd/norwich/Config.lb
index c49caf96e574cc92449185739655cb2a9b02b329..6f9845ef1069f27734eef8f364ffedc8e6b5e834 100644 (file)
--- 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

diff --git a/src/mainboard/amd/rumba/Config.lb b/src/mainboard/amd/rumba/Config.lb
index 56011ade44938ff602eeebb304c8e3e009057679..0dd6367b82310a3b2eee738ea45fa403b7bdb2af 100644 (file)
--- 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
 
 ##

diff --git a/src/mainboard/artecgroup/dbe61/Config.lb b/src/mainboard/artecgroup/dbe61/Config.lb
index 0288c988dbdcdd34acd2bff5d16566fedd5cc22a..128730191578899a0d454e690e7e8ecc4c9ebf0d 100644 (file)
--- 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

diff --git a/src/mainboard/asi/mb_5blgp/Config.lb b/src/mainboard/asi/mb_5blgp/Config.lb
index 1049f338d02d8ae50ad99b385b8049611ff9b75e..7bd25dc188720ac3c2b0e4166b3d4df305b57e94 100644 (file)
--- 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

diff --git a/src/mainboard/asi/mb_5blmp/Config.lb b/src/mainboard/asi/mb_5blmp/Config.lb
index 7a065091df0136b0ec85381fbc1f67d957cfd83f..f344b466fbc8b688f0d488b18532fdc0c0dfe9a0 100644 (file)
--- 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

diff --git a/src/mainboard/asus/mew-am/Config.lb b/src/mainboard/asus/mew-am/Config.lb
index 1a647c3dd320b282f3425a08017f350091c4a98f..af6423c01b7294bacf590b1b7593c3b1485e2ec1 100644 (file)
--- 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

diff --git a/src/mainboard/asus/mew-vm/Config.lb b/src/mainboard/asus/mew-vm/Config.lb
index 3611ac7cbf586efa611f87092ea04d5e2c035543..599806ee86b0e0e049ed48e83ec58743123ab311 100644 (file)
--- 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 

diff --git a/src/mainboard/asus/p2b-d/Config.lb b/src/mainboard/asus/p2b-d/Config.lb
index 8183ac1b4a17d0a7f6320d31c28ea14f80a85d63..1170d4c0912186231c6852e6c36a7389bf754e94 100644 (file)
--- 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

diff --git a/src/mainboard/asus/p2b-ds/Config.lb b/src/mainboard/asus/p2b-ds/Config.lb
index 4411d34ae8828488df38d46f575dec420f87db4b..4307c39442eec0f1688ef3e928fe196b3f56d1bd 100644 (file)
--- 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

diff --git a/src/mainboard/asus/p2b-f/Config.lb b/src/mainboard/asus/p2b-f/Config.lb
index bc789544773ba7b70767d53858c85159d8966837..4be4b44b6b70b463d79570bfaa7bb8e348b1547c 100644 (file)
--- 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

diff --git a/src/mainboard/asus/p2b/Config.lb b/src/mainboard/asus/p2b/Config.lb
index 8c37b967e0d195fa230a256ce06d073156a952fe..559694de3c532736463566baa75eb4b1218b7b26 100644 (file)
--- 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

diff --git a/src/mainboard/asus/p3b-f/Config.lb b/src/mainboard/asus/p3b-f/Config.lb
index c55df05ebdb5d52c0c552563f9081bec9b4b19fe..628c41372b32515b51b3e9825dc35a592515b98c 100644 (file)
--- 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

diff --git a/src/mainboard/axus/tc320/Config.lb b/src/mainboard/axus/tc320/Config.lb
index 5425def5fd111c70bcda0d7ae7d3cf62619444d1..e802587bb3ca72a9a06383c62fcef208a031f38a 100644 (file)
--- 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

diff --git a/src/mainboard/azza/pt-6ibd/Config.lb b/src/mainboard/azza/pt-6ibd/Config.lb
index 9d054e64ffdcd003a79016ab78056a949379ab76..b4f2224fc29c115f9e89c4965d857319a6d8481a 100644 (file)
--- 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

diff --git a/src/mainboard/bcom/winnet100/Config.lb b/src/mainboard/bcom/winnet100/Config.lb
index 81f49c2fb1fe9d7ad125c981969c7c056593e6db..ccd4fb128b22c39588d5938bfad781766484fe9a 100644 (file)
--- 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

diff --git a/src/mainboard/bcom/winnetp680/Config.lb b/src/mainboard/bcom/winnetp680/Config.lb
index 7e1356ad151bcc00bd5c31a37217cdd07d15e63e..ed036503d6ab40408c3273442e445d200a30ab35 100644 (file)
--- 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
 

diff --git a/src/mainboard/bcom/winnetp680/Makefile.inc b/src/mainboard/bcom/winnetp680/Makefile.inc
index 5bb104fdb4c97f00aa684a2ea6d11926816dbff5..380f246efb7de57e70aa3b48e3478735596c766a 100644 (file)
--- 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
 

diff --git a/src/mainboard/biostar/m6tba/Config.lb b/src/mainboard/biostar/m6tba/Config.lb
index 183fc1b6f556a0289553befc712d887d00f93e95..20edbc9b4c24c078e8563d46204be0bba16bd36f 100644 (file)
--- 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

diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/Config.lb b/src/mainboard/compaq/deskpro_en_sff_p600/Config.lb
index b8864974887bd9a87e508bbdb58481dbcc8834a7..49f1585d6b869ce79aa688d70d8f27720afa4a16 100644 (file)
--- 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

diff --git a/src/mainboard/dell/s1850/Config.lb b/src/mainboard/dell/s1850/Config.lb
index 0d871ef3d356d513047a92466f54a857272f5bad..58f55c644ae9b5fd47822c3db809b77525d44ef3 100644 (file)
--- 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 

diff --git a/src/mainboard/dell/s1850/Makefile.inc b/src/mainboard/dell/s1850/Makefile.inc
index 4eda87d04cea54087adff85f8d2e02db20f801eb..61fcddf7d5af9b205972036a102aff5231007e33 100644 (file)
--- 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

diff --git a/src/mainboard/digitallogic/adl855pc/Config.lb b/src/mainboard/digitallogic/adl855pc/Config.lb
index b504243dbfc4af47ef34ecd1bbf21fb88d6f48f8..2a97f086694bf1a2e41ab0d4ed2e366bf4028bcc 100644 (file)
--- 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 

diff --git a/src/mainboard/digitallogic/msm586seg/Config.lb b/src/mainboard/digitallogic/msm586seg/Config.lb
index 178a7fc830cf786250cb9b234beb0f41862522b8..c50b3b736a1a97a6e057ce83b9d634a6788763d2 100644 (file)
--- 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
 
 ##

diff --git a/src/mainboard/digitallogic/msm800sev/Config.lb b/src/mainboard/digitallogic/msm800sev/Config.lb
index 7b7e2b5147028845415ef03d2e1e29bb6d166d44..5965cc1d0a2835a4dc49eb34a3c45c3d720eb69b 100644 (file)
--- 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

diff --git a/src/mainboard/eaglelion/5bcm/Config.lb b/src/mainboard/eaglelion/5bcm/Config.lb
index 3dfe6ab2dcbcf4e444ace56eb0a1982b0c5019c4..2d44747c292aec8d6110e2e8a400e19f0aa5fb09 100644 (file)
--- 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

diff --git a/src/mainboard/emulation/qemu-x86/Config.lb b/src/mainboard/emulation/qemu-x86/Config.lb
index d0f2005af7cc13ea1800c624109ef51d2aab9786..6dd45c9ca7d65b7481fcce358f3f40256180c609 100644 (file)
--- 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. 

diff --git a/src/mainboard/gigabyte/ga-6bxc/Config.lb b/src/mainboard/gigabyte/ga-6bxc/Config.lb
index fb93f0091c7b7ead895e5b829dec28e138479ab5..663f58e15384701b630c0c40b476c8983d819f7a 100644 (file)
--- 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

diff --git a/src/mainboard/iei/juki-511p/Config.lb b/src/mainboard/iei/juki-511p/Config.lb
index a27f2ae1832a9d8854a00126d099815cb8472515..db780ebf07aeeab6129ef2c81ebda47f55d67681 100644 (file)
--- 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

diff --git a/src/mainboard/iei/nova4899r/Config.lb b/src/mainboard/iei/nova4899r/Config.lb
index fa215519198901c8945a588042a29f51f139e411..fe311bb812a6e44bc81947a3d19cfaa4b732e91a 100644 (file)
--- 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

diff --git a/src/mainboard/iei/pcisa-lx-800-r10/Config.lb b/src/mainboard/iei/pcisa-lx-800-r10/Config.lb
index 35da03a0d7c6509c4d2f19582b855a244af74f0a..39fc0df5acff30686d7e04fa7cf7d83c8173e836 100644 (file)
--- 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

diff --git a/src/mainboard/intel/jarrell/Config.lb b/src/mainboard/intel/jarrell/Config.lb
index c00bfac2ea26745a159a0b8fe6d497006dba814f..7dd2af1f61e306baea7be9c9732af6f533ff12c1 100644 (file)
--- 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 

diff --git a/src/mainboard/intel/mtarvon/Config.lb b/src/mainboard/intel/mtarvon/Config.lb
index 6b032515e55525587873abd118d3cf4f39c8e3ab..026c45d40e09ff8c45bdb09be1b1ec3077166332 100644 (file)
--- 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

diff --git a/src/mainboard/intel/truxton/Config.lb b/src/mainboard/intel/truxton/Config.lb
index 6b035f6aa0341f18ace21cf2230d6dd207fa89c8..5e032487d7f1f3dd813d8ee934fb9e2b06614f16 100644 (file)
--- 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

diff --git a/src/mainboard/intel/xe7501devkit/Config.lb b/src/mainboard/intel/xe7501devkit/Config.lb
index 5df28c235a1c98e05e229215150e5935271df5b2..37c4f1750d5216ab82380bf59e75e7da2cf815a8 100644 (file)
--- 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 

diff --git a/src/mainboard/jetway/j7f24/Config.lb b/src/mainboard/jetway/j7f24/Config.lb
index 0900b875f9ac0d8a301c88a5b0848ef06497798e..8e0b498067c1563098351c5eecdca9211676b0df 100644 (file)
--- 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
 

diff --git a/src/mainboard/jetway/j7f24/Makefile.inc b/src/mainboard/jetway/j7f24/Makefile.inc
index 4ce8534c746951bb1e97c6779614f226a8992876..5108502d32fe0b6371110f376c06128b236755ea 100644 (file)
--- 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
 

diff --git a/src/mainboard/lippert/frontrunner/Config.lb b/src/mainboard/lippert/frontrunner/Config.lb
index f5513a3f11c3f782e7524c97d05b85ed6e6c77bb..46eb11cef28fc004e35fa520c86106b58d5cd1cf 100644 (file)
--- 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
 
 ##

diff --git a/src/mainboard/lippert/roadrunner-lx/Config.lb b/src/mainboard/lippert/roadrunner-lx/Config.lb
index 8e52fa57c562caf4a2a728ffa29f74ff3796357a..ed6d61eec03b7eeb5e3d1e64178d553fc731c87e 100644 (file)
--- 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

diff --git a/src/mainboard/lippert/spacerunner-lx/Config.lb b/src/mainboard/lippert/spacerunner-lx/Config.lb
index 7b4d9b4311d721ecc1b3e5b7d996a3b90307fd56..8d2052b13ed99bfff338cc3bc8426274b0228a59 100644 (file)
--- 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

diff --git a/src/mainboard/mitac/6513wu/Config.lb b/src/mainboard/mitac/6513wu/Config.lb
index be2d8b1d29673488854c2e5cad4ed666942f7346..c008f99a2b046bd236f6e816f0a9f4e391eb1faa 100644 (file)
--- 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

diff --git a/src/mainboard/msi/ms6119/Config.lb b/src/mainboard/msi/ms6119/Config.lb
index 076613704eb2aaac09c7930388cce3c51391f1cb..79bc904d643f686d5d21905413ff38a7b5857152 100644 (file)
--- 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

diff --git a/src/mainboard/msi/ms6147/Config.lb b/src/mainboard/msi/ms6147/Config.lb
index aa942d2e3d23eaf9390adae0193f465ac9a9e342..73f79cbef135d7e325093c70665f12b3e956c76f 100644 (file)
--- 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

diff --git a/src/mainboard/msi/ms6156/Config.lb b/src/mainboard/msi/ms6156/Config.lb
index 874661aa4587ea8f82252703034c496b602c78d2..0a93cc772e92c4e4c64495542091d4440e3f9c65 100644 (file)
--- 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

diff --git a/src/mainboard/msi/ms6178/Config.lb b/src/mainboard/msi/ms6178/Config.lb
index 1bfef2e6a72ec33e39355768ffb48e4c68781e8b..c5448e0732b6159e4474d0caa25ee7c8339e3f4a 100644 (file)
--- 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
 

diff --git a/src/mainboard/nec/powermate2000/Config.lb b/src/mainboard/nec/powermate2000/Config.lb
index 5cbbd9680af63b573fb78b564ddb0179374708d8..80de887a040f1959e9c7c79f42076f173de03a09 100644 (file)
--- 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
 

diff --git a/src/mainboard/olpc/btest/Config.lb b/src/mainboard/olpc/btest/Config.lb
index cc9c07306ece02123793e5b88cea7f4b6ce9af79..efd329f93c43c02cef98206c42ff196c11332532 100644 (file)
--- 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
 
 ##

diff --git a/src/mainboard/olpc/rev_a/Config.lb b/src/mainboard/olpc/rev_a/Config.lb
index cc9c07306ece02123793e5b88cea7f4b6ce9af79..efd329f93c43c02cef98206c42ff196c11332532 100644 (file)
--- 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
 
 ##

diff --git a/src/mainboard/pcengines/alix1c/Config.lb b/src/mainboard/pcengines/alix1c/Config.lb
index 579397d88b70ecbf006878398405865f09a0422a..38da7398b4365a6bc76a852ea64f72270e3fdd1f 100644 (file)
--- 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

diff --git a/src/mainboard/rca/rm4100/Config.lb b/src/mainboard/rca/rm4100/Config.lb
index c1d47d95d930d7e667caa766222aeb99eba796bc..58d6de9c7a2bd057c26424cf0977fbc56b4f44d0 100644 (file)
--- 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
 

diff --git a/src/mainboard/soyo/sy-6ba-plus-iii/Config.lb b/src/mainboard/soyo/sy-6ba-plus-iii/Config.lb
index c9d9a99a06b0625860c17047523a4ea4784bfef3..cdf4b58932cdc95be9be28df07a4c291dedbb59f 100644 (file)
--- 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

diff --git a/src/mainboard/supermicro/x6dai_g/Config.lb b/src/mainboard/supermicro/x6dai_g/Config.lb
index 1818798c420f5809fcb0a0608d621ff02a5235cc..9f94fb494ee344f8b862b9cf59afe3d94ae6d6ea 100644 (file)
--- 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 

diff --git a/src/mainboard/supermicro/x6dhe_g/Config.lb b/src/mainboard/supermicro/x6dhe_g/Config.lb
index 93c7854e7c93714a5d66203101e7fde402050b9c..29ffeba85ef948a1a1d9d4cf1052edd521673bdc 100644 (file)
--- 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
 
 
 ##

diff --git a/src/mainboard/supermicro/x6dhe_g2/Config.lb b/src/mainboard/supermicro/x6dhe_g2/Config.lb
index dd64b9738a49bb9e270a82b4ee57c9cae465d2ad..19e210530e9aa4cf183dc3785c48b967745b6a22 100644 (file)
--- 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
 
 
 ##

diff --git a/src/mainboard/supermicro/x6dhr_ig/Config.lb b/src/mainboard/supermicro/x6dhr_ig/Config.lb
index 3f56b78bff9e2c3c526e927a21f91c7314b1bf87..8103171028721e1cce64eed8e5e0809a28330242 100644 (file)
--- 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 

diff --git a/src/mainboard/supermicro/x6dhr_ig2/Config.lb b/src/mainboard/supermicro/x6dhr_ig2/Config.lb
index 44fa9a468253d94324d661e9929488e1f07d61b8..5e7b3a300baa5c3ae524dbbf8f45f21cbf4b0778 100644 (file)
--- 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 

diff --git a/src/mainboard/technologic/ts5300/Config.lb b/src/mainboard/technologic/ts5300/Config.lb
index 13b0a783b479c6eba8583694c17d23dd7505de09..28358a39e270646d544c763cedd7c49e27e83fbf 100644 (file)
--- 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
 
 ##

diff --git a/src/mainboard/televideo/tc7020/Config.lb b/src/mainboard/televideo/tc7020/Config.lb
index 114f435481b3af4f9a7c3932c67dcc03e1c460e0..ff76635ce8b85fe1fa05e9094175b3b9692475f2 100644 (file)
--- 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

diff --git a/src/mainboard/thomson/ip1000/Config.lb b/src/mainboard/thomson/ip1000/Config.lb
index 412e5f1a35f6cf8a4494e0f2575cb21b63fcce0a..a9acf77e746c1a68364c6b098d82d6962ab220f9 100644 (file)
--- 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
 

diff --git a/src/mainboard/tyan/s1846/Config.lb b/src/mainboard/tyan/s1846/Config.lb
index 07b3d8059cfb52fb81c2b6a3cad3e2390cf22eeb..31e0fb805620d8999023dda8cb071d6e5560e43d 100644 (file)
--- 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

diff --git a/src/mainboard/via/epia-cn/Config.lb b/src/mainboard/via/epia-cn/Config.lb
index 054aa11162d7501f521d72a0887bd218cbb05d0e..42d62cbacf4445ce5fcf5d74e09d4c5eb77a129e 100644 (file)
--- 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 5bb104fdb4c97f00aa684a2ea6d11926816dbff5..380f246efb7de57e70aa3b48e3478735596c766a 100644 (file)
--- 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 31622ee46b6d8d4b90511d4fbc7ae5936ae9452f..d6924bd7824eee7b5270df2f384e467d6a6db173 100644 (file)
--- 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 bca63f05f75293452cd0924b1ae92945e7487679..f31056a370854e38cdac0518ab4def8fa833ca5e 100644 (file)
--- 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 a2ffcebe953d18977841c96efa5bbf876f9dfb3c..d7d7cbedc812bfae85de147c6e5b2bb43e4b3920 100644 (file)
--- 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 3028809ac645e77d89edbb9304434ff07301b612..ac0ef8bde90a1187c0815fbd72e04b1dd2898196 100644 (file)
--- 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 3478f46245594d47b828d3a044a823f74041c83a..ce2254583d43690bd7b7cb7cfe624f80d3b3a825 100644 (file)
--- 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 85ec8b934453ed78e85af6a3465404002f7197da..d32b39b982bd4d3fc3a2b6921aa754965cdb5355 100644 (file)
--- 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 e61844d7ea558fd5019bdac634835a3a7f4fd103..cff7134b33c9bbb68f95fa593aeae256f58a0f26 100644 (file)
--- 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 3d878a1c60b7cf6782f6e2e74d67dc54f692b729..01c226670ed979fd7878d3b82a3ff584650d9d1c 100644 (file)
--- 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 ab4fc3cdbb3272897b166129f165087bd4a6a73f..f685ddd3e45fb6a05e77bdbf10d64c34cdd7bcce 100644 (file)
--- 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
 
 ##