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>
2016-08-11 22:45:55 +02:00
parent 4f79e66185
commit d23ee5de22
177 changed files with 177 additions and 185 deletions
--- a/src/mainboard/adi/rcc-dff/cmos.layout
+++ b/src/mainboard/adi/rcc-dff/cmos.layout
@@ -42,7 +42,7 @@ entries
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 #390          2       r       0        unused?
 # -----------------------------------------------------------------
--- a/src/mainboard/advansus/a785e-i/cmos.layout
+++ b/src/mainboard/advansus/a785e-i/cmos.layout
@@ -2,7 +2,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/amd/bettong/cmos.layout
+++ b/src/mainboard/amd/bettong/cmos.layout
@@ -42,7 +42,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
 386          1       e       1        ECC_memory
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/amd/bimini_fam10/cmos.layout
+++ b/src/mainboard/amd/bimini_fam10/cmos.layout
@@ -2,7 +2,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/amd/db-ft3b-lc/cmos.layout
+++ b/src/mainboard/amd/db-ft3b-lc/cmos.layout
@@ -18,7 +18,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/amd/db800/cmos.layout
+++ b/src/mainboard/amd/db800/cmos.layout
@@ -2,7 +2,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
--- a/src/mainboard/amd/dbm690t/cmos.layout
+++ b/src/mainboard/amd/dbm690t/cmos.layout
@@ -19,7 +19,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/amd/dinar/cmos.layout
+++ b/src/mainboard/amd/dinar/cmos.layout
@@ -18,7 +18,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/amd/f2950/cmos.layout
+++ b/src/mainboard/amd/f2950/cmos.layout
@@ -2,7 +2,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
--- a/src/mainboard/amd/inagua/cmos.layout
+++ b/src/mainboard/amd/inagua/cmos.layout
@@ -18,7 +18,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/amd/lamar/cmos.layout
+++ b/src/mainboard/amd/lamar/cmos.layout
@@ -18,7 +18,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
--- a/src/mainboard/amd/mahogany/cmos.layout
+++ b/src/mainboard/amd/mahogany/cmos.layout
@@ -19,7 +19,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/amd/mahogany_fam10/cmos.layout
+++ b/src/mainboard/amd/mahogany_fam10/cmos.layout
@@ -2,7 +2,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/amd/norwich/cmos.layout
+++ b/src/mainboard/amd/norwich/cmos.layout
@@ -2,7 +2,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
--- a/src/mainboard/amd/olivehill/cmos.layout
+++ b/src/mainboard/amd/olivehill/cmos.layout
@@ -18,7 +18,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/amd/olivehillplus/cmos.layout
+++ b/src/mainboard/amd/olivehillplus/cmos.layout
@@ -18,7 +18,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/amd/parmer/cmos.layout
+++ b/src/mainboard/amd/parmer/cmos.layout
@@ -18,7 +18,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/amd/persimmon/cmos.layout
+++ b/src/mainboard/amd/persimmon/cmos.layout
@@ -18,7 +18,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/amd/pistachio/cmos.layout
+++ b/src/mainboard/amd/pistachio/cmos.layout
@@ -19,7 +19,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/amd/rumba/cmos.layout
+++ b/src/mainboard/amd/rumba/cmos.layout
@@ -2,7 +2,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
--- a/src/mainboard/amd/serengeti_cheetah/cmos.layout
+++ b/src/mainboard/amd/serengeti_cheetah/cmos.layout
@@ -2,7 +2,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout
@@ -20,7 +20,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 393          3       e       5        baud_rate
 396          5       e       10       ecc_scrub_rate
 401          1       e       1        interleave_chip_selects
--- a/src/mainboard/amd/south_station/cmos.layout
+++ b/src/mainboard/amd/south_station/cmos.layout
@@ -18,7 +18,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/amd/thatcher/cmos.layout
+++ b/src/mainboard/amd/thatcher/cmos.layout
@@ -18,7 +18,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/amd/tilapia_fam10/cmos.layout
+++ b/src/mainboard/amd/tilapia_fam10/cmos.layout
@@ -2,7 +2,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/amd/torpedo/cmos.layout
+++ b/src/mainboard/amd/torpedo/cmos.layout
@@ -18,7 +18,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/amd/union_station/cmos.layout
+++ b/src/mainboard/amd/union_station/cmos.layout
@@ -18,7 +18,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/apple/macbook21/cmos.layout
+++ b/src/mainboard/apple/macbook21/cmos.layout
@@ -43,7 +43,7 @@ entries
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
 384          1       e       4        boot_option
