summaryrefslogtreecommitdiff
path: root/src/mainboard/google/rambi
diff options
context:
space:
mode:
authorNico Huber <nico.h@gmx.de>2016-08-11 22:45:55 +0200
committerMartin Roth <martinroth@google.com>2016-08-17 00:27:42 +0200
commitd23ee5de2233d2f200dc15bf4a7669599c2b2014 (patch)
tree1446c7a57813f9ba0782c6199bafbf8392d97ff3 /src/mainboard/google/rambi
parent4f79e6618519fa1aa8e8afaac57fc7dbfeeb4484 (diff)
downloadcoreboot-d23ee5de2233d2f200dc15bf4a7669599c2b2014.tar.xz
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>
Diffstat (limited to 'src/mainboard/google/rambi')
-rw-r--r--src/mainboard/google/rambi/cmos.layout2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mainboard/google/rambi/cmos.layout b/src/mainboard/google/rambi/cmos.layout
index 2a518e9213..b575e02970 100644
--- a/src/mainboard/google/rambi/cmos.layout
+++ b/src/mainboard/google/rambi/cmos.layout
@@ -42,7 +42,7 @@ entries
# -----------------------------------------------------------------
# RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 4 boot_option
-388 4 r 0 reboot_bits
+388 4 h 0 reboot_counter
#390 2 r 0 unused?
# -----------------------------------------------------------------