summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTimothy Pearson <tpearson@raptorengineeringinc.com>2015-02-15 16:52:29 -0600
committerAlexandru Gagniuc <mr.nuke.me@gmail.com>2015-02-16 09:24:14 +0100
commit94efd19517cde6b6894d67e2623a007fcd24a4df (patch)
treeea3d0c6281f137b2afa2e5ca05af0c9326ce99e4 /src
parentc0ae684d1663d0eec364270c85915e42cdd61bc6 (diff)
downloadcoreboot-94efd19517cde6b6894d67e2623a007fcd24a4df.tar.xz
mainboard/cmos: Kill off unused boot_* parameters
Change-Id: I19d6b56e3ac5e6e7946648b97c86a223b748e3bd Signed-off-by: Timothy Pearson <tpearson@raptorengineeringinc.com> Reviewed-on: http://review.coreboot.org/8460 Tested-by: build bot (Jenkins) Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/advansus/a785e-i/cmos.layout12
-rw-r--r--src/mainboard/amd/bimini_fam10/cmos.layout12
-rw-r--r--src/mainboard/amd/db800/cmos.layout12
-rw-r--r--src/mainboard/amd/dbm690t/cmos.layout12
-rw-r--r--src/mainboard/amd/dinar/cmos.layout12
-rw-r--r--src/mainboard/amd/inagua/cmos.layout12
-rw-r--r--src/mainboard/amd/mahogany/cmos.layout12
-rw-r--r--src/mainboard/amd/mahogany_fam10/cmos.layout12
-rw-r--r--src/mainboard/amd/norwich/cmos.layout12
-rw-r--r--src/mainboard/amd/olivehill/cmos.layout12
-rw-r--r--src/mainboard/amd/olivehillplus/cmos.layout12
-rw-r--r--src/mainboard/amd/parmer/cmos.layout12
-rw-r--r--src/mainboard/amd/persimmon/cmos.layout12
-rw-r--r--src/mainboard/amd/pistachio/cmos.layout12
-rw-r--r--src/mainboard/amd/rumba/cmos.layout12
-rw-r--r--src/mainboard/amd/serengeti_cheetah/cmos.layout12
-rw-r--r--src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout12
-rw-r--r--src/mainboard/amd/south_station/cmos.layout12
-rw-r--r--src/mainboard/amd/thatcher/cmos.layout12
-rw-r--r--src/mainboard/amd/tilapia_fam10/cmos.layout12
-rw-r--r--src/mainboard/amd/torpedo/cmos.layout12
-rw-r--r--src/mainboard/amd/union_station/cmos.layout12
-rw-r--r--src/mainboard/arima/hdama/cmos.layout12
-rw-r--r--src/mainboard/artecgroup/dbe61/cmos.layout12
-rw-r--r--src/mainboard/asrock/939a785gmh/cmos.layout12
-rw-r--r--src/mainboard/asrock/e350m1/cmos.layout12
-rw-r--r--src/mainboard/asrock/imb-a180/cmos.layout12
-rw-r--r--src/mainboard/asus/a8n_e/cmos.default5
-rw-r--r--src/mainboard/asus/a8n_e/cmos.layout6
-rw-r--r--src/mainboard/asus/a8v-e_deluxe/cmos.layout12
-rw-r--r--src/mainboard/asus/a8v-e_se/cmos.layout12
-rw-r--r--src/mainboard/asus/f2a85-m/cmos.layout12
-rw-r--r--src/mainboard/asus/f2a85-m_le/cmos.layout12
-rw-r--r--src/mainboard/asus/k8v-x/cmos.layout12
-rw-r--r--src/mainboard/asus/kfsn4-dre/cmos.layout12
-rw-r--r--src/mainboard/asus/m2n-e/cmos.layout12
-rw-r--r--src/mainboard/asus/m2v-mx_se/cmos.layout12
-rw-r--r--src/mainboard/asus/m2v/cmos.layout12
-rw-r--r--src/mainboard/asus/m4a78-em/cmos.layout12
-rw-r--r--src/mainboard/asus/m4a785-m/cmos.layout12
-rw-r--r--src/mainboard/asus/m4a785t-m/cmos.default5
-rw-r--r--src/mainboard/asus/m4a785t-m/cmos.layout12
-rw-r--r--src/mainboard/asus/m5a88-v/cmos.layout12
-rw-r--r--src/mainboard/asus/mew-vm/cmos.layout12
-rw-r--r--src/mainboard/avalue/eax-785e/cmos.layout12
-rw-r--r--src/mainboard/bcom/winnetp680/cmos.layout12
-rw-r--r--src/mainboard/broadcom/blast/cmos.layout12
-rw-r--r--src/mainboard/digitallogic/adl855pc/cmos.layout12
-rw-r--r--src/mainboard/digitallogic/msm800sev/cmos.layout12
-rw-r--r--src/mainboard/emulation/qemu-i440fx/cmos.layout12
-rw-r--r--src/mainboard/gigabyte/ga_2761gxdk/cmos.layout12
-rw-r--r--src/mainboard/gigabyte/m57sli/cmos.layout12
-rw-r--r--src/mainboard/gigabyte/ma785gm/cmos.layout12
-rw-r--r--src/mainboard/gigabyte/ma785gmt/cmos.layout12
-rw-r--r--src/mainboard/gigabyte/ma78gm/cmos.layout12
-rw-r--r--src/mainboard/gizmosphere/gizmo/cmos.layout12
-rw-r--r--src/mainboard/gizmosphere/gizmo2/cmos.layout12
-rw-r--r--src/mainboard/hp/abm/cmos.layout12
-rw-r--r--src/mainboard/hp/dl145_g1/cmos.layout12
-rw-r--r--src/mainboard/hp/dl145_g3/cmos.layout12
-rw-r--r--src/mainboard/hp/dl165_g6_fam10/cmos.layout12
-rw-r--r--src/mainboard/hp/pavilion_m6_1035dx/cmos.layout12
-rw-r--r--src/mainboard/ibm/e325/cmos.layout12
-rw-r--r--src/mainboard/ibm/e326/cmos.layout12
-rw-r--r--src/mainboard/iei/kino-780am2-fam10/cmos.layout12
-rw-r--r--src/mainboard/iwill/dk8_htx/cmos.layout12
-rw-r--r--src/mainboard/iwill/dk8s2/cmos.layout12
-rw-r--r--src/mainboard/iwill/dk8x/cmos.layout12
-rw-r--r--src/mainboard/jetway/j7f2/cmos.layout12
-rw-r--r--src/mainboard/jetway/nf81-t56n-lf/cmos.layout12
-rw-r--r--src/mainboard/jetway/pa78vm5/cmos.layout12
-rw-r--r--src/mainboard/kontron/kt690/cmos.layout12
-rw-r--r--src/mainboard/lanner/em8510/cmos.layout12
-rw-r--r--src/mainboard/lenovo/g505s/cmos.layout12
-rw-r--r--src/mainboard/lippert/frontrunner-af/cmos.layout12
-rw-r--r--src/mainboard/lippert/frontrunner/cmos.layout12
-rw-r--r--src/mainboard/lippert/toucan-af/cmos.layout12
-rw-r--r--src/mainboard/msi/ms7135/cmos.layout12
-rw-r--r--src/mainboard/msi/ms7260/cmos.layout12
-rw-r--r--src/mainboard/msi/ms9185/cmos.layout12
-rw-r--r--src/mainboard/msi/ms9282/cmos.layout12
-rw-r--r--src/mainboard/msi/ms9652_fam10/cmos.layout12
-rw-r--r--src/mainboard/newisys/khepri/cmos.layout12
-rw-r--r--src/mainboard/nvidia/l1_2pvv/cmos.layout12
-rw-r--r--src/mainboard/pcengines/alix1c/cmos.default5
-rw-r--r--src/mainboard/pcengines/alix1c/cmos.layout12
-rw-r--r--src/mainboard/pcengines/alix2d/cmos.layout12
-rw-r--r--src/mainboard/siemens/sitemp_g1p1/cmos.layout7
-rw-r--r--src/mainboard/sunw/ultra40/cmos.layout12
-rw-r--r--src/mainboard/supermicro/h8dme/cmos.layout12
-rw-r--r--src/mainboard/supermicro/h8dmr/cmos.layout12
-rw-r--r--src/mainboard/supermicro/h8dmr_fam10/cmos.layout12
-rw-r--r--src/mainboard/supermicro/h8qgi/cmos.layout12
-rw-r--r--src/mainboard/supermicro/h8qme_fam10/cmos.layout12
-rw-r--r--src/mainboard/supermicro/h8scm/cmos.layout12
-rw-r--r--src/mainboard/supermicro/h8scm_fam10/cmos.layout12
-rw-r--r--src/mainboard/technexion/tim5690/cmos.layout12
-rw-r--r--src/mainboard/technexion/tim8690/cmos.layout12
-rw-r--r--src/mainboard/traverse/geos/cmos.layout12
-rw-r--r--src/mainboard/tyan/s2735/cmos.layout12
-rw-r--r--src/mainboard/tyan/s2850/cmos.layout12
-rw-r--r--src/mainboard/tyan/s2875/cmos.layout12
-rw-r--r--src/mainboard/tyan/s2880/cmos.layout12
-rw-r--r--src/mainboard/tyan/s2881/cmos.layout12
-rw-r--r--src/mainboard/tyan/s2882/cmos.layout12
-rw-r--r--src/mainboard/tyan/s2885/cmos.layout12
-rw-r--r--src/mainboard/tyan/s2891/cmos.layout12
-rw-r--r--src/mainboard/tyan/s2892/cmos.layout12
-rw-r--r--src/mainboard/tyan/s2895/cmos.layout12
-rw-r--r--src/mainboard/tyan/s2912/cmos.layout12
-rw-r--r--src/mainboard/tyan/s2912_fam10/cmos.layout12
-rw-r--r--src/mainboard/tyan/s4880/cmos.layout12
-rw-r--r--src/mainboard/tyan/s4882/cmos.layout12
-rw-r--r--src/mainboard/tyan/s8226/cmos.layout12
-rw-r--r--src/mainboard/via/epia-cn/cmos.layout12
-rw-r--r--src/mainboard/via/epia-m700/cmos.layout12
-rw-r--r--src/mainboard/via/pc2500e/cmos.layout11
-rw-r--r--src/mainboard/via/vt8454c/cmos.layout7
-rw-r--r--src/mainboard/winent/mb6047/cmos.layout12
-rw-r--r--src/mainboard/winent/pl6064/cmos.layout12
-rw-r--r--src/mainboard/wyse/s50/cmos.layout12
121 files changed, 0 insertions, 1414 deletions
diff --git a/src/mainboard/advansus/a785e-i/cmos.layout b/src/mainboard/advansus/a785e-i/cmos.layout
index 621778d7c2..f516f499e4 100644
--- a/src/mainboard/advansus/a785e-i/cmos.layout
+++ b/src/mainboard/advansus/a785e-i/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/amd/bimini_fam10/cmos.layout b/src/mainboard/amd/bimini_fam10/cmos.layout
index 621778d7c2..f516f499e4 100644
--- a/src/mainboard/amd/bimini_fam10/cmos.layout
+++ b/src/mainboard/amd/bimini_fam10/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/amd/db800/cmos.layout b/src/mainboard/amd/db800/cmos.layout
index 879bb61f04..b31e20ca3f 100644
--- a/src/mainboard/amd/db800/cmos.layout
+++ b/src/mainboard/amd/db800/cmos.layout
@@ -7,11 +7,6 @@ entries
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -36,13 +31,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
checksums
diff --git a/src/mainboard/amd/dbm690t/cmos.layout b/src/mainboard/amd/dbm690t/cmos.layout
index ccd8c62178..27a5f87021 100644
--- a/src/mainboard/amd/dbm690t/cmos.layout
+++ b/src/mainboard/amd/dbm690t/cmos.layout
@@ -32,11 +32,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -69,13 +64,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/amd/dinar/cmos.layout b/src/mainboard/amd/dinar/cmos.layout
index 485071f54b..849d0b413d 100644
--- a/src/mainboard/amd/dinar/cmos.layout
+++ b/src/mainboard/amd/dinar/cmos.layout
@@ -31,11 +31,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -68,13 +63,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/amd/inagua/cmos.layout b/src/mainboard/amd/inagua/cmos.layout
index 1c5559b667..c63b2cd6a0 100644
--- a/src/mainboard/amd/inagua/cmos.layout
+++ b/src/mainboard/amd/inagua/cmos.layout
@@ -31,11 +31,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -68,13 +63,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/amd/mahogany/cmos.layout b/src/mainboard/amd/mahogany/cmos.layout
index fbe4c31168..b48b1c0862 100644
--- a/src/mainboard/amd/mahogany/cmos.layout
+++ b/src/mainboard/amd/mahogany/cmos.layout
@@ -32,11 +32,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -69,13 +64,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/amd/mahogany_fam10/cmos.layout b/src/mainboard/amd/mahogany_fam10/cmos.layout
index 621778d7c2..f516f499e4 100644
--- a/src/mainboard/amd/mahogany_fam10/cmos.layout
+++ b/src/mainboard/amd/mahogany_fam10/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/amd/norwich/cmos.layout b/src/mainboard/amd/norwich/cmos.layout
index ee7abf4e50..0bcfaf88d2 100644
--- a/src/mainboard/amd/norwich/cmos.layout
+++ b/src/mainboard/amd/norwich/cmos.layout
@@ -7,11 +7,6 @@ entries
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 1 e 0 dcon_present
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -37,13 +32,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
checksums
diff --git a/src/mainboard/amd/olivehill/cmos.layout b/src/mainboard/amd/olivehill/cmos.layout
index 1ca6100522..d827b4b85e 100644
--- a/src/mainboard/amd/olivehill/cmos.layout
+++ b/src/mainboard/amd/olivehill/cmos.layout
@@ -31,11 +31,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -66,13 +61,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/amd/olivehillplus/cmos.layout b/src/mainboard/amd/olivehillplus/cmos.layout
index 1ca6100522..d827b4b85e 100644
--- a/src/mainboard/amd/olivehillplus/cmos.layout
+++ b/src/mainboard/amd/olivehillplus/cmos.layout
@@ -31,11 +31,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -66,13 +61,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/amd/parmer/cmos.layout b/src/mainboard/amd/parmer/cmos.layout
index 1ca6100522..d827b4b85e 100644
--- a/src/mainboard/amd/parmer/cmos.layout
+++ b/src/mainboard/amd/parmer/cmos.layout
@@ -31,11 +31,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -66,13 +61,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/amd/persimmon/cmos.layout b/src/mainboard/amd/persimmon/cmos.layout
index 1c5559b667..c63b2cd6a0 100644
--- a/src/mainboard/amd/persimmon/cmos.layout
+++ b/src/mainboard/amd/persimmon/cmos.layout
@@ -31,11 +31,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -68,13 +63,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/amd/pistachio/cmos.layout b/src/mainboard/amd/pistachio/cmos.layout
index ccd8c62178..27a5f87021 100644
--- a/src/mainboard/amd/pistachio/cmos.layout
+++ b/src/mainboard/amd/pistachio/cmos.layout
@@ -32,11 +32,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -69,13 +64,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/amd/rumba/cmos.layout b/src/mainboard/amd/rumba/cmos.layout
index 879bb61f04..b31e20ca3f 100644
--- a/src/mainboard/amd/rumba/cmos.layout
+++ b/src/mainboard/amd/rumba/cmos.layout
@@ -7,11 +7,6 @@ entries
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -36,13 +31,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
checksums
diff --git a/src/mainboard/amd/serengeti_cheetah/cmos.layout b/src/mainboard/amd/serengeti_cheetah/cmos.layout
index 621778d7c2..f516f499e4 100644
--- a/src/mainboard/amd/serengeti_cheetah/cmos.layout
+++ b/src/mainboard/amd/serengeti_cheetah/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout b/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout
index eb17a59a6a..0506e9bf95 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout
@@ -34,11 +34,6 @@ entries
404 2 e 8 max_mem_clock
406 1 e 2 multi_core
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -78,13 +73,6 @@ enumerations
6 6 Information
6 7 Debug
6 8 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR2-800
8 1 DDR2-667
8 2 DDR2-533
diff --git a/src/mainboard/amd/south_station/cmos.layout b/src/mainboard/amd/south_station/cmos.layout
index 1c5559b667..c63b2cd6a0 100644
--- a/src/mainboard/amd/south_station/cmos.layout
+++ b/src/mainboard/amd/south_station/cmos.layout
@@ -31,11 +31,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -68,13 +63,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/amd/thatcher/cmos.layout b/src/mainboard/amd/thatcher/cmos.layout
index 1ca6100522..d827b4b85e 100644
--- a/src/mainboard/amd/thatcher/cmos.layout
+++ b/src/mainboard/amd/thatcher/cmos.layout
@@ -31,11 +31,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -66,13 +61,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/amd/tilapia_fam10/cmos.layout b/src/mainboard/amd/tilapia_fam10/cmos.layout
index 621778d7c2..f516f499e4 100644
--- a/src/mainboard/amd/tilapia_fam10/cmos.layout
+++ b/src/mainboard/amd/tilapia_fam10/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/amd/torpedo/cmos.layout b/src/mainboard/amd/torpedo/cmos.layout
index 1c5559b667..c63b2cd6a0 100644
--- a/src/mainboard/amd/torpedo/cmos.layout
+++ b/src/mainboard/amd/torpedo/cmos.layout
@@ -31,11 +31,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -68,13 +63,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/amd/union_station/cmos.layout b/src/mainboard/amd/union_station/cmos.layout
index 1c5559b667..c63b2cd6a0 100644
--- a/src/mainboard/amd/union_station/cmos.layout
+++ b/src/mainboard/amd/union_station/cmos.layout
@@ -31,11 +31,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -68,13 +63,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/arima/hdama/cmos.layout b/src/mainboard/arima/hdama/cmos.layout
index 537e938783..85fa992792 100644
--- a/src/mainboard/arima/hdama/cmos.layout
+++ b/src/mainboard/arima/hdama/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/artecgroup/dbe61/cmos.layout b/src/mainboard/artecgroup/dbe61/cmos.layout
index 879bb61f04..b31e20ca3f 100644
--- a/src/mainboard/artecgroup/dbe61/cmos.layout
+++ b/src/mainboard/artecgroup/dbe61/cmos.layout
@@ -7,11 +7,6 @@ entries
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -36,13 +31,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
checksums
diff --git a/src/mainboard/asrock/939a785gmh/cmos.layout b/src/mainboard/asrock/939a785gmh/cmos.layout
index fbe4c31168..b48b1c0862 100644
--- a/src/mainboard/asrock/939a785gmh/cmos.layout
+++ b/src/mainboard/asrock/939a785gmh/cmos.layout
@@ -32,11 +32,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -69,13 +64,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/asrock/e350m1/cmos.layout b/src/mainboard/asrock/e350m1/cmos.layout
index 1c5559b667..c63b2cd6a0 100644
--- a/src/mainboard/asrock/e350m1/cmos.layout
+++ b/src/mainboard/asrock/e350m1/cmos.layout
@@ -31,11 +31,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -68,13 +63,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/asrock/imb-a180/cmos.layout b/src/mainboard/asrock/imb-a180/cmos.layout
index 832160cd01..12d6f8fce5 100644
--- a/src/mainboard/asrock/imb-a180/cmos.layout
+++ b/src/mainboard/asrock/imb-a180/cmos.layout
@@ -31,11 +31,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -66,13 +61,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/asus/a8n_e/cmos.default b/src/mainboard/asus/a8n_e/cmos.default
index 744f95591f..933c804418 100644
--- a/src/mainboard/asus/a8n_e/cmos.default
+++ b/src/mainboard/asus/a8n_e/cmos.default
@@ -8,11 +8,6 @@ hw_scrubber=Enable
interleave_chip_selects=Enable
max_mem_clock=DDR400
multi_core=Enable
-boot_first=HDD
-boot_second=Fallback_Floppy
-boot_third=Fallback_Network
-boot_index=0xf
-boot_countdown=0xc
slow_cpu=off
nmi=Enable
iommu=Enable
diff --git a/src/mainboard/asus/a8n_e/cmos.layout b/src/mainboard/asus/a8n_e/cmos.layout
index 08a137deac..7cb0a8b0ca 100644
--- a/src/mainboard/asus/a8n_e/cmos.layout
+++ b/src/mainboard/asus/a8n_e/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
- 416 4 e 7 boot_first
- 420 4 e 7 boot_second
- 424 4 e 7 boot_third
- 428 4 h 0 boot_index
- 432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -52,7 +47,6 @@ enumerations
7 8 Fallback_Network
7 9 Fallback_HDD
7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/asus/a8v-e_deluxe/cmos.layout b/src/mainboard/asus/a8v-e_deluxe/cmos.layout
index 430015b917..5edb3e47be 100644
--- a/src/mainboard/asus/a8v-e_deluxe/cmos.layout
+++ b/src/mainboard/asus/a8v-e_deluxe/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/asus/a8v-e_se/cmos.layout b/src/mainboard/asus/a8v-e_se/cmos.layout
index 430015b917..5edb3e47be 100644
--- a/src/mainboard/asus/a8v-e_se/cmos.layout
+++ b/src/mainboard/asus/a8v-e_se/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/asus/f2a85-m/cmos.layout b/src/mainboard/asus/f2a85-m/cmos.layout
index 1ca6100522..d827b4b85e 100644
--- a/src/mainboard/asus/f2a85-m/cmos.layout
+++ b/src/mainboard/asus/f2a85-m/cmos.layout
@@ -31,11 +31,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -66,13 +61,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/asus/f2a85-m_le/cmos.layout b/src/mainboard/asus/f2a85-m_le/cmos.layout
index 1ca6100522..d827b4b85e 100644
--- a/src/mainboard/asus/f2a85-m_le/cmos.layout
+++ b/src/mainboard/asus/f2a85-m_le/cmos.layout
@@ -31,11 +31,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -66,13 +61,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/asus/k8v-x/cmos.layout b/src/mainboard/asus/k8v-x/cmos.layout
index 430015b917..5edb3e47be 100644
--- a/src/mainboard/asus/k8v-x/cmos.layout
+++ b/src/mainboard/asus/k8v-x/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/asus/kfsn4-dre/cmos.layout b/src/mainboard/asus/kfsn4-dre/cmos.layout
index eea2f4aa22..66729b0dc9 100644
--- a/src/mainboard/asus/kfsn4-dre/cmos.layout
+++ b/src/mainboard/asus/kfsn4-dre/cmos.layout
@@ -34,11 +34,6 @@ entries
404 2 e 8 max_mem_clock
406 1 e 2 multi_core
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -78,13 +73,6 @@ enumerations
6 6 Information
6 7 Debug
6 8 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR2-800
8 1 DDR2-667
8 2 DDR2-533
diff --git a/src/mainboard/asus/m2n-e/cmos.layout b/src/mainboard/asus/m2n-e/cmos.layout
index 71af3ddda4..0f0163764d 100644
--- a/src/mainboard/asus/m2n-e/cmos.layout
+++ b/src/mainboard/asus/m2n-e/cmos.layout
@@ -31,11 +31,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -68,13 +63,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 200Mhz
8 1 166Mhz
8 2 133Mhz
diff --git a/src/mainboard/asus/m2v-mx_se/cmos.layout b/src/mainboard/asus/m2v-mx_se/cmos.layout
index cd38e2ea9f..23338a9703 100644
--- a/src/mainboard/asus/m2v-mx_se/cmos.layout
+++ b/src/mainboard/asus/m2v-mx_se/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -49,13 +44,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/asus/m2v/cmos.layout b/src/mainboard/asus/m2v/cmos.layout
index 430015b917..5edb3e47be 100644
--- a/src/mainboard/asus/m2v/cmos.layout
+++ b/src/mainboard/asus/m2v/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/asus/m4a78-em/cmos.layout b/src/mainboard/asus/m4a78-em/cmos.layout
index 621778d7c2..f516f499e4 100644
--- a/src/mainboard/asus/m4a78-em/cmos.layout
+++ b/src/mainboard/asus/m4a78-em/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/asus/m4a785-m/cmos.layout b/src/mainboard/asus/m4a785-m/cmos.layout
index 621778d7c2..f516f499e4 100644
--- a/src/mainboard/asus/m4a785-m/cmos.layout
+++ b/src/mainboard/asus/m4a785-m/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/asus/m4a785t-m/cmos.default b/src/mainboard/asus/m4a785t-m/cmos.default
index da086de88b..8ab4fe8c39 100644
--- a/src/mainboard/asus/m4a785t-m/cmos.default
+++ b/src/mainboard/asus/m4a785t-m/cmos.default
@@ -8,11 +8,6 @@ max_mem_clock=400Mhz
multi_core=Enable
power_on_after_fail=Disable
debug_level=Spew
-boot_first=HDD
-boot_second=Fallback_Floppy
-boot_third=Fallback_Network
-boot_index=0xf
-boot_countdown=0xc
slow_cpu=off
nmi=Enable
iommu=Enable
diff --git a/src/mainboard/asus/m4a785t-m/cmos.layout b/src/mainboard/asus/m4a785t-m/cmos.layout
index 621778d7c2..f516f499e4 100644
--- a/src/mainboard/asus/m4a785t-m/cmos.layout
+++ b/src/mainboard/asus/m4a785t-m/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/asus/m5a88-v/cmos.layout b/src/mainboard/asus/m5a88-v/cmos.layout
index 621778d7c2..f516f499e4 100644
--- a/src/mainboard/asus/m5a88-v/cmos.layout
+++ b/src/mainboard/asus/m5a88-v/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/asus/mew-vm/cmos.layout b/src/mainboard/asus/mew-vm/cmos.layout
index 879bb61f04..b31e20ca3f 100644
--- a/src/mainboard/asus/mew-vm/cmos.layout
+++ b/src/mainboard/asus/mew-vm/cmos.layout
@@ -7,11 +7,6 @@ entries
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -36,13 +31,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
checksums
diff --git a/src/mainboard/avalue/eax-785e/cmos.layout b/src/mainboard/avalue/eax-785e/cmos.layout
index 621778d7c2..f516f499e4 100644
--- a/src/mainboard/avalue/eax-785e/cmos.layout
+++ b/src/mainboard/avalue/eax-785e/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/bcom/winnetp680/cmos.layout b/src/mainboard/bcom/winnetp680/cmos.layout
index 879bb61f04..b31e20ca3f 100644
--- a/src/mainboard/bcom/winnetp680/cmos.layout
+++ b/src/mainboard/bcom/winnetp680/cmos.layout
@@ -7,11 +7,6 @@ entries
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -36,13 +31,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
checksums
diff --git a/src/mainboard/broadcom/blast/cmos.layout b/src/mainboard/broadcom/blast/cmos.layout
index 537e938783..85fa992792 100644
--- a/src/mainboard/broadcom/blast/cmos.layout
+++ b/src/mainboard/broadcom/blast/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/digitallogic/adl855pc/cmos.layout b/src/mainboard/digitallogic/adl855pc/cmos.layout
index 879bb61f04..b31e20ca3f 100644
--- a/src/mainboard/digitallogic/adl855pc/cmos.layout
+++ b/src/mainboard/digitallogic/adl855pc/cmos.layout
@@ -7,11 +7,6 @@ entries
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -36,13 +31,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
checksums
diff --git a/src/mainboard/digitallogic/msm800sev/cmos.layout b/src/mainboard/digitallogic/msm800sev/cmos.layout
index 879bb61f04..b31e20ca3f 100644
--- a/src/mainboard/digitallogic/msm800sev/cmos.layout
+++ b/src/mainboard/digitallogic/msm800sev/cmos.layout
@@ -7,11 +7,6 @@ entries
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -36,13 +31,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
checksums
diff --git a/src/mainboard/emulation/qemu-i440fx/cmos.layout b/src/mainboard/emulation/qemu-i440fx/cmos.layout
index 879bb61f04..b31e20ca3f 100644
--- a/src/mainboard/emulation/qemu-i440fx/cmos.layout
+++ b/src/mainboard/emulation/qemu-i440fx/cmos.layout
@@ -7,11 +7,6 @@ entries
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -36,13 +31,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
checksums
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout b/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout
index a9ac84865e..9e328a6cf7 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout
+++ b/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout
@@ -32,11 +32,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -69,13 +64,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 200Mhz
8 1 166Mhz
8 2 133Mhz
diff --git a/src/mainboard/gigabyte/m57sli/cmos.layout b/src/mainboard/gigabyte/m57sli/cmos.layout
index a9ac84865e..9e328a6cf7 100644
--- a/src/mainboard/gigabyte/m57sli/cmos.layout
+++ b/src/mainboard/gigabyte/m57sli/cmos.layout
@@ -32,11 +32,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -69,13 +64,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 200Mhz
8 1 166Mhz
8 2 133Mhz
diff --git a/src/mainboard/gigabyte/ma785gm/cmos.layout b/src/mainboard/gigabyte/ma785gm/cmos.layout
index 621778d7c2..f516f499e4 100644
--- a/src/mainboard/gigabyte/ma785gm/cmos.layout
+++ b/src/mainboard/gigabyte/ma785gm/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/gigabyte/ma785gmt/cmos.layout b/src/mainboard/gigabyte/ma785gmt/cmos.layout
index 621778d7c2..f516f499e4 100644
--- a/src/mainboard/gigabyte/ma785gmt/cmos.layout
+++ b/src/mainboard/gigabyte/ma785gmt/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/gigabyte/ma78gm/cmos.layout b/src/mainboard/gigabyte/ma78gm/cmos.layout
index 621778d7c2..f516f499e4 100644
--- a/src/mainboard/gigabyte/ma78gm/cmos.layout
+++ b/src/mainboard/gigabyte/ma78gm/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/gizmosphere/gizmo/cmos.layout b/src/mainboard/gizmosphere/gizmo/cmos.layout
index 017d8e12dc..7e098c5377 100644
--- a/src/mainboard/gizmosphere/gizmo/cmos.layout
+++ b/src/mainboard/gizmosphere/gizmo/cmos.layout
@@ -32,11 +32,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -69,13 +64,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/gizmosphere/gizmo2/cmos.layout b/src/mainboard/gizmosphere/gizmo2/cmos.layout
index 1ca6100522..d827b4b85e 100644
--- a/src/mainboard/gizmosphere/gizmo2/cmos.layout
+++ b/src/mainboard/gizmosphere/gizmo2/cmos.layout
@@ -31,11 +31,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -66,13 +61,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/hp/abm/cmos.layout b/src/mainboard/hp/abm/cmos.layout
index 1ca6100522..d827b4b85e 100644
--- a/src/mainboard/hp/abm/cmos.layout
+++ b/src/mainboard/hp/abm/cmos.layout
@@ -31,11 +31,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -66,13 +61,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/hp/dl145_g1/cmos.layout b/src/mainboard/hp/dl145_g1/cmos.layout
index 537e938783..85fa992792 100644
--- a/src/mainboard/hp/dl145_g1/cmos.layout
+++ b/src/mainboard/hp/dl145_g1/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/hp/dl145_g3/cmos.layout b/src/mainboard/hp/dl145_g3/cmos.layout
index 621778d7c2..f516f499e4 100644
--- a/src/mainboard/hp/dl145_g3/cmos.layout
+++ b/src/mainboard/hp/dl145_g3/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/hp/dl165_g6_fam10/cmos.layout b/src/mainboard/hp/dl165_g6_fam10/cmos.layout
index 633146be68..99d9ace690 100644
--- a/src/mainboard/hp/dl165_g6_fam10/cmos.layout
+++ b/src/mainboard/hp/dl165_g6_fam10/cmos.layout
@@ -34,11 +34,6 @@ entries
404 2 e 8 max_mem_clock
406 1 e 2 multi_core
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -77,13 +72,6 @@ enumerations
6 6 Information
6 7 Debug
6 8 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR2-800
8 1 DDR2-667
8 2 DDR2-533
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/cmos.layout b/src/mainboard/hp/pavilion_m6_1035dx/cmos.layout
index 1ca6100522..d827b4b85e 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/cmos.layout
+++ b/src/mainboard/hp/pavilion_m6_1035dx/cmos.layout
@@ -31,11 +31,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -66,13 +61,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/ibm/e325/cmos.layout b/src/mainboard/ibm/e325/cmos.layout
index 537e938783..85fa992792 100644
--- a/src/mainboard/ibm/e325/cmos.layout
+++ b/src/mainboard/ibm/e325/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/ibm/e326/cmos.layout b/src/mainboard/ibm/e326/cmos.layout
index 537e938783..85fa992792 100644
--- a/src/mainboard/ibm/e326/cmos.layout
+++ b/src/mainboard/ibm/e326/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/iei/kino-780am2-fam10/cmos.layout b/src/mainboard/iei/kino-780am2-fam10/cmos.layout
index 621778d7c2..f516f499e4 100644
--- a/src/mainboard/iei/kino-780am2-fam10/cmos.layout
+++ b/src/mainboard/iei/kino-780am2-fam10/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/iwill/dk8_htx/cmos.layout b/src/mainboard/iwill/dk8_htx/cmos.layout
index 621778d7c2..f516f499e4 100644
--- a/src/mainboard/iwill/dk8_htx/cmos.layout
+++ b/src/mainboard/iwill/dk8_htx/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/iwill/dk8s2/cmos.layout b/src/mainboard/iwill/dk8s2/cmos.layout
index 537e938783..85fa992792 100644
--- a/src/mainboard/iwill/dk8s2/cmos.layout
+++ b/src/mainboard/iwill/dk8s2/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/iwill/dk8x/cmos.layout b/src/mainboard/iwill/dk8x/cmos.layout
index 537e938783..85fa992792 100644
--- a/src/mainboard/iwill/dk8x/cmos.layout
+++ b/src/mainboard/iwill/dk8x/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/jetway/j7f2/cmos.layout b/src/mainboard/jetway/j7f2/cmos.layout
index 879bb61f04..b31e20ca3f 100644
--- a/src/mainboard/jetway/j7f2/cmos.layout
+++ b/src/mainboard/jetway/j7f2/cmos.layout
@@ -7,11 +7,6 @@ entries
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -36,13 +31,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
checksums
diff --git a/src/mainboard/jetway/nf81-t56n-lf/cmos.layout b/src/mainboard/jetway/nf81-t56n-lf/cmos.layout
index 1c5559b667..c63b2cd6a0 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/cmos.layout
+++ b/src/mainboard/jetway/nf81-t56n-lf/cmos.layout
@@ -31,11 +31,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -68,13 +63,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/jetway/pa78vm5/cmos.layout b/src/mainboard/jetway/pa78vm5/cmos.layout
index 621778d7c2..f516f499e4 100644
--- a/src/mainboard/jetway/pa78vm5/cmos.layout
+++ b/src/mainboard/jetway/pa78vm5/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/kontron/kt690/cmos.layout b/src/mainboard/kontron/kt690/cmos.layout
index ccd8c62178..27a5f87021 100644
--- a/src/mainboard/kontron/kt690/cmos.layout
+++ b/src/mainboard/kontron/kt690/cmos.layout
@@ -32,11 +32,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -69,13 +64,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/lanner/em8510/cmos.layout b/src/mainboard/lanner/em8510/cmos.layout
index 879bb61f04..b31e20ca3f 100644
--- a/src/mainboard/lanner/em8510/cmos.layout
+++ b/src/mainboard/lanner/em8510/cmos.layout
@@ -7,11 +7,6 @@ entries
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -36,13 +31,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
checksums
diff --git a/src/mainboard/lenovo/g505s/cmos.layout b/src/mainboard/lenovo/g505s/cmos.layout
index 1ca6100522..d827b4b85e 100644
--- a/src/mainboard/lenovo/g505s/cmos.layout
+++ b/src/mainboard/lenovo/g505s/cmos.layout
@@ -31,11 +31,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -66,13 +61,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/lippert/frontrunner-af/cmos.layout b/src/mainboard/lippert/frontrunner-af/cmos.layout
index 1c5559b667..c63b2cd6a0 100644
--- a/src/mainboard/lippert/frontrunner-af/cmos.layout
+++ b/src/mainboard/lippert/frontrunner-af/cmos.layout
@@ -31,11 +31,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -68,13 +63,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/lippert/frontrunner/cmos.layout b/src/mainboard/lippert/frontrunner/cmos.layout
index 879bb61f04..b31e20ca3f 100644
--- a/src/mainboard/lippert/frontrunner/cmos.layout
+++ b/src/mainboard/lippert/frontrunner/cmos.layout
@@ -7,11 +7,6 @@ entries
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -36,13 +31,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
checksums
diff --git a/src/mainboard/lippert/toucan-af/cmos.layout b/src/mainboard/lippert/toucan-af/cmos.layout
index 1c5559b667..c63b2cd6a0 100644
--- a/src/mainboard/lippert/toucan-af/cmos.layout
+++ b/src/mainboard/lippert/toucan-af/cmos.layout
@@ -31,11 +31,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -68,13 +63,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/msi/ms7135/cmos.layout b/src/mainboard/msi/ms7135/cmos.layout
index eb8ba848f8..8520347546 100644
--- a/src/mainboard/msi/ms7135/cmos.layout
+++ b/src/mainboard/msi/ms7135/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -50,13 +45,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-#7 3 ROM
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/msi/ms7260/cmos.layout b/src/mainboard/msi/ms7260/cmos.layout
index 806d100d26..ebf3198587 100644
--- a/src/mainboard/msi/ms7260/cmos.layout
+++ b/src/mainboard/msi/ms7260/cmos.layout
@@ -33,11 +33,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -70,13 +65,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 200Mhz
8 1 166Mhz
8 2 133Mhz
diff --git a/src/mainboard/msi/ms9185/cmos.layout b/src/mainboard/msi/ms9185/cmos.layout
index 96d12eae35..30f40c3fa4 100644
--- a/src/mainboard/msi/ms9185/cmos.layout
+++ b/src/mainboard/msi/ms9185/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/msi/ms9282/cmos.layout b/src/mainboard/msi/ms9282/cmos.layout
index 37f9fd3e03..85fa992792 100644
--- a/src/mainboard/msi/ms9282/cmos.layout
+++ b/src/mainboard/msi/ms9282/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/msi/ms9652_fam10/cmos.layout b/src/mainboard/msi/ms9652_fam10/cmos.layout
index eb17a59a6a..0506e9bf95 100644
--- a/src/mainboard/msi/ms9652_fam10/cmos.layout
+++ b/src/mainboard/msi/ms9652_fam10/cmos.layout
@@ -34,11 +34,6 @@ entries
404 2 e 8 max_mem_clock
406 1 e 2 multi_core
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -78,13 +73,6 @@ enumerations
6 6 Information
6 7 Debug
6 8 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR2-800
8 1 DDR2-667
8 2 DDR2-533
diff --git a/src/mainboard/newisys/khepri/cmos.layout b/src/mainboard/newisys/khepri/cmos.layout
index 537e938783..85fa992792 100644
--- a/src/mainboard/newisys/khepri/cmos.layout
+++ b/src/mainboard/newisys/khepri/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/nvidia/l1_2pvv/cmos.layout b/src/mainboard/nvidia/l1_2pvv/cmos.layout
index a9ac84865e..9e328a6cf7 100644
--- a/src/mainboard/nvidia/l1_2pvv/cmos.layout
+++ b/src/mainboard/nvidia/l1_2pvv/cmos.layout
@@ -32,11 +32,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -69,13 +64,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 200Mhz
8 1 166Mhz
8 2 133Mhz
diff --git a/src/mainboard/pcengines/alix1c/cmos.default b/src/mainboard/pcengines/alix1c/cmos.default
index 189c691630..0e59b0901a 100644
--- a/src/mainboard/pcengines/alix1c/cmos.default
+++ b/src/mainboard/pcengines/alix1c/cmos.default
@@ -4,8 +4,3 @@ ECC_memory=Disable
baud_rate=115200
power_on_after_fail=Disable
debug_level=Spew
-boot_first=HDD
-boot_second=Fallback_Floppy
-boot_third=Fallback_Network
-boot_index=0xf
-boot_countdown=0x7f
diff --git a/src/mainboard/pcengines/alix1c/cmos.layout b/src/mainboard/pcengines/alix1c/cmos.layout
index 879bb61f04..b31e20ca3f 100644
--- a/src/mainboard/pcengines/alix1c/cmos.layout
+++ b/src/mainboard/pcengines/alix1c/cmos.layout
@@ -7,11 +7,6 @@ entries
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -36,13 +31,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
checksums
diff --git a/src/mainboard/pcengines/alix2d/cmos.layout b/src/mainboard/pcengines/alix2d/cmos.layout
index 879bb61f04..b31e20ca3f 100644
--- a/src/mainboard/pcengines/alix2d/cmos.layout
+++ b/src/mainboard/pcengines/alix2d/cmos.layout
@@ -7,11 +7,6 @@ entries
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -36,13 +31,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
checksums
diff --git a/src/mainboard/siemens/sitemp_g1p1/cmos.layout b/src/mainboard/siemens/sitemp_g1p1/cmos.layout
index 06053333dc..c09a911bb5 100644
--- a/src/mainboard/siemens/sitemp_g1p1/cmos.layout
+++ b/src/mainboard/siemens/sitemp_g1p1/cmos.layout
@@ -97,13 +97,6 @@ enumerations
6 6 Info
6 7 Debug
6 8 Spew
-#7 0 Network
-#7 1 HDD
-#7 2 Floppy
-#7 8 Fallback_Network
-#7 9 Fallback_HDD
-#7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/sunw/ultra40/cmos.layout b/src/mainboard/sunw/ultra40/cmos.layout
index 537e938783..85fa992792 100644
--- a/src/mainboard/sunw/ultra40/cmos.layout
+++ b/src/mainboard/sunw/ultra40/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/supermicro/h8dme/cmos.layout b/src/mainboard/supermicro/h8dme/cmos.layout
index a9ac84865e..9e328a6cf7 100644
--- a/src/mainboard/supermicro/h8dme/cmos.layout
+++ b/src/mainboard/supermicro/h8dme/cmos.layout
@@ -32,11 +32,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -69,13 +64,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 200Mhz
8 1 166Mhz
8 2 133Mhz
diff --git a/src/mainboard/supermicro/h8dmr/cmos.layout b/src/mainboard/supermicro/h8dmr/cmos.layout
index a9ac84865e..9e328a6cf7 100644
--- a/src/mainboard/supermicro/h8dmr/cmos.layout
+++ b/src/mainboard/supermicro/h8dmr/cmos.layout
@@ -32,11 +32,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -69,13 +64,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 200Mhz
8 1 166Mhz
8 2 133Mhz
diff --git a/src/mainboard/supermicro/h8dmr_fam10/cmos.layout b/src/mainboard/supermicro/h8dmr_fam10/cmos.layout
index eb17a59a6a..0506e9bf95 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/cmos.layout
+++ b/src/mainboard/supermicro/h8dmr_fam10/cmos.layout
@@ -34,11 +34,6 @@ entries
404 2 e 8 max_mem_clock
406 1 e 2 multi_core
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -78,13 +73,6 @@ enumerations
6 6 Information
6 7 Debug
6 8 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR2-800
8 1 DDR2-667
8 2 DDR2-533
diff --git a/src/mainboard/supermicro/h8qgi/cmos.layout b/src/mainboard/supermicro/h8qgi/cmos.layout
index 1c5559b667..c63b2cd6a0 100644
--- a/src/mainboard/supermicro/h8qgi/cmos.layout
+++ b/src/mainboard/supermicro/h8qgi/cmos.layout
@@ -31,11 +31,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -68,13 +63,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/supermicro/h8qme_fam10/cmos.layout b/src/mainboard/supermicro/h8qme_fam10/cmos.layout
index eb17a59a6a..0506e9bf95 100644
--- a/src/mainboard/supermicro/h8qme_fam10/cmos.layout
+++ b/src/mainboard/supermicro/h8qme_fam10/cmos.layout
@@ -34,11 +34,6 @@ entries
404 2 e 8 max_mem_clock
406 1 e 2 multi_core
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -78,13 +73,6 @@ enumerations
6 6 Information
6 7 Debug
6 8 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR2-800
8 1 DDR2-667
8 2 DDR2-533
diff --git a/src/mainboard/supermicro/h8scm/cmos.layout b/src/mainboard/supermicro/h8scm/cmos.layout
index 1c5559b667..c63b2cd6a0 100644
--- a/src/mainboard/supermicro/h8scm/cmos.layout
+++ b/src/mainboard/supermicro/h8scm/cmos.layout
@@ -31,11 +31,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -68,13 +63,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/supermicro/h8scm_fam10/cmos.layout b/src/mainboard/supermicro/h8scm_fam10/cmos.layout
index 621778d7c2..f516f499e4 100644
--- a/src/mainboard/supermicro/h8scm_fam10/cmos.layout
+++ b/src/mainboard/supermicro/h8scm_fam10/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/technexion/tim5690/cmos.layout b/src/mainboard/technexion/tim5690/cmos.layout
index ccd8c62178..27a5f87021 100644
--- a/src/mainboard/technexion/tim5690/cmos.layout
+++ b/src/mainboard/technexion/tim5690/cmos.layout
@@ -32,11 +32,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -69,13 +64,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/technexion/tim8690/cmos.layout b/src/mainboard/technexion/tim8690/cmos.layout
index ccd8c62178..27a5f87021 100644
--- a/src/mainboard/technexion/tim8690/cmos.layout
+++ b/src/mainboard/technexion/tim8690/cmos.layout
@@ -32,11 +32,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -69,13 +64,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/traverse/geos/cmos.layout b/src/mainboard/traverse/geos/cmos.layout
index ee7abf4e50..0bcfaf88d2 100644
--- a/src/mainboard/traverse/geos/cmos.layout
+++ b/src/mainboard/traverse/geos/cmos.layout
@@ -7,11 +7,6 @@ entries
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 1 e 0 dcon_present
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -37,13 +32,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
checksums
diff --git a/src/mainboard/tyan/s2735/cmos.layout b/src/mainboard/tyan/s2735/cmos.layout
index 8b6ef00c43..2c50002cef 100644
--- a/src/mainboard/tyan/s2735/cmos.layout
+++ b/src/mainboard/tyan/s2735/cmos.layout
@@ -10,11 +10,6 @@ entries
397 1 e 1 remap_memory_high
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
#440 4 e 9 slow_cpu
444 1 e 1 nmi
456 1 e 1 ECC_memory
@@ -46,13 +41,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
checksums
diff --git a/src/mainboard/tyan/s2850/cmos.layout b/src/mainboard/tyan/s2850/cmos.layout
index 537e938783..85fa992792 100644
--- a/src/mainboard/tyan/s2850/cmos.layout
+++ b/src/mainboard/tyan/s2850/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/tyan/s2875/cmos.layout b/src/mainboard/tyan/s2875/cmos.layout
index 537e938783..85fa992792 100644
--- a/src/mainboard/tyan/s2875/cmos.layout
+++ b/src/mainboard/tyan/s2875/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/tyan/s2880/cmos.layout b/src/mainboard/tyan/s2880/cmos.layout
index 537e938783..85fa992792 100644
--- a/src/mainboard/tyan/s2880/cmos.layout
+++ b/src/mainboard/tyan/s2880/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/tyan/s2881/cmos.layout b/src/mainboard/tyan/s2881/cmos.layout
index 537e938783..85fa992792 100644
--- a/src/mainboard/tyan/s2881/cmos.layout
+++ b/src/mainboard/tyan/s2881/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/tyan/s2882/cmos.layout b/src/mainboard/tyan/s2882/cmos.layout
index 537e938783..85fa992792 100644
--- a/src/mainboard/tyan/s2882/cmos.layout
+++ b/src/mainboard/tyan/s2882/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/tyan/s2885/cmos.layout b/src/mainboard/tyan/s2885/cmos.layout
index 537e938783..85fa992792 100644
--- a/src/mainboard/tyan/s2885/cmos.layout
+++ b/src/mainboard/tyan/s2885/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/tyan/s2891/cmos.layout b/src/mainboard/tyan/s2891/cmos.layout
index 537e938783..85fa992792 100644
--- a/src/mainboard/tyan/s2891/cmos.layout
+++ b/src/mainboard/tyan/s2891/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/tyan/s2892/cmos.layout b/src/mainboard/tyan/s2892/cmos.layout
index 537e938783..85fa992792 100644
--- a/src/mainboard/tyan/s2892/cmos.layout
+++ b/src/mainboard/tyan/s2892/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/tyan/s2895/cmos.layout b/src/mainboard/tyan/s2895/cmos.layout
index 537e938783..85fa992792 100644
--- a/src/mainboard/tyan/s2895/cmos.layout
+++ b/src/mainboard/tyan/s2895/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/tyan/s2912/cmos.layout b/src/mainboard/tyan/s2912/cmos.layout
index a9ac84865e..9e328a6cf7 100644
--- a/src/mainboard/tyan/s2912/cmos.layout
+++ b/src/mainboard/tyan/s2912/cmos.layout
@@ -32,11 +32,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -69,13 +64,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 200Mhz
8 1 166Mhz
8 2 133Mhz
diff --git a/src/mainboard/tyan/s2912_fam10/cmos.layout b/src/mainboard/tyan/s2912_fam10/cmos.layout
index eb17a59a6a..0506e9bf95 100644
--- a/src/mainboard/tyan/s2912_fam10/cmos.layout
+++ b/src/mainboard/tyan/s2912_fam10/cmos.layout
@@ -34,11 +34,6 @@ entries
404 2 e 8 max_mem_clock
406 1 e 2 multi_core
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -78,13 +73,6 @@ enumerations
6 6 Information
6 7 Debug
6 8 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR2-800
8 1 DDR2-667
8 2 DDR2-533
diff --git a/src/mainboard/tyan/s4880/cmos.layout b/src/mainboard/tyan/s4880/cmos.layout
index 537e938783..85fa992792 100644
--- a/src/mainboard/tyan/s4880/cmos.layout
+++ b/src/mainboard/tyan/s4880/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/tyan/s4882/cmos.layout b/src/mainboard/tyan/s4882/cmos.layout
index 537e938783..85fa992792 100644
--- a/src/mainboard/tyan/s4882/cmos.layout
+++ b/src/mainboard/tyan/s4882/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/tyan/s8226/cmos.layout b/src/mainboard/tyan/s8226/cmos.layout
index 1c5559b667..c63b2cd6a0 100644
--- a/src/mainboard/tyan/s8226/cmos.layout
+++ b/src/mainboard/tyan/s8226/cmos.layout
@@ -31,11 +31,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -68,13 +63,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/via/epia-cn/cmos.layout b/src/mainboard/via/epia-cn/cmos.layout
index 879bb61f04..b31e20ca3f 100644
--- a/src/mainboard/via/epia-cn/cmos.layout
+++ b/src/mainboard/via/epia-cn/cmos.layout
@@ -7,11 +7,6 @@ entries
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -36,13 +31,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
checksums
diff --git a/src/mainboard/via/epia-m700/cmos.layout b/src/mainboard/via/epia-m700/cmos.layout
index 879bb61f04..b31e20ca3f 100644
--- a/src/mainboard/via/epia-m700/cmos.layout
+++ b/src/mainboard/via/epia-m700/cmos.layout
@@ -7,11 +7,6 @@ entries
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -36,13 +31,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
checksums
diff --git a/src/mainboard/via/pc2500e/cmos.layout b/src/mainboard/via/pc2500e/cmos.layout
index 5c642f7bab..89d5e9d425 100644
--- a/src/mainboard/via/pc2500e/cmos.layout
+++ b/src/mainboard/via/pc2500e/cmos.layout
@@ -28,11 +28,6 @@ entries
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -55,12 +50,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
checksums
diff --git a/src/mainboard/via/vt8454c/cmos.layout b/src/mainboard/via/vt8454c/cmos.layout
index 22f8b5a82f..b00ac42c4d 100644
--- a/src/mainboard/via/vt8454c/cmos.layout
+++ b/src/mainboard/via/vt8454c/cmos.layout
@@ -51,13 +51,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
checksums
diff --git a/src/mainboard/winent/mb6047/cmos.layout b/src/mainboard/winent/mb6047/cmos.layout
index 537e938783..85fa992792 100644
--- a/src/mainboard/winent/mb6047/cmos.layout
+++ b/src/mainboard/winent/mb6047/cmos.layout
@@ -11,11 +11,6 @@ entries
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,13 +43,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/winent/pl6064/cmos.layout b/src/mainboard/winent/pl6064/cmos.layout
index 879bb61f04..b31e20ca3f 100644
--- a/src/mainboard/winent/pl6064/cmos.layout
+++ b/src/mainboard/winent/pl6064/cmos.layout
@@ -7,11 +7,6 @@ entries
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -36,13 +31,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
checksums
diff --git a/src/mainboard/wyse/s50/cmos.layout b/src/mainboard/wyse/s50/cmos.layout
index a213758cef..96a2c6c0a3 100644
--- a/src/mainboard/wyse/s50/cmos.layout
+++ b/src/mainboard/wyse/s50/cmos.layout
@@ -30,11 +30,6 @@ entries
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
-416 4 e 7 boot_first
-420 4 e 7 boot_second
-424 4 e 7 boot_third
-428 4 h 0 boot_index
-432 8 h 0 boot_countdown
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -59,13 +54,6 @@ enumerations
6 7 Info
6 8 Debug
6 9 Spew
-7 0 Network
-7 1 HDD
-7 2 Floppy
-7 8 Fallback_Network
-7 9 Fallback_HDD
-7 10 Fallback_Floppy
-#7 3 ROM
checksums