-388          4       h       0        reboot_bits
+388          4       h       0        reboot_counter
 #390          2       r       0        unused?
 # -----------------------------------------------------------------
--- a/src/mainboard/artecgroup/dbe61/cmos.layout
+++ b/src/mainboard/artecgroup/dbe61/cmos.layout
@@ -2,7 +2,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
--- a/src/mainboard/asrock/939a785gmh/cmos.layout
+++ b/src/mainboard/asrock/939a785gmh/cmos.layout
@@ -19,7 +19,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/asrock/e350m1/cmos.layout
+++ b/src/mainboard/asrock/e350m1/cmos.layout
@@ -18,7 +18,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/asrock/imb-a180/cmos.layout
+++ b/src/mainboard/asrock/imb-a180/cmos.layout
@@ -18,7 +18,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/asus/a8n_e/cmos.layout
+++ b/src/mainboard/asus/a8n_e/cmos.layout
@@ -2,7 +2,7 @@ entries
    0 384 r 0 reserved_memory
    384 1 e 4 boot_option
    386 1 e 1 ECC_memory
-    388 4 r 0 reboot_bits
+    388 4 h 0 reboot_counter
    392 3 e 5 baud_rate
    395 1 e 1 hw_scrubber
    396 1 e 1 interleave_chip_selects
--- a/src/mainboard/asus/a8v-e_deluxe/cmos.layout
+++ b/src/mainboard/asus/a8v-e_deluxe/cmos.layout
@@ -2,7 +2,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/asus/a8v-e_se/cmos.layout
+++ b/src/mainboard/asus/a8v-e_se/cmos.layout
@@ -2,7 +2,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/asus/dsbf/cmos.layout
+++ b/src/mainboard/asus/dsbf/cmos.layout
@@ -43,7 +43,7 @@ entries
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 #390          2       r       0        unused?
 # -----------------------------------------------------------------
--- a/src/mainboard/asus/f2a85-m/cmos.layout
+++ b/src/mainboard/asus/f2a85-m/cmos.layout
@@ -18,7 +18,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/asus/f2a85-m_le/cmos.layout
+++ b/src/mainboard/asus/f2a85-m_le/cmos.layout
@@ -18,7 +18,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/asus/k8v-x/cmos.layout
+++ b/src/mainboard/asus/k8v-x/cmos.layout
@@ -2,7 +2,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/asus/kcma-d8/cmos.layout
+++ b/src/mainboard/asus/kcma-d8/cmos.layout
@@ -20,7 +20,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 393          3       e       5        baud_rate
 396          5       e       10       ecc_scrub_rate
 401          1       e       1        interleave_chip_selects
--- a/src/mainboard/asus/kfsn4-dre/cmos.layout
+++ b/src/mainboard/asus/kfsn4-dre/cmos.layout
@@ -20,7 +20,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 393          3       e       5        baud_rate
 396          5       e       10       ecc_scrub_rate
 401          1       e       1        interleave_chip_selects
--- a/src/mainboard/asus/kfsn4-dre_k8/cmos.layout
+++ b/src/mainboard/asus/kfsn4-dre_k8/cmos.layout
@@ -20,7 +20,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 393          3       e       5        baud_rate
 396          1       e       1        hw_scrubber
 397          1       e       1        interleave_chip_selects
--- a/src/mainboard/asus/kgpe-d16/cmos.layout
+++ b/src/mainboard/asus/kgpe-d16/cmos.layout
@@ -20,7 +20,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 393          3       e       5        baud_rate
 396          5       e       10       ecc_scrub_rate
 401          1       e       1        interleave_chip_selects
