mainboard: Clean up boot_option/reboot_bits in cmos.layout

Since commit 3bfd7cc (drivers/pc80: Rework normal / fallback selector
code) the reboot counter stored in `reboot_bits` isn't reset on a reboot
with `boot_option = 1` any more. Hence, with SKIP_MAX_REBOOT_CNT_CLEAR
enabled, later stages (e.g. payload, OS) have to clear the counter too,
when they want to switch to normal boot. So change the bits to (h)ex
instead of (r)eserved.

To clarify their meaning, rename `reboot_bits` to `reboot_counter`. Also
remove all occurences of the obsolete `last_boot` bit that have sneaked
in again since 24391321 (mainboard: Remove last_boot NVRAM option).

Change-Id: Ib3fc38115ce951b75374e0d1347798b23db7243c
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/16157
Tested-by: build bot (Jenkins)
Reviewed-by: Timothy Pearson <tpearson@raptorengineering.com>
Reviewed-by: York Yang <york.yang@intel.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
diff --git a/src/mainboard/adi/rcc-dff/cmos.layout b/src/mainboard/adi/rcc-dff/cmos.layout
index 28976c1..2704122 100644
--- a/src/mainboard/adi/rcc-dff/cmos.layout
+++ b/src/mainboard/adi/rcc-dff/cmos.layout
@@ -42,7 +42,7 @@
 # -----------------------------------------------------------------
 # 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 bf58aac..aca27b0 100644
--- a/src/mainboard/advansus/a785e-i/cmos.layout
+++ b/src/mainboard/advansus/a785e-i/cmos.layout
@@ -2,7 +2,7 @@
 
 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 ba44a24..c1338d3 100644
--- a/src/mainboard/amd/bettong/cmos.layout
+++ b/src/mainboard/amd/bettong/cmos.layout
@@ -42,7 +42,7 @@
 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 bf58aac..aca27b0 100644
--- a/src/mainboard/amd/bimini_fam10/cmos.layout
+++ b/src/mainboard/amd/bimini_fam10/cmos.layout
@@ -2,7 +2,7 @@
 
 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 d83bb14..75a2d30 100644
--- a/src/mainboard/amd/db-ft3b-lc/cmos.layout
+++ b/src/mainboard/amd/db-ft3b-lc/cmos.layout
@@ -18,7 +18,7 @@
 
 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 6de5ab6..d9ec552 100644
--- a/src/mainboard/amd/db800/cmos.layout
+++ b/src/mainboard/amd/db800/cmos.layout
@@ -2,7 +2,7 @@
 
 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 4e9d62c..93aa445 100644
--- a/src/mainboard/amd/dbm690t/cmos.layout
+++ b/src/mainboard/amd/dbm690t/cmos.layout
@@ -19,7 +19,7 @@
 
 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 bf617ae..d18813a 100644
--- a/src/mainboard/amd/dinar/cmos.layout
+++ b/src/mainboard/amd/dinar/cmos.layout
@@ -18,7 +18,7 @@
 
 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 6de5ab6..d9ec552 100644
--- a/src/mainboard/amd/f2950/cmos.layout
+++ b/src/mainboard/amd/f2950/cmos.layout
@@ -2,7 +2,7 @@
 
 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 f47185f..ca3d9e5 100644
--- a/src/mainboard/amd/inagua/cmos.layout
+++ b/src/mainboard/amd/inagua/cmos.layout
@@ -18,7 +18,7 @@
 
 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 9663cdb..f9e614d 100644
--- a/src/mainboard/amd/lamar/cmos.layout
+++ b/src/mainboard/amd/lamar/cmos.layout
@@ -18,7 +18,7 @@
 
 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 64832c1..0d4f95e 100644
--- a/src/mainboard/amd/mahogany/cmos.layout
+++ b/src/mainboard/amd/mahogany/cmos.layout
@@ -19,7 +19,7 @@
 
 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 bf58aac..aca27b0 100644
--- a/src/mainboard/amd/mahogany_fam10/cmos.layout
+++ b/src/mainboard/amd/mahogany_fam10/cmos.layout
@@ -2,7 +2,7 @@
 
 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 6a030e6..c724569 100644
--- a/src/mainboard/amd/norwich/cmos.layout
+++ b/src/mainboard/amd/norwich/cmos.layout
@@ -2,7 +2,7 @@
 
 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 d83bb14..75a2d30 100644
--- a/src/mainboard/amd/olivehill/cmos.layout
+++ b/src/mainboard/amd/olivehill/cmos.layout
@@ -18,7 +18,7 @@
 
 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 d83bb14..75a2d30 100644
--- a/src/mainboard/amd/olivehillplus/cmos.layout
+++ b/src/mainboard/amd/olivehillplus/cmos.layout
@@ -18,7 +18,7 @@
 
 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 d83bb14..75a2d30 100644
--- a/src/mainboard/amd/parmer/cmos.layout
+++ b/src/mainboard/amd/parmer/cmos.layout
@@ -18,7 +18,7 @@
 
 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 f47185f..ca3d9e5 100644
--- a/src/mainboard/amd/persimmon/cmos.layout
+++ b/src/mainboard/amd/persimmon/cmos.layout
@@ -18,7 +18,7 @@
 
 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 4e9d62c..93aa445 100644
--- a/src/mainboard/amd/pistachio/cmos.layout
+++ b/src/mainboard/amd/pistachio/cmos.layout
@@ -19,7 +19,7 @@
 
 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 6de5ab6..d9ec552 100644
