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>

19 files changed, 19 insertions, 19 deletions

diff --git a/src/mainboard/asus/a8n_e/cmos.layout b/src/mainboard/asus/a8n_e/cmos.layout
index 90e3e94178..c4b81c64f1 100644
--- a/src/mainboard/asus/a8n_e/cmos.layout
+++ b/src/mainboard/asus/a8n_e/cmos.layout
@@ -2,7 +2,7 @@ entries
     0 384 r 0 reserved_memory
     384 1 e 4 boot_option
     386 1 e 1 ECC_memory
-    388 4 r 0 reboot_bits
+    388 4 h 0 reboot_counter
     392 3 e 5 baud_rate
     395 1 e 1 hw_scrubber
     396 1 e 1 interleave_chip_selects
diff --git a/src/mainboard/asus/a8v-e_deluxe/cmos.layout b/src/mainboard/asus/a8v-e_deluxe/cmos.layout
index 7cf03696d4..fadba1ea8e 100644
--- a/src/mainboard/asus/a8v-e_deluxe/cmos.layout
+++ b/src/mainboard/asus/a8v-e_deluxe/cmos.layout
@@ -2,7 +2,7 @@ entries
 
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
diff --git a/src/mainboard/asus/a8v-e_se/cmos.layout b/src/mainboard/asus/a8v-e_se/cmos.layout
index 7cf03696d4..fadba1ea8e 100644
--- a/src/mainboard/asus/a8v-e_se/cmos.layout
+++ b/src/mainboard/asus/a8v-e_se/cmos.layout
@@ -2,7 +2,7 @@ entries
 
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
diff --git a/src/mainboard/asus/dsbf/cmos.layout b/src/mainboard/asus/dsbf/cmos.layout
index 2bccce8d96..06d46ff7f0 100644
--- a/src/mainboard/asus/dsbf/cmos.layout
+++ b/src/mainboard/asus/dsbf/cmos.layout
@@ -43,7 +43,7 @@ entries
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 #390          2       r       0        unused?
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/asus/f2a85-m/cmos.layout b/src/mainboard/asus/f2a85-m/cmos.layout
index d83bb14d26..75a2d30eb1 100644
--- a/src/mainboard/asus/f2a85-m/cmos.layout
+++ b/src/mainboard/asus/f2a85-m/cmos.layout
@@ -18,7 +18,7 @@ entries
 
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
diff --git a/src/mainboard/asus/f2a85-m_le/cmos.layout b/src/mainboard/asus/f2a85-m_le/cmos.layout
index d83bb14d26..75a2d30eb1 100644
--- a/src/mainboard/asus/f2a85-m_le/cmos.layout
+++ b/src/mainboard/asus/f2a85-m_le/cmos.layout
@@ -18,7 +18,7 @@ entries
 
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
diff --git a/src/mainboard/asus/k8v-x/cmos.layout b/src/mainboard/asus/k8v-x/cmos.layout
index 7cf03696d4..fadba1ea8e 100644
--- a/src/mainboard/asus/k8v-x/cmos.layout
+++ b/src/mainboard/asus/k8v-x/cmos.layout
@@ -2,7 +2,7 @@ entries
 
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
diff --git a/src/mainboard/asus/kcma-d8/cmos.layout b/src/mainboard/asus/kcma-d8/cmos.layout
index 14e3c9b977..b9dadf4335 100644
--- a/src/mainboard/asus/kcma-d8/cmos.layout
+++ b/src/mainboard/asus/kcma-d8/cmos.layout
@@ -20,7 +20,7 @@ entries
 
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 393          3       e       5        baud_rate
 396          5       e       10       ecc_scrub_rate
 401          1       e       1        interleave_chip_selects
diff --git a/src/mainboard/asus/kfsn4-dre/cmos.layout b/src/mainboard/asus/kfsn4-dre/cmos.layout
index bd5fdbeb2f..169af87b9b 100644
--- a/src/mainboard/asus/kfsn4-dre/cmos.layout
+++ b/src/mainboard/asus/kfsn4-dre/cmos.layout
@@ -20,7 +20,7 @@ entries
 
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 393          3       e       5        baud_rate
 396          5       e       10       ecc_scrub_rate
 401          1       e       1        interleave_chip_selects