--- a/src/mainboard/asus/m2n-e/cmos.layout
+++ b/src/mainboard/asus/m2n-e/cmos.layout
@@ -18,7 +18,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/asus/m2v-mx_se/cmos.layout
+++ b/src/mainboard/asus/m2v-mx_se/cmos.layout
@@ -2,7 +2,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/asus/m2v/cmos.layout
+++ b/src/mainboard/asus/m2v/cmos.layout
@@ -2,7 +2,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/asus/m4a78-em/cmos.layout
+++ b/src/mainboard/asus/m4a78-em/cmos.layout
@@ -2,7 +2,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/asus/m4a785-m/cmos.layout
+++ b/src/mainboard/asus/m4a785-m/cmos.layout
@@ -2,7 +2,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/asus/m4a785t-m/cmos.layout
+++ b/src/mainboard/asus/m4a785t-m/cmos.layout
@@ -2,7 +2,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/asus/m5a88-v/cmos.layout
+++ b/src/mainboard/asus/m5a88-v/cmos.layout
@@ -2,7 +2,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/asus/mew-vm/cmos.layout
+++ b/src/mainboard/asus/mew-vm/cmos.layout
@@ -2,7 +2,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
--- a/src/mainboard/avalue/eax-785e/cmos.layout
+++ b/src/mainboard/avalue/eax-785e/cmos.layout
@@ -2,7 +2,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/bachmann/ot200/cmos.layout
+++ b/src/mainboard/bachmann/ot200/cmos.layout
@@ -20,7 +20,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 # -----------------------------------------------------------------
 # coreboot config options: console
--- a/src/mainboard/bap/ode_e20XX/cmos.layout
+++ b/src/mainboard/bap/ode_e20XX/cmos.layout
@@ -18,7 +18,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/bap/ode_e21XX/cmos.layout
+++ b/src/mainboard/bap/ode_e21XX/cmos.layout
@@ -18,7 +18,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/bcom/winnetp680/cmos.layout
+++ b/src/mainboard/bcom/winnetp680/cmos.layout
@@ -2,7 +2,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
--- a/src/mainboard/biostar/am1ml/cmos.layout
+++ b/src/mainboard/biostar/am1ml/cmos.layout
@@ -42,7 +42,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
 386          1       e       1        ECC_memory
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/broadcom/blast/cmos.layout
+++ b/src/mainboard/broadcom/blast/cmos.layout
@@ -2,7 +2,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/digitallogic/msm800sev/cmos.layout
+++ b/src/mainboard/digitallogic/msm800sev/cmos.layout
@@ -2,7 +2,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
--- a/src/mainboard/emulation/qemu-i440fx/cmos.layout
+++ b/src/mainboard/emulation/qemu-i440fx/cmos.layout
@@ -2,7 +2,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
--- a/src/mainboard/esd/atom15/cmos.layout
+++ b/src/mainboard/esd/atom15/cmos.layout
@@ -42,7 +42,7 @@ entries
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 #390          2       r       0        unused?
 # -----------------------------------------------------------------
--- a/src/mainboard/getac/p470/cmos.layout
+++ b/src/mainboard/getac/p470/cmos.layout
@@ -43,7 +43,7 @@ entries
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 #390          2       r       0        unused?
 # -----------------------------------------------------------------
--- a/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout
@@ -43,7 +43,7 @@ entries
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 #390          2       r       0        unused?
 # -----------------------------------------------------------------
--- a/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout
+++ b/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout
@@ -43,7 +43,7 @@ entries
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 #390          2       r       0        unused?
 # -----------------------------------------------------------------
--- a/src/mainboard/gigabyte/ga-g41m-es2l/cmos.layout
+++ b/src/mainboard/gigabyte/ga-g41m-es2l/cmos.layout
@@ -43,7 +43,7 @@ entries
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 #390          2       r       0        unused?
 # -----------------------------------------------------------------
