diff options
| author | Nico Huber <nico.h@gmx.de> | 2016-08-11 22:45:55 +0200 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2016-08-17 00:27:42 +0200 |
| commit | d23ee5de2233d2f200dc15bf4a7669599c2b2014 (patch) | |
| tree | 1446c7a57813f9ba0782c6199bafbf8392d97ff3 /src/mainboard/google | |
| parent | 4f79e6618519fa1aa8e8afaac57fc7dbfeeb4484 (diff) | |
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')
20 files changed, 20 insertions, 25 deletions
diff --git a/src/mainboard/google/auron/cmos.layout b/src/mainboard/google/auron/cmos.layout index 2a518e9213..b575e02970 100644 --- a/src/mainboard/google/auron/cmos.layout +++ b/src/mainboard/google/auron/cmos.layout @@ -42,7 +42,7 @@ entries # ----------------------------------------------------------------- # RTC_BOOT_BYTE (coreboot hardcoded) 384 1 e 4 boot_option -388 4 r 0 reboot_bits +388 4 h 0 reboot_counter #390 2 r 0 unused? # ----------------------------------------------------------------- diff --git a/src/mainboard/google/auron_paine/cmos.layout b/src/mainboard/google/auron_paine/cmos.layout index 19677177db..b575e02970 100644 --- a/src/mainboard/google/auron_paine/cmos.layout +++ b/src/mainboard/google/auron_paine/cmos.layout @@ -42,8 +42,7 @@ entries # ----------------------------------------------------------------- # RTC_BOOT_BYTE (coreboot hardcoded) 384 1 e 4 boot_option -385 1 e 4 last_boot -388 4 r 0 reboot_bits +388 4 h 0 reboot_counter #390 2 r 0 unused? # ----------------------------------------------------------------- diff --git a/src/mainboard/google/butterfly/cmos.layout b/src/mainboard/google/butterfly/cmos.layout index 8fe3d9b974..180751d971 100644 --- a/src/mainboard/google/butterfly/cmos.layout +++ b/src/mainboard/google/butterfly/cmos.layout @@ -42,7 +42,7 @@ entries # ----------------------------------------------------------------- # RTC_BOOT_BYTE (coreboot hardcoded) 384 1 e 4 boot_option -388 4 r 0 reboot_bits +388 4 h 0 reboot_counter #390 2 r 0 unused? # ----------------------------------------------------------------- diff --git a/src/mainboard/google/chell/cmos.layout b/src/mainboard/google/chell/cmos.layout index 7159e7ba04..91a1336104 100644 --- a/src/mainboard/google/chell/cmos.layout +++ b/src/mainboard/google/chell/cmos.layout @@ -65,7 +65,7 @@ entries # ----------------------------------------------------------------- # RTC_BOOT_BYTE (coreboot hardcoded) 384 1 e 4 boot_option -388 4 r 0 reboot_bits +388 4 h 0 reboot_counter #390 2 r 0 unused? # ----------------------------------------------------------------- diff --git a/src/mainboard/google/cyan/cmos.layout b/src/mainboard/google/cyan/cmos.layout index c14566e2ad..ae46e10647 100644 --- a/src/mainboard/google/cyan/cmos.layout +++ b/src/mainboard/google/cyan/cmos.layout @@ -65,7 +65,7 @@ entries # ----------------------------------------------------------------- # RTC_BOOT_BYTE (coreboot hardcoded) 384 1 e 4 boot_option -388 4 r 0 reboot_bits +388 4 h 0 reboot_counter #390 2 r 0 unused? # ----------------------------------------------------------------- diff --git a/src/mainboard/google/falco/cmos.layout b/src/mainboard/google/falco/cmos.layout index 2a518e9213..b575e02970 100644 --- a/src/mainboard/google/falco/cmos.layout +++ b/src/mainboard/google/falco/cmos.layout @@ -42,7 +42,7 @@ entries # ----------------------------------------------------------------- # RTC_BOOT_BYTE (coreboot hardcoded) 384 1 e 4 boot_option -388 4 r 0 reboot_bits +388 4 h 0 reboot_counter #390 2 r 0 unused? # ----------------------------------------------------------------- diff --git a/src/mainboard/google/glados/cmos.layout b/src/mainboard/google/glados/cmos.layout index 7159e7ba04..91a1336104 100644 --- a/src/mainboard/google/glados/cmos.layout +++ b/src/mainboard/google/glados/cmos.layout @@ -65,7 +65,7 @@ entries # ----------------------------------------------------------------- # RTC_BOOT_BYTE (coreboot hardcoded) 384 1 e 4 boot_option -388 4 r 0 reboot_bits +388 4 h 0 reboot_counter #390 2 r 0 unused? # ----------------------------------------------------------------- diff --git a/src/mainboard/google/guado/cmos.layout b/src/mainboard/google/guado/cmos.layout index b4193159b6..c508d64ebe 100644 --- a/src/mainboard/google/guado/cmos.layout +++ b/src/mainboard/google/guado/cmos.layout @@ -64,8 +64,7 @@ entries # ----------------------------------------------------------------- # RTC_BOOT_BYTE (coreboot hardcoded) 384 1 e 4 boot_option -385 1 e 4 last_boot -388 4 r 0 reboot_bits +388 4 h 0 reboot_counter #390 2 r 0 unused? # ----------------------------------------------------------------- diff --git a/src/mainboard/google/jecht/cmos.layout b/src/mainboard/google/jecht/cmos.layout index c9528ebea3..c508d64ebe 100644 --- a/src/mainboard/google/jecht/cmos.layout +++ b/src/mainboard/google/jecht/cmos.layout @@ -64,7 +64,7 @@ entries # ----------------------------------------------------------------- # RTC_BOOT_BYTE (coreboot hardcoded) 384 1 e 4 boot_option -388 4 r 0 reboot_bits +388 4 h 0 reboot_counter #390 2 r 0 unused? # ----------------------------------------------------------------- diff --git a/src/mainboard/google/lars/cmos.layout b/src/mainboard/google/lars/cmos.layout index ef96d8426d..1c166c6756 100644 --- a/src/mainboard/google/lars/cmos.layout +++ b/src/mainboard/google/lars/cmos.layout @@ -65,7 +65,7 @@ entries # ----------------------------------------------------------------- # RTC_BOOT_BYTE (coreboot hardcoded) 384 1 e 4 boot_option -388 4 r 0 reboot_bits +388 4 h 0 reboot_counter #390 2 r 0 unused? # ----------------------------------------------------------------- diff --git a/src/mainboard/google/link/cmos.layout b/src/mainboard/google/link/cmos.layout index 0513a5466e..91dc89017a 100644 --- a/src/mainboard/google/link/cmos.layout +++ b/src/mainboard/google/link/cmos.layout @@ -42,7 +42,7 @@ entries # ----------------------------------------------------------------- # RTC_BOOT_BYTE (coreboot hardcoded) 384 1 e 4 boot_option -388 4 r 0 reboot_bits +388 4 h 0 reboot_counter #390 2 r 0 unused? # ----------------------------------------------------------------- diff --git a/src/mainboard/google/ninja/cmos.layout b/src/mainboard/google/ninja/cmos.layout index b4193159b6..c508d64ebe 100644 --- a/src/mainboard/google/ninja/cmos.layout +++ b/src/mainboard/google/ninja/cmos.layout @@ -64,8 +64,7 @@ entries # ----------------------------------------------------------------- # RTC_BOOT_BYTE (coreboot hardcoded) 384 1 e 4 boot_option -385 1 e 4 last_boot -388 4 r 0 reboot_bits +388 4 h 0 reboot_counter #390 2 r 0 unused? # ----------------------------------------------------------------- diff --git a/src/mainboard/google/panther/cmos.layout b/src/mainboard/google/panther/cmos.layout index 2a518e9213..b575e02970 100644 --- a/src/mainboard/google/panther/cmos.layout +++ b/src/mainboard/google/panther/cmos.layout @@ -42,7 +42,7 @@ entries # ----------------------------------------------------------------- # RTC_BOOT_BYTE (coreboot hardcoded) 384 1 e 4 boot_option -388 4 r 0 reboot_bits +388 4 h 0 reboot_counter #390 2 r 0 unused? # ----------------------------------------------------------------- diff --git a/src/mainboard/google/parrot/cmos.layout b/src/mainboard/google/parrot/cmos.layout index 0513a5466e..91dc89017a 100644 --- a/src/mainboard/google/parrot/cmos.layout +++ b/src/mainboard/google/parrot/cmos.layout @@ -42,7 +42,7 @@ entries # ----------------------------------------------------------------- # RTC_BOOT_BYTE (coreboot hardcoded) 384 1 e 4 boot_option -388 4 r 0 reboot_bits +388 4 h 0 reboot_counter #390 2 r 0 unused? # ----------------------------------------------------------------- diff --git a/src/mainboard/google/peppy/cmos.layout b/src/mainboard/google/peppy/cmos.layout index 2a518e9213..b575e02970 100644 --- a/src/mainboard/google/peppy/cmos.layout +++ b/src/mainboard/google/peppy/cmos.layout @@ -42,7 +42,7 @@ entries # ----------------------------------------------------------------- # RTC_BOOT_BYTE (coreboot hardcoded) 384 1 e 4 boot_option -388 4 r 0 reboot_bits +388 4 h 0 reboot_counter #390 2 r 0 unused? # ----------------------------------------------------------------- diff --git a/src/mainboard/google/rambi/cmos.layout b/src/mainboard/google/rambi/cmos.layout index 2a518e9213..b575e02970 100644 --- a/src/mainboard/google/rambi/cmos.layout +++ b/src/mainboard/google/rambi/cmos.layout @@ -42,7 +42,7 @@ entries # ----------------------------------------------------------------- # RTC_BOOT_BYTE (coreboot hardcoded) 384 1 e 4 boot_option -388 4 r 0 reboot_bits +388 4 h 0 reboot_counter #390 2 r 0 unused? # ----------------------------------------------------------------- diff --git a/src/mainboard/google/rikku/cmos.layout b/src/mainboard/google/rikku/cmos.layout index b4193159b6..c508d64ebe 100644 --- a/src/mainboard/google/rikku/cmos.layout +++ b/src/mainboard/google/rikku/cmos.layout @@ -64,8 +64,7 @@ entries # ----------------------------------------------------------------- # RTC_BOOT_BYTE (coreboot hardcoded) 384 1 e 4 boot_option -385 1 e 4 last_boot -388 4 r 0 reboot_bits +388 4 h 0 reboot_counter #390 2 r 0 unused? # ----------------------------------------------------------------- diff --git a/src/mainboard/google/samus/cmos.layout b/src/mainboard/google/samus/cmos.layout index 2a518e9213..b575e02970 100644 --- a/src/mainboard/google/samus/cmos.layout +++ b/src/mainboard/google/samus/cmos.layout @@ -42,7 +42,7 @@ entries # ----------------------------------------------------------------- # RTC_BOOT_BYTE (coreboot hardcoded) 384 1 e 4 boot_option -388 4 r 0 reboot_bits +388 4 h 0 reboot_counter #390 2 r 0 unused? # ----------------------------------------------------------------- diff --git a/src/mainboard/google/stout/cmos.layout b/src/mainboard/google/stout/cmos.layout index 0513a5466e..91dc89017a 100644 --- a/src/mainboard/google/stout/cmos.layout +++ b/src/mainboard/google/stout/cmos.layout @@ -42,7 +42,7 @@ entries # ----------------------------------------------------------------- # RTC_BOOT_BYTE (coreboot hardcoded) 384 1 e 4 boot_option -388 4 r 0 reboot_bits +388 4 h 0 reboot_counter #390 2 r 0 unused? # ----------------------------------------------------------------- diff --git a/src/mainboard/google/tidus/cmos.layout b/src/mainboard/google/tidus/cmos.layout index b4193159b6..c508d64ebe 100644 --- a/src/mainboard/google/tidus/cmos.layout +++ b/src/mainboard/google/tidus/cmos.layout @@ -64,8 +64,7 @@ entries # ----------------------------------------------------------------- # RTC_BOOT_BYTE (coreboot hardcoded) 384 1 e 4 boot_option -385 1 e 4 last_boot -388 4 r 0 reboot_bits +388 4 h 0 reboot_counter #390 2 r 0 unused? # ----------------------------------------------------------------- |