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/lenovo | |
| parent | 4f79e6618519fa1aa8e8afaac57fc7dbfeeb4484 (diff) | |
| download | coreboot-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/lenovo')
| -rw-r--r-- | src/mainboard/lenovo/g505s/cmos.layout | 2 | ||||
| -rw-r--r-- | src/mainboard/lenovo/t400/cmos.layout | 2 | ||||
| -rw-r--r-- | src/mainboard/lenovo/t420/cmos.layout | 2 | ||||
| -rw-r--r-- | src/mainboard/lenovo/t420s/cmos.layout | 2 | ||||
| -rw-r--r-- | src/mainboard/lenovo/t430s/cmos.layout | 2 | ||||
| -rw-r--r-- | src/mainboard/lenovo/t520/cmos.layout | 2 | ||||
| -rw-r--r-- | src/mainboard/lenovo/t530/cmos.layout | 2 | ||||
| -rw-r--r-- | src/mainboard/lenovo/t60/cmos.layout | 2 | ||||
| -rw-r--r-- | src/mainboard/lenovo/x200/cmos.layout | 2 | ||||
| -rw-r--r-- | src/mainboard/lenovo/x201/cmos.layout | 2 | ||||
| -rw-r--r-- | src/mainboard/lenovo/x220/cmos.layout | 2 | ||||
| -rw-r--r-- | src/mainboard/lenovo/x230/cmos.layout | 2 | ||||
| -rw-r--r-- | src/mainboard/lenovo/x60/cmos.layout | 2 |
13 files changed, 13 insertions, 13 deletions
diff --git a/src/mainboard/lenovo/g505s/cmos.layout b/src/mainboard/lenovo/g505s/cmos.layout index 61c5690346..249564693d 100644 --- a/src/mainboard/lenovo/g505s/cmos.layout +++ b/src/mainboard/lenovo/g505s/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/lenovo/t400/cmos.layout b/src/mainboard/lenovo/t400/cmos.layout index 475f4b2914..d62042cc9d 100644 --- a/src/mainboard/lenovo/t400/cmos.layout +++ b/src/mainboard/lenovo/t400/cmos.layout @@ -44,7 +44,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/lenovo/t420/cmos.layout b/src/mainboard/lenovo/t420/cmos.layout index 58a4abeaf6..79a3a68592 100644 --- a/src/mainboard/lenovo/t420/cmos.layout +++ b/src/mainboard/lenovo/t420/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/lenovo/t420s/cmos.layout b/src/mainboard/lenovo/t420s/cmos.layout index 3521849cde..ec9be116ad 100644 --- a/src/mainboard/lenovo/t420s/cmos.layout +++ b/src/mainboard/lenovo/t420s/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/lenovo/t430s/cmos.layout b/src/mainboard/lenovo/t430s/cmos.layout index 16b499aac5..73bbe3aa3d 100644 --- a/src/mainboard/lenovo/t430s/cmos.layout +++ b/src/mainboard/lenovo/t430s/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/lenovo/t520/cmos.layout b/src/mainboard/lenovo/t520/cmos.layout index 044c3107a5..a151b7e02a 100644 --- a/src/mainboard/lenovo/t520/cmos.layout +++ b/src/mainboard/lenovo/t520/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/lenovo/t530/cmos.layout b/src/mainboard/lenovo/t530/cmos.layout index 0e28bddb3b..d6d671cff1 100644 --- a/src/mainboard/lenovo/t530/cmos.layout +++ b/src/mainboard/lenovo/t530/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/lenovo/t60/cmos.layout b/src/mainboard/lenovo/t60/cmos.layout index 5068fac822..12e7d86c5a 100644 --- a/src/mainboard/lenovo/t60/cmos.layout +++ b/src/mainboard/lenovo/t60/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/lenovo/x200/cmos.layout b/src/mainboard/lenovo/x200/cmos.layout index 17918976f5..19ead05bee 100644 --- a/src/mainboard/lenovo/x200/cmos.layout +++ b/src/mainboard/lenovo/x200/cmos.layout @@ -44,7 +44,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/lenovo/x201/cmos.layout b/src/mainboard/lenovo/x201/cmos.layout index 7d4aeae0b3..2a91eb71bb 100644 --- a/src/mainboard/lenovo/x201/cmos.layout +++ b/src/mainboard/lenovo/x201/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/lenovo/x220/cmos.layout b/src/mainboard/lenovo/x220/cmos.layout index ca2c45c933..143ee807cd 100644 --- a/src/mainboard/lenovo/x220/cmos.layout +++ b/src/mainboard/lenovo/x220/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/lenovo/x230/cmos.layout b/src/mainboard/lenovo/x230/cmos.layout index 29c20665e8..14602fff43 100644 --- a/src/mainboard/lenovo/x230/cmos.layout +++ b/src/mainboard/lenovo/x230/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/lenovo/x60/cmos.layout b/src/mainboard/lenovo/x60/cmos.layout index 9f10fbc930..2d9fe41b02 100644 --- a/src/mainboard/lenovo/x60/cmos.layout +++ b/src/mainboard/lenovo/x60/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? # ----------------------------------------------------------------- |