--- a/src/mainboard/amd/rumba/cmos.layout
+++ b/src/mainboard/amd/rumba/cmos.layout
@@ -2,7 +2,7 @@
 
 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 0ad18a2..e5964b4 100644
--- a/src/mainboard/amd/serengeti_cheetah/cmos.layout
+++ b/src/mainboard/amd/serengeti_cheetah/cmos.layout
@@ -2,7 +2,7 @@
 
 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 3c0a4ed..fe0ff4e 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout
@@ -20,7 +20,7 @@
 
 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 f47185f..ca3d9e5 100644
--- a/src/mainboard/amd/south_station/cmos.layout
+++ b/src/mainboard/amd/south_station/cmos.layout
@@ -18,7 +18,7 @@
 
 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 d83bb14..75a2d30 100644
--- a/src/mainboard/amd/thatcher/cmos.layout
+++ b/src/mainboard/amd/thatcher/cmos.layout
@@ -18,7 +18,7 @@
 
 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 bf58aac..aca27b0 100644
--- a/src/mainboard/amd/tilapia_fam10/cmos.layout
+++ b/src/mainboard/amd/tilapia_fam10/cmos.layout
@@ -2,7 +2,7 @@
 
 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 f47185f..ca3d9e5 100644
--- a/src/mainboard/amd/torpedo/cmos.layout
+++ b/src/mainboard/amd/torpedo/cmos.layout
@@ -18,7 +18,7 @@
 
 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 f47185f..ca3d9e5 100644
--- a/src/mainboard/amd/union_station/cmos.layout
+++ b/src/mainboard/amd/union_station/cmos.layout
@@ -18,7 +18,7 @@
 
 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 a6483458..4b4b8de 100644
--- a/src/mainboard/apple/macbook21/cmos.layout
+++ b/src/mainboard/apple/macbook21/cmos.layout
@@ -43,7 +43,7 @@
 # -----------------------------------------------------------------
 # 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 6de5ab6..d9ec552 100644
--- a/src/mainboard/artecgroup/dbe61/cmos.layout
+++ b/src/mainboard/artecgroup/dbe61/cmos.layout
@@ -2,7 +2,7 @@
 
 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 64832c1..0d4f95e 100644
--- a/src/mainboard/asrock/939a785gmh/cmos.layout
+++ b/src/mainboard/asrock/939a785gmh/cmos.layout
@@ -19,7 +19,7 @@
 
 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 83de4da..c7da8b8 100644
--- a/src/mainboard/asrock/e350m1/cmos.layout
+++ b/src/mainboard/asrock/e350m1/cmos.layout
@@ -18,7 +18,7 @@
 
 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 d83bb14..75a2d30 100644
--- a/src/mainboard/asrock/imb-a180/cmos.layout
+++ b/src/mainboard/asrock/imb-a180/cmos.layout
@@ -18,7 +18,7 @@
 
 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 90e3e94..c4b81c6 100644
--- a/src/mainboard/asus/a8n_e/cmos.layout
+++ b/src/mainboard/asus/a8n_e/cmos.layout
@@ -2,7 +2,7 @@
     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 7cf0369..fadba1e 100644
--- a/src/mainboard/asus/a8v-e_deluxe/cmos.layout
+++ b/src/mainboard/asus/a8v-e_deluxe/cmos.layout
@@ -2,7 +2,7 @@
 
 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 7cf0369..fadba1e 100644
--- a/src/mainboard/asus/a8v-e_se/cmos.layout
+++ b/src/mainboard/asus/a8v-e_se/cmos.layout
@@ -2,7 +2,7 @@
 
 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 2bccce8..06d46ff 100644
--- a/src/mainboard/asus/dsbf/cmos.layout
+++ b/src/mainboard/asus/dsbf/cmos.layout
@@ -43,7 +43,7 @@
 # -----------------------------------------------------------------
 # 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 d83bb14..75a2d30 100644
--- a/src/mainboard/asus/f2a85-m/cmos.layout
+++ b/src/mainboard/asus/f2a85-m/cmos.layout
@@ -18,7 +18,7 @@
 
 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 d83bb14..75a2d30 100644
--- a/src/mainboard/asus/f2a85-m_le/cmos.layout
+++ b/src/mainboard/asus/f2a85-m_le/cmos.layout
@@ -18,7 +18,7 @@
 
 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 7cf0369..fadba1e 100644
--- a/src/mainboard/asus/k8v-x/cmos.layout
+++ b/src/mainboard/asus/k8v-x/cmos.layout
@@ -2,7 +2,7 @@
 
 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 14e3c9b..b9dadf4 100644
--- a/src/mainboard/asus/kcma-d8/cmos.layout
+++ b/src/mainboard/asus/kcma-d8/cmos.layout
@@ -20,7 +20,7 @@
 
 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 bd5fdbe..169af87 100644
--- a/src/mainboard/asus/kfsn4-dre/cmos.layout
+++ b/src/mainboard/asus/kfsn4-dre/cmos.layout
@@ -20,7 +20,7 @@
 
 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 9b26123..d6ac1bc 100644
--- a/src/mainboard/asus/kfsn4-dre_k8/cmos.layout
+++ b/src/mainboard/asus/kfsn4-dre_k8/cmos.layout
@@ -20,7 +20,7 @@
 
 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 9e48910..18c7a3f 100644
