summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/adi/rcc-dff/cmos.layout2
-rw-r--r--src/mainboard/advansus/a785e-i/cmos.layout2
-rw-r--r--src/mainboard/amd/bettong/cmos.layout2
-rw-r--r--src/mainboard/amd/bimini_fam10/cmos.layout2
-rw-r--r--src/mainboard/amd/db-ft3b-lc/cmos.layout2
-rw-r--r--src/mainboard/amd/db800/cmos.layout2
-rw-r--r--src/mainboard/amd/dbm690t/cmos.layout2
-rw-r--r--src/mainboard/amd/dinar/cmos.layout2
-rw-r--r--src/mainboard/amd/f2950/cmos.layout2
-rw-r--r--src/mainboard/amd/inagua/cmos.layout2
-rw-r--r--src/mainboard/amd/lamar/cmos.layout2
-rw-r--r--src/mainboard/amd/mahogany/cmos.layout2
-rw-r--r--src/mainboard/amd/mahogany_fam10/cmos.layout2
-rw-r--r--src/mainboard/amd/norwich/cmos.layout2
-rw-r--r--src/mainboard/amd/olivehill/cmos.layout2
-rw-r--r--src/mainboard/amd/olivehillplus/cmos.layout2
-rw-r--r--src/mainboard/amd/parmer/cmos.layout2
-rw-r--r--src/mainboard/amd/persimmon/cmos.layout2
-rw-r--r--src/mainboard/amd/pistachio/cmos.layout2
-rw-r--r--src/mainboard/amd/rumba/cmos.layout2
-rw-r--r--src/mainboard/amd/serengeti_cheetah/cmos.layout2
-rw-r--r--src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout2
-rw-r--r--src/mainboard/amd/south_station/cmos.layout2
-rw-r--r--src/mainboard/amd/thatcher/cmos.layout2
-rw-r--r--src/mainboard/amd/tilapia_fam10/cmos.layout2
-rw-r--r--src/mainboard/amd/torpedo/cmos.layout2
-rw-r--r--src/mainboard/amd/union_station/cmos.layout2
-rw-r--r--src/mainboard/apple/macbook21/cmos.layout2
-rw-r--r--src/mainboard/artecgroup/dbe61/cmos.layout2
-rw-r--r--src/mainboard/asrock/939a785gmh/cmos.layout2
-rw-r--r--src/mainboard/asrock/e350m1/cmos.layout2
-rw-r--r--src/mainboard/asrock/imb-a180/cmos.layout2
-rw-r--r--src/mainboard/asus/a8n_e/cmos.layout2
-rw-r--r--src/mainboard/asus/a8v-e_deluxe/cmos.layout2
-rw-r--r--src/mainboard/asus/a8v-e_se/cmos.layout2
-rw-r--r--src/mainboard/asus/dsbf/cmos.layout2
-rw-r--r--src/mainboard/asus/f2a85-m/cmos.layout2
-rw-r--r--src/mainboard/asus/f2a85-m_le/cmos.layout2
-rw-r--r--src/mainboard/asus/k8v-x/cmos.layout2
-rw-r--r--src/mainboard/asus/kcma-d8/cmos.layout2
-rw-r--r--src/mainboard/asus/kfsn4-dre/cmos.layout2
-rw-r--r--src/mainboard/asus/kfsn4-dre_k8/cmos.layout2
-rw-r--r--src/mainboard/asus/kgpe-d16/cmos.layout2
-rw-r--r--src/mainboard/asus/m2n-e/cmos.layout2
-rw-r--r--src/mainboard/asus/m2v-mx_se/cmos.layout2
-rw-r--r--src/mainboard/asus/m2v/cmos.layout2
-rw-r--r--src/mainboard/asus/m4a78-em/cmos.layout2
-rw-r--r--src/mainboard/asus/m4a785-m/cmos.layout2
-rw-r--r--src/mainboard/asus/m4a785t-m/cmos.layout2
-rw-r--r--src/mainboard/asus/m5a88-v/cmos.layout2
-rw-r--r--src/mainboard/asus/mew-vm/cmos.layout2
-rw-r--r--src/mainboard/avalue/eax-785e/cmos.layout2
-rw-r--r--src/mainboard/bachmann/ot200/cmos.layout2
-rw-r--r--src/mainboard/bap/ode_e20XX/cmos.layout2
-rw-r--r--src/mainboard/bap/ode_e21XX/cmos.layout2
-rw-r--r--src/mainboard/bcom/winnetp680/cmos.layout2
-rw-r--r--src/mainboard/biostar/am1ml/cmos.layout2
-rw-r--r--src/mainboard/broadcom/blast/cmos.layout2
-rw-r--r--src/mainboard/digitallogic/msm800sev/cmos.layout2
-rw-r--r--src/mainboard/emulation/qemu-i440fx/cmos.layout2
-rw-r--r--src/mainboard/esd/atom15/cmos.layout2
-rw-r--r--src/mainboard/getac/p470/cmos.layout2
-rw-r--r--src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout2
-rw-r--r--src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout2
-rw-r--r--src/mainboard/gigabyte/ga-g41m-es2l/cmos.layout2
-rw-r--r--src/mainboard/gigabyte/ga_2761gxdk/cmos.layout2
-rw-r--r--src/mainboard/gigabyte/m57sli/cmos.layout2
-rw-r--r--src/mainboard/gigabyte/ma785gm/cmos.layout2
-rw-r--r--src/mainboard/gigabyte/ma785gmt/cmos.layout2
-rw-r--r--src/mainboard/gigabyte/ma78gm/cmos.layout2
-rw-r--r--src/mainboard/gizmosphere/gizmo/cmos.layout2
-rw-r--r--src/mainboard/gizmosphere/gizmo2/cmos.layout2
-rw-r--r--src/mainboard/google/auron/cmos.layout2
-rw-r--r--src/mainboard/google/auron_paine/cmos.layout3
-rw-r--r--src/mainboard/google/butterfly/cmos.layout2
-rw-r--r--src/mainboard/google/chell/cmos.layout2
-rw-r--r--src/mainboard/google/cyan/cmos.layout2
-rw-r--r--src/mainboard/google/falco/cmos.layout2
-rw-r--r--src/mainboard/google/glados/cmos.layout2
-rw-r--r--src/mainboard/google/guado/cmos.layout3
-rw-r--r--src/mainboard/google/jecht/cmos.layout2
-rw-r--r--src/mainboard/google/lars/cmos.layout2
-rw-r--r--src/mainboard/google/link/cmos.layout2
-rw-r--r--src/mainboard/google/ninja/cmos.layout3
-rw-r--r--src/mainboard/google/panther/cmos.layout2
-rw-r--r--src/mainboard/google/parrot/cmos.layout2
-rw-r--r--src/mainboard/google/peppy/cmos.layout2
-rw-r--r--src/mainboard/google/rambi/cmos.layout2
-rw-r--r--src/mainboard/google/rikku/cmos.layout3
-rw-r--r--src/mainboard/google/samus/cmos.layout2
-rw-r--r--src/mainboard/google/stout/cmos.layout2
-rw-r--r--src/mainboard/google/tidus/cmos.layout3
-rw-r--r--src/mainboard/hp/abm/cmos.layout2
-rw-r--r--src/mainboard/hp/dl145_g1/cmos.layout2
-rw-r--r--src/mainboard/hp/dl145_g3/cmos.layout2
-rw-r--r--src/mainboard/hp/dl165_g6_fam10/cmos.layout2
-rw-r--r--src/mainboard/hp/pavilion_m6_1035dx/cmos.layout2
-rw-r--r--src/mainboard/ibase/mb899/cmos.layout2
-rw-r--r--src/mainboard/iei/kino-780am2-fam10/cmos.layout2
-rw-r--r--src/mainboard/intel/baskingridge/cmos.layout2
-rw-r--r--src/mainboard/intel/bayleybay_fsp/cmos.layout2
-rw-r--r--src/mainboard/intel/camelbackmountain_fsp/cmos.layout3
-rw-r--r--src/mainboard/intel/cougar_canyon2/cmos.layout2
-rw-r--r--src/mainboard/intel/d945gclf/cmos.layout2
-rw-r--r--src/mainboard/intel/eagleheights/cmos.layout2
-rw-r--r--src/mainboard/intel/emeraldlake2/cmos.layout2
-rw-r--r--src/mainboard/intel/kunimitsu/cmos.layout2
-rw-r--r--src/mainboard/intel/littleplains/cmos.layout2
-rw-r--r--src/mainboard/intel/minnowmax/cmos.layout2
-rw-r--r--src/mainboard/intel/mohonpeak/cmos.layout2
-rw-r--r--src/mainboard/intel/stargo2/cmos.layout3
-rw-r--r--src/mainboard/intel/strago/cmos.layout2
-rw-r--r--src/mainboard/intel/wtm2/cmos.layout2
-rw-r--r--src/mainboard/iwave/iWRainbowG6/cmos.layout2
-rw-r--r--src/mainboard/iwill/dk8_htx/cmos.layout2
-rw-r--r--src/mainboard/jetway/j7f2/cmos.layout2
-rw-r--r--src/mainboard/jetway/nf81-t56n-lf/cmos.layout2
-rw-r--r--src/mainboard/jetway/pa78vm5/cmos.layout2
-rw-r--r--src/mainboard/kontron/986lcd-m/cmos.layout2
-rw-r--r--src/mainboard/kontron/kt690/cmos.layout2
-rw-r--r--src/mainboard/kontron/ktqm77/cmos.layout2
-rw-r--r--src/mainboard/lanner/em8510/cmos.layout2
-rw-r--r--src/mainboard/lenovo/g505s/cmos.layout2
-rw-r--r--src/mainboard/lenovo/t400/cmos.layout2
-rw-r--r--src/mainboard/lenovo/t420/cmos.layout2
-rw-r--r--src/mainboard/lenovo/t420s/cmos.layout2
-rw-r--r--src/mainboard/lenovo/t430s/cmos.layout2
-rw-r--r--src/mainboard/lenovo/t520/cmos.layout2
-rw-r--r--src/mainboard/lenovo/t530/cmos.layout2
-rw-r--r--src/mainboard/lenovo/t60/cmos.layout2
-rw-r--r--src/mainboard/lenovo/x200/cmos.layout2
-rw-r--r--src/mainboard/lenovo/x201/cmos.layout2
-rw-r--r--src/mainboard/lenovo/x220/cmos.layout2
-rw-r--r--src/mainboard/lenovo/x230/cmos.layout2
-rw-r--r--src/mainboard/lenovo/x60/cmos.layout2
-rw-r--r--src/mainboard/lippert/frontrunner-af/cmos.layout2
-rw-r--r--src/mainboard/lippert/frontrunner/cmos.layout2
-rw-r--r--src/mainboard/lippert/toucan-af/cmos.layout2
-rw-r--r--src/mainboard/msi/ms7135/cmos.layout2
-rw-r--r--src/mainboard/msi/ms7260/cmos.layout2
-rw-r--r--src/mainboard/msi/ms9185/cmos.layout2
-rw-r--r--src/mainboard/msi/ms9282/cmos.layout2
-rw-r--r--src/mainboard/msi/ms9652_fam10/cmos.layout2
-rw-r--r--src/mainboard/nvidia/l1_2pvv/cmos.layout2
-rw-r--r--src/mainboard/packardbell/ms2290/cmos.layout2
-rw-r--r--src/mainboard/pcengines/alix1c/cmos.layout2
-rw-r--r--src/mainboard/pcengines/alix2d/cmos.layout2
-rw-r--r--src/mainboard/roda/rk886ex/cmos.layout2
-rw-r--r--src/mainboard/roda/rk9/cmos.layout2
-rw-r--r--src/mainboard/samsung/lumpy/cmos.layout2
-rw-r--r--src/mainboard/samsung/stumpy/cmos.layout2
-rw-r--r--src/mainboard/siemens/mc_bdx1/cmos.layout3
-rw-r--r--src/mainboard/siemens/mc_tcu3/cmos.layout2
-rw-r--r--src/mainboard/siemens/sitemp_g1p1/cmos.layout2
-rw-r--r--src/mainboard/sunw/ultra40/cmos.layout2
-rw-r--r--src/mainboard/sunw/ultra40m2/cmos.layout2
-rw-r--r--src/mainboard/supermicro/h8dme/cmos.layout2
-rw-r--r--src/mainboard/supermicro/h8dmr/cmos.layout2
-rw-r--r--src/mainboard/supermicro/h8dmr_fam10/cmos.layout2
-rw-r--r--src/mainboard/supermicro/h8qgi/cmos.layout2
-rw-r--r--src/mainboard/supermicro/h8qme_fam10/cmos.layout2
-rw-r--r--src/mainboard/supermicro/h8scm/cmos.layout2
-rw-r--r--src/mainboard/supermicro/h8scm_fam10/cmos.layout2
-rw-r--r--src/mainboard/supermicro/x7db8/cmos.layout2
-rw-r--r--src/mainboard/technexion/tim5690/cmos.layout2
-rw-r--r--src/mainboard/technexion/tim8690/cmos.layout2
-rw-r--r--src/mainboard/traverse/geos/cmos.layout2
-rw-r--r--src/mainboard/tyan/s2912/cmos.layout2
-rw-r--r--src/mainboard/tyan/s2912_fam10/cmos.layout2
-rw-r--r--src/mainboard/tyan/s8226/cmos.layout2
-rw-r--r--src/mainboard/via/epia-cn/cmos.layout2
-rw-r--r--src/mainboard/via/epia-m700/cmos.layout2
-rw-r--r--src/mainboard/via/pc2500e/cmos.layout2
-rw-r--r--src/mainboard/via/vt8454c/cmos.layout2
-rw-r--r--src/mainboard/winent/mb6047/cmos.layout2
-rw-r--r--src/mainboard/winent/pl6064/cmos.layout2
-rw-r--r--src/mainboard/wyse/s50/cmos.layout2
177 files changed, 177 insertions, 185 deletions
diff --git a/src/mainboard/adi/rcc-dff/cmos.layout b/src/mainboard/adi/rcc-dff/cmos.layout
index 28976c1212..27041228f0 100644
--- a/src/mainboard/adi/rcc-dff/cmos.layout
+++ b/src/mainboard/adi/rcc-dff/cmos.layout
@@ -42,7 +42,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/advansus/a785e-i/cmos.layout b/src/mainboard/advansus/a785e-i/cmos.layout
index bf58aac890..aca27b0779 100644
--- a/src/mainboard/advansus/a785e-i/cmos.layout
+++ b/src/mainboard/advansus/a785e-i/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/amd/bettong/cmos.layout b/src/mainboard/amd/bettong/cmos.layout
index ba44a24625..c1338d3cdf 100644
--- a/src/mainboard/amd/bettong/cmos.layout
+++ b/src/mainboard/amd/bettong/cmos.layout
@@ -42,7 +42,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
386 1 e 1 ECC_memory
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/amd/bimini_fam10/cmos.layout b/src/mainboard/amd/bimini_fam10/cmos.layout
index bf58aac890..aca27b0779 100644
--- a/src/mainboard/amd/bimini_fam10/cmos.layout
+++ b/src/mainboard/amd/bimini_fam10/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/amd/db-ft3b-lc/cmos.layout b/src/mainboard/amd/db-ft3b-lc/cmos.layout
index d83bb14d26..75a2d30eb1 100644
--- a/src/mainboard/amd/db-ft3b-lc/cmos.layout
+++ b/src/mainboard/amd/db-ft3b-lc/cmos.layout
@@ -18,7 +18,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/amd/db800/cmos.layout b/src/mainboard/amd/db800/cmos.layout
index 6de5ab6d1b..d9ec5520bf 100644
--- a/src/mainboard/amd/db800/cmos.layout
+++ b/src/mainboard/amd/db800/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
diff --git a/src/mainboard/amd/dbm690t/cmos.layout b/src/mainboard/amd/dbm690t/cmos.layout
index 4e9d62cffc..93aa445656 100644
--- a/src/mainboard/amd/dbm690t/cmos.layout
+++ b/src/mainboard/amd/dbm690t/cmos.layout
@@ -19,7 +19,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/amd/dinar/cmos.layout b/src/mainboard/amd/dinar/cmos.layout
index bf617ae067..d18813aaf3 100644
--- a/src/mainboard/amd/dinar/cmos.layout
+++ b/src/mainboard/amd/dinar/cmos.layout
@@ -18,7 +18,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/amd/f2950/cmos.layout b/src/mainboard/amd/f2950/cmos.layout
index 6de5ab6d1b..d9ec5520bf 100644
--- a/src/mainboard/amd/f2950/cmos.layout
+++ b/src/mainboard/amd/f2950/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
diff --git a/src/mainboard/amd/inagua/cmos.layout b/src/mainboard/amd/inagua/cmos.layout
index f47185f896..ca3d9e5e3c 100644
--- a/src/mainboard/amd/inagua/cmos.layout
+++ b/src/mainboard/amd/inagua/cmos.layout
@@ -18,7 +18,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/amd/lamar/cmos.layout b/src/mainboard/amd/lamar/cmos.layout
index 9663cdbb90..f9e614dd7a 100644
--- a/src/mainboard/amd/lamar/cmos.layout
+++ b/src/mainboard/amd/lamar/cmos.layout
@@ -18,7 +18,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
diff --git a/src/mainboard/amd/mahogany/cmos.layout b/src/mainboard/amd/mahogany/cmos.layout
index 64832c1d53..0d4f95e04b 100644
--- a/src/mainboard/amd/mahogany/cmos.layout
+++ b/src/mainboard/amd/mahogany/cmos.layout
@@ -19,7 +19,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/amd/mahogany_fam10/cmos.layout b/src/mainboard/amd/mahogany_fam10/cmos.layout
index bf58aac890..aca27b0779 100644
--- a/src/mainboard/amd/mahogany_fam10/cmos.layout
+++ b/src/mainboard/amd/mahogany_fam10/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/amd/norwich/cmos.layout b/src/mainboard/amd/norwich/cmos.layout
index 6a030e6674..c724569209 100644
--- a/src/mainboard/amd/norwich/cmos.layout
+++ b/src/mainboard/amd/norwich/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
diff --git a/src/mainboard/amd/olivehill/cmos.layout b/src/mainboard/amd/olivehill/cmos.layout
index d83bb14d26..75a2d30eb1 100644
--- a/src/mainboard/amd/olivehill/cmos.layout
+++ b/src/mainboard/amd/olivehill/cmos.layout
@@ -18,7 +18,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/amd/olivehillplus/cmos.layout b/src/mainboard/amd/olivehillplus/cmos.layout
index d83bb14d26..75a2d30eb1 100644
--- a/src/mainboard/amd/olivehillplus/cmos.layout
+++ b/src/mainboard/amd/olivehillplus/cmos.layout
@@ -18,7 +18,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/amd/parmer/cmos.layout b/src/mainboard/amd/parmer/cmos.layout
index d83bb14d26..75a2d30eb1 100644
--- a/src/mainboard/amd/parmer/cmos.layout
+++ b/src/mainboard/amd/parmer/cmos.layout
@@ -18,7 +18,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/amd/persimmon/cmos.layout b/src/mainboard/amd/persimmon/cmos.layout
index f47185f896..ca3d9e5e3c 100644
--- a/src/mainboard/amd/persimmon/cmos.layout
+++ b/src/mainboard/amd/persimmon/cmos.layout
@@ -18,7 +18,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/amd/pistachio/cmos.layout b/src/mainboard/amd/pistachio/cmos.layout
index 4e9d62cffc..93aa445656 100644
--- a/src/mainboard/amd/pistachio/cmos.layout
+++ b/src/mainboard/amd/pistachio/cmos.layout
@@ -19,7 +19,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/amd/rumba/cmos.layout b/src/mainboard/amd/rumba/cmos.layout
index 6de5ab6d1b..d9ec5520bf 100644
--- a/src/mainboard/amd/rumba/cmos.layout
+++ b/src/mainboard/amd/rumba/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
diff --git a/src/mainboard/amd/serengeti_cheetah/cmos.layout b/src/mainboard/amd/serengeti_cheetah/cmos.layout
index 0ad18a254b..e5964b42f4 100644
--- a/src/mainboard/amd/serengeti_cheetah/cmos.layout
+++ b/src/mainboard/amd/serengeti_cheetah/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout b/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout
index 3c0a4ed49d..fe0ff4e95b 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout
@@ -20,7 +20,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
393 3 e 5 baud_rate
396 5 e 10 ecc_scrub_rate
401 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/amd/south_station/cmos.layout b/src/mainboard/amd/south_station/cmos.layout
index f47185f896..ca3d9e5e3c 100644
--- a/src/mainboard/amd/south_station/cmos.layout
+++ b/src/mainboard/amd/south_station/cmos.layout
@@ -18,7 +18,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/amd/thatcher/cmos.layout b/src/mainboard/amd/thatcher/cmos.layout
index d83bb14d26..75a2d30eb1 100644
--- a/src/mainboard/amd/thatcher/cmos.layout
+++ b/src/mainboard/amd/thatcher/cmos.layout
@@ -18,7 +18,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/amd/tilapia_fam10/cmos.layout b/src/mainboard/amd/tilapia_fam10/cmos.layout
index bf58aac890..aca27b0779 100644
--- a/src/mainboard/amd/tilapia_fam10/cmos.layout
+++ b/src/mainboard/amd/tilapia_fam10/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/amd/torpedo/cmos.layout b/src/mainboard/amd/torpedo/cmos.layout
index f47185f896..ca3d9e5e3c 100644
--- a/src/mainboard/amd/torpedo/cmos.layout
+++ b/src/mainboard/amd/torpedo/cmos.layout
@@ -18,7 +18,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/amd/union_station/cmos.layout b/src/mainboard/amd/union_station/cmos.layout
index f47185f896..ca3d9e5e3c 100644
--- a/src/mainboard/amd/union_station/cmos.layout
+++ b/src/mainboard/amd/union_station/cmos.layout
@@ -18,7 +18,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/apple/macbook21/cmos.layout b/src/mainboard/apple/macbook21/cmos.layout
index a64834581f..4b4b8de21b 100644
--- a/src/mainboard/apple/macbook21/cmos.layout
+++ b/src/mainboard/apple/macbook21/cmos.layout
@@ -43,7 +43,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 h 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/artecgroup/dbe61/cmos.layout b/src/mainboard/artecgroup/dbe61/cmos.layout
index 6de5ab6d1b..d9ec5520bf 100644
--- a/src/mainboard/artecgroup/dbe61/cmos.layout
+++ b/src/mainboard/artecgroup/dbe61/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
diff --git a/src/mainboard/asrock/939a785gmh/cmos.layout b/src/mainboard/asrock/939a785gmh/cmos.layout
index 64832c1d53..0d4f95e04b 100644
--- a/src/mainboard/asrock/939a785gmh/cmos.layout
+++ b/src/mainboard/asrock/939a785gmh/cmos.layout
@@ -19,7 +19,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/asrock/e350m1/cmos.layout b/src/mainboard/asrock/e350m1/cmos.layout
index 83de4da400..c7da8b82e6 100644
--- a/src/mainboard/asrock/e350m1/cmos.layout
+++ b/src/mainboard/asrock/e350m1/cmos.layout
@@ -18,7 +18,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/asrock/imb-a180/cmos.layout b/src/mainboard/asrock/imb-a180/cmos.layout
index d83bb14d26..75a2d30eb1 100644
--- a/src/mainboard/asrock/imb-a180/cmos.layout
+++ b/src/mainboard/asrock/imb-a180/cmos.layout
@@ -18,7 +18,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/asus/a8n_e/cmos.layout b/src/mainboard/asus/a8n_e/cmos.layout
index 90e3e94178..c4b81c64f1 100644
--- a/src/mainboard/asus/a8n_e/cmos.layout
+++ b/src/mainboard/asus/a8n_e/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
386 1 e 1 ECC_memory
- 388 4 r 0 reboot_bits
+ 388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/asus/a8v-e_deluxe/cmos.layout b/src/mainboard/asus/a8v-e_deluxe/cmos.layout
index 7cf03696d4..fadba1ea8e 100644
--- a/src/mainboard/asus/a8v-e_deluxe/cmos.layout
+++ b/src/mainboard/asus/a8v-e_deluxe/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/asus/a8v-e_se/cmos.layout b/src/mainboard/asus/a8v-e_se/cmos.layout
index 7cf03696d4..fadba1ea8e 100644
--- a/src/mainboard/asus/a8v-e_se/cmos.layout
+++ b/src/mainboard/asus/a8v-e_se/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/asus/dsbf/cmos.layout b/src/mainboard/asus/dsbf/cmos.layout
index 2bccce8d96..06d46ff7f0 100644
--- a/src/mainboard/asus/dsbf/cmos.layout
+++ b/src/mainboard/asus/dsbf/cmos.layout
@@ -43,7 +43,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/asus/f2a85-m/cmos.layout b/src/mainboard/asus/f2a85-m/cmos.layout
index d83bb14d26..75a2d30eb1 100644
--- a/src/mainboard/asus/f2a85-m/cmos.layout
+++ b/src/mainboard/asus/f2a85-m/cmos.layout
@@ -18,7 +18,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/asus/f2a85-m_le/cmos.layout b/src/mainboard/asus/f2a85-m_le/cmos.layout
index d83bb14d26..75a2d30eb1 100644
--- a/src/mainboard/asus/f2a85-m_le/cmos.layout
+++ b/src/mainboard/asus/f2a85-m_le/cmos.layout
@@ -18,7 +18,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/asus/k8v-x/cmos.layout b/src/mainboard/asus/k8v-x/cmos.layout
index 7cf03696d4..fadba1ea8e 100644
--- a/src/mainboard/asus/k8v-x/cmos.layout
+++ b/src/mainboard/asus/k8v-x/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/asus/kcma-d8/cmos.layout b/src/mainboard/asus/kcma-d8/cmos.layout
index 14e3c9b977..b9dadf4335 100644
--- a/src/mainboard/asus/kcma-d8/cmos.layout
+++ b/src/mainboard/asus/kcma-d8/cmos.layout
@@ -20,7 +20,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
393 3 e 5 baud_rate
396 5 e 10 ecc_scrub_rate
401 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/asus/kfsn4-dre/cmos.layout b/src/mainboard/asus/kfsn4-dre/cmos.layout
index bd5fdbeb2f..169af87b9b 100644
--- a/src/mainboard/asus/kfsn4-dre/cmos.layout
+++ b/src/mainboard/asus/kfsn4-dre/cmos.layout
@@ -20,7 +20,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
393 3 e 5 baud_rate
396 5 e 10 ecc_scrub_rate
401 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/asus/kfsn4-dre_k8/cmos.layout b/src/mainboard/asus/kfsn4-dre_k8/cmos.layout
index 9b26123d1a..d6ac1bcbc4 100644
--- a/src/mainboard/asus/kfsn4-dre_k8/cmos.layout
+++ b/src/mainboard/asus/kfsn4-dre_k8/cmos.layout
@@ -20,7 +20,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
393 3 e 5 baud_rate
396 1 e 1 hw_scrubber
397 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/asus/kgpe-d16/cmos.layout b/src/mainboard/asus/kgpe-d16/cmos.layout
index 9e48910c3f..18c7a3fab7 100644
--- a/src/mainboard/asus/kgpe-d16/cmos.layout
+++ b/src/mainboard/asus/kgpe-d16/cmos.layout
@@ -20,7 +20,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
393 3 e 5 baud_rate
396 5 e 10 ecc_scrub_rate
401 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/asus/m2n-e/cmos.layout b/src/mainboard/asus/m2n-e/cmos.layout
index da602990cf..9968c56898 100644
--- a/src/mainboard/asus/m2n-e/cmos.layout
+++ b/src/mainboard/asus/m2n-e/cmos.layout
@@ -18,7 +18,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/asus/m2v-mx_se/cmos.layout b/src/mainboard/asus/m2v-mx_se/cmos.layout
index b74079d58b..96e5c640ab 100644
--- a/src/mainboard/asus/m2v-mx_se/cmos.layout
+++ b/src/mainboard/asus/m2v-mx_se/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/asus/m2v/cmos.layout b/src/mainboard/asus/m2v/cmos.layout
index 7cf03696d4..fadba1ea8e 100644
--- a/src/mainboard/asus/m2v/cmos.layout
+++ b/src/mainboard/asus/m2v/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/asus/m4a78-em/cmos.layout b/src/mainboard/asus/m4a78-em/cmos.layout
index bf58aac890..aca27b0779 100644
--- a/src/mainboard/asus/m4a78-em/cmos.layout
+++ b/src/mainboard/asus/m4a78-em/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/asus/m4a785-m/cmos.layout b/src/mainboard/asus/m4a785-m/cmos.layout
index bf58aac890..aca27b0779 100644
--- a/src/mainboard/asus/m4a785-m/cmos.layout
+++ b/src/mainboard/asus/m4a785-m/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/asus/m4a785t-m/cmos.layout b/src/mainboard/asus/m4a785t-m/cmos.layout
index bf58aac890..aca27b0779 100644
--- a/src/mainboard/asus/m4a785t-m/cmos.layout
+++ b/src/mainboard/asus/m4a785t-m/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/asus/m5a88-v/cmos.layout b/src/mainboard/asus/m5a88-v/cmos.layout
index bf58aac890..aca27b0779 100644
--- a/src/mainboard/asus/m5a88-v/cmos.layout
+++ b/src/mainboard/asus/m5a88-v/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/asus/mew-vm/cmos.layout b/src/mainboard/asus/mew-vm/cmos.layout
index 6de5ab6d1b..d9ec5520bf 100644
--- a/src/mainboard/asus/mew-vm/cmos.layout
+++ b/src/mainboard/asus/mew-vm/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
diff --git a/src/mainboard/avalue/eax-785e/cmos.layout b/src/mainboard/avalue/eax-785e/cmos.layout
index bf58aac890..aca27b0779 100644
--- a/src/mainboard/avalue/eax-785e/cmos.layout
+++ b/src/mainboard/avalue/eax-785e/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/bachmann/ot200/cmos.layout b/src/mainboard/bachmann/ot200/cmos.layout
index a04213d085..9b247a1565 100644
--- a/src/mainboard/bachmann/ot200/cmos.layout
+++ b/src/mainboard/bachmann/ot200/cmos.layout
@@ -20,7 +20,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
# -----------------------------------------------------------------
# coreboot config options: console
diff --git a/src/mainboard/bap/ode_e20XX/cmos.layout b/src/mainboard/bap/ode_e20XX/cmos.layout
index d83bb14d26..75a2d30eb1 100644
--- a/src/mainboard/bap/ode_e20XX/cmos.layout
+++ b/src/mainboard/bap/ode_e20XX/cmos.layout
@@ -18,7 +18,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/bap/ode_e21XX/cmos.layout b/src/mainboard/bap/ode_e21XX/cmos.layout
index d83bb14d26..75a2d30eb1 100644
--- a/src/mainboard/bap/ode_e21XX/cmos.layout
+++ b/src/mainboard/bap/ode_e21XX/cmos.layout
@@ -18,7 +18,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/bcom/winnetp680/cmos.layout b/src/mainboard/bcom/winnetp680/cmos.layout
index 6de5ab6d1b..d9ec5520bf 100644
--- a/src/mainboard/bcom/winnetp680/cmos.layout
+++ b/src/mainboard/bcom/winnetp680/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
diff --git a/src/mainboard/biostar/am1ml/cmos.layout b/src/mainboard/biostar/am1ml/cmos.layout
index d29e4d2549..d8384e34e3 100644
--- a/src/mainboard/biostar/am1ml/cmos.layout
+++ b/src/mainboard/biostar/am1ml/cmos.layout
@@ -42,7 +42,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
386 1 e 1 ECC_memory
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/broadcom/blast/cmos.layout b/src/mainboard/broadcom/blast/cmos.layout
index 4e081ea1aa..c5db29ca32 100644
--- a/src/mainboard/broadcom/blast/cmos.layout
+++ b/src/mainboard/broadcom/blast/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/digitallogic/msm800sev/cmos.layout b/src/mainboard/digitallogic/msm800sev/cmos.layout
index 6de5ab6d1b..d9ec5520bf 100644
--- a/src/mainboard/digitallogic/msm800sev/cmos.layout
+++ b/src/mainboard/digitallogic/msm800sev/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
diff --git a/src/mainboard/emulation/qemu-i440fx/cmos.layout b/src/mainboard/emulation/qemu-i440fx/cmos.layout
index 6de5ab6d1b..d9ec5520bf 100644
--- a/src/mainboard/emulation/qemu-i440fx/cmos.layout
+++ b/src/mainboard/emulation/qemu-i440fx/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
diff --git a/src/mainboard/esd/atom15/cmos.layout b/src/mainboard/esd/atom15/cmos.layout
index 8aaa522bb8..f65750cd07 100644
--- a/src/mainboard/esd/atom15/cmos.layout
+++ b/src/mainboard/esd/atom15/cmos.layout
@@ -42,7 +42,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/getac/p470/cmos.layout b/src/mainboard/getac/p470/cmos.layout
index 177bdfe764..4c40dc7924 100644
--- a/src/mainboard/getac/p470/cmos.layout
+++ b/src/mainboard/getac/p470/cmos.layout
@@ -43,7 +43,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout b/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout
index 32a3059d71..5600a6b635 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout
@@ -43,7 +43,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout b/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout
index 32a3059d71..5600a6b635 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout
+++ b/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout
@@ -43,7 +43,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/gigabyte/ga-g41m-es2l/cmos.layout b/src/mainboard/gigabyte/ga-g41m-es2l/cmos.layout
index f92de110ea..3138479092 100644
--- a/src/mainboard/gigabyte/ga-g41m-es2l/cmos.layout
+++ b/src/mainboard/gigabyte/ga-g41m-es2l/cmos.layout
@@ -43,7 +43,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout b/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout
index 53f259ad5a..a6d7a6e810 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout
+++ b/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout
@@ -19,7 +19,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/gigabyte/m57sli/cmos.layout b/src/mainboard/gigabyte/m57sli/cmos.layout
index 53f259ad5a..a6d7a6e810 100644
--- a/src/mainboard/gigabyte/m57sli/cmos.layout
+++ b/src/mainboard/gigabyte/m57sli/cmos.layout
@@ -19,7 +19,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/gigabyte/ma785gm/cmos.layout b/src/mainboard/gigabyte/ma785gm/cmos.layout
index bf58aac890..aca27b0779 100644
--- a/src/mainboard/gigabyte/ma785gm/cmos.layout
+++ b/src/mainboard/gigabyte/ma785gm/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/gigabyte/ma785gmt/cmos.layout b/src/mainboard/gigabyte/ma785gmt/cmos.layout
index bf58aac890..aca27b0779 100644
--- a/src/mainboard/gigabyte/ma785gmt/cmos.layout
+++ b/src/mainboard/gigabyte/ma785gmt/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/gigabyte/ma78gm/cmos.layout b/src/mainboard/gigabyte/ma78gm/cmos.layout
index bf58aac890..aca27b0779 100644
--- a/src/mainboard/gigabyte/ma78gm/cmos.layout
+++ b/src/mainboard/gigabyte/ma78gm/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/gizmosphere/gizmo/cmos.layout b/src/mainboard/gizmosphere/gizmo/cmos.layout
index ea39ed60d4..33ed614898 100644
--- a/src/mainboard/gizmosphere/gizmo/cmos.layout
+++ b/src/mainboard/gizmosphere/gizmo/cmos.layout
@@ -19,7 +19,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/gizmosphere/gizmo2/cmos.layout b/src/mainboard/gizmosphere/gizmo2/cmos.layout
index d83bb14d26..75a2d30eb1 100644
--- a/src/mainboard/gizmosphere/gizmo2/cmos.layout
+++ b/src/mainboard/gizmosphere/gizmo2/cmos.layout
@@ -18,7 +18,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/google/auron/cmos.layout b/src/mainboard/google/auron/cmos.layout
index 2a518e9213..b575e02970 100644
--- a/src/mainboard/google/auron/cmos.layout
+++ b/src/mainboard/google/auron/cmos.layout
@@ -42,7 +42,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/google/auron_paine/cmos.layout b/src/mainboard/google/auron_paine/cmos.layout
index 19677177db..b575e02970 100644
--- a/src/mainboard/google/auron_paine/cmos.layout
+++ b/src/mainboard/google/auron_paine/cmos.layout
@@ -42,8 +42,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/google/butterfly/cmos.layout b/src/mainboard/google/butterfly/cmos.layout
index 8fe3d9b974..180751d971 100644
--- a/src/mainboard/google/butterfly/cmos.layout
+++ b/src/mainboard/google/butterfly/cmos.layout
@@ -42,7 +42,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/google/chell/cmos.layout b/src/mainboard/google/chell/cmos.layout
index 7159e7ba04..91a1336104 100644
--- a/src/mainboard/google/chell/cmos.layout
+++ b/src/mainboard/google/chell/cmos.layout
@@ -65,7 +65,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/google/cyan/cmos.layout b/src/mainboard/google/cyan/cmos.layout
index c14566e2ad..ae46e10647 100644
--- a/src/mainboard/google/cyan/cmos.layout
+++ b/src/mainboard/google/cyan/cmos.layout
@@ -65,7 +65,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/google/falco/cmos.layout b/src/mainboard/google/falco/cmos.layout
index 2a518e9213..b575e02970 100644
--- a/src/mainboard/google/falco/cmos.layout
+++ b/src/mainboard/google/falco/cmos.layout
@@ -42,7 +42,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/google/glados/cmos.layout b/src/mainboard/google/glados/cmos.layout
index 7159e7ba04..91a1336104 100644
--- a/src/mainboard/google/glados/cmos.layout
+++ b/src/mainboard/google/glados/cmos.layout
@@ -65,7 +65,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/google/guado/cmos.layout b/src/mainboard/google/guado/cmos.layout
index b4193159b6..c508d64ebe 100644
--- a/src/mainboard/google/guado/cmos.layout
+++ b/src/mainboard/google/guado/cmos.layout
@@ -64,8 +64,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/google/jecht/cmos.layout b/src/mainboard/google/jecht/cmos.layout
index c9528ebea3..c508d64ebe 100644
--- a/src/mainboard/google/jecht/cmos.layout
+++ b/src/mainboard/google/jecht/cmos.layout
@@ -64,7 +64,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/google/lars/cmos.layout b/src/mainboard/google/lars/cmos.layout
index ef96d8426d..1c166c6756 100644
--- a/src/mainboard/google/lars/cmos.layout
+++ b/src/mainboard/google/lars/cmos.layout
@@ -65,7 +65,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/google/link/cmos.layout b/src/mainboard/google/link/cmos.layout
index 0513a5466e..91dc89017a 100644
--- a/src/mainboard/google/link/cmos.layout
+++ b/src/mainboard/google/link/cmos.layout
@@ -42,7 +42,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/google/ninja/cmos.layout b/src/mainboard/google/ninja/cmos.layout
index b4193159b6..c508d64ebe 100644
--- a/src/mainboard/google/ninja/cmos.layout
+++ b/src/mainboard/google/ninja/cmos.layout
@@ -64,8 +64,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/google/panther/cmos.layout b/src/mainboard/google/panther/cmos.layout
index 2a518e9213..b575e02970 100644
--- a/src/mainboard/google/panther/cmos.layout
+++ b/src/mainboard/google/panther/cmos.layout
@@ -42,7 +42,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/google/parrot/cmos.layout b/src/mainboard/google/parrot/cmos.layout
index 0513a5466e..91dc89017a 100644
--- a/src/mainboard/google/parrot/cmos.layout
+++ b/src/mainboard/google/parrot/cmos.layout
@@ -42,7 +42,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/google/peppy/cmos.layout b/src/mainboard/google/peppy/cmos.layout
index 2a518e9213..b575e02970 100644
--- a/src/mainboard/google/peppy/cmos.layout
+++ b/src/mainboard/google/peppy/cmos.layout
@@ -42,7 +42,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/google/rambi/cmos.layout b/src/mainboard/google/rambi/cmos.layout
index 2a518e9213..b575e02970 100644
--- a/src/mainboard/google/rambi/cmos.layout
+++ b/src/mainboard/google/rambi/cmos.layout
@@ -42,7 +42,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/google/rikku/cmos.layout b/src/mainboard/google/rikku/cmos.layout
index b4193159b6..c508d64ebe 100644
--- a/src/mainboard/google/rikku/cmos.layout
+++ b/src/mainboard/google/rikku/cmos.layout
@@ -64,8 +64,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/google/samus/cmos.layout b/src/mainboard/google/samus/cmos.layout
index 2a518e9213..b575e02970 100644
--- a/src/mainboard/google/samus/cmos.layout
+++ b/src/mainboard/google/samus/cmos.layout
@@ -42,7 +42,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/google/stout/cmos.layout b/src/mainboard/google/stout/cmos.layout
index 0513a5466e..91dc89017a 100644
--- a/src/mainboard/google/stout/cmos.layout
+++ b/src/mainboard/google/stout/cmos.layout
@@ -42,7 +42,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/google/tidus/cmos.layout b/src/mainboard/google/tidus/cmos.layout
index b4193159b6..c508d64ebe 100644
--- a/src/mainboard/google/tidus/cmos.layout
+++ b/src/mainboard/google/tidus/cmos.layout
@@ -64,8 +64,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/hp/abm/cmos.layout b/src/mainboard/hp/abm/cmos.layout
index d83bb14d26..75a2d30eb1 100644
--- a/src/mainboard/hp/abm/cmos.layout
+++ b/src/mainboard/hp/abm/cmos.layout
@@ -18,7 +18,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/hp/dl145_g1/cmos.layout b/src/mainboard/hp/dl145_g1/cmos.layout
index 4e081ea1aa..c5db29ca32 100644
--- a/src/mainboard/hp/dl145_g1/cmos.layout
+++ b/src/mainboard/hp/dl145_g1/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/hp/dl145_g3/cmos.layout b/src/mainboard/hp/dl145_g3/cmos.layout
index 0ad18a254b..e5964b42f4 100644
--- a/src/mainboard/hp/dl145_g3/cmos.layout
+++ b/src/mainboard/hp/dl145_g3/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/hp/dl165_g6_fam10/cmos.layout b/src/mainboard/hp/dl165_g6_fam10/cmos.layout
index 5602c70f12..37ab3bd12c 100644
--- a/src/mainboard/hp/dl165_g6_fam10/cmos.layout
+++ b/src/mainboard/hp/dl165_g6_fam10/cmos.layout
@@ -20,7 +20,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
393 3 e 5 baud_rate
396 5 e 10 ecc_scrub_rate
401 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/cmos.layout b/src/mainboard/hp/pavilion_m6_1035dx/cmos.layout
index 5b1f9cb43b..231572a443 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/cmos.layout
+++ b/src/mainboard/hp/pavilion_m6_1035dx/cmos.layout
@@ -5,7 +5,7 @@ entries
# RTC_BOOT_BYTE (coreboot hardcoded)
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
# southbridge/amd/agesa/hudson should use this but it doesn't
400 1 e 1 power_on_after_fail
diff --git a/src/mainboard/ibase/mb899/cmos.layout b/src/mainboard/ibase/mb899/cmos.layout
index f42dd0a899..d1bab313d5 100644
--- a/src/mainboard/ibase/mb899/cmos.layout
+++ b/src/mainboard/ibase/mb899/cmos.layout
@@ -42,7 +42,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/iei/kino-780am2-fam10/cmos.layout b/src/mainboard/iei/kino-780am2-fam10/cmos.layout
index bf58aac890..aca27b0779 100644
--- a/src/mainboard/iei/kino-780am2-fam10/cmos.layout
+++ b/src/mainboard/iei/kino-780am2-fam10/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/intel/baskingridge/cmos.layout b/src/mainboard/intel/baskingridge/cmos.layout
index 2f429c9a7a..6d7e031bd6 100644
--- a/src/mainboard/intel/baskingridge/cmos.layout
+++ b/src/mainboard/intel/baskingridge/cmos.layout
@@ -42,7 +42,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/intel/bayleybay_fsp/cmos.layout b/src/mainboard/intel/bayleybay_fsp/cmos.layout
index bd5010c19b..c3d557eaf0 100644
--- a/src/mainboard/intel/bayleybay_fsp/cmos.layout
+++ b/src/mainboard/intel/bayleybay_fsp/cmos.layout
@@ -42,7 +42,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/intel/camelbackmountain_fsp/cmos.layout b/src/mainboard/intel/camelbackmountain_fsp/cmos.layout
index 9ff9d1f22b..27ad8be975 100644
--- a/src/mainboard/intel/camelbackmountain_fsp/cmos.layout
+++ b/src/mainboard/intel/camelbackmountain_fsp/cmos.layout
@@ -64,8 +64,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/intel/cougar_canyon2/cmos.layout b/src/mainboard/intel/cougar_canyon2/cmos.layout
index 44ce09658c..d33634a88a 100644
--- a/src/mainboard/intel/cougar_canyon2/cmos.layout
+++ b/src/mainboard/intel/cougar_canyon2/cmos.layout
@@ -42,7 +42,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/intel/d945gclf/cmos.layout b/src/mainboard/intel/d945gclf/cmos.layout
index c280627af6..05115822f6 100644
--- a/src/mainboard/intel/d945gclf/cmos.layout
+++ b/src/mainboard/intel/d945gclf/cmos.layout
@@ -42,7 +42,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/intel/eagleheights/cmos.layout b/src/mainboard/intel/eagleheights/cmos.layout
index 468e72385e..873f938998 100644
--- a/src/mainboard/intel/eagleheights/cmos.layout
+++ b/src/mainboard/intel/eagleheights/cmos.layout
@@ -43,7 +43,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/intel/emeraldlake2/cmos.layout b/src/mainboard/intel/emeraldlake2/cmos.layout
index ab8cdb81d2..3cc675f3aa 100644
--- a/src/mainboard/intel/emeraldlake2/cmos.layout
+++ b/src/mainboard/intel/emeraldlake2/cmos.layout
@@ -42,7 +42,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/intel/kunimitsu/cmos.layout b/src/mainboard/intel/kunimitsu/cmos.layout
index ef96d8426d..1c166c6756 100644
--- a/src/mainboard/intel/kunimitsu/cmos.layout
+++ b/src/mainboard/intel/kunimitsu/cmos.layout
@@ -65,7 +65,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/intel/littleplains/cmos.layout b/src/mainboard/intel/littleplains/cmos.layout
index 28976c1212..27041228f0 100644
--- a/src/mainboard/intel/littleplains/cmos.layout
+++ b/src/mainboard/intel/littleplains/cmos.layout
@@ -42,7 +42,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/intel/minnowmax/cmos.layout b/src/mainboard/intel/minnowmax/cmos.layout
index 8aaa522bb8..f65750cd07 100644
--- a/src/mainboard/intel/minnowmax/cmos.layout
+++ b/src/mainboard/intel/minnowmax/cmos.layout
@@ -42,7 +42,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/intel/mohonpeak/cmos.layout b/src/mainboard/intel/mohonpeak/cmos.layout
index 28976c1212..27041228f0 100644
--- a/src/mainboard/intel/mohonpeak/cmos.layout
+++ b/src/mainboard/intel/mohonpeak/cmos.layout
@@ -42,7 +42,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/intel/stargo2/cmos.layout b/src/mainboard/intel/stargo2/cmos.layout
index 7312dc9580..ed2c93a66b 100644
--- a/src/mainboard/intel/stargo2/cmos.layout
+++ b/src/mainboard/intel/stargo2/cmos.layout
@@ -42,8 +42,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/intel/strago/cmos.layout b/src/mainboard/intel/strago/cmos.layout
index c14566e2ad..ae46e10647 100644
--- a/src/mainboard/intel/strago/cmos.layout
+++ b/src/mainboard/intel/strago/cmos.layout
@@ -65,7 +65,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/intel/wtm2/cmos.layout b/src/mainboard/intel/wtm2/cmos.layout
index 2a518e9213..b575e02970 100644
--- a/src/mainboard/intel/wtm2/cmos.layout
+++ b/src/mainboard/intel/wtm2/cmos.layout
@@ -42,7 +42,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/iwave/iWRainbowG6/cmos.layout b/src/mainboard/iwave/iWRainbowG6/cmos.layout
index e2ff2c5128..4fd2d9198a 100644
--- a/src/mainboard/iwave/iWRainbowG6/cmos.layout
+++ b/src/mainboard/iwave/iWRainbowG6/cmos.layout
@@ -43,7 +43,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/iwill/dk8_htx/cmos.layout b/src/mainboard/iwill/dk8_htx/cmos.layout
index 0ad18a254b..e5964b42f4 100644
--- a/src/mainboard/iwill/dk8_htx/cmos.layout
+++ b/src/mainboard/iwill/dk8_htx/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/jetway/j7f2/cmos.layout b/src/mainboard/jetway/j7f2/cmos.layout
index 6de5ab6d1b..d9ec5520bf 100644
--- a/src/mainboard/jetway/j7f2/cmos.layout
+++ b/src/mainboard/jetway/j7f2/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
diff --git a/src/mainboard/jetway/nf81-t56n-lf/cmos.layout b/src/mainboard/jetway/nf81-t56n-lf/cmos.layout
index f47185f896..ca3d9e5e3c 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/cmos.layout
+++ b/src/mainboard/jetway/nf81-t56n-lf/cmos.layout
@@ -18,7 +18,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/jetway/pa78vm5/cmos.layout b/src/mainboard/jetway/pa78vm5/cmos.layout
index bf58aac890..aca27b0779 100644
--- a/src/mainboard/jetway/pa78vm5/cmos.layout
+++ b/src/mainboard/jetway/pa78vm5/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/kontron/986lcd-m/cmos.layout b/src/mainboard/kontron/986lcd-m/cmos.layout
index 2a99e5040a..c614e6fbee 100644
--- a/src/mainboard/kontron/986lcd-m/cmos.layout
+++ b/src/mainboard/kontron/986lcd-m/cmos.layout
@@ -42,7 +42,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/kontron/kt690/cmos.layout b/src/mainboard/kontron/kt690/cmos.layout
index 4e9d62cffc..93aa445656 100644
--- a/src/mainboard/kontron/kt690/cmos.layout
+++ b/src/mainboard/kontron/kt690/cmos.layout
@@ -19,7 +19,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/kontron/ktqm77/cmos.layout b/src/mainboard/kontron/ktqm77/cmos.layout
index 9517618744..b17ee516aa 100644
--- a/src/mainboard/kontron/ktqm77/cmos.layout
+++ b/src/mainboard/kontron/ktqm77/cmos.layout
@@ -42,7 +42,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/lanner/em8510/cmos.layout b/src/mainboard/lanner/em8510/cmos.layout
index 6de5ab6d1b..d9ec5520bf 100644
--- a/src/mainboard/lanner/em8510/cmos.layout
+++ b/src/mainboard/lanner/em8510/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
diff --git a/src/mainboard/lenovo/g505s/cmos.layout b/src/mainboard/lenovo/g505s/cmos.layout
index 61c5690346..249564693d 100644
--- a/src/mainboard/lenovo/g505s/cmos.layout
+++ b/src/mainboard/lenovo/g505s/cmos.layout
@@ -18,7 +18,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/lenovo/t400/cmos.layout b/src/mainboard/lenovo/t400/cmos.layout
index 475f4b2914..d62042cc9d 100644
--- a/src/mainboard/lenovo/t400/cmos.layout
+++ b/src/mainboard/lenovo/t400/cmos.layout
@@ -44,7 +44,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/lenovo/t420/cmos.layout b/src/mainboard/lenovo/t420/cmos.layout
index 58a4abeaf6..79a3a68592 100644
--- a/src/mainboard/lenovo/t420/cmos.layout
+++ b/src/mainboard/lenovo/t420/cmos.layout
@@ -43,7 +43,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/lenovo/t420s/cmos.layout b/src/mainboard/lenovo/t420s/cmos.layout
index 3521849cde..ec9be116ad 100644
--- a/src/mainboard/lenovo/t420s/cmos.layout
+++ b/src/mainboard/lenovo/t420s/cmos.layout
@@ -43,7 +43,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/lenovo/t430s/cmos.layout b/src/mainboard/lenovo/t430s/cmos.layout
index 16b499aac5..73bbe3aa3d 100644
--- a/src/mainboard/lenovo/t430s/cmos.layout
+++ b/src/mainboard/lenovo/t430s/cmos.layout
@@ -43,7 +43,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/lenovo/t520/cmos.layout b/src/mainboard/lenovo/t520/cmos.layout
index 044c3107a5..a151b7e02a 100644
--- a/src/mainboard/lenovo/t520/cmos.layout
+++ b/src/mainboard/lenovo/t520/cmos.layout
@@ -43,7 +43,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/lenovo/t530/cmos.layout b/src/mainboard/lenovo/t530/cmos.layout
index 0e28bddb3b..d6d671cff1 100644
--- a/src/mainboard/lenovo/t530/cmos.layout
+++ b/src/mainboard/lenovo/t530/cmos.layout
@@ -43,7 +43,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/lenovo/t60/cmos.layout b/src/mainboard/lenovo/t60/cmos.layout
index 5068fac822..12e7d86c5a 100644
--- a/src/mainboard/lenovo/t60/cmos.layout
+++ b/src/mainboard/lenovo/t60/cmos.layout
@@ -43,7 +43,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/lenovo/x200/cmos.layout b/src/mainboard/lenovo/x200/cmos.layout
index 17918976f5..19ead05bee 100644
--- a/src/mainboard/lenovo/x200/cmos.layout
+++ b/src/mainboard/lenovo/x200/cmos.layout
@@ -44,7 +44,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/lenovo/x201/cmos.layout b/src/mainboard/lenovo/x201/cmos.layout
index 7d4aeae0b3..2a91eb71bb 100644
--- a/src/mainboard/lenovo/x201/cmos.layout
+++ b/src/mainboard/lenovo/x201/cmos.layout
@@ -43,7 +43,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/lenovo/x220/cmos.layout b/src/mainboard/lenovo/x220/cmos.layout
index ca2c45c933..143ee807cd 100644
--- a/src/mainboard/lenovo/x220/cmos.layout
+++ b/src/mainboard/lenovo/x220/cmos.layout
@@ -43,7 +43,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/lenovo/x230/cmos.layout b/src/mainboard/lenovo/x230/cmos.layout
index 29c20665e8..14602fff43 100644
--- a/src/mainboard/lenovo/x230/cmos.layout
+++ b/src/mainboard/lenovo/x230/cmos.layout
@@ -43,7 +43,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/lenovo/x60/cmos.layout b/src/mainboard/lenovo/x60/cmos.layout
index 9f10fbc930..2d9fe41b02 100644
--- a/src/mainboard/lenovo/x60/cmos.layout
+++ b/src/mainboard/lenovo/x60/cmos.layout
@@ -43,7 +43,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 h 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/lippert/frontrunner-af/cmos.layout b/src/mainboard/lippert/frontrunner-af/cmos.layout
index f47185f896..ca3d9e5e3c 100644
--- a/src/mainboard/lippert/frontrunner-af/cmos.layout
+++ b/src/mainboard/lippert/frontrunner-af/cmos.layout
@@ -18,7 +18,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/lippert/frontrunner/cmos.layout b/src/mainboard/lippert/frontrunner/cmos.layout
index 6de5ab6d1b..d9ec5520bf 100644
--- a/src/mainboard/lippert/frontrunner/cmos.layout
+++ b/src/mainboard/lippert/frontrunner/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
diff --git a/src/mainboard/lippert/toucan-af/cmos.layout b/src/mainboard/lippert/toucan-af/cmos.layout
index f47185f896..ca3d9e5e3c 100644
--- a/src/mainboard/lippert/toucan-af/cmos.layout
+++ b/src/mainboard/lippert/toucan-af/cmos.layout
@@ -18,7 +18,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/msi/ms7135/cmos.layout b/src/mainboard/msi/ms7135/cmos.layout
index 34afb4218d..02c3a96ce8 100644
--- a/src/mainboard/msi/ms7135/cmos.layout
+++ b/src/mainboard/msi/ms7135/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/msi/ms7260/cmos.layout b/src/mainboard/msi/ms7260/cmos.layout
index be9dce6a2a..89a7b1325b 100644
--- a/src/mainboard/msi/ms7260/cmos.layout
+++ b/src/mainboard/msi/ms7260/cmos.layout
@@ -20,7 +20,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/msi/ms9185/cmos.layout b/src/mainboard/msi/ms9185/cmos.layout
index 7e80285d8f..41c4ac9206 100644
--- a/src/mainboard/msi/ms9185/cmos.layout
+++ b/src/mainboard/msi/ms9185/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/msi/ms9282/cmos.layout b/src/mainboard/msi/ms9282/cmos.layout
index 4e081ea1aa..c5db29ca32 100644
--- a/src/mainboard/msi/ms9282/cmos.layout
+++ b/src/mainboard/msi/ms9282/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/msi/ms9652_fam10/cmos.layout b/src/mainboard/msi/ms9652_fam10/cmos.layout
index 3c0a4ed49d..fe0ff4e95b 100644
--- a/src/mainboard/msi/ms9652_fam10/cmos.layout
+++ b/src/mainboard/msi/ms9652_fam10/cmos.layout
@@ -20,7 +20,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
393 3 e 5 baud_rate
396 5 e 10 ecc_scrub_rate
401 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/nvidia/l1_2pvv/cmos.layout b/src/mainboard/nvidia/l1_2pvv/cmos.layout
index 53f259ad5a..a6d7a6e810 100644
--- a/src/mainboard/nvidia/l1_2pvv/cmos.layout
+++ b/src/mainboard/nvidia/l1_2pvv/cmos.layout
@@ -19,7 +19,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/packardbell/ms2290/cmos.layout b/src/mainboard/packardbell/ms2290/cmos.layout
index 4cfb902020..09a5d498e6 100644
--- a/src/mainboard/packardbell/ms2290/cmos.layout
+++ b/src/mainboard/packardbell/ms2290/cmos.layout
@@ -43,7 +43,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/pcengines/alix1c/cmos.layout b/src/mainboard/pcengines/alix1c/cmos.layout
index 6de5ab6d1b..d9ec5520bf 100644
--- a/src/mainboard/pcengines/alix1c/cmos.layout
+++ b/src/mainboard/pcengines/alix1c/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
diff --git a/src/mainboard/pcengines/alix2d/cmos.layout b/src/mainboard/pcengines/alix2d/cmos.layout
index 6de5ab6d1b..d9ec5520bf 100644
--- a/src/mainboard/pcengines/alix2d/cmos.layout
+++ b/src/mainboard/pcengines/alix2d/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
diff --git a/src/mainboard/roda/rk886ex/cmos.layout b/src/mainboard/roda/rk886ex/cmos.layout
index 177bdfe764..4c40dc7924 100644
--- a/src/mainboard/roda/rk886ex/cmos.layout
+++ b/src/mainboard/roda/rk886ex/cmos.layout
@@ -43,7 +43,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/roda/rk9/cmos.layout b/src/mainboard/roda/rk9/cmos.layout
index 3d757840af..711551bad6 100644
--- a/src/mainboard/roda/rk9/cmos.layout
+++ b/src/mainboard/roda/rk9/cmos.layout
@@ -44,7 +44,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/samsung/lumpy/cmos.layout b/src/mainboard/samsung/lumpy/cmos.layout
index b88ceb8803..531c162c97 100644
--- a/src/mainboard/samsung/lumpy/cmos.layout
+++ b/src/mainboard/samsung/lumpy/cmos.layout
@@ -42,7 +42,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/samsung/stumpy/cmos.layout b/src/mainboard/samsung/stumpy/cmos.layout
index a5ed03072f..eba4d4367e 100644
--- a/src/mainboard/samsung/stumpy/cmos.layout
+++ b/src/mainboard/samsung/stumpy/cmos.layout
@@ -42,7 +42,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/siemens/mc_bdx1/cmos.layout b/src/mainboard/siemens/mc_bdx1/cmos.layout
index 9ff9d1f22b..27ad8be975 100644
--- a/src/mainboard/siemens/mc_bdx1/cmos.layout
+++ b/src/mainboard/siemens/mc_bdx1/cmos.layout
@@ -64,8 +64,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-385 1 e 4 last_boot
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/siemens/mc_tcu3/cmos.layout b/src/mainboard/siemens/mc_tcu3/cmos.layout
index 6297de00fe..27ad8be975 100644
--- a/src/mainboard/siemens/mc_tcu3/cmos.layout
+++ b/src/mainboard/siemens/mc_tcu3/cmos.layout
@@ -64,7 +64,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/siemens/sitemp_g1p1/cmos.layout b/src/mainboard/siemens/sitemp_g1p1/cmos.layout
index acaa674572..7cae2fbb03 100644
--- a/src/mainboard/siemens/sitemp_g1p1/cmos.layout
+++ b/src/mainboard/siemens/sitemp_g1p1/cmos.layout
@@ -29,7 +29,7 @@ entries
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
#386 2 r 1 unused
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
#395 1 r 1 unused
#396 1 r 1 unused
diff --git a/src/mainboard/sunw/ultra40/cmos.layout b/src/mainboard/sunw/ultra40/cmos.layout
index 4e081ea1aa..c5db29ca32 100644
--- a/src/mainboard/sunw/ultra40/cmos.layout
+++ b/src/mainboard/sunw/ultra40/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/sunw/ultra40m2/cmos.layout b/src/mainboard/sunw/ultra40m2/cmos.layout
index 3dfdf3561f..d501be58cd 100644
--- a/src/mainboard/sunw/ultra40m2/cmos.layout
+++ b/src/mainboard/sunw/ultra40m2/cmos.layout
@@ -19,7 +19,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/supermicro/h8dme/cmos.layout b/src/mainboard/supermicro/h8dme/cmos.layout
index 53f259ad5a..a6d7a6e810 100644
--- a/src/mainboard/supermicro/h8dme/cmos.layout
+++ b/src/mainboard/supermicro/h8dme/cmos.layout
@@ -19,7 +19,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/supermicro/h8dmr/cmos.layout b/src/mainboard/supermicro/h8dmr/cmos.layout
index 53f259ad5a..a6d7a6e810 100644
--- a/src/mainboard/supermicro/h8dmr/cmos.layout
+++ b/src/mainboard/supermicro/h8dmr/cmos.layout
@@ -19,7 +19,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/supermicro/h8dmr_fam10/cmos.layout b/src/mainboard/supermicro/h8dmr_fam10/cmos.layout
index 3c0a4ed49d..fe0ff4e95b 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/cmos.layout
+++ b/src/mainboard/supermicro/h8dmr_fam10/cmos.layout
@@ -20,7 +20,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
393 3 e 5 baud_rate
396 5 e 10 ecc_scrub_rate
401 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/supermicro/h8qgi/cmos.layout b/src/mainboard/supermicro/h8qgi/cmos.layout
index f47185f896..ca3d9e5e3c 100644
--- a/src/mainboard/supermicro/h8qgi/cmos.layout
+++ b/src/mainboard/supermicro/h8qgi/cmos.layout
@@ -18,7 +18,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/supermicro/h8qme_fam10/cmos.layout b/src/mainboard/supermicro/h8qme_fam10/cmos.layout
index 3c0a4ed49d..fe0ff4e95b 100644
--- a/src/mainboard/supermicro/h8qme_fam10/cmos.layout
+++ b/src/mainboard/supermicro/h8qme_fam10/cmos.layout
@@ -20,7 +20,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
393 3 e 5 baud_rate
396 5 e 10 ecc_scrub_rate
401 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/supermicro/h8scm/cmos.layout b/src/mainboard/supermicro/h8scm/cmos.layout
index f47185f896..ca3d9e5e3c 100644
--- a/src/mainboard/supermicro/h8scm/cmos.layout
+++ b/src/mainboard/supermicro/h8scm/cmos.layout
@@ -18,7 +18,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/supermicro/h8scm_fam10/cmos.layout b/src/mainboard/supermicro/h8scm_fam10/cmos.layout
index bf58aac890..aca27b0779 100644
--- a/src/mainboard/supermicro/h8scm_fam10/cmos.layout
+++ b/src/mainboard/supermicro/h8scm_fam10/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/supermicro/x7db8/cmos.layout b/src/mainboard/supermicro/x7db8/cmos.layout
index 2bccce8d96..06d46ff7f0 100644
--- a/src/mainboard/supermicro/x7db8/cmos.layout
+++ b/src/mainboard/supermicro/x7db8/cmos.layout
@@ -43,7 +43,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------
diff --git a/src/mainboard/technexion/tim5690/cmos.layout b/src/mainboard/technexion/tim5690/cmos.layout
index 4e9d62cffc..93aa445656 100644
--- a/src/mainboard/technexion/tim5690/cmos.layout
+++ b/src/mainboard/technexion/tim5690/cmos.layout
@@ -19,7 +19,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/technexion/tim8690/cmos.layout b/src/mainboard/technexion/tim8690/cmos.layout
index 4e9d62cffc..93aa445656 100644
--- a/src/mainboard/technexion/tim8690/cmos.layout
+++ b/src/mainboard/technexion/tim8690/cmos.layout
@@ -19,7 +19,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/traverse/geos/cmos.layout b/src/mainboard/traverse/geos/cmos.layout
index 6a030e6674..c724569209 100644
--- a/src/mainboard/traverse/geos/cmos.layout
+++ b/src/mainboard/traverse/geos/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
diff --git a/src/mainboard/tyan/s2912/cmos.layout b/src/mainboard/tyan/s2912/cmos.layout
index 53f259ad5a..a6d7a6e810 100644
--- a/src/mainboard/tyan/s2912/cmos.layout
+++ b/src/mainboard/tyan/s2912/cmos.layout
@@ -19,7 +19,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/tyan/s2912_fam10/cmos.layout b/src/mainboard/tyan/s2912_fam10/cmos.layout
index 3c0a4ed49d..fe0ff4e95b 100644
--- a/src/mainboard/tyan/s2912_fam10/cmos.layout
+++ b/src/mainboard/tyan/s2912_fam10/cmos.layout
@@ -20,7 +20,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
393 3 e 5 baud_rate
396 5 e 10 ecc_scrub_rate
401 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/tyan/s8226/cmos.layout b/src/mainboard/tyan/s8226/cmos.layout
index f47185f896..ca3d9e5e3c 100644
--- a/src/mainboard/tyan/s8226/cmos.layout
+++ b/src/mainboard/tyan/s8226/cmos.layout
@@ -18,7 +18,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/via/epia-cn/cmos.layout b/src/mainboard/via/epia-cn/cmos.layout
index 6de5ab6d1b..d9ec5520bf 100644
--- a/src/mainboard/via/epia-cn/cmos.layout
+++ b/src/mainboard/via/epia-cn/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
diff --git a/src/mainboard/via/epia-m700/cmos.layout b/src/mainboard/via/epia-m700/cmos.layout
index 6de5ab6d1b..d9ec5520bf 100644
--- a/src/mainboard/via/epia-m700/cmos.layout
+++ b/src/mainboard/via/epia-m700/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
diff --git a/src/mainboard/via/pc2500e/cmos.layout b/src/mainboard/via/pc2500e/cmos.layout
index 74f120d91e..ba4ba59125 100644
--- a/src/mainboard/via/pc2500e/cmos.layout
+++ b/src/mainboard/via/pc2500e/cmos.layout
@@ -19,7 +19,7 @@ entries
#start-bit length config config-ID name
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
diff --git a/src/mainboard/via/vt8454c/cmos.layout b/src/mainboard/via/vt8454c/cmos.layout
index dea018f960..f20d3cfb1b 100644
--- a/src/mainboard/via/vt8454c/cmos.layout
+++ b/src/mainboard/via/vt8454c/cmos.layout
@@ -18,7 +18,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
456 1 e 1 ECC_memory
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
diff --git a/src/mainboard/winent/mb6047/cmos.layout b/src/mainboard/winent/mb6047/cmos.layout
index 1e4f30767a..3d09360b56 100644
--- a/src/mainboard/winent/mb6047/cmos.layout
+++ b/src/mainboard/winent/mb6047/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
395 1 e 1 hw_scrubber
396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/winent/pl6064/cmos.layout b/src/mainboard/winent/pl6064/cmos.layout
index 6de5ab6d1b..d9ec5520bf 100644
--- a/src/mainboard/winent/pl6064/cmos.layout
+++ b/src/mainboard/winent/pl6064/cmos.layout
@@ -2,7 +2,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level
diff --git a/src/mainboard/wyse/s50/cmos.layout b/src/mainboard/wyse/s50/cmos.layout
index fffba2bd87..3be09dc8cf 100644
--- a/src/mainboard/wyse/s50/cmos.layout
+++ b/src/mainboard/wyse/s50/cmos.layout
@@ -20,7 +20,7 @@ entries
0 384 r 0 reserved_memory
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
392 3 e 5 baud_rate
400 1 e 1 power_on_after_fail
412 4 e 6 debug_level