[coreboot-gerrit] Change in coreboot[master]: mb/*/*/cmos.layout: Remove rtc nvram configurable debug level
Arthur Heymans (Code Review)
gerrit at coreboot.org
Fri Sep 22 13:53:11 CEST 2017
Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/21637
Change subject: mb/*/*/cmos.layout: Remove rtc nvram configurable debug level
......................................................................
mb/*/*/cmos.layout: Remove rtc nvram configurable debug level
Having both a Kconfig option and an rtc nvram option to set this is
confusing and it seems this method is used very scarcely.
Another issue with rtc nvram option is that without a proper
cmos.default invalid checksum will result in possible unexpected
settings.
Change-Id: I8db4ba428ec51f9230bb5f3d2259ae9141308f81
Signed-off-by: Arthur Heymans <arthur at aheymans.xyz>
---
M src/mainboard/adi/rcc-dff/cmos.layout
M src/mainboard/advansus/a785e-i/cmos.layout
M src/mainboard/amd/bettong/cmos.layout
M src/mainboard/amd/bimini_fam10/cmos.layout
M src/mainboard/amd/db-ft3b-lc/cmos.layout
M src/mainboard/amd/db800/cmos.layout
M src/mainboard/amd/dbm690t/cmos.layout
M src/mainboard/amd/dinar/cmos.layout
M src/mainboard/amd/f2950/cmos.layout
M src/mainboard/amd/gardenia/cmos.layout
M src/mainboard/amd/inagua/cmos.layout
M src/mainboard/amd/lamar/cmos.layout
M src/mainboard/amd/mahogany/cmos.layout
M src/mainboard/amd/mahogany_fam10/cmos.layout
M src/mainboard/amd/norwich/cmos.layout
M src/mainboard/amd/olivehill/cmos.layout
M src/mainboard/amd/olivehillplus/cmos.layout
M src/mainboard/amd/parmer/cmos.layout
M src/mainboard/amd/persimmon/cmos.layout
M src/mainboard/amd/pistachio/cmos.layout
M src/mainboard/amd/rumba/cmos.layout
M src/mainboard/amd/serengeti_cheetah/cmos.layout
M src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout
M src/mainboard/amd/south_station/cmos.layout
M src/mainboard/amd/thatcher/cmos.layout
M src/mainboard/amd/tilapia_fam10/cmos.layout
M src/mainboard/amd/torpedo/cmos.layout
M src/mainboard/amd/union_station/cmos.layout
M src/mainboard/apple/macbook21/cmos.layout
M src/mainboard/artecgroup/dbe61/cmos.layout
M src/mainboard/asrock/939a785gmh/cmos.layout
M src/mainboard/asrock/e350m1/cmos.layout
M src/mainboard/asrock/g41c-gs/cmos.layout
M src/mainboard/asrock/imb-a180/cmos.layout
M src/mainboard/asus/a8n_e/cmos.layout
M src/mainboard/asus/a8v-e_deluxe/cmos.layout
M src/mainboard/asus/a8v-e_se/cmos.layout
M src/mainboard/asus/dsbf/cmos.layout
M src/mainboard/asus/f2a85-m/cmos.layout
M src/mainboard/asus/k8v-x/cmos.layout
M src/mainboard/asus/kcma-d8/cmos.default
M src/mainboard/asus/kcma-d8/cmos.layout
M src/mainboard/asus/kfsn4-dre/cmos.default
M src/mainboard/asus/kfsn4-dre/cmos.layout
M src/mainboard/asus/kfsn4-dre_k8/cmos.default
M src/mainboard/asus/kfsn4-dre_k8/cmos.layout
M src/mainboard/asus/kgpe-d16/cmos.default
M src/mainboard/asus/kgpe-d16/cmos.layout
M src/mainboard/asus/m2n-e/cmos.layout
M src/mainboard/asus/m2v-mx_se/cmos.layout
M src/mainboard/asus/m2v/cmos.layout
M src/mainboard/asus/m4a78-em/cmos.layout
M src/mainboard/asus/m4a785-m/cmos.layout
M src/mainboard/asus/m4a785t-m/cmos.layout
M src/mainboard/asus/m5a88-v/cmos.layout
M src/mainboard/asus/mew-vm/cmos.layout
M src/mainboard/asus/p5gc-mx/cmos.layout
M src/mainboard/avalue/eax-785e/cmos.layout
M src/mainboard/bachmann/ot200/cmos.layout
M src/mainboard/bap/ode_e20XX/cmos.layout
M src/mainboard/bap/ode_e21XX/cmos.layout
M src/mainboard/bcom/winnetp680/cmos.layout
M src/mainboard/biostar/am1ml/cmos.layout
M src/mainboard/broadcom/blast/cmos.layout
M src/mainboard/digitallogic/msm800sev/cmos.layout
M src/mainboard/elmex/pcm205400/cmos.layout
M src/mainboard/emulation/qemu-i440fx/cmos.default
M src/mainboard/emulation/qemu-i440fx/cmos.layout
M src/mainboard/esd/atom15/cmos.layout
M src/mainboard/foxconn/g41s-k/cmos.layout
M src/mainboard/getac/p470/cmos.layout
M src/mainboard/gigabyte/ga-945gcm-s2l/cmos.layout
M src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout
M src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout
M src/mainboard/gigabyte/ga-g41m-es2l/cmos.layout
M src/mainboard/gigabyte/ga_2761gxdk/cmos.layout
M src/mainboard/gigabyte/m57sli/cmos.default
M src/mainboard/gigabyte/m57sli/cmos.layout
M src/mainboard/gigabyte/ma785gm/cmos.layout
M src/mainboard/gigabyte/ma785gmt/cmos.layout
M src/mainboard/gigabyte/ma78gm/cmos.layout
M src/mainboard/gizmosphere/gizmo/cmos.layout
M src/mainboard/gizmosphere/gizmo2/cmos.layout
M src/mainboard/google/auron/cmos.layout
M src/mainboard/google/beltino/cmos.layout
M src/mainboard/google/butterfly/cmos.default
M src/mainboard/google/butterfly/cmos.layout
M src/mainboard/google/chell/cmos.layout
M src/mainboard/google/cyan/cmos.layout
M src/mainboard/google/glados/cmos.layout
M src/mainboard/google/jecht/cmos.layout
M src/mainboard/google/kahlee/cmos.layout
M src/mainboard/google/lars/cmos.layout
M src/mainboard/google/link/cmos.layout
M src/mainboard/google/parrot/cmos.layout
M src/mainboard/google/rambi/cmos.layout
M src/mainboard/google/slippy/cmos.layout
M src/mainboard/google/stout/cmos.default
M src/mainboard/google/stout/cmos.layout
M src/mainboard/hp/abm/cmos.layout
M src/mainboard/hp/dl145_g1/cmos.layout
M src/mainboard/hp/dl145_g3/cmos.layout
M src/mainboard/hp/dl165_g6_fam10/cmos.layout
M src/mainboard/hp/pavilion_m6_1035dx/cmos.default
M src/mainboard/hp/pavilion_m6_1035dx/cmos.layout
M src/mainboard/ibase/mb899/cmos.layout
M src/mainboard/iei/kino-780am2-fam10/cmos.layout
M src/mainboard/intel/baskingridge/cmos.layout
M src/mainboard/intel/bayleybay_fsp/cmos.layout
M src/mainboard/intel/camelbackmountain_fsp/cmos.layout
M src/mainboard/intel/cougar_canyon2/cmos.layout
M src/mainboard/intel/d510mo/cmos.layout
M src/mainboard/intel/d945gclf/cmos.layout
M src/mainboard/intel/eagleheights/cmos.layout
M src/mainboard/intel/emeraldlake2/cmos.layout
M src/mainboard/intel/kblrvp/cmos.layout
M src/mainboard/intel/kunimitsu/cmos.layout
M src/mainboard/intel/littleplains/cmos.layout
M src/mainboard/intel/minnowmax/cmos.layout
M src/mainboard/intel/mohonpeak/cmos.layout
M src/mainboard/intel/stargo2/cmos.layout
M src/mainboard/intel/strago/cmos.layout
M src/mainboard/intel/wtm2/cmos.layout
M src/mainboard/iwave/iWRainbowG6/cmos.layout
M src/mainboard/iwill/dk8_htx/cmos.layout
M src/mainboard/jetway/j7f2/cmos.layout
M src/mainboard/jetway/nf81-t56n-lf/cmos.layout
M src/mainboard/jetway/pa78vm5/cmos.layout
M src/mainboard/kontron/986lcd-m/cmos.layout
M src/mainboard/kontron/kt690/cmos.layout
M src/mainboard/kontron/ktqm77/cmos.layout
M src/mainboard/lanner/em8510/cmos.layout
M src/mainboard/lenovo/g505s/cmos.layout
M src/mainboard/lenovo/l520/cmos.layout
M src/mainboard/lenovo/t400/cmos.layout
M src/mainboard/lenovo/t420/cmos.layout
M src/mainboard/lenovo/t420s/cmos.layout
M src/mainboard/lenovo/t430/cmos.layout
M src/mainboard/lenovo/t430s/cmos.layout
M src/mainboard/lenovo/t520/cmos.layout
M src/mainboard/lenovo/t530/cmos.layout
M src/mainboard/lenovo/t60/cmos.layout
M src/mainboard/lenovo/x1_carbon_gen1/cmos.layout
M src/mainboard/lenovo/x200/cmos.layout
M src/mainboard/lenovo/x201/cmos.layout
M src/mainboard/lenovo/x220/cmos.layout
M src/mainboard/lenovo/x230/cmos.layout
M src/mainboard/lenovo/x60/cmos.layout
M src/mainboard/lippert/frontrunner-af/cmos.layout
M src/mainboard/lippert/frontrunner/cmos.layout
M src/mainboard/lippert/toucan-af/cmos.layout
M src/mainboard/msi/ms7135/cmos.layout
M src/mainboard/msi/ms7260/cmos.layout
M src/mainboard/msi/ms7721/cmos.layout
M src/mainboard/msi/ms9185/cmos.layout
M src/mainboard/msi/ms9282/cmos.layout
M src/mainboard/msi/ms9652_fam10/cmos.layout
M src/mainboard/nvidia/l1_2pvv/cmos.layout
M src/mainboard/packardbell/ms2290/cmos.layout
M src/mainboard/pcengines/alix1c/cmos.layout
M src/mainboard/pcengines/alix2d/cmos.layout
M src/mainboard/pcengines/apu1/cmos.layout
M src/mainboard/pcengines/apu2/cmos.layout
M src/mainboard/roda/rk886ex/cmos.layout
M src/mainboard/roda/rk9/cmos.layout
M src/mainboard/roda/rv11/cmos.layout
M src/mainboard/samsung/lumpy/cmos.layout
M src/mainboard/samsung/stumpy/cmos.layout
M src/mainboard/sapphire/pureplatinumh61/cmos.layout
M src/mainboard/siemens/mc_bdx1/cmos.layout
M src/mainboard/siemens/mc_tcu3/cmos.layout
M src/mainboard/siemens/sitemp_g1p1/cmos.layout
M src/mainboard/sunw/ultra40/cmos.layout
M src/mainboard/sunw/ultra40m2/cmos.layout
M src/mainboard/supermicro/h8dme/cmos.layout
M src/mainboard/supermicro/h8dmr/cmos.layout
M src/mainboard/supermicro/h8dmr_fam10/cmos.layout
M src/mainboard/supermicro/h8qgi/cmos.layout
M src/mainboard/supermicro/h8qme_fam10/cmos.layout
M src/mainboard/supermicro/h8scm/cmos.layout
M src/mainboard/supermicro/h8scm_fam10/cmos.layout
M src/mainboard/supermicro/x7db8/cmos.layout
M src/mainboard/technexion/tim5690/cmos.layout
M src/mainboard/technexion/tim8690/cmos.layout
M src/mainboard/traverse/geos/cmos.layout
M src/mainboard/tyan/s2912/cmos.layout
M src/mainboard/tyan/s2912_fam10/cmos.layout
M src/mainboard/tyan/s8226/cmos.layout
M src/mainboard/via/epia-cn/cmos.layout
M src/mainboard/via/epia-m700/cmos.layout
M src/mainboard/via/pc2500e/cmos.layout
M src/mainboard/via/vt8454c/cmos.layout
M src/mainboard/winent/mb6047/cmos.layout
M src/mainboard/winent/pl6064/cmos.layout
M src/mainboard/winnet/g170/cmos.layout
M src/mainboard/wyse/s50/cmos.layout
196 files changed, 190 insertions(+), 1,351 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/37/21637/1
diff --git a/src/mainboard/adi/rcc-dff/cmos.layout b/src/mainboard/adi/rcc-dff/cmos.layout
index a838b60..93c2657 100644
--- a/src/mainboard/adi/rcc-dff/cmos.layout
+++ b/src/mainboard/adi/rcc-dff/cmos.layout
@@ -48,7 +48,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -86,15 +86,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/advansus/a785e-i/cmos.layout b/src/mainboard/advansus/a785e-i/cmos.layout
index 1d957dc..3ddc409 100644
--- a/src/mainboard/advansus/a785e-i/cmos.layout
+++ b/src/mainboard/advansus/a785e-i/cmos.layout
@@ -9,7 +9,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 gart
@@ -30,10 +30,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/amd/bettong/cmos.layout b/src/mainboard/amd/bettong/cmos.layout
index 96aea1e..86d780d 100644
--- a/src/mainboard/amd/bettong/cmos.layout
+++ b/src/mainboard/amd/bettong/cmos.layout
@@ -49,7 +49,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
416 4 e 7 boot_first
420 4 e 7 boot_second
424 4 e 7 boot_third
@@ -72,10 +72,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Network
7 1 HDD
7 2 Floppy
diff --git a/src/mainboard/amd/bimini_fam10/cmos.layout b/src/mainboard/amd/bimini_fam10/cmos.layout
index 1d957dc..3ddc409 100644
--- a/src/mainboard/amd/bimini_fam10/cmos.layout
+++ b/src/mainboard/amd/bimini_fam10/cmos.layout
@@ -9,7 +9,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 gart
@@ -30,10 +30,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/amd/db-ft3b-lc/cmos.layout b/src/mainboard/amd/db-ft3b-lc/cmos.layout
index 25860f6..27ff4081 100644
--- a/src/mainboard/amd/db-ft3b-lc/cmos.layout
+++ b/src/mainboard/amd/db-ft3b-lc/cmos.layout
@@ -25,7 +25,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -44,10 +44,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 b8ea936..bd03017 100644
--- a/src/mainboard/amd/db800/cmos.layout
+++ b/src/mainboard/amd/db800/cmos.layout
@@ -5,7 +5,7 @@
388 4 h 0 reboot_counter
#392 3 r 0 unused
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -18,10 +18,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
checksums
diff --git a/src/mainboard/amd/dbm690t/cmos.layout b/src/mainboard/amd/dbm690t/cmos.layout
index c1c8f2f..532a940 100644
--- a/src/mainboard/amd/dbm690t/cmos.layout
+++ b/src/mainboard/amd/dbm690t/cmos.layout
@@ -26,7 +26,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -47,10 +47,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 0e4ad46..a04b4d5 100644
--- a/src/mainboard/amd/dinar/cmos.layout
+++ b/src/mainboard/amd/dinar/cmos.layout
@@ -25,7 +25,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -46,10 +46,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/amd/f2950/cmos.layout b/src/mainboard/amd/f2950/cmos.layout
index b8ea936..bd03017 100644
--- a/src/mainboard/amd/f2950/cmos.layout
+++ b/src/mainboard/amd/f2950/cmos.layout
@@ -5,7 +5,7 @@
388 4 h 0 reboot_counter
#392 3 r 0 unused
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -18,10 +18,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
checksums
diff --git a/src/mainboard/amd/gardenia/cmos.layout b/src/mainboard/amd/gardenia/cmos.layout
index 96aea1e..86d780d 100644
--- a/src/mainboard/amd/gardenia/cmos.layout
+++ b/src/mainboard/amd/gardenia/cmos.layout
@@ -49,7 +49,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
416 4 e 7 boot_first
420 4 e 7 boot_second
424 4 e 7 boot_third
@@ -72,10 +72,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Network
7 1 HDD
7 2 Floppy
diff --git a/src/mainboard/amd/inagua/cmos.layout b/src/mainboard/amd/inagua/cmos.layout
index 956aba3..569f814 100644
--- a/src/mainboard/amd/inagua/cmos.layout
+++ b/src/mainboard/amd/inagua/cmos.layout
@@ -25,7 +25,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -46,10 +46,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/amd/lamar/cmos.layout b/src/mainboard/amd/lamar/cmos.layout
index 481338a..6a4b5fd 100644
--- a/src/mainboard/amd/lamar/cmos.layout
+++ b/src/mainboard/amd/lamar/cmos.layout
@@ -21,7 +21,7 @@
388 4 h 0 reboot_counter
#392 3 r 0 unused
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
444 1 e 1 nmi
728 256 h 0 user_data
984 16 h 0 check_sum
@@ -37,10 +37,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 63d04dd..1c34451 100644
--- a/src/mainboard/amd/mahogany/cmos.layout
+++ b/src/mainboard/amd/mahogany/cmos.layout
@@ -26,7 +26,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -47,10 +47,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 1d957dc..3ddc409 100644
--- a/src/mainboard/amd/mahogany_fam10/cmos.layout
+++ b/src/mainboard/amd/mahogany_fam10/cmos.layout
@@ -9,7 +9,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 gart
@@ -30,10 +30,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 8aa23fe..7a1f4e4 100644
--- a/src/mainboard/amd/norwich/cmos.layout
+++ b/src/mainboard/amd/norwich/cmos.layout
@@ -5,7 +5,7 @@
388 4 h 0 reboot_counter
#392 3 r 0 unused
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 1 e 0 dcon_present
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -19,10 +19,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
checksums
diff --git a/src/mainboard/amd/olivehill/cmos.layout b/src/mainboard/amd/olivehill/cmos.layout
index 25860f6..27ff4081 100644
--- a/src/mainboard/amd/olivehill/cmos.layout
+++ b/src/mainboard/amd/olivehill/cmos.layout
@@ -25,7 +25,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -44,10 +44,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 25860f6..27ff4081 100644
--- a/src/mainboard/amd/olivehillplus/cmos.layout
+++ b/src/mainboard/amd/olivehillplus/cmos.layout
@@ -25,7 +25,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -44,10 +44,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 25860f6..27ff4081 100644
--- a/src/mainboard/amd/parmer/cmos.layout
+++ b/src/mainboard/amd/parmer/cmos.layout
@@ -25,7 +25,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -44,10 +44,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 956aba3..569f814 100644
--- a/src/mainboard/amd/persimmon/cmos.layout
+++ b/src/mainboard/amd/persimmon/cmos.layout
@@ -25,7 +25,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -46,10 +46,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 c1c8f2f..532a940 100644
--- a/src/mainboard/amd/pistachio/cmos.layout
+++ b/src/mainboard/amd/pistachio/cmos.layout
@@ -26,7 +26,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -47,10 +47,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 b8ea936..bd03017 100644
--- a/src/mainboard/amd/rumba/cmos.layout
+++ b/src/mainboard/amd/rumba/cmos.layout
@@ -5,7 +5,7 @@
388 4 h 0 reboot_counter
#392 3 r 0 unused
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -18,10 +18,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
checksums
diff --git a/src/mainboard/amd/serengeti_cheetah/cmos.layout b/src/mainboard/amd/serengeti_cheetah/cmos.layout
index c1745c5..6a4e901 100644
--- a/src/mainboard/amd/serengeti_cheetah/cmos.layout
+++ b/src/mainboard/amd/serengeti_cheetah/cmos.layout
@@ -9,7 +9,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -30,10 +30,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 1bc969e..9e6bb82 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout
@@ -28,7 +28,7 @@
403 1 e 1 interleave_memory_channels
404 2 e 8 max_mem_clock
406 1 e 2 multi_core
-412 4 e 6 debug_level
+#412 4 e 0 unused
416 5 e 10 ecc_scrub_rate
440 4 e 9 slow_cpu
444 1 e 1 nmi
@@ -52,15 +52,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 0 Emergency
-6 1 Alert
-6 2 Critical
-6 3 Error
-6 4 Warning
-6 5 Notice
-6 6 Information
-6 7 Debug
-6 8 Spew
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 956aba3..569f814 100644
--- a/src/mainboard/amd/south_station/cmos.layout
+++ b/src/mainboard/amd/south_station/cmos.layout
@@ -25,7 +25,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -46,10 +46,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 25860f6..27ff4081 100644
--- a/src/mainboard/amd/thatcher/cmos.layout
+++ b/src/mainboard/amd/thatcher/cmos.layout
@@ -25,7 +25,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -44,10 +44,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 1d957dc..3ddc409 100644
--- a/src/mainboard/amd/tilapia_fam10/cmos.layout
+++ b/src/mainboard/amd/tilapia_fam10/cmos.layout
@@ -9,7 +9,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 gart
@@ -30,10 +30,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 956aba3..569f814 100644
--- a/src/mainboard/amd/torpedo/cmos.layout
+++ b/src/mainboard/amd/torpedo/cmos.layout
@@ -25,7 +25,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -46,10 +46,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 956aba3..569f814 100644
--- a/src/mainboard/amd/union_station/cmos.layout
+++ b/src/mainboard/amd/union_station/cmos.layout
@@ -25,7 +25,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -46,10 +46,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/apple/macbook21/cmos.layout b/src/mainboard/apple/macbook21/cmos.layout
index 2d1449e..2443c8c 100644
--- a/src/mainboard/apple/macbook21/cmos.layout
+++ b/src/mainboard/apple/macbook21/cmos.layout
@@ -49,7 +49,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -92,15 +92,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/artecgroup/dbe61/cmos.layout b/src/mainboard/artecgroup/dbe61/cmos.layout
index b8ea936..bd03017 100644
--- a/src/mainboard/artecgroup/dbe61/cmos.layout
+++ b/src/mainboard/artecgroup/dbe61/cmos.layout
@@ -5,7 +5,7 @@
388 4 h 0 reboot_counter
#392 3 r 0 unused
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -18,10 +18,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
checksums
diff --git a/src/mainboard/asrock/939a785gmh/cmos.layout b/src/mainboard/asrock/939a785gmh/cmos.layout
index 63d04dd..1c34451 100644
--- a/src/mainboard/asrock/939a785gmh/cmos.layout
+++ b/src/mainboard/asrock/939a785gmh/cmos.layout
@@ -26,7 +26,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -47,10 +47,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 67510ee..c53be62 100644
--- a/src/mainboard/asrock/e350m1/cmos.layout
+++ b/src/mainboard/asrock/e350m1/cmos.layout
@@ -25,7 +25,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 2 e 3 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -49,10 +49,6 @@
3 2 Last
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/asrock/g41c-gs/cmos.layout b/src/mainboard/asrock/g41c-gs/cmos.layout
index 038e344..7696f5f 100644
--- a/src/mainboard/asrock/g41c-gs/cmos.layout
+++ b/src/mainboard/asrock/g41c-gs/cmos.layout
@@ -48,7 +48,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: southbridge
@@ -79,15 +79,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/asrock/imb-a180/cmos.layout b/src/mainboard/asrock/imb-a180/cmos.layout
index 25860f6..27ff4081 100644
--- a/src/mainboard/asrock/imb-a180/cmos.layout
+++ b/src/mainboard/asrock/imb-a180/cmos.layout
@@ -25,7 +25,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -44,10 +44,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/asus/a8n_e/cmos.layout b/src/mainboard/asus/a8n_e/cmos.layout
index bf14548..d1b3cf9 100644
--- a/src/mainboard/asus/a8n_e/cmos.layout
+++ b/src/mainboard/asus/a8n_e/cmos.layout
@@ -9,7 +9,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
- 412 4 e 6 debug_level
+# 412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
diff --git a/src/mainboard/asus/a8v-e_deluxe/cmos.layout b/src/mainboard/asus/a8v-e_deluxe/cmos.layout
index e13df93..3dadb0d 100644
--- a/src/mainboard/asus/a8v-e_deluxe/cmos.layout
+++ b/src/mainboard/asus/a8v-e_deluxe/cmos.layout
@@ -9,7 +9,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -30,10 +30,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 e13df93..3dadb0d 100644
--- a/src/mainboard/asus/a8v-e_se/cmos.layout
+++ b/src/mainboard/asus/a8v-e_se/cmos.layout
@@ -9,7 +9,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -30,10 +30,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/asus/dsbf/cmos.layout b/src/mainboard/asus/dsbf/cmos.layout
index 6f5898e..d06751f 100644
--- a/src/mainboard/asus/dsbf/cmos.layout
+++ b/src/mainboard/asus/dsbf/cmos.layout
@@ -49,7 +49,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -82,15 +82,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/asus/f2a85-m/cmos.layout b/src/mainboard/asus/f2a85-m/cmos.layout
index 25860f6..27ff4081 100644
--- a/src/mainboard/asus/f2a85-m/cmos.layout
+++ b/src/mainboard/asus/f2a85-m/cmos.layout
@@ -25,7 +25,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -44,10 +44,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 e13df93..3dadb0d 100644
--- a/src/mainboard/asus/k8v-x/cmos.layout
+++ b/src/mainboard/asus/k8v-x/cmos.layout
@@ -9,7 +9,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -30,10 +30,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/asus/kcma-d8/cmos.default b/src/mainboard/asus/kcma-d8/cmos.default
index 5fa6a8d..a1b6a8e 100644
--- a/src/mainboard/asus/kcma-d8/cmos.default
+++ b/src/mainboard/asus/kcma-d8/cmos.default
@@ -1,4 +1,3 @@
-debug_level = Spew
multi_core = Enable
slow_cpu = off
compute_unit_siblings = Enable
diff --git a/src/mainboard/asus/kcma-d8/cmos.layout b/src/mainboard/asus/kcma-d8/cmos.layout
index 4ce870f..a8c74c2 100644
--- a/src/mainboard/asus/kcma-d8/cmos.layout
+++ b/src/mainboard/asus/kcma-d8/cmos.layout
@@ -28,7 +28,7 @@
403 1 e 1 interleave_memory_channels
404 4 e 8 max_mem_clock
408 1 e 2 multi_core
-412 4 e 6 debug_level
+#412 4 e 0 unused
416 5 e 10 ecc_scrub_rate
440 4 e 9 slow_cpu
444 1 e 1 nmi
@@ -72,15 +72,6 @@
3 2 Last
4 0 Fallback
4 1 Normal
-6 0 Emergency
-6 1 Alert
-6 2 Critical
-6 3 Error
-6 4 Warning
-6 5 Notice
-6 6 Information
-6 7 Debug
-6 8 Spew
8 0 DDR3-1866
8 1 DDR3-1600
8 2 DDR3-1333
diff --git a/src/mainboard/asus/kfsn4-dre/cmos.default b/src/mainboard/asus/kfsn4-dre/cmos.default
index f257088..e7f1b2e 100644
--- a/src/mainboard/asus/kfsn4-dre/cmos.default
+++ b/src/mainboard/asus/kfsn4-dre/cmos.default
@@ -1,4 +1,3 @@
-debug_level = Spew
multi_core = Enable
slow_cpu = off
hypertransport_speed_limit = Auto
diff --git a/src/mainboard/asus/kfsn4-dre/cmos.layout b/src/mainboard/asus/kfsn4-dre/cmos.layout
index 3c0757d..dfa7df1 100644
--- a/src/mainboard/asus/kfsn4-dre/cmos.layout
+++ b/src/mainboard/asus/kfsn4-dre/cmos.layout
@@ -28,7 +28,7 @@
403 1 e 1 interleave_memory_channels
404 2 e 8 max_mem_clock
406 1 e 2 multi_core
-412 4 e 6 debug_level
+#412 4 e 0 unused
416 5 e 10 ecc_scrub_rate
440 4 e 9 slow_cpu
444 1 e 1 nmi
@@ -53,15 +53,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 0 Emergency
-6 1 Alert
-6 2 Critical
-6 3 Error
-6 4 Warning
-6 5 Notice
-6 6 Information
-6 7 Debug
-6 8 Spew
8 0 DDR2-800
8 1 DDR2-667
8 2 DDR2-533
diff --git a/src/mainboard/asus/kfsn4-dre_k8/cmos.default b/src/mainboard/asus/kfsn4-dre_k8/cmos.default
index d3a8081..72a5d4c 100644
--- a/src/mainboard/asus/kfsn4-dre_k8/cmos.default
+++ b/src/mainboard/asus/kfsn4-dre_k8/cmos.default
@@ -1,4 +1,3 @@
-debug_level = Spew
multi_core = Enable
slow_cpu = off
hypertransport_speed_limit = Auto
diff --git a/src/mainboard/asus/kfsn4-dre_k8/cmos.layout b/src/mainboard/asus/kfsn4-dre_k8/cmos.layout
index 86b95a9..bee218a 100644
--- a/src/mainboard/asus/kfsn4-dre_k8/cmos.layout
+++ b/src/mainboard/asus/kfsn4-dre_k8/cmos.layout
@@ -28,7 +28,7 @@
399 1 e 1 interleave_memory_channels
408 2 e 8 max_mem_clock
410 1 e 2 multi_core
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -51,15 +51,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 0 Emergency
-6 1 Alert
-6 2 Critical
-6 3 Error
-6 4 Warning
-6 5 Notice
-6 6 Information
-6 7 Debug
-6 8 Spew
8 0 DDR2-800
8 1 DDR2-667
8 2 DDR2-533
diff --git a/src/mainboard/asus/kgpe-d16/cmos.default b/src/mainboard/asus/kgpe-d16/cmos.default
index 3e7ed32..ac5fac5 100644
--- a/src/mainboard/asus/kgpe-d16/cmos.default
+++ b/src/mainboard/asus/kgpe-d16/cmos.default
@@ -1,4 +1,3 @@
-debug_level = Spew
multi_core = Enable
slow_cpu = off
compute_unit_siblings = Enable
diff --git a/src/mainboard/asus/kgpe-d16/cmos.layout b/src/mainboard/asus/kgpe-d16/cmos.layout
index 1c8d466..378f985 100644
--- a/src/mainboard/asus/kgpe-d16/cmos.layout
+++ b/src/mainboard/asus/kgpe-d16/cmos.layout
@@ -28,7 +28,7 @@
403 1 e 1 interleave_memory_channels
404 4 e 8 max_mem_clock
408 1 e 2 multi_core
-412 4 e 6 debug_level
+#412 4 e 0 unused
416 5 e 10 ecc_scrub_rate
440 4 e 9 slow_cpu
444 1 e 1 nmi
@@ -73,15 +73,6 @@
3 2 Last
4 0 Fallback
4 1 Normal
-6 0 Emergency
-6 1 Alert
-6 2 Critical
-6 3 Error
-6 4 Warning
-6 5 Notice
-6 6 Information
-6 7 Debug
-6 8 Spew
8 0 DDR3-1866
8 1 DDR3-1600
8 2 DDR3-1333
diff --git a/src/mainboard/asus/m2n-e/cmos.layout b/src/mainboard/asus/m2n-e/cmos.layout
index 50b9f0c..5928345 100644
--- a/src/mainboard/asus/m2n-e/cmos.layout
+++ b/src/mainboard/asus/m2n-e/cmos.layout
@@ -25,7 +25,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -46,10 +46,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 a1be31e..21e1d18 100644
--- a/src/mainboard/asus/m2v-mx_se/cmos.layout
+++ b/src/mainboard/asus/m2v-mx_se/cmos.layout
@@ -9,7 +9,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -31,10 +31,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 e13df93..3dadb0d 100644
--- a/src/mainboard/asus/m2v/cmos.layout
+++ b/src/mainboard/asus/m2v/cmos.layout
@@ -9,7 +9,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -30,10 +30,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 1d957dc..3ddc409 100644
--- a/src/mainboard/asus/m4a78-em/cmos.layout
+++ b/src/mainboard/asus/m4a78-em/cmos.layout
@@ -9,7 +9,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 gart
@@ -30,10 +30,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 1d957dc..3ddc409 100644
--- a/src/mainboard/asus/m4a785-m/cmos.layout
+++ b/src/mainboard/asus/m4a785-m/cmos.layout
@@ -9,7 +9,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 gart
@@ -30,10 +30,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/asus/m4a785t-m/cmos.layout b/src/mainboard/asus/m4a785t-m/cmos.layout
index 1d957dc..3ddc409 100644
--- a/src/mainboard/asus/m4a785t-m/cmos.layout
+++ b/src/mainboard/asus/m4a785t-m/cmos.layout
@@ -9,7 +9,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 gart
@@ -30,10 +30,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 1d957dc..3ddc409 100644
--- a/src/mainboard/asus/m5a88-v/cmos.layout
+++ b/src/mainboard/asus/m5a88-v/cmos.layout
@@ -9,7 +9,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 gart
@@ -30,10 +30,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 b8ea936..bd03017 100644
--- a/src/mainboard/asus/mew-vm/cmos.layout
+++ b/src/mainboard/asus/mew-vm/cmos.layout
@@ -5,7 +5,7 @@
388 4 h 0 reboot_counter
#392 3 r 0 unused
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -18,10 +18,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
checksums
diff --git a/src/mainboard/asus/p5gc-mx/cmos.layout b/src/mainboard/asus/p5gc-mx/cmos.layout
index 77a318d..6f7d780 100644
--- a/src/mainboard/asus/p5gc-mx/cmos.layout
+++ b/src/mainboard/asus/p5gc-mx/cmos.layout
@@ -27,7 +27,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -66,15 +66,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
11 0 1M
11 1 4M
11 2 8M
diff --git a/src/mainboard/avalue/eax-785e/cmos.layout b/src/mainboard/avalue/eax-785e/cmos.layout
index 1d957dc..3ddc409 100644
--- a/src/mainboard/avalue/eax-785e/cmos.layout
+++ b/src/mainboard/avalue/eax-785e/cmos.layout
@@ -9,7 +9,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 gart
@@ -30,10 +30,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/bachmann/ot200/cmos.layout b/src/mainboard/bachmann/ot200/cmos.layout
index fde9b5c..f3092c0 100644
--- a/src/mainboard/bachmann/ot200/cmos.layout
+++ b/src/mainboard/bachmann/ot200/cmos.layout
@@ -24,8 +24,8 @@
# -----------------------------------------------------------------
# coreboot config options: console
-##392 3 r 0 unused
-395 4 e 2 debug_level
+#392 3 r 0 unused
+#395 4 e 0 unused
# -----------------------------------------------------------------
# coreboot config options: check sums
@@ -34,15 +34,6 @@
enumerations
#ID value text
-2 0 Emergency
-2 1 Alert
-2 2 Critical
-2 3 Error
-2 4 Warning
-2 5 Notice
-2 6 Info
-2 7 Debug
-2 8 Spew
4 0 Fallback
4 1 Normal
checksums
diff --git a/src/mainboard/bap/ode_e20XX/cmos.layout b/src/mainboard/bap/ode_e20XX/cmos.layout
index 25860f6..27ff4081 100644
--- a/src/mainboard/bap/ode_e20XX/cmos.layout
+++ b/src/mainboard/bap/ode_e20XX/cmos.layout
@@ -25,7 +25,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -44,10 +44,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/bap/ode_e21XX/cmos.layout b/src/mainboard/bap/ode_e21XX/cmos.layout
index 25860f6..27ff4081 100644
--- a/src/mainboard/bap/ode_e21XX/cmos.layout
+++ b/src/mainboard/bap/ode_e21XX/cmos.layout
@@ -25,7 +25,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -44,10 +44,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 b8ea936..bd03017 100644
--- a/src/mainboard/bcom/winnetp680/cmos.layout
+++ b/src/mainboard/bcom/winnetp680/cmos.layout
@@ -5,7 +5,7 @@
388 4 h 0 reboot_counter
#392 3 r 0 unused
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -18,10 +18,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
checksums
diff --git a/src/mainboard/biostar/am1ml/cmos.layout b/src/mainboard/biostar/am1ml/cmos.layout
index 68cf089..ebe324f 100644
--- a/src/mainboard/biostar/am1ml/cmos.layout
+++ b/src/mainboard/biostar/am1ml/cmos.layout
@@ -49,7 +49,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
416 4 e 7 boot_first
420 4 e 7 boot_second
424 4 e 7 boot_third
@@ -72,10 +72,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Network
7 1 HDD
7 2 Floppy
diff --git a/src/mainboard/broadcom/blast/cmos.layout b/src/mainboard/broadcom/blast/cmos.layout
index 8b35950..874c993 100644
--- a/src/mainboard/broadcom/blast/cmos.layout
+++ b/src/mainboard/broadcom/blast/cmos.layout
@@ -9,7 +9,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -30,10 +30,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/digitallogic/msm800sev/cmos.layout b/src/mainboard/digitallogic/msm800sev/cmos.layout
index b8ea936..bd03017 100644
--- a/src/mainboard/digitallogic/msm800sev/cmos.layout
+++ b/src/mainboard/digitallogic/msm800sev/cmos.layout
@@ -5,7 +5,7 @@
388 4 h 0 reboot_counter
#392 3 r 0 unused
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -18,10 +18,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
checksums
diff --git a/src/mainboard/elmex/pcm205400/cmos.layout b/src/mainboard/elmex/pcm205400/cmos.layout
index 9859577..835ca89 100644
--- a/src/mainboard/elmex/pcm205400/cmos.layout
+++ b/src/mainboard/elmex/pcm205400/cmos.layout
@@ -25,7 +25,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -46,10 +46,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/emulation/qemu-i440fx/cmos.default b/src/mainboard/emulation/qemu-i440fx/cmos.default
index 82e6fab..82d7755 100644
--- a/src/mainboard/emulation/qemu-i440fx/cmos.default
+++ b/src/mainboard/emulation/qemu-i440fx/cmos.default
@@ -1,4 +1,3 @@
boot_option = Fallback
power_on_after_fail = Enable
-debug_level = Spew
ECC_memory = Disable
diff --git a/src/mainboard/emulation/qemu-i440fx/cmos.layout b/src/mainboard/emulation/qemu-i440fx/cmos.layout
index b8ea936..bd03017 100644
--- a/src/mainboard/emulation/qemu-i440fx/cmos.layout
+++ b/src/mainboard/emulation/qemu-i440fx/cmos.layout
@@ -5,7 +5,7 @@
388 4 h 0 reboot_counter
#392 3 r 0 unused
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -18,10 +18,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
checksums
diff --git a/src/mainboard/esd/atom15/cmos.layout b/src/mainboard/esd/atom15/cmos.layout
index e686727..d9a35a8 100644
--- a/src/mainboard/esd/atom15/cmos.layout
+++ b/src/mainboard/esd/atom15/cmos.layout
@@ -48,7 +48,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -87,15 +87,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/foxconn/g41s-k/cmos.layout b/src/mainboard/foxconn/g41s-k/cmos.layout
index 038e344..7696f5f 100644
--- a/src/mainboard/foxconn/g41s-k/cmos.layout
+++ b/src/mainboard/foxconn/g41s-k/cmos.layout
@@ -48,7 +48,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: southbridge
@@ -79,15 +79,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/getac/p470/cmos.layout b/src/mainboard/getac/p470/cmos.layout
index 71aa19e..1d3dfa6 100644
--- a/src/mainboard/getac/p470/cmos.layout
+++ b/src/mainboard/getac/p470/cmos.layout
@@ -49,7 +49,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -92,15 +92,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/cmos.layout b/src/mainboard/gigabyte/ga-945gcm-s2l/cmos.layout
index 7ff7d92..4f0eda7 100644
--- a/src/mainboard/gigabyte/ga-945gcm-s2l/cmos.layout
+++ b/src/mainboard/gigabyte/ga-945gcm-s2l/cmos.layout
@@ -48,7 +48,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -88,15 +88,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout b/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout
index 72569b2..91900e1 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout
@@ -49,7 +49,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
400 8 h 0 volume
@@ -89,15 +89,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout b/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout
index 72569b2..91900e1 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout
+++ b/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout
@@ -49,7 +49,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
400 8 h 0 volume
@@ -89,15 +89,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/gigabyte/ga-g41m-es2l/cmos.layout b/src/mainboard/gigabyte/ga-g41m-es2l/cmos.layout
index f5f309c..4d7a4db 100644
--- a/src/mainboard/gigabyte/ga-g41m-es2l/cmos.layout
+++ b/src/mainboard/gigabyte/ga-g41m-es2l/cmos.layout
@@ -49,7 +49,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: southbridge
@@ -80,15 +80,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout b/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout
index f426810..ac07b2b 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout
+++ b/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout
@@ -26,7 +26,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -47,10 +47,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
8 0 200Mhz
8 1 166Mhz
8 2 133Mhz
diff --git a/src/mainboard/gigabyte/m57sli/cmos.default b/src/mainboard/gigabyte/m57sli/cmos.default
index 62068cf..9528e9b 100644
--- a/src/mainboard/gigabyte/m57sli/cmos.default
+++ b/src/mainboard/gigabyte/m57sli/cmos.default
@@ -1,4 +1,3 @@
-debug_level = Spew
multi_core = Enable
slow_cpu = off
max_mem_clock = 200Mhz
diff --git a/src/mainboard/gigabyte/m57sli/cmos.layout b/src/mainboard/gigabyte/m57sli/cmos.layout
index f426810..ac07b2b 100644
--- a/src/mainboard/gigabyte/m57sli/cmos.layout
+++ b/src/mainboard/gigabyte/m57sli/cmos.layout
@@ -26,7 +26,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -47,10 +47,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 1d957dc..3ddc409 100644
--- a/src/mainboard/gigabyte/ma785gm/cmos.layout
+++ b/src/mainboard/gigabyte/ma785gm/cmos.layout
@@ -9,7 +9,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 gart
@@ -30,10 +30,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 1d957dc..3ddc409 100644
--- a/src/mainboard/gigabyte/ma785gmt/cmos.layout
+++ b/src/mainboard/gigabyte/ma785gmt/cmos.layout
@@ -9,7 +9,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 gart
@@ -30,10 +30,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 1d957dc..3ddc409 100644
--- a/src/mainboard/gigabyte/ma78gm/cmos.layout
+++ b/src/mainboard/gigabyte/ma78gm/cmos.layout
@@ -9,7 +9,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 gart
@@ -30,10 +30,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 e504168..147c85a 100644
--- a/src/mainboard/gizmosphere/gizmo/cmos.layout
+++ b/src/mainboard/gizmosphere/gizmo/cmos.layout
@@ -26,7 +26,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -47,10 +47,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 25860f6..27ff4081 100644
--- a/src/mainboard/gizmosphere/gizmo2/cmos.layout
+++ b/src/mainboard/gizmosphere/gizmo2/cmos.layout
@@ -25,7 +25,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -44,10 +44,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/google/auron/cmos.layout b/src/mainboard/google/auron/cmos.layout
index 64ae59b..4273218 100644
--- a/src/mainboard/google/auron/cmos.layout
+++ b/src/mainboard/google/auron/cmos.layout
@@ -48,7 +48,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -84,15 +84,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/google/beltino/cmos.layout b/src/mainboard/google/beltino/cmos.layout
index 64ae59b..4273218 100644
--- a/src/mainboard/google/beltino/cmos.layout
+++ b/src/mainboard/google/beltino/cmos.layout
@@ -48,7 +48,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -84,15 +84,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/google/butterfly/cmos.default b/src/mainboard/google/butterfly/cmos.default
index d6789eb..5269675 100644
--- a/src/mainboard/google/butterfly/cmos.default
+++ b/src/mainboard/google/butterfly/cmos.default
@@ -1,5 +1,4 @@
boot_option = Fallback
-debug_level = Spew
nmi = Enable
power_on_after_fail = Enable
sata_mode = AHCI
diff --git a/src/mainboard/google/butterfly/cmos.layout b/src/mainboard/google/butterfly/cmos.layout
index 29fe11f..e459bc5 100644
--- a/src/mainboard/google/butterfly/cmos.layout
+++ b/src/mainboard/google/butterfly/cmos.layout
@@ -49,7 +49,7 @@
# coreboot config options: console
# No serial port on this motherboard
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -92,15 +92,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/google/chell/cmos.layout b/src/mainboard/google/chell/cmos.layout
index e22c6ab..3c938bd 100644
--- a/src/mainboard/google/chell/cmos.layout
+++ b/src/mainboard/google/chell/cmos.layout
@@ -71,7 +71,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -107,15 +107,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/google/cyan/cmos.layout b/src/mainboard/google/cyan/cmos.layout
index 0a1cb48..264a930 100644
--- a/src/mainboard/google/cyan/cmos.layout
+++ b/src/mainboard/google/cyan/cmos.layout
@@ -71,7 +71,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -107,15 +107,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/google/glados/cmos.layout b/src/mainboard/google/glados/cmos.layout
index e22c6ab..3c938bd 100644
--- a/src/mainboard/google/glados/cmos.layout
+++ b/src/mainboard/google/glados/cmos.layout
@@ -71,7 +71,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -107,15 +107,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/google/jecht/cmos.layout b/src/mainboard/google/jecht/cmos.layout
index e5866a9..d3bbc7b 100644
--- a/src/mainboard/google/jecht/cmos.layout
+++ b/src/mainboard/google/jecht/cmos.layout
@@ -70,7 +70,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -106,15 +106,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/google/kahlee/cmos.layout b/src/mainboard/google/kahlee/cmos.layout
index b9b67dd..eeb8933 100644
--- a/src/mainboard/google/kahlee/cmos.layout
+++ b/src/mainboard/google/kahlee/cmos.layout
@@ -49,7 +49,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
416 4 e 7 boot_first
420 4 e 7 boot_second
424 4 e 7 boot_third
@@ -74,10 +74,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Network
7 1 HDD
7 2 Floppy
diff --git a/src/mainboard/google/lars/cmos.layout b/src/mainboard/google/lars/cmos.layout
index e01c964..fa45786 100644
--- a/src/mainboard/google/lars/cmos.layout
+++ b/src/mainboard/google/lars/cmos.layout
@@ -71,7 +71,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -107,15 +107,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/google/link/cmos.layout b/src/mainboard/google/link/cmos.layout
index d101585..7c4f38d 100644
--- a/src/mainboard/google/link/cmos.layout
+++ b/src/mainboard/google/link/cmos.layout
@@ -48,7 +48,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -89,15 +89,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/google/parrot/cmos.layout b/src/mainboard/google/parrot/cmos.layout
index d101585..7c4f38d 100644
--- a/src/mainboard/google/parrot/cmos.layout
+++ b/src/mainboard/google/parrot/cmos.layout
@@ -48,7 +48,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -89,15 +89,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/google/rambi/cmos.layout b/src/mainboard/google/rambi/cmos.layout
index 64ae59b..4273218 100644
--- a/src/mainboard/google/rambi/cmos.layout
+++ b/src/mainboard/google/rambi/cmos.layout
@@ -48,7 +48,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -84,15 +84,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/google/slippy/cmos.layout b/src/mainboard/google/slippy/cmos.layout
index 64ae59b..4273218 100644
--- a/src/mainboard/google/slippy/cmos.layout
+++ b/src/mainboard/google/slippy/cmos.layout
@@ -48,7 +48,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -84,15 +84,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/google/stout/cmos.default b/src/mainboard/google/stout/cmos.default
index d6789eb..5269675 100644
--- a/src/mainboard/google/stout/cmos.default
+++ b/src/mainboard/google/stout/cmos.default
@@ -1,5 +1,4 @@
boot_option = Fallback
-debug_level = Spew
nmi = Enable
power_on_after_fail = Enable
sata_mode = AHCI
diff --git a/src/mainboard/google/stout/cmos.layout b/src/mainboard/google/stout/cmos.layout
index d101585..7c4f38d 100644
--- a/src/mainboard/google/stout/cmos.layout
+++ b/src/mainboard/google/stout/cmos.layout
@@ -48,7 +48,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -89,15 +89,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/hp/abm/cmos.layout b/src/mainboard/hp/abm/cmos.layout
index 25860f6..27ff4081 100644
--- a/src/mainboard/hp/abm/cmos.layout
+++ b/src/mainboard/hp/abm/cmos.layout
@@ -25,7 +25,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -44,10 +44,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 8b35950..874c993 100644
--- a/src/mainboard/hp/dl145_g1/cmos.layout
+++ b/src/mainboard/hp/dl145_g1/cmos.layout
@@ -9,7 +9,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -30,10 +30,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 c1745c5..6a4e901 100644
--- a/src/mainboard/hp/dl145_g3/cmos.layout
+++ b/src/mainboard/hp/dl145_g3/cmos.layout
@@ -9,7 +9,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -30,10 +30,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 40d93aa..7303351 100644
--- a/src/mainboard/hp/dl165_g6_fam10/cmos.layout
+++ b/src/mainboard/hp/dl165_g6_fam10/cmos.layout
@@ -28,7 +28,7 @@
403 1 e 1 interleave_memory_channels
404 2 e 8 max_mem_clock
406 1 e 2 multi_core
-412 4 e 6 debug_level
+#412 4 e 0 unused
416 5 e 10 ecc_scrub_rate
440 4 e 9 slow_cpu
444 1 e 1 nmi
@@ -51,15 +51,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 0 Emergency
-6 1 Alert
-6 2 Critical
-6 3 Error
-6 4 Warning
-6 5 Notice
-6 6 Information
-6 7 Debug
-6 8 Spew
8 0 DDR2-800
8 1 DDR2-667
8 2 DDR2-533
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/cmos.default b/src/mainboard/hp/pavilion_m6_1035dx/cmos.default
index 5031376..f5272cb 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/cmos.default
+++ b/src/mainboard/hp/pavilion_m6_1035dx/cmos.default
@@ -1,4 +1,3 @@
boot_option = Fallback
-debug_level = Spew
nmi = Disable
power_on_after_fail = Disable
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/cmos.layout b/src/mainboard/hp/pavilion_m6_1035dx/cmos.layout
index 231572a..e243d95 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/cmos.layout
+++ b/src/mainboard/hp/pavilion_m6_1035dx/cmos.layout
@@ -11,7 +11,7 @@
400 1 e 1 power_on_after_fail
# The only option that is actually used
-412 4 e 6 debug_level
+#412 4 e 0 unused
# southbridge/amd/agesa/hudson should use this but it doesn't
444 1 e 1 nmi
@@ -28,15 +28,6 @@
1 1 Enable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
checksums
diff --git a/src/mainboard/ibase/mb899/cmos.layout b/src/mainboard/ibase/mb899/cmos.layout
index a78e9cc..1640d4c 100644
--- a/src/mainboard/ibase/mb899/cmos.layout
+++ b/src/mainboard/ibase/mb899/cmos.layout
@@ -48,7 +48,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -102,15 +102,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/iei/kino-780am2-fam10/cmos.layout b/src/mainboard/iei/kino-780am2-fam10/cmos.layout
index 1d957dc..3ddc409 100644
--- a/src/mainboard/iei/kino-780am2-fam10/cmos.layout
+++ b/src/mainboard/iei/kino-780am2-fam10/cmos.layout
@@ -9,7 +9,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 gart
@@ -30,10 +30,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/intel/baskingridge/cmos.layout b/src/mainboard/intel/baskingridge/cmos.layout
index 93a32fa..40631b7 100644
--- a/src/mainboard/intel/baskingridge/cmos.layout
+++ b/src/mainboard/intel/baskingridge/cmos.layout
@@ -48,7 +48,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -80,15 +80,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/intel/bayleybay_fsp/cmos.layout b/src/mainboard/intel/bayleybay_fsp/cmos.layout
index c6276a8..4fb50ca 100644
--- a/src/mainboard/intel/bayleybay_fsp/cmos.layout
+++ b/src/mainboard/intel/bayleybay_fsp/cmos.layout
@@ -48,7 +48,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -79,15 +79,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/intel/camelbackmountain_fsp/cmos.layout b/src/mainboard/intel/camelbackmountain_fsp/cmos.layout
index cf1c696..39c763a 100644
--- a/src/mainboard/intel/camelbackmountain_fsp/cmos.layout
+++ b/src/mainboard/intel/camelbackmountain_fsp/cmos.layout
@@ -70,7 +70,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -101,15 +101,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/intel/cougar_canyon2/cmos.layout b/src/mainboard/intel/cougar_canyon2/cmos.layout
index 0dbc95c..6d07c46 100644
--- a/src/mainboard/intel/cougar_canyon2/cmos.layout
+++ b/src/mainboard/intel/cougar_canyon2/cmos.layout
@@ -48,7 +48,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -85,15 +85,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/intel/d510mo/cmos.layout b/src/mainboard/intel/d510mo/cmos.layout
index 898fa2a..177b712 100644
--- a/src/mainboard/intel/d510mo/cmos.layout
+++ b/src/mainboard/intel/d510mo/cmos.layout
@@ -31,7 +31,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -64,15 +64,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/intel/d945gclf/cmos.layout b/src/mainboard/intel/d945gclf/cmos.layout
index 7ff7d92..4f0eda7 100644
--- a/src/mainboard/intel/d945gclf/cmos.layout
+++ b/src/mainboard/intel/d945gclf/cmos.layout
@@ -48,7 +48,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -88,15 +88,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/intel/eagleheights/cmos.layout b/src/mainboard/intel/eagleheights/cmos.layout
index eace7e7..11efa38 100644
--- a/src/mainboard/intel/eagleheights/cmos.layout
+++ b/src/mainboard/intel/eagleheights/cmos.layout
@@ -49,7 +49,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -80,15 +80,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
# -----------------------------------------------------------------
checksums
diff --git a/src/mainboard/intel/emeraldlake2/cmos.layout b/src/mainboard/intel/emeraldlake2/cmos.layout
index d6aed7e..5887d85 100644
--- a/src/mainboard/intel/emeraldlake2/cmos.layout
+++ b/src/mainboard/intel/emeraldlake2/cmos.layout
@@ -48,7 +48,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -89,15 +89,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/intel/kblrvp/cmos.layout b/src/mainboard/intel/kblrvp/cmos.layout
index feda382..dbb2392 100644
--- a/src/mainboard/intel/kblrvp/cmos.layout
+++ b/src/mainboard/intel/kblrvp/cmos.layout
@@ -71,7 +71,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -107,15 +107,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/intel/kunimitsu/cmos.layout b/src/mainboard/intel/kunimitsu/cmos.layout
index e01c964..fa45786 100644
--- a/src/mainboard/intel/kunimitsu/cmos.layout
+++ b/src/mainboard/intel/kunimitsu/cmos.layout
@@ -71,7 +71,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -107,15 +107,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/intel/littleplains/cmos.layout b/src/mainboard/intel/littleplains/cmos.layout
index a838b60..93c2657 100644
--- a/src/mainboard/intel/littleplains/cmos.layout
+++ b/src/mainboard/intel/littleplains/cmos.layout
@@ -48,7 +48,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -86,15 +86,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/intel/minnowmax/cmos.layout b/src/mainboard/intel/minnowmax/cmos.layout
index e686727..d9a35a8 100644
--- a/src/mainboard/intel/minnowmax/cmos.layout
+++ b/src/mainboard/intel/minnowmax/cmos.layout
@@ -48,7 +48,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -87,15 +87,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/intel/mohonpeak/cmos.layout b/src/mainboard/intel/mohonpeak/cmos.layout
index a838b60..93c2657 100644
--- a/src/mainboard/intel/mohonpeak/cmos.layout
+++ b/src/mainboard/intel/mohonpeak/cmos.layout
@@ -48,7 +48,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -86,15 +86,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/intel/stargo2/cmos.layout b/src/mainboard/intel/stargo2/cmos.layout
index 442f34e..18bbdbc 100644
--- a/src/mainboard/intel/stargo2/cmos.layout
+++ b/src/mainboard/intel/stargo2/cmos.layout
@@ -48,7 +48,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -84,15 +84,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/intel/strago/cmos.layout b/src/mainboard/intel/strago/cmos.layout
index 0a1cb48..264a930 100644
--- a/src/mainboard/intel/strago/cmos.layout
+++ b/src/mainboard/intel/strago/cmos.layout
@@ -71,7 +71,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -107,15 +107,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/intel/wtm2/cmos.layout b/src/mainboard/intel/wtm2/cmos.layout
index 64ae59b..4273218 100644
--- a/src/mainboard/intel/wtm2/cmos.layout
+++ b/src/mainboard/intel/wtm2/cmos.layout
@@ -48,7 +48,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -84,15 +84,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/iwave/iWRainbowG6/cmos.layout b/src/mainboard/iwave/iWRainbowG6/cmos.layout
index 1081a15..22fb2de 100644
--- a/src/mainboard/iwave/iWRainbowG6/cmos.layout
+++ b/src/mainboard/iwave/iWRainbowG6/cmos.layout
@@ -49,7 +49,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -93,15 +93,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/iwill/dk8_htx/cmos.layout b/src/mainboard/iwill/dk8_htx/cmos.layout
index c1745c5..6a4e901 100644
--- a/src/mainboard/iwill/dk8_htx/cmos.layout
+++ b/src/mainboard/iwill/dk8_htx/cmos.layout
@@ -9,7 +9,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -30,10 +30,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/jetway/j7f2/cmos.layout b/src/mainboard/jetway/j7f2/cmos.layout
index b8ea936..bd03017 100644
--- a/src/mainboard/jetway/j7f2/cmos.layout
+++ b/src/mainboard/jetway/j7f2/cmos.layout
@@ -5,7 +5,7 @@
388 4 h 0 reboot_counter
#392 3 r 0 unused
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -18,10 +18,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
checksums
diff --git a/src/mainboard/jetway/nf81-t56n-lf/cmos.layout b/src/mainboard/jetway/nf81-t56n-lf/cmos.layout
index 956aba3..569f814 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/cmos.layout
+++ b/src/mainboard/jetway/nf81-t56n-lf/cmos.layout
@@ -25,7 +25,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -46,10 +46,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 1d957dc..3ddc409 100644
--- a/src/mainboard/jetway/pa78vm5/cmos.layout
+++ b/src/mainboard/jetway/pa78vm5/cmos.layout
@@ -9,7 +9,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 gart
@@ -30,10 +30,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/kontron/986lcd-m/cmos.layout b/src/mainboard/kontron/986lcd-m/cmos.layout
index d917c63..92d501a 100644
--- a/src/mainboard/kontron/986lcd-m/cmos.layout
+++ b/src/mainboard/kontron/986lcd-m/cmos.layout
@@ -48,7 +48,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -105,15 +105,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/kontron/kt690/cmos.layout b/src/mainboard/kontron/kt690/cmos.layout
index c1c8f2f..532a940 100644
--- a/src/mainboard/kontron/kt690/cmos.layout
+++ b/src/mainboard/kontron/kt690/cmos.layout
@@ -26,7 +26,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -47,10 +47,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/kontron/ktqm77/cmos.layout b/src/mainboard/kontron/ktqm77/cmos.layout
index fde236a..aa2d082 100644
--- a/src/mainboard/kontron/ktqm77/cmos.layout
+++ b/src/mainboard/kontron/ktqm77/cmos.layout
@@ -48,7 +48,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -106,15 +106,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/lanner/em8510/cmos.layout b/src/mainboard/lanner/em8510/cmos.layout
index b8ea936..bd03017 100644
--- a/src/mainboard/lanner/em8510/cmos.layout
+++ b/src/mainboard/lanner/em8510/cmos.layout
@@ -5,7 +5,7 @@
388 4 h 0 reboot_counter
#392 3 r 0 unused
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -18,10 +18,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
checksums
diff --git a/src/mainboard/lenovo/g505s/cmos.layout b/src/mainboard/lenovo/g505s/cmos.layout
index 5e489a3..abaf76a 100644
--- a/src/mainboard/lenovo/g505s/cmos.layout
+++ b/src/mainboard/lenovo/g505s/cmos.layout
@@ -26,7 +26,7 @@
399 1 e 2 multi_core
#400 8 r 8 reserved for century byte
408 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -45,10 +45,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/lenovo/l520/cmos.layout b/src/mainboard/lenovo/l520/cmos.layout
index d1bc017..1b47e0d 100644
--- a/src/mainboard/lenovo/l520/cmos.layout
+++ b/src/mainboard/lenovo/l520/cmos.layout
@@ -49,7 +49,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -98,15 +98,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/lenovo/t400/cmos.layout b/src/mainboard/lenovo/t400/cmos.layout
index e7b593e..82896ab 100644
--- a/src/mainboard/lenovo/t400/cmos.layout
+++ b/src/mainboard/lenovo/t400/cmos.layout
@@ -50,7 +50,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -99,15 +99,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/lenovo/t420/cmos.layout b/src/mainboard/lenovo/t420/cmos.layout
index 2cfe87a..a71eee4 100644
--- a/src/mainboard/lenovo/t420/cmos.layout
+++ b/src/mainboard/lenovo/t420/cmos.layout
@@ -49,7 +49,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -100,15 +100,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/lenovo/t420s/cmos.layout b/src/mainboard/lenovo/t420s/cmos.layout
index 60b0051..8f5d655 100644
--- a/src/mainboard/lenovo/t420s/cmos.layout
+++ b/src/mainboard/lenovo/t420s/cmos.layout
@@ -49,7 +49,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -100,15 +100,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/lenovo/t430/cmos.layout b/src/mainboard/lenovo/t430/cmos.layout
index a045fef..4097433 100644
--- a/src/mainboard/lenovo/t430/cmos.layout
+++ b/src/mainboard/lenovo/t430/cmos.layout
@@ -48,8 +48,8 @@
# -----------------------------------------------------------------
# coreboot config options: console
-##392 3 r 0 unused
-395 4 e 6 debug_level
+#392 3 r 0 unused
+#395 4 e 0 unused
#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -99,15 +99,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/lenovo/t430s/cmos.layout b/src/mainboard/lenovo/t430s/cmos.layout
index 5e92d8f..0778555 100644
--- a/src/mainboard/lenovo/t430s/cmos.layout
+++ b/src/mainboard/lenovo/t430s/cmos.layout
@@ -49,7 +49,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -98,15 +98,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/lenovo/t520/cmos.layout b/src/mainboard/lenovo/t520/cmos.layout
index 06a4a74..2f54afc 100644
--- a/src/mainboard/lenovo/t520/cmos.layout
+++ b/src/mainboard/lenovo/t520/cmos.layout
@@ -49,7 +49,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -99,15 +99,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/lenovo/t530/cmos.layout b/src/mainboard/lenovo/t530/cmos.layout
index 8304d52..9234a0c 100644
--- a/src/mainboard/lenovo/t530/cmos.layout
+++ b/src/mainboard/lenovo/t530/cmos.layout
@@ -49,7 +49,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -100,15 +100,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/lenovo/t60/cmos.layout b/src/mainboard/lenovo/t60/cmos.layout
index 8fb4ecf..18f6487 100644
--- a/src/mainboard/lenovo/t60/cmos.layout
+++ b/src/mainboard/lenovo/t60/cmos.layout
@@ -49,7 +49,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -107,15 +107,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/cmos.layout b/src/mainboard/lenovo/x1_carbon_gen1/cmos.layout
index 4bc5220..2098e1f 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/cmos.layout
+++ b/src/mainboard/lenovo/x1_carbon_gen1/cmos.layout
@@ -49,7 +49,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -99,15 +99,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/lenovo/x200/cmos.layout b/src/mainboard/lenovo/x200/cmos.layout
index 8faecef..b81b066 100644
--- a/src/mainboard/lenovo/x200/cmos.layout
+++ b/src/mainboard/lenovo/x200/cmos.layout
@@ -50,7 +50,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -97,15 +97,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/lenovo/x201/cmos.layout b/src/mainboard/lenovo/x201/cmos.layout
index b07ffb9..b96ce1d 100644
--- a/src/mainboard/lenovo/x201/cmos.layout
+++ b/src/mainboard/lenovo/x201/cmos.layout
@@ -49,7 +49,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -93,15 +93,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/lenovo/x220/cmos.layout b/src/mainboard/lenovo/x220/cmos.layout
index 38784c0..fd04554 100644
--- a/src/mainboard/lenovo/x220/cmos.layout
+++ b/src/mainboard/lenovo/x220/cmos.layout
@@ -49,7 +49,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -99,15 +99,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/lenovo/x230/cmos.layout b/src/mainboard/lenovo/x230/cmos.layout
index a2e8fd9..eee219a 100644
--- a/src/mainboard/lenovo/x230/cmos.layout
+++ b/src/mainboard/lenovo/x230/cmos.layout
@@ -49,7 +49,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -99,15 +99,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/lenovo/x60/cmos.layout b/src/mainboard/lenovo/x60/cmos.layout
index 2f8e101..47b8334 100644
--- a/src/mainboard/lenovo/x60/cmos.layout
+++ b/src/mainboard/lenovo/x60/cmos.layout
@@ -49,7 +49,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
#400 8 r 0 reserved for century byte
@@ -106,15 +106,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/lippert/frontrunner-af/cmos.layout b/src/mainboard/lippert/frontrunner-af/cmos.layout
index 956aba3..569f814 100644
--- a/src/mainboard/lippert/frontrunner-af/cmos.layout
+++ b/src/mainboard/lippert/frontrunner-af/cmos.layout
@@ -25,7 +25,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -46,10 +46,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 b8ea936..bd03017 100644
--- a/src/mainboard/lippert/frontrunner/cmos.layout
+++ b/src/mainboard/lippert/frontrunner/cmos.layout
@@ -5,7 +5,7 @@
388 4 h 0 reboot_counter
#392 3 r 0 unused
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -18,10 +18,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
checksums
diff --git a/src/mainboard/lippert/toucan-af/cmos.layout b/src/mainboard/lippert/toucan-af/cmos.layout
index 956aba3..569f814 100644
--- a/src/mainboard/lippert/toucan-af/cmos.layout
+++ b/src/mainboard/lippert/toucan-af/cmos.layout
@@ -25,7 +25,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -46,10 +46,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 c16c25a..b25066c 100644
--- a/src/mainboard/msi/ms7135/cmos.layout
+++ b/src/mainboard/msi/ms7135/cmos.layout
@@ -10,7 +10,7 @@
399 1 e 2 multi_core
400 8 h 0 century
408 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -33,10 +33,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 b16d8f0..105b36f 100644
--- a/src/mainboard/msi/ms7260/cmos.layout
+++ b/src/mainboard/msi/ms7260/cmos.layout
@@ -27,7 +27,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -48,10 +48,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
8 0 200Mhz
8 1 166Mhz
8 2 133Mhz
diff --git a/src/mainboard/msi/ms7721/cmos.layout b/src/mainboard/msi/ms7721/cmos.layout
index 25860f6..27ff4081 100644
--- a/src/mainboard/msi/ms7721/cmos.layout
+++ b/src/mainboard/msi/ms7721/cmos.layout
@@ -25,7 +25,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -44,10 +44,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/msi/ms9185/cmos.layout b/src/mainboard/msi/ms9185/cmos.layout
index 016d3f1..7e99622 100644
--- a/src/mainboard/msi/ms9185/cmos.layout
+++ b/src/mainboard/msi/ms9185/cmos.layout
@@ -9,7 +9,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -30,10 +30,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 8b35950..874c993 100644
--- a/src/mainboard/msi/ms9282/cmos.layout
+++ b/src/mainboard/msi/ms9282/cmos.layout
@@ -9,7 +9,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -30,10 +30,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 331e016..3da7ea5 100644
--- a/src/mainboard/msi/ms9652_fam10/cmos.layout
+++ b/src/mainboard/msi/ms9652_fam10/cmos.layout
@@ -28,7 +28,7 @@
403 1 e 1 interleave_memory_channels
404 2 e 8 max_mem_clock
406 1 e 2 multi_core
-412 4 e 6 debug_level
+#412 4 e 0 unused
416 5 e 10 ecc_scrub_rate
440 4 e 9 slow_cpu
444 1 e 1 nmi
@@ -52,15 +52,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 0 Emergency
-6 1 Alert
-6 2 Critical
-6 3 Error
-6 4 Warning
-6 5 Notice
-6 6 Information
-6 7 Debug
-6 8 Spew
8 0 DDR2-800
8 1 DDR2-667
8 2 DDR2-533
diff --git a/src/mainboard/nvidia/l1_2pvv/cmos.layout b/src/mainboard/nvidia/l1_2pvv/cmos.layout
index f426810..ac07b2b 100644
--- a/src/mainboard/nvidia/l1_2pvv/cmos.layout
+++ b/src/mainboard/nvidia/l1_2pvv/cmos.layout
@@ -26,7 +26,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -47,10 +47,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
8 0 200Mhz
8 1 166Mhz
8 2 133Mhz
diff --git a/src/mainboard/packardbell/ms2290/cmos.layout b/src/mainboard/packardbell/ms2290/cmos.layout
index 24e9dc0..5eae5d2 100644
--- a/src/mainboard/packardbell/ms2290/cmos.layout
+++ b/src/mainboard/packardbell/ms2290/cmos.layout
@@ -49,7 +49,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: southbridge
@@ -75,15 +75,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/pcengines/alix1c/cmos.layout b/src/mainboard/pcengines/alix1c/cmos.layout
index b8ea936..bd03017 100644
--- a/src/mainboard/pcengines/alix1c/cmos.layout
+++ b/src/mainboard/pcengines/alix1c/cmos.layout
@@ -5,7 +5,7 @@
388 4 h 0 reboot_counter
#392 3 r 0 unused
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -18,10 +18,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
checksums
diff --git a/src/mainboard/pcengines/alix2d/cmos.layout b/src/mainboard/pcengines/alix2d/cmos.layout
index b8ea936..bd03017 100644
--- a/src/mainboard/pcengines/alix2d/cmos.layout
+++ b/src/mainboard/pcengines/alix2d/cmos.layout
@@ -5,7 +5,7 @@
388 4 h 0 reboot_counter
#392 3 r 0 unused
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -18,10 +18,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
checksums
diff --git a/src/mainboard/pcengines/apu1/cmos.layout b/src/mainboard/pcengines/apu1/cmos.layout
index f2c551f..20850f3 100644
--- a/src/mainboard/pcengines/apu1/cmos.layout
+++ b/src/mainboard/pcengines/apu1/cmos.layout
@@ -7,7 +7,7 @@
392 1 e 2 boot_option
393 1 e 1 multi_core
#394 6 unused
-400 4 e 4 debug_level
+{400 4 e 0 unused
# leave 7 bits to make checksummed area end byte-aligned
408 16 h 0 check_sum
@@ -20,16 +20,6 @@
## for boot_option
2 0 Fallback
2 1 Normal
-## for debug_level
-4 0 Emerg
-4 1 Alert
-4 2 Crit
-4 3 Err
-4 4 Warning
-4 5 Notice
-4 6 Info
-4 7 Debug
-4 8 Spew
checksums
diff --git a/src/mainboard/pcengines/apu2/cmos.layout b/src/mainboard/pcengines/apu2/cmos.layout
index 1b7e9c3..2b0becf 100644
--- a/src/mainboard/pcengines/apu2/cmos.layout
+++ b/src/mainboard/pcengines/apu2/cmos.layout
@@ -25,7 +25,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -44,10 +44,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/roda/rk886ex/cmos.layout b/src/mainboard/roda/rk886ex/cmos.layout
index eea7342..77ea669 100644
--- a/src/mainboard/roda/rk886ex/cmos.layout
+++ b/src/mainboard/roda/rk886ex/cmos.layout
@@ -49,7 +49,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -93,15 +93,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/roda/rk9/cmos.layout b/src/mainboard/roda/rk9/cmos.layout
index 2d2f589..38ec6c9 100644
--- a/src/mainboard/roda/rk9/cmos.layout
+++ b/src/mainboard/roda/rk9/cmos.layout
@@ -50,7 +50,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -88,15 +88,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/roda/rv11/cmos.layout b/src/mainboard/roda/rv11/cmos.layout
index d26b45b..324ad4d 100644
--- a/src/mainboard/roda/rv11/cmos.layout
+++ b/src/mainboard/roda/rv11/cmos.layout
@@ -48,8 +48,8 @@
# -----------------------------------------------------------------
# coreboot config options: console
-##392 3 r 0 unused
-395 4 e 5 debug_level
+#392 3 r 0 unused
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
diff --git a/src/mainboard/samsung/lumpy/cmos.layout b/src/mainboard/samsung/lumpy/cmos.layout
index 2e0976b..302c6a1 100644
--- a/src/mainboard/samsung/lumpy/cmos.layout
+++ b/src/mainboard/samsung/lumpy/cmos.layout
@@ -48,7 +48,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -89,15 +89,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/samsung/stumpy/cmos.layout b/src/mainboard/samsung/stumpy/cmos.layout
index 10c7d92..67c50a8 100644
--- a/src/mainboard/samsung/stumpy/cmos.layout
+++ b/src/mainboard/samsung/stumpy/cmos.layout
@@ -48,7 +48,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# Stumpy USB reset workaround disable
@@ -89,15 +89,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/sapphire/pureplatinumh61/cmos.layout b/src/mainboard/sapphire/pureplatinumh61/cmos.layout
index 61a063d..8c10b52 100644
--- a/src/mainboard/sapphire/pureplatinumh61/cmos.layout
+++ b/src/mainboard/sapphire/pureplatinumh61/cmos.layout
@@ -49,7 +49,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
400 8 h 0 volume
@@ -89,15 +89,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/siemens/mc_bdx1/cmos.layout b/src/mainboard/siemens/mc_bdx1/cmos.layout
index cf1c696..39c763a 100644
--- a/src/mainboard/siemens/mc_bdx1/cmos.layout
+++ b/src/mainboard/siemens/mc_bdx1/cmos.layout
@@ -70,7 +70,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -101,15 +101,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/siemens/mc_tcu3/cmos.layout b/src/mainboard/siemens/mc_tcu3/cmos.layout
index cf1c696..39c763a 100644
--- a/src/mainboard/siemens/mc_tcu3/cmos.layout
+++ b/src/mainboard/siemens/mc_tcu3/cmos.layout
@@ -70,7 +70,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -101,15 +101,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/siemens/sitemp_g1p1/cmos.layout b/src/mainboard/siemens/sitemp_g1p1/cmos.layout
index f7571cc..139f669 100644
--- a/src/mainboard/siemens/sitemp_g1p1/cmos.layout
+++ b/src/mainboard/siemens/sitemp_g1p1/cmos.layout
@@ -37,7 +37,7 @@
#397 2 r 8 unused
399 1 e 2 multi_core
#400 8 r 18 reserved
-408 4 e 6 debug_level
+#408 4 e 0 unused
412 1 e 1 power_on_after_fail
#413 1 r 1 unused
414 1 e 17 sata_mode
@@ -80,11 +80,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 4 Warning
-6 5 Notice
-6 6 Info
-6 7 Debug
-6 8 Spew
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 8b35950..874c993 100644
--- a/src/mainboard/sunw/ultra40/cmos.layout
+++ b/src/mainboard/sunw/ultra40/cmos.layout
@@ -9,7 +9,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -30,10 +30,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
8 0 DDR400
8 1 DDR333
8 2 DDR266
diff --git a/src/mainboard/sunw/ultra40m2/cmos.layout b/src/mainboard/sunw/ultra40m2/cmos.layout
index c00426d..6b617b1 100644
--- a/src/mainboard/sunw/ultra40m2/cmos.layout
+++ b/src/mainboard/sunw/ultra40m2/cmos.layout
@@ -26,7 +26,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
408 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -47,10 +47,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
8 0 200Mhz
8 1 166Mhz
8 2 133Mhz
diff --git a/src/mainboard/supermicro/h8dme/cmos.layout b/src/mainboard/supermicro/h8dme/cmos.layout
index f426810..ac07b2b 100644
--- a/src/mainboard/supermicro/h8dme/cmos.layout
+++ b/src/mainboard/supermicro/h8dme/cmos.layout
@@ -26,7 +26,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -47,10 +47,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 f426810..ac07b2b 100644
--- a/src/mainboard/supermicro/h8dmr/cmos.layout
+++ b/src/mainboard/supermicro/h8dmr/cmos.layout
@@ -26,7 +26,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -47,10 +47,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 331e016..3da7ea5 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/cmos.layout
+++ b/src/mainboard/supermicro/h8dmr_fam10/cmos.layout
@@ -28,7 +28,7 @@
403 1 e 1 interleave_memory_channels
404 2 e 8 max_mem_clock
406 1 e 2 multi_core
-412 4 e 6 debug_level
+#412 4 e 0 unused
416 5 e 10 ecc_scrub_rate
440 4 e 9 slow_cpu
444 1 e 1 nmi
@@ -52,15 +52,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 0 Emergency
-6 1 Alert
-6 2 Critical
-6 3 Error
-6 4 Warning
-6 5 Notice
-6 6 Information
-6 7 Debug
-6 8 Spew
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 956aba3..569f814 100644
--- a/src/mainboard/supermicro/h8qgi/cmos.layout
+++ b/src/mainboard/supermicro/h8qgi/cmos.layout
@@ -25,7 +25,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -46,10 +46,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 331e016..3da7ea5 100644
--- a/src/mainboard/supermicro/h8qme_fam10/cmos.layout
+++ b/src/mainboard/supermicro/h8qme_fam10/cmos.layout
@@ -28,7 +28,7 @@
403 1 e 1 interleave_memory_channels
404 2 e 8 max_mem_clock
406 1 e 2 multi_core
-412 4 e 6 debug_level
+#412 4 e 0 unused
416 5 e 10 ecc_scrub_rate
440 4 e 9 slow_cpu
444 1 e 1 nmi
@@ -52,15 +52,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 0 Emergency
-6 1 Alert
-6 2 Critical
-6 3 Error
-6 4 Warning
-6 5 Notice
-6 6 Information
-6 7 Debug
-6 8 Spew
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 956aba3..569f814 100644
--- a/src/mainboard/supermicro/h8scm/cmos.layout
+++ b/src/mainboard/supermicro/h8scm/cmos.layout
@@ -25,7 +25,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -46,10 +46,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 1d957dc..3ddc409 100644
--- a/src/mainboard/supermicro/h8scm_fam10/cmos.layout
+++ b/src/mainboard/supermicro/h8scm_fam10/cmos.layout
@@ -9,7 +9,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 gart
@@ -30,10 +30,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
8 0 400Mhz
8 1 333Mhz
8 2 266Mhz
diff --git a/src/mainboard/supermicro/x7db8/cmos.layout b/src/mainboard/supermicro/x7db8/cmos.layout
index 6f5898e..d06751f 100644
--- a/src/mainboard/supermicro/x7db8/cmos.layout
+++ b/src/mainboard/supermicro/x7db8/cmos.layout
@@ -49,7 +49,7 @@
# -----------------------------------------------------------------
# coreboot config options: console
#392 3 r 0 unused
-395 4 e 6 debug_level
+#395 4 e 0 unused
#399 1 r 0 unused
# coreboot config options: cpu
@@ -82,15 +82,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 1 Emergency
-6 2 Alert
-6 3 Critical
-6 4 Error
-6 5 Warning
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
7 0 Disable
7 1 Enable
7 2 Keep
diff --git a/src/mainboard/technexion/tim5690/cmos.layout b/src/mainboard/technexion/tim5690/cmos.layout
index c1c8f2f..532a940 100644
--- a/src/mainboard/technexion/tim5690/cmos.layout
+++ b/src/mainboard/technexion/tim5690/cmos.layout
@@ -26,7 +26,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -47,10 +47,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 c1c8f2f..532a940 100644
--- a/src/mainboard/technexion/tim8690/cmos.layout
+++ b/src/mainboard/technexion/tim8690/cmos.layout
@@ -26,7 +26,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -47,10 +47,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 8aa23fe..7a1f4e4 100644
--- a/src/mainboard/traverse/geos/cmos.layout
+++ b/src/mainboard/traverse/geos/cmos.layout
@@ -5,7 +5,7 @@
388 4 h 0 reboot_counter
#392 3 r 0 unused
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 1 e 0 dcon_present
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -19,10 +19,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
checksums
diff --git a/src/mainboard/tyan/s2912/cmos.layout b/src/mainboard/tyan/s2912/cmos.layout
index f426810..ac07b2b 100644
--- a/src/mainboard/tyan/s2912/cmos.layout
+++ b/src/mainboard/tyan/s2912/cmos.layout
@@ -26,7 +26,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -47,10 +47,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 42b34ae..b87653d 100644
--- a/src/mainboard/tyan/s2912_fam10/cmos.layout
+++ b/src/mainboard/tyan/s2912_fam10/cmos.layout
@@ -27,7 +27,7 @@
403 1 e 1 interleave_memory_channels
404 2 e 8 max_mem_clock
406 1 e 2 multi_core
-412 4 e 6 debug_level
+#412 4 e 0 unused
416 5 e 10 ecc_scrub_rate
440 4 e 9 slow_cpu
444 1 e 1 nmi
@@ -51,15 +51,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 0 Emergency
-6 1 Alert
-6 2 Critical
-6 3 Error
-6 4 Warning
-6 5 Notice
-6 6 Information
-6 7 Debug
-6 8 Spew
8 0 DDR2-800
8 1 DDR2-667
8 2 DDR2-533
diff --git a/src/mainboard/tyan/s8226/cmos.layout b/src/mainboard/tyan/s8226/cmos.layout
index 956aba3..569f814 100644
--- a/src/mainboard/tyan/s8226/cmos.layout
+++ b/src/mainboard/tyan/s8226/cmos.layout
@@ -25,7 +25,7 @@
397 2 e 8 max_mem_clock
399 1 e 2 multi_core
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -46,10 +46,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 b8ea936..bd03017 100644
--- a/src/mainboard/via/epia-cn/cmos.layout
+++ b/src/mainboard/via/epia-cn/cmos.layout
@@ -5,7 +5,7 @@
388 4 h 0 reboot_counter
#392 3 r 0 unused
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -18,10 +18,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
checksums
diff --git a/src/mainboard/via/epia-m700/cmos.layout b/src/mainboard/via/epia-m700/cmos.layout
index b8ea936..bd03017 100644
--- a/src/mainboard/via/epia-m700/cmos.layout
+++ b/src/mainboard/via/epia-m700/cmos.layout
@@ -5,7 +5,7 @@
388 4 h 0 reboot_counter
#392 3 r 0 unused
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -18,10 +18,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
checksums
diff --git a/src/mainboard/via/pc2500e/cmos.layout b/src/mainboard/via/pc2500e/cmos.layout
index 92473e8..a223d63 100644
--- a/src/mainboard/via/pc2500e/cmos.layout
+++ b/src/mainboard/via/pc2500e/cmos.layout
@@ -22,7 +22,7 @@
388 4 h 0 reboot_counter
#392 3 r 0 unused
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -33,10 +33,6 @@
1 1 Enable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
checksums
diff --git a/src/mainboard/via/vt8454c/cmos.layout b/src/mainboard/via/vt8454c/cmos.layout
index de4f5e7..5908931 100644
--- a/src/mainboard/via/vt8454c/cmos.layout
+++ b/src/mainboard/via/vt8454c/cmos.layout
@@ -21,7 +21,7 @@
388 4 h 0 reboot_counter
#392 3 r 0 unused
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
1008 16 h 0 check_sum
enumerations
@@ -33,10 +33,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
checksums
diff --git a/src/mainboard/winent/mb6047/cmos.layout b/src/mainboard/winent/mb6047/cmos.layout
index 0bf2dc4..5db5406 100644
--- a/src/mainboard/winent/mb6047/cmos.layout
+++ b/src/mainboard/winent/mb6047/cmos.layout
@@ -10,7 +10,7 @@
399 1 e 2 multi_core
400 8 h 0 century
408 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 iommu
@@ -31,10 +31,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
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 b8ea936..bd03017 100644
--- a/src/mainboard/winent/pl6064/cmos.layout
+++ b/src/mainboard/winent/pl6064/cmos.layout
@@ -5,7 +5,7 @@
388 4 h 0 reboot_counter
#392 3 r 0 unused
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -18,10 +18,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
checksums
diff --git a/src/mainboard/winnet/g170/cmos.layout b/src/mainboard/winnet/g170/cmos.layout
index 5db20b1..88cb1c1 100644
--- a/src/mainboard/winnet/g170/cmos.layout
+++ b/src/mainboard/winnet/g170/cmos.layout
@@ -5,7 +5,7 @@
388 4 h 0 reboot_counter
#392 8 e unused
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -18,10 +18,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
checksums
diff --git a/src/mainboard/wyse/s50/cmos.layout b/src/mainboard/wyse/s50/cmos.layout
index b7deea8..d9c2eb0 100644
--- a/src/mainboard/wyse/s50/cmos.layout
+++ b/src/mainboard/wyse/s50/cmos.layout
@@ -23,7 +23,7 @@
388 4 h 0 reboot_counter
#392 3 r 0 unused
400 1 e 1 power_on_after_fail
-412 4 e 6 debug_level
+#412 4 e 0 unused
456 1 e 1 ECC_memory
1008 16 h 0 check_sum
@@ -36,10 +36,6 @@
2 1 Disable
4 0 Fallback
4 1 Normal
-6 6 Notice
-6 7 Info
-6 8 Debug
-6 9 Spew
checksums
--
To view, visit https://review.coreboot.org/21637
To unsubscribe, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8db4ba428ec51f9230bb5f3d2259ae9141308f81
Gerrit-Change-Number: 21637
Gerrit-PatchSet: 1
Gerrit-Owner: Arthur Heymans <arthur at aheymans.xyz>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20170922/2bf5436d/attachment-0001.html>
More information about the coreboot-gerrit
mailing list