mb/system76: Fix CMOS layouts

DisplayPort_Output conflicts with RTC_BOOT_BYTE. Move it to 392 and
adjust the checksum to start there as well.

Modify enum index for debug_level and boot_option to match other boards
across coreboot.

Change-Id: I4d1fe4fda22ef848950c518229321d3d2bc3db12
Signed-off-by: Tim Crawford <tcrawford@system76.com>
This commit is contained in:
Tim Crawford
2021-05-14 12:41:16 -06:00
committed by Jeremy Soller
parent 181b9f3cdd
commit 5d09435cb4
15 changed files with 209 additions and 185 deletions

View File

@@ -5,10 +5,10 @@ entries
0 384 r 0 reserved_memory 0 384 r 0 reserved_memory
# RTC_BOOT_BYTE (coreboot hardcoded) # RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 2 boot_option 384 1 e 4 boot_option
388 4 h 0 reboot_counter 388 4 h 0 reboot_counter
#395 4 e 3 debug_level #395 4 e 6 debug_level
408 1 h 1 preserve_smmstore 408 1 h 1 preserve_smmstore
984 16 h 0 check_sum 984 16 h 0 check_sum
@@ -17,18 +17,18 @@ enumerations
1 0 Disable 1 0 Disable
1 1 Enable 1 1 Enable
2 0 Fallback 4 0 Fallback
2 1 Normal 4 1 Normal
3 0 Emergency 6 0 Emergency
3 1 Alert 6 1 Alert
3 2 Critical 6 2 Critical
3 3 Error 6 3 Error
3 4 Warning 6 4 Warning
3 5 Notice 6 5 Notice
3 6 Info 6 6 Info
3 7 Debug 6 7 Debug
3 8 Spew 6 8 Spew
checksums checksums

View File

@@ -5,10 +5,10 @@ entries
0 384 r 0 reserved_memory 0 384 r 0 reserved_memory
# RTC_BOOT_BYTE (coreboot hardcoded) # RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 2 boot_option 384 1 e 4 boot_option
388 4 h 0 reboot_counter 388 4 h 0 reboot_counter
#395 4 e 3 debug_level #395 4 e 6 debug_level
408 1 h 1 preserve_smmstore 408 1 h 1 preserve_smmstore
984 16 h 0 check_sum 984 16 h 0 check_sum
@@ -17,18 +17,18 @@ enumerations
1 0 Disable 1 0 Disable
1 1 Enable 1 1 Enable
2 0 Fallback 4 0 Fallback
2 1 Normal 4 1 Normal
3 0 Emergency 6 0 Emergency
3 1 Alert 6 1 Alert
3 2 Critical 6 2 Critical
3 3 Error 6 3 Error
3 4 Warning 6 4 Warning
3 5 Notice 6 5 Notice
3 6 Info 6 6 Info
3 7 Debug 6 7 Debug
3 8 Spew 6 8 Spew
checksums checksums

View File

@@ -5,10 +5,10 @@ entries
0 384 r 0 reserved_memory 0 384 r 0 reserved_memory
# RTC_BOOT_BYTE (coreboot hardcoded) # RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 2 boot_option 384 1 e 4 boot_option
388 4 h 0 reboot_counter 388 4 h 0 reboot_counter
#395 4 e 3 debug_level #395 4 e 6 debug_level
408 1 h 1 preserve_smmstore 408 1 h 1 preserve_smmstore
984 16 h 0 check_sum 984 16 h 0 check_sum
@@ -17,18 +17,18 @@ enumerations
1 0 Disable 1 0 Disable
1 1 Enable 1 1 Enable
2 0 Fallback 4 0 Fallback
2 1 Normal 4 1 Normal
3 0 Emergency 6 0 Emergency
3 1 Alert 6 1 Alert
3 2 Critical 6 2 Critical
3 3 Error 6 3 Error
3 4 Warning 6 4 Warning
3 5 Notice 6 5 Notice
3 6 Info 6 6 Info
3 7 Debug 6 7 Debug
3 8 Spew 6 8 Spew
checksums checksums

View File

