aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Crawford <tcrawford@system76.com>2021-08-09 16:55:07 -0600
committerNick Vaccaro <nvaccaro@google.com>2021-08-12 17:59:21 +0000
commit9f7e9cbc2686c478af3d9cd17ea3103cf9fb1d20 (patch)
tree16b931de8c889d3ada63cef9ee4e6f41917eafbd
parent716320b726a4fa6e7f42f2aec90de6f98ef52dd3 (diff)
mb/system76/*: Add CMOS option table
System76 uses several custom CMOS values downstream. Reduce our diff by providing a generic layout with the defaults: boot_option=Fallback debug_level=Debug power_on_after_fail=Enable Tested on galp3-c, gaze15, oryp5, oryp6. All boards boot multiple times with USE_OPTION_TABLE selected. Change-Id: Ie57b0e5713bba8ad46e1a4123a3ddd43e0eea964 Signed-off-by: Tim Crawford <tcrawford@system76.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/56888 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Diffstat
-rw-r--r--src/mainboard/system76/gaze15/Kconfig2
-rw-r--r--src/mainboard/system76/gaze15/cmos.default3
-rw-r--r--src/mainboard/system76/gaze15/cmos.layout36
-rw-r--r--src/mainboard/system76/lemp9/Kconfig2
-rw-r--r--src/mainboard/system76/lemp9/cmos.default3
-rw-r--r--src/mainboard/system76/lemp9/cmos.layout36
-rw-r--r--src/mainboard/system76/oryp5/Kconfig2
-rw-r--r--src/mainboard/system76/oryp5/cmos.default3
-rw-r--r--src/mainboard/system76/oryp5/cmos.layout36
-rw-r--r--src/mainboard/system76/oryp6/Kconfig2
-rw-r--r--src/mainboard/system76/oryp6/cmos.default3
-rw-r--r--src/mainboard/system76/oryp6/cmos.layout36
-rw-r--r--src/mainboard/system76/whl-u/Kconfig2
-rw-r--r--src/mainboard/system76/whl-u/cmos.default3
-rw-r--r--src/mainboard/system76/whl-u/cmos.layout36
15 files changed, 205 insertions, 0 deletions
diff --git a/src/mainboard/system76/gaze15/Kconfig b/src/mainboard/system76/gaze15/Kconfig
index 4ee05ee5c1..2d19fad634 100644
--- a/src/mainboard/system76/gaze15/Kconfig
+++ b/src/mainboard/system76/gaze15/Kconfig
@@ -9,6 +9,8 @@ config BOARD_SPECIFIC_OPTIONS
select EC_SYSTEM76_EC_COLOR_KEYBOARD
select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES
+ select HAVE_CMOS_DEFAULT
+ select HAVE_OPTION_TABLE
select INTEL_GMA_HAVE_VBT
select INTEL_LPSS_UART_FOR_CONSOLE
select MAINBOARD_HAS_LPC_TPM
diff --git a/src/mainboard/system76/gaze15/cmos.default b/src/mainboard/system76/gaze15/cmos.default
new file mode 100644
index 0000000000..d56495357c
--- /dev/null
+++ b/src/mainboard/system76/gaze15/cmos.default
@@ -0,0 +1,3 @@
+boot_option=Fallback
+debug_level=Debug
+power_on_after_fail=Enable
diff --git a/src/mainboard/system76/gaze15/cmos.layout b/src/mainboard/system76/gaze15/cmos.layout
new file mode 100644
index 0000000000..c0275d6218
--- /dev/null
+++ b/src/mainboard/system76/gaze15/cmos.layout
@@ -0,0 +1,36 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+entries
+
+0 384 r 0 reserved_memory
+
+# RTC_BOOT_BYTE (coreboot hardcoded)
+384 1 e 4 boot_option
+388 4 h 0 reboot_counter
+
+395 4 e 6 debug_level
+409 2 e 7 power_on_after_fail
+984 16 h 0 check_sum
+
+enumerations
+
+4 0 Fallback
+4 1 Normal
+
+6 0 Emergency
+6 1 Alert
+6 2 Critical
+6 3 Error
+6 4 Warning
+6 5 Notice
+6 6 Info
+6 7 Debug
+6 8 Spew
+
+7 0 Disable
+7 1 Enable
+7 2 Keep
+
+checksums
+
+checksum 392 983 984
diff --git a/src/mainboard/system76/lemp9/Kconfig b/src/mainboard/system76/lemp9/Kconfig
index ddb819bd43..2a547fd813 100644
--- a/src/mainboard/system76/lemp9/Kconfig
+++ b/src/mainboard/system76/lemp9/Kconfig
@@ -8,6 +8,8 @@ config BOARD_SPECIFIC_OPTIONS
select EC_SYSTEM76_EC_BAT_THRESHOLDS
select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES
+ select HAVE_CMOS_DEFAULT
+ select HAVE_OPTION_TABLE
select HAVE_SMI_HANDLER
select HAVE_SPD_IN_CBFS
select INTEL_GMA_HAVE_VBT
diff --git a/src/mainboard/system76/lemp9/cmos.default b/src/mainboard/system76/lemp9/cmos.default
new file mode 100644
index 0000000000..d56495357c
--- /dev/null
+++ b/src/mainboard/system76/lemp9/cmos.default
@@ -0,0 +1,3 @@
+boot_option=Fallback
+debug_level=Debug
+power_on_after_fail=Enable
diff --git a/src/mainboard/system76/lemp9/cmos.layout b/src/mainboard/system76/lemp9/cmos.layout
new file mode 100644
index 0000000000..c0275d6218
--- /dev/null
+++ b/src/mainboard/system76/lemp9/cmos.layout
@@ -0,0 +1,36 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+entries
+
+0 384 r 0 reserved_memory
+
+# RTC_BOOT_BYTE (coreboot hardcoded)
+384 1 e 4 boot_option
+388 4 h 0 reboot_counter
+
+395 4 e 6 debug_level
+409 2 e 7 power_on_after_fail
+984 16 h 0 check_sum
+
+enumerations
+
+4 0 Fallback
+4 1 Normal
+
+6 0 Emergency
+6 1 Alert
+6 2 Critical
+6 3 Error
+6 4 Warning
+6 5 Notice
+6 6 Info
+6 7 Debug
+6 8 Spew
+
+7 0 Disable
+7 1 Enable
+7 2 Keep
+
+checksums
+
+checksum 392 983 984
diff --git a/src/mainboard/system76/oryp5/Kconfig b/src/mainboard/system76/oryp5/Kconfig
index 5b95c9811c..fa4ec7f32a 100644
--- a/src/mainboard/system76/oryp5/Kconfig
+++ b/src/mainboard/system76/oryp5/Kconfig
@@ -10,6 +10,8 @@ config BOARD_SPECIFIC_OPTIONS
select EC_SYSTEM76_EC_COLOR_KEYBOARD
select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES
+ select HAVE_CMOS_DEFAULT
+ select HAVE_OPTION_TABLE
select INTEL_GMA_HAVE_VBT
select INTEL_LPSS_UART_FOR_CONSOLE
select MAINBOARD_HAS_LPC_TPM
diff --git a/src/mainboard/system76/oryp5/cmos.default b/src/mainboard/system76/oryp5/cmos.default
new file mode 100644
index 0000000000..d56495357c
--- /dev/null
+++ b/src/mainboard/system76/oryp5/cmos.default
@@ -0,0 +1,3 @@
+boot_option=Fallback
+debug_level=Debug
+power_on_after_fail=Enable
diff --git a/src/mainboard/system76/oryp5/cmos.layout b/src/mainboard/system76/oryp5/cmos.layout
new file mode 100644
index 0000000000..c0275d6218
--- /dev/null
+++ b/src/mainboard/system76/oryp5/cmos.layout
@@ -0,0 +1,36 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+entries
+
+0 384 r 0 reserved_memory
+
+# RTC_BOOT_BYTE (coreboot hardcoded)
+384 1 e 4 boot_option
+388 4 h 0 reboot_counter
+
+395 4 e 6 debug_level
+409 2 e 7 power_on_after_fail
+984 16 h 0 check_sum
+
+enumerations
+
+4 0 Fallback
+4 1 Normal
+
+6 0 Emergency
+6 1 Alert
+6 2 Critical
+6 3 Error
+6 4 Warning
+6 5 Notice
+6 6 Info
+6 7 Debug
+6 8 Spew
+
+7 0 Disable
+7 1 Enable
+7 2 Keep
+
+checksums
+
+checksum 392 983 984
diff --git a/src/mainboard/system76/oryp6/Kconfig b/src/mainboard/system76/oryp6/Kconfig
index 2ebe4c822f..4f17e55d0e 100644
--- a/src/mainboard/system76/oryp6/Kconfig
+++ b/src/mainboard/system76/oryp6/Kconfig
@@ -10,6 +10,8 @@ config BOARD_SPECIFIC_OPTIONS
select EC_SYSTEM76_EC_COLOR_KEYBOARD
select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES
+ select HAVE_CMOS_DEFAULT
+ select HAVE_OPTION_TABLE
select INTEL_GMA_HAVE_VBT
select MAINBOARD_HAS_LPC_TPM
select MAINBOARD_HAS_TPM2
diff --git a/src/mainboard/system76/oryp6/cmos.default b/src/mainboard/system76/oryp6/cmos.default
new file mode 100644
index 0000000000..d56495357c
--- /dev/null
+++ b/src/mainboard/system76/oryp6/cmos.default
@@ -0,0 +1,3 @@
+boot_option=Fallback
+debug_level=Debug
+power_on_after_fail=Enable
diff --git a/src/mainboard/system76/oryp6/cmos.layout b/src/mainboard/system76/oryp6/cmos.layout
new file mode 100644
index 0000000000..c0275d6218
--- /dev/null
+++ b/src/mainboard/system76/oryp6/cmos.layout
@@ -0,0 +1,36 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+entries
+
+0 384 r 0 reserved_memory
+
+# RTC_BOOT_BYTE (coreboot hardcoded)
+384 1 e 4 boot_option
+388 4 h 0 reboot_counter
+
+395 4 e 6 debug_level
+409 2 e 7 power_on_after_fail
+984 16 h 0 check_sum
+
+enumerations
+
+4 0 Fallback
+4 1 Normal
+
+6 0 Emergency
+6 1 Alert
+6 2 Critical
+6 3 Error
+6 4 Warning
+6 5 Notice
+6 6 Info
+6 7 Debug
+6 8 Spew
+
+7 0 Disable
+7 1 Enable
+7 2 Keep
+
+checksums
+
+checksum 392 983 984
diff --git a/src/mainboard/system76/whl-u/Kconfig b/src/mainboard/system76/whl-u/Kconfig
index 1b8130a6b9..95f861a378 100644
--- a/src/mainboard/system76/whl-u/Kconfig
+++ b/src/mainboard/system76/whl-u/Kconfig
@@ -9,6 +9,8 @@ config BOARD_SPECIFIC_OPTIONS
select EC_SYSTEM76_EC_COLOR_KEYBOARD if BOARD_SYSTEM76_DARP5
select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES
+ select HAVE_CMOS_DEFAULT
+ select HAVE_OPTION_TABLE
select INTEL_GMA_HAVE_VBT
select INTEL_LPSS_UART_FOR_CONSOLE
select MAINBOARD_HAS_LPC_TPM
diff --git a/src/mainboard/system76/whl-u/cmos.default b/src/mainboard/system76/whl-u/cmos.default
new file mode 100644
index 0000000000..d56495357c
--- /dev/null
+++ b/src/mainboard/system76/whl-u/cmos.default
@@ -0,0 +1,3 @@
+boot_option=Fallback
+debug_level=Debug
+power_on_after_fail=Enable
diff --git a/src/mainboard/system76/whl-u/cmos.layout b/src/mainboard/system76/whl-u/cmos.layout
new file mode 100644
index 0000000000..c0275d6218
--- /dev/null
+++ b/src/mainboard/system76/whl-u/cmos.layout
@@ -0,0 +1,36 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+entries
+
+0 384 r 0 reserved_memory
+
+# RTC_BOOT_BYTE (coreboot hardcoded)
+384 1 e 4 boot_option
+388 4 h 0 reboot_counter
+
+395 4 e 6 debug_level
+409 2 e 7 power_on_after_fail
+984 16 h 0 check_sum
+
+enumerations
+
+4 0 Fallback
+4 1 Normal
+
+6 0 Emergency
+6 1 Alert
+6 2 Critical
+6 3 Error
+6 4 Warning
+6 5 Notice
+6 6 Info
+6 7 Debug
+6 8 Spew
+
+7 0 Disable
+7 1 Enable
+7 2 Keep
+
+checksums
+
+checksum 392 983 984
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 08:45:31 +0000