--- a/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout
+++ b/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout
@@ -19,7 +19,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/gigabyte/m57sli/cmos.layout
+++ b/src/mainboard/gigabyte/m57sli/cmos.layout
@@ -19,7 +19,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/gigabyte/ma785gm/cmos.layout
+++ b/src/mainboard/gigabyte/ma785gm/cmos.layout
@@ -2,7 +2,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/gigabyte/ma785gmt/cmos.layout
+++ b/src/mainboard/gigabyte/ma785gmt/cmos.layout
@@ -2,7 +2,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/gigabyte/ma78gm/cmos.layout
+++ b/src/mainboard/gigabyte/ma78gm/cmos.layout
@@ -2,7 +2,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/gizmosphere/gizmo/cmos.layout
+++ b/src/mainboard/gizmosphere/gizmo/cmos.layout
@@ -19,7 +19,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/gizmosphere/gizmo2/cmos.layout
+++ b/src/mainboard/gizmosphere/gizmo2/cmos.layout
@@ -18,7 +18,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/google/auron/cmos.layout
+++ b/src/mainboard/google/auron/cmos.layout
@@ -42,7 +42,7 @@ entries
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 #390          2       r       0        unused?
 # -----------------------------------------------------------------
--- a/src/mainboard/google/auron_paine/cmos.layout
+++ b/src/mainboard/google/auron_paine/cmos.layout
@@ -42,8 +42,7 @@ entries
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
 384          1       e       4        boot_option
-385          1       e       4        last_boot
+388          4       h       0        reboot_counter
 388          4       r       0        reboot_bits
 #390          2       r       0        unused?
 # -----------------------------------------------------------------
--- a/src/mainboard/google/butterfly/cmos.layout
+++ b/src/mainboard/google/butterfly/cmos.layout
@@ -42,7 +42,7 @@ entries
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 #390          2       r       0        unused?
 # -----------------------------------------------------------------
--- a/src/mainboard/google/chell/cmos.layout
+++ b/src/mainboard/google/chell/cmos.layout
@@ -65,7 +65,7 @@ entries
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 #390          2       r       0        unused?
 # -----------------------------------------------------------------
--- a/src/mainboard/google/cyan/cmos.layout
+++ b/src/mainboard/google/cyan/cmos.layout
@@ -65,7 +65,7 @@ entries
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 #390          2       r       0        unused?
 # -----------------------------------------------------------------
--- a/src/mainboard/google/falco/cmos.layout
+++ b/src/mainboard/google/falco/cmos.layout
@@ -42,7 +42,7 @@ entries
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 #390          2       r       0        unused?
 # -----------------------------------------------------------------
--- a/src/mainboard/google/glados/cmos.layout
+++ b/src/mainboard/google/glados/cmos.layout
@@ -65,7 +65,7 @@ entries
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 #390          2       r       0        unused?
 # -----------------------------------------------------------------
--- a/src/mainboard/google/guado/cmos.layout
+++ b/src/mainboard/google/guado/cmos.layout
@@ -64,8 +64,7 @@ entries
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
 384          1       e       4        boot_option
-385          1       e       4        last_boot
+388          4       h       0        reboot_counter
 388          4       r       0        reboot_bits
 #390          2       r       0        unused?
 # -----------------------------------------------------------------
--- a/src/mainboard/google/jecht/cmos.layout
+++ b/src/mainboard/google/jecht/cmos.layout
@@ -64,7 +64,7 @@ entries
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 #390          2       r       0        unused?
 # -----------------------------------------------------------------
--- a/src/mainboard/google/lars/cmos.layout
+++ b/src/mainboard/google/lars/cmos.layout
@@ -65,7 +65,7 @@ entries
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 #390          2       r       0        unused?
 # -----------------------------------------------------------------
--- a/src/mainboard/google/link/cmos.layout
+++ b/src/mainboard/google/link/cmos.layout
@@ -42,7 +42,7 @@ entries
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 #390          2       r       0        unused?
 # -----------------------------------------------------------------
--- a/src/mainboard/google/ninja/cmos.layout
+++ b/src/mainboard/google/ninja/cmos.layout
@@ -64,8 +64,7 @@ entries
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
 384          1       e       4        boot_option
-385          1       e       4        last_boot
+388          4       h       0        reboot_counter
 388          4       r       0        reboot_bits
 #390          2       r       0        unused?
 # -----------------------------------------------------------------