@@ -2,19 +2,27 @@
entries entries
#start length type id name 0 384 r 0 reserved_memory
0 384 r 0 reserved_memory
384 1 e 1 DisplayPort_Output # RTC_BOOT_BYTE (coreboot hardcoded)
408 1 h 1 preserve_smmstore 384 1 e 4 boot_option
984 16 h 0 check_sum 388 4 h 0 reboot_counter
392 1 e 8 DisplayPort_Output
408 1 h 1 preserve_smmstore
984 16 h 0 check_sum
enumerations enumerations
#ID value text 1 0 Disable
1 0 Mini_DisplayPort 1 1 Enable
1 1 USB-C
4 0 Fallback
4 1 Normal
8 0 Mini_DisplayPort
8 1 USB-C
checksums checksums
#checksum start end location checksum 392 983 984
checksum 384 983 984

View File

@@ -5,10 +5,10 @@ entries
0 384 r 0 reserved_memory 0 384 r 0 reserved_memory
# RTC_BOOT_BYTE (coreboot hardcoded) # RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 2 boot_option 384 1 e 4 boot_option
388 4 h 0 reboot_counter 388 4 h 0 reboot_counter
#395 4 e 3 debug_level #395 4 e 6 debug_level
408 1 h 1 preserve_smmstore 408 1 h 1 preserve_smmstore
984 16 h 0 check_sum 984 16 h 0 check_sum
@@ -17,18 +17,18 @@ enumerations
1 0 Disable 1 0 Disable
1 1 Enable 1 1 Enable
2 0 Fallback 4 0 Fallback
2 1 Normal 4 1 Normal
3 0 Emergency 6 0 Emergency
3 1 Alert 6 1 Alert
3 2 Critical 6 2 Critical
3 3 Error 6 3 Error
3 4 Warning 6 4 Warning
3 5 Notice 6 5 Notice
3 6 Info 6 6 Info
3 7 Debug 6 7 Debug
3 8 Spew 6 8 Spew
checksums checksums

View File

@@ -5,10 +5,10 @@ entries
0 384 r 0 reserved_memory 0 384 r 0 reserved_memory
# RTC_BOOT_BYTE (coreboot hardcoded) # RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 2 boot_option 384 1 e 4 boot_option
388 4 h 0 reboot_counter 388 4 h 0 reboot_counter
#395 4 e 3 debug_level #395 4 e 6 debug_level
408 1 h 1 preserve_smmstore 408 1 h 1 preserve_smmstore
984 16 h 0 check_sum 984 16 h 0 check_sum
@@ -17,18 +17,18 @@ enumerations
1 0 Disable 1 0 Disable
1 1 Enable 1 1 Enable
2 0 Fallback 4 0 Fallback
2 1 Normal 4 1 Normal
3 0 Emergency 6 0 Emergency
3 1 Alert 6 1 Alert
3 2 Critical 6 2 Critical
3 3 Error 6 3 Error
3 4 Warning 6 4 Warning
3 5 Notice 6 5 Notice
3 6 Info 6 6 Info
3 7 Debug 6 7 Debug
3 8 Spew 6 8 Spew
checksums checksums

View File

@@ -5,10 +5,10 @@ entries
0 384 r 0 reserved_memory 0 384 r 0 reserved_memory
# RTC_BOOT_BYTE (coreboot hardcoded) # RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 2 boot_option 384 1 e 4 boot_option
388 4 h 0 reboot_counter 388 4 h 0 reboot_counter
#395 4 e 3 debug_level #395 4 e 6 debug_level
408 1 h 1 preserve_smmstore 408 1 h 1 preserve_smmstore
984 16 h 0 check_sum 984 16 h 0 check_sum
@@ -17,18 +17,18 @@ enumerations
1 0 Disable 1 0 Disable
1 1 Enable 1 1 Enable
2 0 Fallback 4 0 Fallback
2 1 Normal 4 1 Normal
3 0 Emergency 6 0 Emergency
3 1 Alert 6 1 Alert
3 2 Critical 6 2 Critical
3 3 Error 6 3 Error
3 4 Warning 6 4 Warning
3 5 Notice 6 5 Notice
3 6 Info 6 6 Info
3 7 Debug 6 7 Debug
3 8 Spew 6 8 Spew
checksums checksums

View File