--- a/src/mainboard/asus/kgpe-d16/cmos.layout
+++ b/src/mainboard/asus/kgpe-d16/cmos.layout
@@ -20,7 +20,7 @@
 
 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 da60299..9968c56 100644
--- a/src/mainboard/asus/m2n-e/cmos.layout
+++ b/src/mainboard/asus/m2n-e/cmos.layout
@@ -18,7 +18,7 @@
 
 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 b74079d..96e5c64 100644
--- a/src/mainboard/asus/m2v-mx_se/cmos.layout
+++ b/src/mainboard/asus/m2v-mx_se/cmos.layout
@@ -2,7 +2,7 @@
 
 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 7cf0369..fadba1e 100644
--- a/src/mainboard/asus/m2v/cmos.layout
+++ b/src/mainboard/asus/m2v/cmos.layout
@@ -2,7 +2,7 @@
 
 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 bf58aac..aca27b0 100644
--- a/src/mainboard/asus/m4a78-em/cmos.layout
+++ b/src/mainboard/asus/m4a78-em/cmos.layout
@@ -2,7 +2,7 @@
 
 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 bf58aac..aca27b0 100644
--- a/src/mainboard/asus/m4a785-m/cmos.layout
+++ b/src/mainboard/asus/m4a785-m/cmos.layout
@@ -2,7 +2,7 @@
 
 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 bf58aac..aca27b0 100644
--- a/src/mainboard/asus/m4a785t-m/cmos.layout
+++ b/src/mainboard/asus/m4a785t-m/cmos.layout
@@ -2,7 +2,7 @@
 
 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 bf58aac..aca27b0 100644
--- a/src/mainboard/asus/m5a88-v/cmos.layout
+++ b/src/mainboard/asus/m5a88-v/cmos.layout
@@ -2,7 +2,7 @@
 
 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 6de5ab6..d9ec552 100644
--- a/src/mainboard/asus/mew-vm/cmos.layout
+++ b/src/mainboard/asus/mew-vm/cmos.layout
@@ -2,7 +2,7 @@
 
 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 bf58aac..aca27b0 100644
--- a/src/mainboard/avalue/eax-785e/cmos.layout
+++ b/src/mainboard/avalue/eax-785e/cmos.layout
@@ -2,7 +2,7 @@
 
 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 a04213d..9b247a1 100644
--- a/src/mainboard/bachmann/ot200/cmos.layout
+++ b/src/mainboard/bachmann/ot200/cmos.layout
@@ -20,7 +20,7 @@
 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 d83bb14..75a2d30 100644
--- a/src/mainboard/bap/ode_e20XX/cmos.layout
+++ b/src/mainboard/bap/ode_e20XX/cmos.layout
@@ -18,7 +18,7 @@
 
 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 d83bb14..75a2d30 100644
--- a/src/mainboard/bap/ode_e21XX/cmos.layout
+++ b/src/mainboard/bap/ode_e21XX/cmos.layout
@@ -18,7 +18,7 @@
 
 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 6de5ab6..d9ec552 100644
--- a/src/mainboard/bcom/winnetp680/cmos.layout
+++ b/src/mainboard/bcom/winnetp680/cmos.layout
@@ -2,7 +2,7 @@
 
 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 d29e4d2..d8384e3 100644
--- a/src/mainboard/biostar/am1ml/cmos.layout
+++ b/src/mainboard/biostar/am1ml/cmos.layout
@@ -42,7 +42,7 @@
 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 4e081ea..c5db29c 100644
--- a/src/mainboard/broadcom/blast/cmos.layout
+++ b/src/mainboard/broadcom/blast/cmos.layout
@@ -2,7 +2,7 @@
 
 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 6de5ab6..d9ec552 100644
--- a/src/mainboard/digitallogic/msm800sev/cmos.layout
+++ b/src/mainboard/digitallogic/msm800sev/cmos.layout
@@ -2,7 +2,7 @@
 
 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 6de5ab6..d9ec552 100644
--- a/src/mainboard/emulation/qemu-i440fx/cmos.layout
+++ b/src/mainboard/emulation/qemu-i440fx/cmos.layout
@@ -2,7 +2,7 @@
 
 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 8aaa522..f65750c 100644
--- a/src/mainboard/esd/atom15/cmos.layout
+++ b/src/mainboard/esd/atom15/cmos.layout
@@ -42,7 +42,7 @@
 # -----------------------------------------------------------------
 # 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 177bdfe..4c40dc7 100644
--- a/src/mainboard/getac/p470/cmos.layout
+++ b/src/mainboard/getac/p470/cmos.layout
@@ -43,7 +43,7 @@
 # -----------------------------------------------------------------
 # 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 32a3059..5600a6b 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout
@@ -43,7 +43,7 @@
 # -----------------------------------------------------------------
 # 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 32a3059..5600a6b 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout
+++ b/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout
@@ -43,7 +43,7 @@
 # -----------------------------------------------------------------
 # 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 f92de11..3138479 100644
--- a/src/mainboard/gigabyte/ga-g41m-es2l/cmos.layout
+++ b/src/mainboard/gigabyte/ga-g41m-es2l/cmos.layout
@@ -43,7 +43,7 @@
 # -----------------------------------------------------------------
 # 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 53f259a..a6d7a6e 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout
+++ b/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout
@@ -19,7 +19,7 @@
 
 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 53f259a..a6d7a6e 100644