--- a/src/mainboard/google/panther/cmos.layout
+++ b/src/mainboard/google/panther/cmos.layout
@@ -42,7 +42,7 @@ entries
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 #390          2       r       0        unused?
 # -----------------------------------------------------------------
--- a/src/mainboard/google/parrot/cmos.layout
+++ b/src/mainboard/google/parrot/cmos.layout
@@ -42,7 +42,7 @@ entries
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 #390          2       r       0        unused?
 # -----------------------------------------------------------------
--- a/src/mainboard/google/peppy/cmos.layout
+++ b/src/mainboard/google/peppy/cmos.layout
@@ -42,7 +42,7 @@ entries
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 #390          2       r       0        unused?
 # -----------------------------------------------------------------
--- a/src/mainboard/google/rambi/cmos.layout
+++ b/src/mainboard/google/rambi/cmos.layout
@@ -42,7 +42,7 @@ entries
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 #390          2       r       0        unused?
 # -----------------------------------------------------------------
--- a/src/mainboard/google/rikku/cmos.layout
+++ b/src/mainboard/google/rikku/cmos.layout
@@ -64,8 +64,7 @@ entries
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
 384          1       e       4        boot_option
-385          1       e       4        last_boot
+388          4       h       0        reboot_counter
 388          4       r       0        reboot_bits
 #390          2       r       0        unused?
 # -----------------------------------------------------------------
--- a/src/mainboard/google/samus/cmos.layout
+++ b/src/mainboard/google/samus/cmos.layout
@@ -42,7 +42,7 @@ entries
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 #390          2       r       0        unused?
 # -----------------------------------------------------------------
--- a/src/mainboard/google/stout/cmos.layout
+++ b/src/mainboard/google/stout/cmos.layout
@@ -42,7 +42,7 @@ entries
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 #390          2       r       0        unused?
 # -----------------------------------------------------------------
--- a/src/mainboard/google/tidus/cmos.layout
+++ b/src/mainboard/google/tidus/cmos.layout
@@ -64,8 +64,7 @@ entries
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
 384          1       e       4        boot_option
-385          1       e       4        last_boot
+388          4       h       0        reboot_counter
 388          4       r       0        reboot_bits
 #390          2       r       0        unused?
 # -----------------------------------------------------------------
--- a/src/mainboard/hp/abm/cmos.layout
+++ b/src/mainboard/hp/abm/cmos.layout
@@ -18,7 +18,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/hp/dl145_g1/cmos.layout
+++ b/src/mainboard/hp/dl145_g1/cmos.layout
@@ -2,7 +2,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/hp/dl145_g3/cmos.layout
+++ b/src/mainboard/hp/dl145_g3/cmos.layout
@@ -2,7 +2,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/hp/dl165_g6_fam10/cmos.layout
+++ b/src/mainboard/hp/dl165_g6_fam10/cmos.layout
@@ -20,7 +20,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 393          3       e       5        baud_rate
 396          5       e       10       ecc_scrub_rate
 401          1       e       1        interleave_chip_selects
--- a/src/mainboard/hp/pavilion_m6_1035dx/cmos.layout
+++ b/src/mainboard/hp/pavilion_m6_1035dx/cmos.layout
@@ -5,7 +5,7 @@ entries
 # RTC_BOOT_BYTE (coreboot hardcoded)
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 # southbridge/amd/agesa/hudson should use this but it doesn't
 400          1       e       1        power_on_after_fail
--- a/src/mainboard/ibase/mb899/cmos.layout
+++ b/src/mainboard/ibase/mb899/cmos.layout
@@ -42,7 +42,7 @@ entries
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 #390          2       r       0        unused?
 # -----------------------------------------------------------------
--- a/src/mainboard/iei/kino-780am2-fam10/cmos.layout
+++ b/src/mainboard/iei/kino-780am2-fam10/cmos.layout
@@ -2,7 +2,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
--- a/src/mainboard/intel/baskingridge/cmos.layout
+++ b/src/mainboard/intel/baskingridge/cmos.layout
@@ -42,7 +42,7 @@ entries
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 #390          2       r       0        unused?
 # -----------------------------------------------------------------
--- a/Show More
+++ b/Show More