@@ -5,10 +5,10 @@ entries
0 384 r 0 reserved_memory 0 384 r 0 reserved_memory
# RTC_BOOT_BYTE (coreboot hardcoded) # RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 2 boot_option 384 1 e 4 boot_option
388 4 h 0 reboot_counter 388 4 h 0 reboot_counter
#395 4 e 3 debug_level #395 4 e 6 debug_level
408 1 h 1 preserve_smmstore 408 1 h 1 preserve_smmstore
984 16 h 0 check_sum 984 16 h 0 check_sum
@@ -17,18 +17,18 @@ enumerations
1 0 Disable 1 0 Disable
1 1 Enable 1 1 Enable
2 0 Fallback 4 0 Fallback
2 1 Normal 4 1 Normal
3 0 Emergency 6 0 Emergency
3 1 Alert 6 1 Alert
3 2 Critical 6 2 Critical
3 3 Error 6 3 Error
3 4 Warning 6 4 Warning
3 5 Notice 6 5 Notice
3 6 Info 6 6 Info
3 7 Debug 6 7 Debug
3 8 Spew 6 8 Spew
checksums checksums

View File

@@ -2,19 +2,27 @@
entries entries
#start length type id name 0 384 r 0 reserved_memory
0 384 r 0 reserved_memory
384 1 e 1 DisplayPort_Output # RTC_BOOT_BYTE (coreboot hardcoded)
408 1 h 1 preserve_smmstore 384 1 e 4 boot_option
984 16 h 0 check_sum 388 4 h 0 reboot_counter
392 1 e 8 DisplayPort_Output
408 1 h 1 preserve_smmstore
984 16 h 0 check_sum
enumerations enumerations
#ID value text 1 0 Disable
1 0 Mini_DisplayPort 1 1 Enable
1 1 USB-C
4 0 Fallback
4 1 Normal
8 0 Mini_DisplayPort
8 1 USB-C
checksums checksums
#checksum start end location checksum 392 983 984
checksum 384 983 984

View File

@@ -5,10 +5,10 @@ entries
0 384 r 0 reserved_memory 0 384 r 0 reserved_memory
# RTC_BOOT_BYTE (coreboot hardcoded) # RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 2 boot_option 384 1 e 4 boot_option
388 4 h 0 reboot_counter 388 4 h 0 reboot_counter
#395 4 e 3 debug_level #395 4 e 6 debug_level
408 1 h 1 preserve_smmstore 408 1 h 1 preserve_smmstore
984 16 h 0 check_sum 984 16 h 0 check_sum
@@ -17,18 +17,18 @@ enumerations
1 0 Disable 1 0 Disable
1 1 Enable 1 1 Enable
2 0 Fallback 4 0 Fallback
2 1 Normal 4 1 Normal
3 0 Emergency 6 0 Emergency
3 1 Alert 6 1 Alert
3 2 Critical 6 2 Critical
3 3 Error 6 3 Error
3 4 Warning 6 4 Warning
3 5 Notice 6 5 Notice
3 6 Info 6 6 Info
3 7 Debug 6 7 Debug
3 8 Spew 6 8 Spew
checksums checksums

View File

@@ -5,10 +5,10 @@ entries
0 384 r 0 reserved_memory 0 384 r 0 reserved_memory
# RTC_BOOT_BYTE (coreboot hardcoded) # RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 2 boot_option 384 1 e 4 boot_option
388 4 h 0 reboot_counter 388 4 h 0 reboot_counter
#395 4 e 3 debug_level #395 4 e 6 debug_level
408 1 h 1 preserve_smmstore 408 1 h 1 preserve_smmstore
984 16 h 0 check_sum 984 16 h 0 check_sum
@@ -17,18 +17,18 @@ enumerations
1 0 Disable 1 0 Disable
1 1 Enable 1 1 Enable
2 0 Fallback 4 0 Fallback
2 1 Normal 4 1 Normal
3 0 Emergency 6 0 Emergency
3 1 Alert 6 1 Alert
3 2 Critical 6 2 Critical
3 3 Error 6 3 Error
3 4 Warning 6 4 Warning
3 5 Notice 6 5 Notice
3 6 Info 6 6 Info
3 7 Debug 6 7 Debug
3 8 Spew 6 8 Spew
checksums checksums