--- a/src/mainboard/gigabyte/m57sli/cmos.layout
+++ b/src/mainboard/gigabyte/m57sli/cmos.layout
@@ -19,7 +19,7 @@
 
 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 bf58aac..aca27b0 100644
--- a/src/mainboard/gigabyte/ma785gm/cmos.layout
+++ b/src/mainboard/gigabyte/ma785gm/cmos.layout
@@ -2,7 +2,7 @@
 
 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 bf58aac..aca27b0 100644
--- a/src/mainboard/gigabyte/ma785gmt/cmos.layout
+++ b/src/mainboard/gigabyte/ma785gmt/cmos.layout
@@ -2,7 +2,7 @@
 
 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 bf58aac..aca27b0 100644
--- a/src/mainboard/gigabyte/ma78gm/cmos.layout
+++ b/src/mainboard/gigabyte/ma78gm/cmos.layout
@@ -2,7 +2,7 @@
 
 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 ea39ed6..33ed614 100644
--- a/src/mainboard/gizmosphere/gizmo/cmos.layout
+++ b/src/mainboard/gizmosphere/gizmo/cmos.layout
@@ -19,7 +19,7 @@
 
 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 d83bb14..75a2d30 100644
--- a/src/mainboard/gizmosphere/gizmo2/cmos.layout
+++ b/src/mainboard/gizmosphere/gizmo2/cmos.layout
@@ -18,7 +18,7 @@
 
 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 2a518e9..b575e02 100644
--- a/src/mainboard/google/auron/cmos.layout
+++ b/src/mainboard/google/auron/cmos.layout
@@ -42,7 +42,7 @@
 # -----------------------------------------------------------------
 # 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 1967717..b575e02 100644
--- a/src/mainboard/google/auron_paine/cmos.layout
+++ b/src/mainboard/google/auron_paine/cmos.layout
@@ -42,8 +42,7 @@
 # -----------------------------------------------------------------
 # 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 8fe3d9b..180751d 100644
--- a/src/mainboard/google/butterfly/cmos.layout
+++ b/src/mainboard/google/butterfly/cmos.layout
@@ -42,7 +42,7 @@
 # -----------------------------------------------------------------
 # 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 7159e7b..91a1336 100644
--- a/src/mainboard/google/chell/cmos.layout
+++ b/src/mainboard/google/chell/cmos.layout
@@ -65,7 +65,7 @@
 # -----------------------------------------------------------------
 # 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 c14566e..ae46e10 100644
--- a/src/mainboard/google/cyan/cmos.layout
+++ b/src/mainboard/google/cyan/cmos.layout
@@ -65,7 +65,7 @@
 # -----------------------------------------------------------------
 # 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 2a518e9..b575e02 100644
--- a/src/mainboard/google/falco/cmos.layout
+++ b/src/mainboard/google/falco/cmos.layout
@@ -42,7 +42,7 @@
 # -----------------------------------------------------------------
 # 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 7159e7b..91a1336 100644
--- a/src/mainboard/google/glados/cmos.layout
+++ b/src/mainboard/google/glados/cmos.layout
@@ -65,7 +65,7 @@
 # -----------------------------------------------------------------
 # 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 b419315..c508d64 100644
--- a/src/mainboard/google/guado/cmos.layout
+++ b/src/mainboard/google/guado/cmos.layout
@@ -64,8 +64,7 @@
 # -----------------------------------------------------------------
 # 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 c9528eb..c508d64 100644
--- a/src/mainboard/google/jecht/cmos.layout
+++ b/src/mainboard/google/jecht/cmos.layout
@@ -64,7 +64,7 @@
 # -----------------------------------------------------------------
 # 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 ef96d84..1c166c6 100644
--- a/src/mainboard/google/lars/cmos.layout
+++ b/src/mainboard/google/lars/cmos.layout
@@ -65,7 +65,7 @@
 # -----------------------------------------------------------------
 # 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 0513a54..91dc8901 100644
--- a/src/mainboard/google/link/cmos.layout
+++ b/src/mainboard/google/link/cmos.layout
@@ -42,7 +42,7 @@
 # -----------------------------------------------------------------
 # 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 b419315..c508d64 100644
--- a/src/mainboard/google/ninja/cmos.layout
+++ b/src/mainboard/google/ninja/cmos.layout
@@ -64,8 +64,7 @@
 # -----------------------------------------------------------------
 # 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 2a518e9..b575e02 100644
--- a/src/mainboard/google/panther/cmos.layout
+++ b/src/mainboard/google/panther/cmos.layout
@@ -42,7 +42,7 @@
 # -----------------------------------------------------------------
 # 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 0513a54..91dc8901 100644
--- a/src/mainboard/google/parrot/cmos.layout
+++ b/src/mainboard/google/parrot/cmos.layout
@@ -42,7 +42,7 @@
 # -----------------------------------------------------------------
 # 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 2a518e9..b575e02 100644
--- a/src/mainboard/google/peppy/cmos.layout
+++ b/src/mainboard/google/peppy/cmos.layout
@@ -42,7 +42,7 @@
 # -----------------------------------------------------------------
 # 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 2a518e9..b575e02 100644
--- a/src/mainboard/google/rambi/cmos.layout
+++ b/src/mainboard/google/rambi/cmos.layout
@@ -42,7 +42,7 @@
 # -----------------------------------------------------------------
 # 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 b419315..c508d64 100644
--- a/src/mainboard/google/rikku/cmos.layout
+++ b/src/mainboard/google/rikku/cmos.layout
@@ -64,8 +64,7 @@
 # -----------------------------------------------------------------
 # 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 2a518e9..b575e02 100644
