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/intel | |
| 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/intel')
| -rw-r--r-- | src/mainboard/intel/baskingridge/cmos.layout | 2 | ||||
| -rw-r--r-- | src/mainboard/intel/bayleybay_fsp/cmos.layout | 2 | ||||
| -rw-r--r-- | src/mainboard/intel/camelbackmountain_fsp/cmos.layout | 3 | ||||
| -rw-r--r-- | src/mainboard/intel/cougar_canyon2/cmos.layout | 2 | ||||
| -rw-r--r-- | src/mainboard/intel/d945gclf/cmos.layout | 2 | ||||
| -rw-r--r-- | src/mainboard/intel/eagleheights/cmos.layout | 2 | ||||
| -rw-r--r-- | src/mainboard/intel/emeraldlake2/cmos.layout | 2 | ||||
| -rw-r--r-- | src/mainboard/intel/kunimitsu/cmos.layout | 2 | ||||
| -rw-r--r-- | src/mainboard/intel/littleplains/cmos.layout | 2 | ||||
| -rw-r--r-- | src/mainboard/intel/minnowmax/cmos.layout | 2 | ||||
| -rw-r--r-- | src/mainboard/intel/mohonpeak/cmos.layout | 2 | ||||
| -rw-r--r-- | src/mainboard/intel/stargo2/cmos.layout | 3 | ||||
| -rw-r--r-- | src/mainboard/intel/strago/cmos.layout | 2 | ||||
| -rw-r--r-- | src/mainboard/intel/wtm2/cmos.layout | 2 |
14 files changed, 14 insertions, 16 deletions
diff --git a/src/mainboard/intel/baskingridge/cmos.layout b/src/mainboard/intel/baskingridge/cmos.layout index 2f429c9a7a..6d7e031bd6 100644 --- 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? # ----------------------------------------------------------------- diff --git a/src/mainboard/intel/bayleybay_fsp/cmos.layout b/src/mainboard/intel/bayleybay_fsp/cmos.layout index bd5010c19b..c3d557eaf0 100644 --- a/src/mainboard/intel/bayleybay_fsp/cmos.layout +++ b/src/mainboard/intel/bayleybay_fsp/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/intel/camelbackmountain_fsp/cmos.layout b/src/mainboard/intel/camelbackmountain_fsp/cmos.layout index 9ff9d1f22b..27ad8be975 100644 --- a/src/mainboard/intel/camelbackmountain_fsp/cmos.layout +++ b/src/mainboard/intel/camelbackmountain_fsp/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/intel/cougar_canyon2/cmos.layout b/src/mainboard/intel/cougar_canyon2/cmos.layout index 44ce09658c..d33634a88a 100644 --- a/src/mainboard/intel/cougar_canyon2/cmos.layout +++ b/src/mainboard/intel/cougar_canyon2/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/intel/d945gclf/cmos.layout b/src/mainboard/intel/d945gclf/cmos.layout index c280627af6..05115822f6 100644 --- a/src/mainboard/intel/d945gclf/cmos.layout +++ b/src/mainboard/intel/d945gclf/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/intel/eagleheights/cmos.layout b/src/mainboard/intel/eagleheights/cmos.layout index 468e72385e..873f938998 100644 --- a/src/mainboard/intel/eagleheights/cmos.layout +++ b/src/mainboard/intel/eagleheights/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/intel/emeraldlake2/cmos.layout b/src/mainboard/intel/emeraldlake2/cmos.layout index ab8cdb81d2..3cc675f3aa 100644 --- a/src/mainboard/intel/emeraldlake2/cmos.layout +++ b/src/mainboard/intel/emeraldlake2/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/intel/kunimitsu/cmos.layout b/src/mainboard/intel/kunimitsu/cmos.layout index ef96d8426d..1c166c6756 100644 --- a/src/mainboard/intel/kunimitsu/cmos.layout +++ b/src/mainboard/intel/kunimitsu/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/intel/littleplains/cmos.layout b/src/mainboard/intel/littleplains/cmos.layout index 28976c1212..27041228f0 100644 --- a/src/mainboard/intel/littleplains/cmos.layout +++ b/src/mainboard/intel/littleplains/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/intel/minnowmax/cmos.layout b/src/mainboard/intel/minnowmax/cmos.layout index 8aaa522bb8..f65750cd07 100644 --- a/src/mainboard/intel/minnowmax/cmos.layout +++ b/src/mainboard/intel/minnowmax/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/intel/mohonpeak/cmos.layout b/src/mainboard/intel/mohonpeak/cmos.layout index 28976c1212..27041228f0 100644 --- a/src/mainboard/intel/mohonpeak/cmos.layout +++ b/src/mainboard/intel/mohonpeak/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/intel/stargo2/cmos.layout b/src/mainboard/intel/stargo2/cmos.layout index 7312dc9580..ed2c93a66b 100644 --- a/src/mainboard/intel/stargo2/cmos.layout +++ b/src/mainboard/intel/stargo2/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/intel/strago/cmos.layout b/src/mainboard/intel/strago/cmos.layout index c14566e2ad..ae46e10647 100644 --- a/src/mainboard/intel/strago/cmos.layout +++ b/src/mainboard/intel/strago/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/intel/wtm2/cmos.layout b/src/mainboard/intel/wtm2/cmos.layout index 2a518e9213..b575e02970 100644 --- a/src/mainboard/intel/wtm2/cmos.layout +++ b/src/mainboard/intel/wtm2/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? # ----------------------------------------------------------------- |