diff --git a/src/mainboard/asus/kfsn4-dre_k8/cmos.layout b/src/mainboard/asus/kfsn4-dre_k8/cmos.layout
index 9b26123d1a..d6ac1bcbc4 100644
--- a/src/mainboard/asus/kfsn4-dre_k8/cmos.layout
+++ b/src/mainboard/asus/kfsn4-dre_k8/cmos.layout
@@ -20,7 +20,7 @@ entries
 
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 393          3       e       5        baud_rate
 396          1       e       1        hw_scrubber
 397          1       e       1        interleave_chip_selects
diff --git a/src/mainboard/asus/kgpe-d16/cmos.layout b/src/mainboard/asus/kgpe-d16/cmos.layout
index 9e48910c3f..18c7a3fab7 100644
--- a/src/mainboard/asus/kgpe-d16/cmos.layout
+++ b/src/mainboard/asus/kgpe-d16/cmos.layout
@@ -20,7 +20,7 @@ entries
 
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 393          3       e       5        baud_rate
 396          5       e       10       ecc_scrub_rate
 401          1       e       1        interleave_chip_selects
diff --git a/src/mainboard/asus/m2n-e/cmos.layout b/src/mainboard/asus/m2n-e/cmos.layout
index da602990cf..9968c56898 100644
--- a/src/mainboard/asus/m2n-e/cmos.layout
+++ b/src/mainboard/asus/m2n-e/cmos.layout
@@ -18,7 +18,7 @@ entries
 
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
diff --git a/src/mainboard/asus/m2v-mx_se/cmos.layout b/src/mainboard/asus/m2v-mx_se/cmos.layout
index b74079d58b..96e5c640ab 100644
--- a/src/mainboard/asus/m2v-mx_se/cmos.layout
+++ b/src/mainboard/asus/m2v-mx_se/cmos.layout
@@ -2,7 +2,7 @@ entries
 
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
diff --git a/src/mainboard/asus/m2v/cmos.layout b/src/mainboard/asus/m2v/cmos.layout
index 7cf03696d4..fadba1ea8e 100644
--- a/src/mainboard/asus/m2v/cmos.layout
+++ b/src/mainboard/asus/m2v/cmos.layout
@@ -2,7 +2,7 @@ entries
 
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
diff --git a/src/mainboard/asus/m4a78-em/cmos.layout b/src/mainboard/asus/m4a78-em/cmos.layout
index bf58aac890..aca27b0779 100644
--- a/src/mainboard/asus/m4a78-em/cmos.layout
+++ b/src/mainboard/asus/m4a78-em/cmos.layout
@@ -2,7 +2,7 @@ entries
 
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
diff --git a/src/mainboard/asus/m4a785-m/cmos.layout b/src/mainboard/asus/m4a785-m/cmos.layout
index bf58aac890..aca27b0779 100644
--- a/src/mainboard/asus/m4a785-m/cmos.layout
+++ b/src/mainboard/asus/m4a785-m/cmos.layout
@@ -2,7 +2,7 @@ entries
 
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
diff --git a/src/mainboard/asus/m4a785t-m/cmos.layout b/src/mainboard/asus/m4a785t-m/cmos.layout
index bf58aac890..aca27b0779 100644
--- a/src/mainboard/asus/m4a785t-m/cmos.layout
+++ b/src/mainboard/asus/m4a785t-m/cmos.layout
@@ -2,7 +2,7 @@ entries
 
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
diff --git a/src/mainboard/asus/m5a88-v/cmos.layout b/src/mainboard/asus/m5a88-v/cmos.layout
index bf58aac890..aca27b0779 100644
--- a/src/mainboard/asus/m5a88-v/cmos.layout
+++ b/src/mainboard/asus/m5a88-v/cmos.layout
@@ -2,7 +2,7 @@ entries
 
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
diff --git a/src/mainboard/asus/mew-vm/cmos.layout b/src/mainboard/asus/mew-vm/cmos.layout
index 6de5ab6d1b..d9ec5520bf 100644
--- a/src/mainboard/asus/mew-vm/cmos.layout
+++ b/src/mainboard/asus/mew-vm/cmos.layout
@@ -2,7 +2,7 @@ entries
 
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
-388          4       r       0        reboot_bits
+388          4       h       0        reboot_counter
 392          3       e       5        baud_rate
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level