--- a/src/mainboard/google/samus/cmos.layout
+++ b/src/mainboard/google/samus/cmos.layout
@@ -42,7 +42,7 @@
 # -----------------------------------------------------------------
 # 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 0513a54..91dc8901 100644
--- a/src/mainboard/google/stout/cmos.layout
+++ b/src/mainboard/google/stout/cmos.layout
@@ -42,7 +42,7 @@
 # -----------------------------------------------------------------
 # 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 b419315..c508d64 100644
--- a/src/mainboard/google/tidus/cmos.layout
+++ b/src/mainboard/google/tidus/cmos.layout
@@ -64,8 +64,7 @@
 # -----------------------------------------------------------------
 # 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 d83bb14..75a2d30 100644
--- a/src/mainboard/hp/abm/cmos.layout
+++ b/src/mainboard/hp/abm/cmos.layout
@@ -18,7 +18,7 @@
 
 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 4e081ea..c5db29c 100644
--- a/src/mainboard/hp/dl145_g1/cmos.layout
+++ b/src/mainboard/hp/dl145_g1/cmos.layout
@@ -2,7 +2,7 @@
 
 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 0ad18a2..e5964b4 100644
--- a/src/mainboard/hp/dl145_g3/cmos.layout
+++ b/src/mainboard/hp/dl145_g3/cmos.layout
@@ -2,7 +2,7 @@
 
 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 5602c70..37ab3bd 100644
--- a/src/mainboard/hp/dl165_g6_fam10/cmos.layout
+++ b/src/mainboard/hp/dl165_g6_fam10/cmos.layout
@@ -20,7 +20,7 @@
 
 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 5b1f9cb..231572a 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/cmos.layout
+++ b/src/mainboard/hp/pavilion_m6_1035dx/cmos.layout
@@ -5,7 +5,7 @@
 # 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 f42dd0a..d1bab31 100644
--- a/src/mainboard/ibase/mb899/cmos.layout
+++ b/src/mainboard/ibase/mb899/cmos.layout
@@ -42,7 +42,7 @@
 # -----------------------------------------------------------------
 # 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 bf58aac..aca27b0 100644
--- a/src/mainboard/iei/kino-780am2-fam10/cmos.layout
+++ b/src/mainboard/iei/kino-780am2-fam10/cmos.layout
@@ -2,7 +2,7 @@
 
 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 2f429c9..6d7e031 100644
--- a/src/mainboard/intel/baskingridge/cmos.layout
+++ b/src/mainboard/intel/baskingridge/cmos.layout
@@ -42,7 +42,7 @@
 # -----------------------------------------------------------------
 # 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 bd5010c..c3d557e 100644
--- a/src/mainboard/intel/bayleybay_fsp/cmos.layout
+++ b/src/mainboard/intel/bayleybay_fsp/cmos.layout
@@ -42,7 +42,7 @@
 # -----------------------------------------------------------------
 # 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 9ff9d1f..27ad8be 100644
--- a/src/mainboard/intel/camelbackmountain_fsp/cmos.layout
+++ b/src/mainboard/intel/camelbackmountain_fsp/cmos.layout
@@ -64,8 +64,7 @@
 # -----------------------------------------------------------------
 # 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 44ce0965..d33634a 100644
--- a/src/mainboard/intel/cougar_canyon2/cmos.layout
+++ b/src/mainboard/intel/cougar_canyon2/cmos.layout
@@ -42,7 +42,7 @@
 # -----------------------------------------------------------------
 # 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 c280627..0511582 100644
--- a/src/mainboard/intel/d945gclf/cmos.layout
+++ b/src/mainboard/intel/d945gclf/cmos.layout
@@ -42,7 +42,7 @@
 # -----------------------------------------------------------------
 # 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 468e723..873f938 100644
--- a/src/mainboard/intel/eagleheights/cmos.layout
+++ b/src/mainboard/intel/eagleheights/cmos.layout
@@ -43,7 +43,7 @@
 # -----------------------------------------------------------------
 # 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 ab8cdb8..3cc675f 100644
--- a/src/mainboard/intel/emeraldlake2/cmos.layout
+++ b/src/mainboard/intel/emeraldlake2/cmos.layout
@@ -42,7 +42,7 @@
 # -----------------------------------------------------------------
 # 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 ef96d84..1c166c6 100644
--- a/src/mainboard/intel/kunimitsu/cmos.layout
+++ b/src/mainboard/intel/kunimitsu/cmos.layout
@@ -65,7 +65,7 @@
 # -----------------------------------------------------------------
 # 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 28976c1..2704122 100644
--- a/src/mainboard/intel/littleplains/cmos.layout
+++ b/src/mainboard/intel/littleplains/cmos.layout
@@ -42,7 +42,7 @@
 # -----------------------------------------------------------------
 # 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 8aaa522..f65750c 100644
--- a/src/mainboard/intel/minnowmax/cmos.layout
+++ b/src/mainboard/intel/minnowmax/cmos.layout
@@ -42,7 +42,7 @@
 # -----------------------------------------------------------------
 # 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 28976c1..2704122 100644
--- a/src/mainboard/intel/mohonpeak/cmos.layout
+++ b/src/mainboard/intel/mohonpeak/cmos.layout
@@ -42,7 +42,7 @@
 # -----------------------------------------------------------------
 # 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 7312dc9..ed2c93a 100644