View File

@@ -5,7 +5,7 @@ entries
0 384 r 0 reserved_memory 0 384 r 0 reserved_memory
# RTC_BOOT_BYTE (coreboot hardcoded) # RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 2 boot_option 384 1 e 4 boot_option
388 4 h 0 reboot_counter 388 4 h 0 reboot_counter
#395 4 e 3 debug_level #395 4 e 3 debug_level
@@ -17,18 +17,18 @@ enumerations
1 0 Disable 1 0 Disable
1 1 Enable 1 1 Enable
2 0 Fallback 4 0 Fallback
2 1 Normal 4 1 Normal
3 0 Emergency 6 0 Emergency
3 1 Alert 6 1 Alert
3 2 Critical 6 2 Critical
3 3 Error 6 3 Error
3 4 Warning 6 4 Warning
3 5 Notice 6 5 Notice
3 6 Info 6 6 Info
3 7 Debug 6 7 Debug
3 8 Spew 6 8 Spew
checksums checksums

View File

@@ -5,10 +5,10 @@ entries
0 384 r 0 reserved_memory 0 384 r 0 reserved_memory
# RTC_BOOT_BYTE (coreboot hardcoded) # RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 2 boot_option 384 1 e 4 boot_option
388 4 h 0 reboot_counter 388 4 h 0 reboot_counter
#395 4 e 3 debug_level #395 4 e 6 debug_level
408 1 h 1 preserve_smmstore 408 1 h 1 preserve_smmstore
984 16 h 0 check_sum 984 16 h 0 check_sum
@@ -17,18 +17,18 @@ enumerations
1 0 Disable 1 0 Disable
1 1 Enable 1 1 Enable
2 0 Fallback 4 0 Fallback
2 1 Normal 4 1 Normal
3 0 Emergency 6 0 Emergency
3 1 Alert 6 1 Alert
3 2 Critical 6 2 Critical
3 3 Error 6 3 Error
3 4 Warning 6 4 Warning
3 5 Notice 6 5 Notice
3 6 Info 6 6 Info
3 7 Debug 6 7 Debug
3 8 Spew 6 8 Spew
checksums checksums

View File

@@ -5,10 +5,10 @@ entries
0 384 r 0 reserved_memory 0 384 r 0 reserved_memory
# RTC_BOOT_BYTE (coreboot hardcoded) # RTC_BOOT_BYTE (coreboot hardcoded)
384 1 e 2 boot_option 384 1 e 4 boot_option
388 4 h 0 reboot_counter 388 4 h 0 reboot_counter
#395 4 e 3 debug_level #395 4 e 6 debug_level
408 1 h 1 preserve_smmstore 408 1 h 1 preserve_smmstore
984 16 h 0 check_sum 984 16 h 0 check_sum
@@ -17,18 +17,18 @@ enumerations
1 0 Disable 1 0 Disable
1 1 Enable 1 1 Enable
2 0 Fallback 4 0 Fallback
2 1 Normal 4 1 Normal
3 0 Emergency 6 0 Emergency
3 1 Alert 6 1 Alert
3 2 Critical 6 2 Critical
3 3 Error 6 3 Error
3 4 Warning 6 4 Warning
3 5 Notice 6 5 Notice
3 6 Info 6 6 Info
3 7 Debug 6 7 Debug
3 8 Spew 6 8 Spew
checksums checksums

View File

@@ -2,19 +2,27 @@
entries entries
#start length type id name 0 384 r 0 reserved_memory
0 384 r 0 reserved_memory
384 1 e 1 DisplayPort_Output # RTC_BOOT_BYTE (coreboot hardcoded)
408 1 h 1 preserve_smmstore 384 1 e 4 boot_option
984 16 h 0 check_sum 388 4 h 0 reboot_counter
392 1 e 8 DisplayPort_Output
408 1 h 1 preserve_smmstore
984 16 h 0 check_sum
enumerations enumerations
#ID value text 1 0 Disable
1 0 Mini_DisplayPort 1 1 Enable
1 1 USB-C
4 0 Fallback
4 1 Normal
8 0 Mini_DisplayPort
8 1 USB-C
checksums checksums
#checksum start end location checksum 392 983 984
checksum 384 983 984