--- a/src/mainboard/intel/stargo2/cmos.layout
+++ b/src/mainboard/intel/stargo2/cmos.layout
@@ -42,8 +42,7 @@
 # -----------------------------------------------------------------
 # 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 c14566e..ae46e10 100644
--- a/src/mainboard/intel/strago/cmos.layout
+++ b/src/mainboard/intel/strago/cmos.layout
@@ -65,7 +65,7 @@
 # -----------------------------------------------------------------
 # 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 2a518e9..b575e02 100644
--- a/src/mainboard/intel/wtm2/cmos.layout
+++ b/src/mainboard/intel/wtm2/cmos.layout
@@ -42,7 +42,7 @@
 # -----------------------------------------------------------------
 # 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 e2ff2c5..4fd2d91 100644
--- a/src/mainboard/iwave/iWRainbowG6/cmos.layout
+++ b/src/mainboard/iwave/iWRainbowG6/cmos.layout
@@ -43,7 +43,7 @@
 # -----------------------------------------------------------------
 # 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 0ad18a2..e5964b4 100644
--- a/src/mainboard/iwill/dk8_htx/cmos.layout
+++ b/src/mainboard/iwill/dk8_htx/cmos.layout
@@ -2,7 +2,7 @@
 
 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 6de5ab6..d9ec552 100644
--- a/src/mainboard/jetway/j7f2/cmos.layout
+++ b/src/mainboard/jetway/j7f2/cmos.layout
@@ -2,7 +2,7 @@
 
 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 f47185f..ca3d9e5 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/cmos.layout
+++ b/src/mainboard/jetway/nf81-t56n-lf/cmos.layout
@@ -18,7 +18,7 @@
 
 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 bf58aac..aca27b0 100644
--- a/src/mainboard/jetway/pa78vm5/cmos.layout
+++ b/src/mainboard/jetway/pa78vm5/cmos.layout
@@ -2,7 +2,7 @@
 
 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 2a99e50..c614e6f 100644
--- a/src/mainboard/kontron/986lcd-m/cmos.layout
+++ b/src/mainboard/kontron/986lcd-m/cmos.layout
@@ -42,7 +42,7 @@
 # -----------------------------------------------------------------
 # 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 4e9d62c..93aa445 100644
--- a/src/mainboard/kontron/kt690/cmos.layout
+++ b/src/mainboard/kontron/kt690/cmos.layout
@@ -19,7 +19,7 @@
 
 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 9517618..b17ee51 100644
--- a/src/mainboard/kontron/ktqm77/cmos.layout
+++ b/src/mainboard/kontron/ktqm77/cmos.layout
@@ -42,7 +42,7 @@
 # -----------------------------------------------------------------
 # 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 6de5ab6..d9ec552 100644
--- a/src/mainboard/lanner/em8510/cmos.layout
+++ b/src/mainboard/lanner/em8510/cmos.layout
@@ -2,7 +2,7 @@
 
 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 61c5690..2495646 100644
--- a/src/mainboard/lenovo/g505s/cmos.layout
+++ b/src/mainboard/lenovo/g505s/cmos.layout
@@ -18,7 +18,7 @@
 
 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 475f4b2..d62042c 100644
--- a/src/mainboard/lenovo/t400/cmos.layout
+++ b/src/mainboard/lenovo/t400/cmos.layout
@@ -44,7 +44,7 @@
 # -----------------------------------------------------------------
 # 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 58a4abe..79a3a68 100644
--- a/src/mainboard/lenovo/t420/cmos.layout
+++ b/src/mainboard/lenovo/t420/cmos.layout
@@ -43,7 +43,7 @@
 # -----------------------------------------------------------------
 # 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 3521849..ec9be11 100644
--- a/src/mainboard/lenovo/t420s/cmos.layout
+++ b/src/mainboard/lenovo/t420s/cmos.layout
@@ -43,7 +43,7 @@
 # -----------------------------------------------------------------
 # 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 16b499a..73bbe3a 100644
--- a/src/mainboard/lenovo/t430s/cmos.layout
+++ b/src/mainboard/lenovo/t430s/cmos.layout
@@ -43,7 +43,7 @@
 # -----------------------------------------------------------------
 # 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 044c310..a151b7e 100644
--- a/src/mainboard/lenovo/t520/cmos.layout
+++ b/src/mainboard/lenovo/t520/cmos.layout
@@ -43,7 +43,7 @@
 # -----------------------------------------------------------------
 # 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 0e28bdd..d6d671c 100644
--- a/src/mainboard/lenovo/t530/cmos.layout
+++ b/src/mainboard/lenovo/t530/cmos.layout
@@ -43,7 +43,7 @@
 # -----------------------------------------------------------------
 # 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 5068fac..12e7d86 100644
--- a/src/mainboard/lenovo/t60/cmos.layout
+++ b/src/mainboard/lenovo/t60/cmos.layout
@@ -43,7 +43,7 @@
 # -----------------------------------------------------------------
 # 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 1791897..19ead05 100644
--- a/src/mainboard/lenovo/x200/cmos.layout
+++ b/src/mainboard/lenovo/x200/cmos.layout
@@ -44,7 +44,7 @@
 # -----------------------------------------------------------------
 # 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 7d4aeae..2a91eb7 100644
--- a/src/mainboard/lenovo/x201/cmos.layout
+++ b/src/mainboard/lenovo/x201/cmos.layout
@@ -43,7 +43,7 @@
 # -----------------------------------------------------------------
 # 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 ca2c45c..143ee80 100644
--- a/src/mainboard/lenovo/x220/cmos.layout
+++ b/src/mainboard/lenovo/x220/cmos.layout
@@ -43,7 +43,7 @@
 # -----------------------------------------------------------------
 # 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 29c2066..14602ff 100644
--- a/src/mainboard/lenovo/x230/cmos.layout
+++ b/src/mainboard/lenovo/x230/cmos.layout
@@ -43,7 +43,7 @@
 # -----------------------------------------------------------------
 # 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 9f10fbc..2d9fe41 100644
--- a/src/mainboard/lenovo/x60/cmos.layout
+++ b/src/mainboard/lenovo/x60/cmos.layout
@@ -43,7 +43,7 @@
 # -----------------------------------------------------------------
 # 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 f47185f..ca3d9e5 100644
--- a/src/mainboard/lippert/frontrunner-af/cmos.layout
+++ b/src/mainboard/lippert/frontrunner-af/cmos.layout
@@ -18,7 +18,7 @@
 
 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 6de5ab6..d9ec552 100644
--- a/src/mainboard/lippert/frontrunner/cmos.layout
+++ b/src/mainboard/lippert/frontrunner/cmos.layout
@@ -2,7 +2,7 @@
 
 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 f47185f..ca3d9e5 100644
--- a/src/mainboard/lippert/toucan-af/cmos.layout
+++ b/src/mainboard/lippert/toucan-af/cmos.layout
@@ -18,7 +18,7 @@
 
 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 34afb42..02c3a96 100644
--- a/src/mainboard/msi/ms7135/cmos.layout
+++ b/src/mainboard/msi/ms7135/cmos.layout
@@ -2,7 +2,7 @@
 
 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 be9dce6..89a7b13 100644
--- a/src/mainboard/msi/ms7260/cmos.layout
+++ b/src/mainboard/msi/ms7260/cmos.layout
@@ -20,7 +20,7 @@
 
 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 7e80285..41c4ac9 100644
--- a/src/mainboard/msi/ms9185/cmos.layout
+++ b/src/mainboard/msi/ms9185/cmos.layout
@@ -2,7 +2,7 @@
 
 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 4e081ea..c5db29c 100644
--- a/src/mainboard/msi/ms9282/cmos.layout
+++ b/src/mainboard/msi/ms9282/cmos.layout
@@ -2,7 +2,7 @@
 
 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 3c0a4ed..fe0ff4e 100644
--- a/src/mainboard/msi/ms9652_fam10/cmos.layout
+++ b/src/mainboard/msi/ms9652_fam10/cmos.layout
@@ -20,7 +20,7 @@
 
 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 53f259a..a6d7a6e 100644
--- a/src/mainboard/nvidia/l1_2pvv/cmos.layout
+++ b/src/mainboard/nvidia/l1_2pvv/cmos.layout
@@ -19,7 +19,7 @@
 
 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 4cfb902..09a5d49 100644
--- a/src/mainboard/packardbell/ms2290/cmos.layout
+++ b/src/mainboard/packardbell/ms2290/cmos.layout
@@ -43,7 +43,7 @@
 # -----------------------------------------------------------------
 # 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 6de5ab6..d9ec552 100644
--- a/src/mainboard/pcengines/alix1c/cmos.layout
+++ b/src/mainboard/pcengines/alix1c/cmos.layout
@@ -2,7 +2,7 @@
 
 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 6de5ab6..d9ec552 100644
--- a/src/mainboard/pcengines/alix2d/cmos.layout
+++ b/src/mainboard/pcengines/alix2d/cmos.layout
@@ -2,7 +2,7 @@
 
 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 177bdfe..4c40dc7 100644
--- a/src/mainboard/roda/rk886ex/cmos.layout
+++ b/src/mainboard/roda/rk886ex/cmos.layout
@@ -43,7 +43,7 @@
 # -----------------------------------------------------------------
 # 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 3d75784..711551b 100644
--- a/src/mainboard/roda/rk9/cmos.layout
+++ b/src/mainboard/roda/rk9/cmos.layout
@@ -44,7 +44,7 @@
 # -----------------------------------------------------------------
 # 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 b88ceb8..531c162 100644
--- a/src/mainboard/samsung/lumpy/cmos.layout
+++ b/src/mainboard/samsung/lumpy/cmos.layout
@@ -42,7 +42,7 @@
 # -----------------------------------------------------------------
 # 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 a5ed030..eba4d43 100644
--- a/src/mainboard/samsung/stumpy/cmos.layout
+++ b/src/mainboard/samsung/stumpy/cmos.layout
@@ -42,7 +42,7 @@
 # -----------------------------------------------------------------
 # 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 9ff9d1f..27ad8be 100644
--- a/src/mainboard/siemens/mc_bdx1/cmos.layout
+++ b/src/mainboard/siemens/mc_bdx1/cmos.layout
@@ -64,8 +64,7 @@
 # -----------------------------------------------------------------
 # 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 6297de0..27ad8be 100644
--- a/src/mainboard/siemens/mc_tcu3/cmos.layout
+++ b/src/mainboard/siemens/mc_tcu3/cmos.layout
@@ -64,7 +64,7 @@
 # -----------------------------------------------------------------
 # 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 acaa674..7cae2fb 100644
--- a/src/mainboard/siemens/sitemp_g1p1/cmos.layout
+++ b/src/mainboard/siemens/sitemp_g1p1/cmos.layout
@@ -29,7 +29,7 @@
 # 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 4e081ea..c5db29c 100644
--- a/src/mainboard/sunw/ultra40/cmos.layout
+++ b/src/mainboard/sunw/ultra40/cmos.layout
@@ -2,7 +2,7 @@
 
 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 3dfdf35..d501be5 100644
--- a/src/mainboard/sunw/ultra40m2/cmos.layout
+++ b/src/mainboard/sunw/ultra40m2/cmos.layout
@@ -19,7 +19,7 @@
 
 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 53f259a..a6d7a6e 100644
--- a/src/mainboard/supermicro/h8dme/cmos.layout
+++ b/src/mainboard/supermicro/h8dme/cmos.layout
@@ -19,7 +19,7 @@
 
 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 53f259a..a6d7a6e 100644
--- a/src/mainboard/supermicro/h8dmr/cmos.layout
+++ b/src/mainboard/supermicro/h8dmr/cmos.layout
@@ -19,7 +19,7 @@
 
 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 3c0a4ed..fe0ff4e 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/cmos.layout
+++ b/src/mainboard/supermicro/h8dmr_fam10/cmos.layout
@@ -20,7 +20,7 @@
 
 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 f47185f..ca3d9e5 100644
--- a/src/mainboard/supermicro/h8qgi/cmos.layout
+++ b/src/mainboard/supermicro/h8qgi/cmos.layout
@@ -18,7 +18,7 @@
 
 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 3c0a4ed..fe0ff4e 100644
--- a/src/mainboard/supermicro/h8qme_fam10/cmos.layout
+++ b/src/mainboard/supermicro/h8qme_fam10/cmos.layout
@@ -20,7 +20,7 @@
 
 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 f47185f..ca3d9e5 100644
--- a/src/mainboard/supermicro/h8scm/cmos.layout
+++ b/src/mainboard/supermicro/h8scm/cmos.layout
@@ -18,7 +18,7 @@
 
 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 bf58aac..aca27b0 100644
--- a/src/mainboard/supermicro/h8scm_fam10/cmos.layout
+++ b/src/mainboard/supermicro/h8scm_fam10/cmos.layout
@@ -2,7 +2,7 @@
 
 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 2bccce8..06d46ff 100644
--- a/src/mainboard/supermicro/x7db8/cmos.layout
+++ b/src/mainboard/supermicro/x7db8/cmos.layout
@@ -43,7 +43,7 @@
 # -----------------------------------------------------------------
 # 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 4e9d62c..93aa445 100644
--- a/src/mainboard/technexion/tim5690/cmos.layout
+++ b/src/mainboard/technexion/tim5690/cmos.layout
@@ -19,7 +19,7 @@
 
 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 4e9d62c..93aa445 100644
--- a/src/mainboard/technexion/tim8690/cmos.layout
+++ b/src/mainboard/technexion/tim8690/cmos.layout
@@ -19,7 +19,7 @@
 
 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 6a030e6..c724569 100644
--- a/src/mainboard/traverse/geos/cmos.layout
+++ b/src/mainboard/traverse/geos/cmos.layout
@@ -2,7 +2,7 @@
 
 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 53f259a..a6d7a6e 100644
--- a/src/mainboard/tyan/s2912/cmos.layout
+++ b/src/mainboard/tyan/s2912/cmos.layout
@@ -19,7 +19,7 @@
 
 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 3c0a4ed..fe0ff4e 100644
--- a/src/mainboard/tyan/s2912_fam10/cmos.layout
+++ b/src/mainboard/tyan/s2912_fam10/cmos.layout
@@ -20,7 +20,7 @@
 
 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 f47185f..ca3d9e5 100644
--- a/src/mainboard/tyan/s8226/cmos.layout
+++ b/src/mainboard/tyan/s8226/cmos.layout
@@ -18,7 +18,7 @@
 
 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 6de5ab6..d9ec552 100644
--- a/src/mainboard/via/epia-cn/cmos.layout
+++ b/src/mainboard/via/epia-cn/cmos.layout
@@ -2,7 +2,7 @@
 
 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 6de5ab6..d9ec552 100644
--- a/src/mainboard/via/epia-m700/cmos.layout
+++ b/src/mainboard/via/epia-m700/cmos.layout
@@ -2,7 +2,7 @@
 
 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 74f120d..ba4ba59 100644
--- a/src/mainboard/via/pc2500e/cmos.layout
+++ b/src/mainboard/via/pc2500e/cmos.layout
@@ -19,7 +19,7 @@
 #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 dea018f..f20d3cf 100644
--- a/src/mainboard/via/vt8454c/cmos.layout
+++ b/src/mainboard/via/vt8454c/cmos.layout
@@ -18,7 +18,7 @@
 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 1e4f307..3d09360 100644
--- a/src/mainboard/winent/mb6047/cmos.layout
+++ b/src/mainboard/winent/mb6047/cmos.layout
@@ -2,7 +2,7 @@
 
 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 6de5ab6..d9ec552 100644
--- a/src/mainboard/winent/pl6064/cmos.layout
+++ b/src/mainboard/winent/pl6064/cmos.layout
@@ -2,7 +2,7 @@
 
 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 fffba2b..3be09dc 100644
--- a/src/mainboard/wyse/s50/cmos.layout
+++ b/src/mainboard/wyse/s50/cmos.layout
@@ -20,7 +20,7 @@
 
 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