From dc33cd724e91915b359364767dea4200bc9461c8 Mon Sep 17 00:00:00 2001 From: Tim Crawford Date: Fri, 24 Jan 2025 14:15:01 -0700 Subject: [PATCH] mb/system76: Switch from CMOS options to UEFI vars Change-Id: I507afea254b8e6122a4f29bc478b1801263777de Signed-off-by: Tim Crawford --- src/mainboard/system76/addw1/Kconfig | 3 +- src/mainboard/system76/addw1/cmos.default | 5 --- src/mainboard/system76/addw1/cmos.layout | 43 ---------------------- src/mainboard/system76/adl/Kconfig | 7 +--- src/mainboard/system76/adl/cmos.default | 5 --- src/mainboard/system76/adl/cmos.layout | 43 ---------------------- src/mainboard/system76/bonw14/Kconfig | 3 +- src/mainboard/system76/bonw14/cmos.default | 5 --- src/mainboard/system76/bonw14/cmos.layout | 43 ---------------------- src/mainboard/system76/cml-u/Kconfig | 3 +- src/mainboard/system76/cml-u/cmos.default | 5 --- src/mainboard/system76/cml-u/cmos.layout | 43 ---------------------- src/mainboard/system76/gaze15/Kconfig | 3 +- src/mainboard/system76/gaze15/cmos.default | 5 --- src/mainboard/system76/gaze15/cmos.layout | 43 ---------------------- src/mainboard/system76/kbl-u/Kconfig | 3 +- src/mainboard/system76/kbl-u/cmos.default | 4 -- src/mainboard/system76/kbl-u/cmos.layout | 38 ------------------- src/mainboard/system76/meer9/Kconfig | 6 +-- src/mainboard/system76/meer9/cmos.default | 5 --- src/mainboard/system76/meer9/cmos.layout | 43 ---------------------- src/mainboard/system76/mtl/Kconfig | 6 +-- src/mainboard/system76/mtl/cmos.default | 5 --- src/mainboard/system76/mtl/cmos.layout | 43 ---------------------- src/mainboard/system76/oryp5/Kconfig | 3 +- src/mainboard/system76/oryp5/cmos.default | 5 --- src/mainboard/system76/oryp5/cmos.layout | 43 ---------------------- src/mainboard/system76/oryp6/Kconfig | 3 +- src/mainboard/system76/oryp6/cmos.default | 5 --- src/mainboard/system76/oryp6/cmos.layout | 43 ---------------------- src/mainboard/system76/rpl/Kconfig | 7 +--- src/mainboard/system76/rpl/cmos.default | 5 --- src/mainboard/system76/rpl/cmos.layout | 43 ---------------------- src/mainboard/system76/tgl-h/Kconfig | 3 +- src/mainboard/system76/tgl-h/cmos.default | 5 --- src/mainboard/system76/tgl-h/cmos.layout | 43 ---------------------- src/mainboard/system76/tgl-u/Kconfig | 3 +- src/mainboard/system76/tgl-u/cmos.default | 5 --- src/mainboard/system76/tgl-u/cmos.layout | 43 ---------------------- src/mainboard/system76/whl-u/Kconfig | 3 +- src/mainboard/system76/whl-u/cmos.default | 5 --- src/mainboard/system76/whl-u/cmos.layout | 43 ---------------------- 42 files changed, 14 insertions(+), 708 deletions(-) delete mode 100644 src/mainboard/system76/addw1/cmos.default delete mode 100644 src/mainboard/system76/addw1/cmos.layout delete mode 100644 src/mainboard/system76/adl/cmos.default delete mode 100644 src/mainboard/system76/adl/cmos.layout delete mode 100644 src/mainboard/system76/bonw14/cmos.default delete mode 100644 src/mainboard/system76/bonw14/cmos.layout delete mode 100644 src/mainboard/system76/cml-u/cmos.default delete mode 100644 src/mainboard/system76/cml-u/cmos.layout delete mode 100644 src/mainboard/system76/gaze15/cmos.default delete mode 100644 src/mainboard/system76/gaze15/cmos.layout delete mode 100644 src/mainboard/system76/kbl-u/cmos.default delete mode 100644 src/mainboard/system76/kbl-u/cmos.layout delete mode 100644 src/mainboard/system76/meer9/cmos.default delete mode 100644 src/mainboard/system76/meer9/cmos.layout delete mode 100644 src/mainboard/system76/mtl/cmos.default delete mode 100644 src/mainboard/system76/mtl/cmos.layout delete mode 100644 src/mainboard/system76/oryp5/cmos.default delete mode 100644 src/mainboard/system76/oryp5/cmos.layout delete mode 100644 src/mainboard/system76/oryp6/cmos.default delete mode 100644 src/mainboard/system76/oryp6/cmos.layout delete mode 100644 src/mainboard/system76/rpl/cmos.default delete mode 100644 src/mainboard/system76/rpl/cmos.layout delete mode 100644 src/mainboard/system76/tgl-h/cmos.default delete mode 100644 src/mainboard/system76/tgl-h/cmos.layout delete mode 100644 src/mainboard/system76/tgl-u/cmos.default delete mode 100644 src/mainboard/system76/tgl-u/cmos.layout delete mode 100644 src/mainboard/system76/whl-u/cmos.default delete mode 100644 src/mainboard/system76/whl-u/cmos.layout diff --git a/src/mainboard/system76/addw1/Kconfig b/src/mainboard/system76/addw1/Kconfig index 8c21cd4284..64717d439a 100644 --- a/src/mainboard/system76/addw1/Kconfig +++ b/src/mainboard/system76/addw1/Kconfig @@ -5,6 +5,7 @@ if BOARD_SYSTEM76_ADDW1 || BOARD_SYSTEM76_ADDW2 config BOARD_SPECIFIC_OPTIONS def_bool y select BOARD_ROMSIZE_KB_16384 + select DRIVERS_EFI_VARIABLE_STORE select DRIVERS_GENERIC_CBFS_SERIAL select DRIVERS_GENERIC_CBFS_UUID select DRIVERS_GFX_NVIDIA @@ -15,8 +16,6 @@ config BOARD_SPECIFIC_OPTIONS select EC_SYSTEM76_EC_OLED 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 MEMORY_MAPPED_TPM diff --git a/src/mainboard/system76/addw1/cmos.default b/src/mainboard/system76/addw1/cmos.default deleted file mode 100644 index 0cc5970e49..0000000000 --- a/src/mainboard/system76/addw1/cmos.default +++ /dev/null @@ -1,5 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -boot_option=Fallback -debug_level=Debug -me_state=Disable diff --git a/src/mainboard/system76/addw1/cmos.layout b/src/mainboard/system76/addw1/cmos.layout deleted file mode 100644 index b3df3808cc..0000000000 --- a/src/mainboard/system76/addw1/cmos.layout +++ /dev/null @@ -1,43 +0,0 @@ -# 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 - -# RTC_CLK_ALTCENTURY -400 8 r 0 century - -412 4 e 6 debug_level -416 1 e 2 me_state -417 3 h 0 me_state_counter - -# CMOS_VSTART_ramtop -800 80 r 0 ramtop - -984 16 h 0 check_sum - -enumerations - -2 0 Enable -2 1 Disable - -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 - -checksums - -checksum 408 799 984 diff --git a/src/mainboard/system76/adl/Kconfig b/src/mainboard/system76/adl/Kconfig index 296d12c51c..9fc865eb20 100644 --- a/src/mainboard/system76/adl/Kconfig +++ b/src/mainboard/system76/adl/Kconfig @@ -3,6 +3,7 @@ config BOARD_SYSTEM76_ADL_COMMON def_bool n select BOARD_ROMSIZE_KB_32768 + select DRIVERS_EFI_VARIABLE_STORE select DRIVERS_GENERIC_BAYHUB_LV2 select DRIVERS_GENERIC_CBFS_SERIAL select DRIVERS_GENERIC_CBFS_UUID @@ -13,8 +14,6 @@ config BOARD_SYSTEM76_ADL_COMMON select EC_SYSTEM76_EC_LOCKDOWN 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_TPM2 @@ -104,10 +103,6 @@ config MAINBOARD_VERSION default "oryp9" if BOARD_SYSTEM76_ORYP9 default "oryp10" if BOARD_SYSTEM76_ORYP10 -config CMOS_DEFAULT_FILE - default "src/mainboard/\$(MAINBOARDDIR)/cmos-csme.default" if BOARD_SYSTEM76_DARP8 - default "src/mainboard/\$(MAINBOARDDIR)/cmos.default" - config CONSOLE_POST default y diff --git a/src/mainboard/system76/adl/cmos.default b/src/mainboard/system76/adl/cmos.default deleted file mode 100644 index 0cc5970e49..0000000000 --- a/src/mainboard/system76/adl/cmos.default +++ /dev/null @@ -1,5 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -boot_option=Fallback -debug_level=Debug -me_state=Disable diff --git a/src/mainboard/system76/adl/cmos.layout b/src/mainboard/system76/adl/cmos.layout deleted file mode 100644 index b3df3808cc..0000000000 --- a/src/mainboard/system76/adl/cmos.layout +++ /dev/null @@ -1,43 +0,0 @@ -# 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 - -# RTC_CLK_ALTCENTURY -400 8 r 0 century - -412 4 e 6 debug_level -416 1 e 2 me_state -417 3 h 0 me_state_counter - -# CMOS_VSTART_ramtop -800 80 r 0 ramtop - -984 16 h 0 check_sum - -enumerations - -2 0 Enable -2 1 Disable - -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 - -checksums - -checksum 408 799 984 diff --git a/src/mainboard/system76/bonw14/Kconfig b/src/mainboard/system76/bonw14/Kconfig index 6b511569c7..d6894823c2 100644 --- a/src/mainboard/system76/bonw14/Kconfig +++ b/src/mainboard/system76/bonw14/Kconfig @@ -5,6 +5,7 @@ if BOARD_SYSTEM76_BONW14 config BOARD_SPECIFIC_OPTIONS def_bool y select BOARD_ROMSIZE_KB_16384 + select DRIVERS_EFI_VARIABLE_STORE select DRIVERS_GENERIC_CBFS_SERIAL select DRIVERS_GENERIC_CBFS_UUID select DRIVERS_GFX_NVIDIA @@ -14,8 +15,6 @@ config BOARD_SPECIFIC_OPTIONS select EC_SYSTEM76_EC_DGPU select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES - select HAVE_CMOS_DEFAULT - select HAVE_OPTION_TABLE select INTEL_LPSS_UART_FOR_CONSOLE select MEMORY_MAPPED_TPM select MAINBOARD_HAS_TPM2 diff --git a/src/mainboard/system76/bonw14/cmos.default b/src/mainboard/system76/bonw14/cmos.default deleted file mode 100644 index 0cc5970e49..0000000000 --- a/src/mainboard/system76/bonw14/cmos.default +++ /dev/null @@ -1,5 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -boot_option=Fallback -debug_level=Debug -me_state=Disable diff --git a/src/mainboard/system76/bonw14/cmos.layout b/src/mainboard/system76/bonw14/cmos.layout deleted file mode 100644 index b3df3808cc..0000000000 --- a/src/mainboard/system76/bonw14/cmos.layout +++ /dev/null @@ -1,43 +0,0 @@ -# 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 - -# RTC_CLK_ALTCENTURY -400 8 r 0 century - -412 4 e 6 debug_level -416 1 e 2 me_state -417 3 h 0 me_state_counter - -# CMOS_VSTART_ramtop -800 80 r 0 ramtop - -984 16 h 0 check_sum - -enumerations - -2 0 Enable -2 1 Disable - -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 - -checksums - -checksum 408 799 984 diff --git a/src/mainboard/system76/cml-u/Kconfig b/src/mainboard/system76/cml-u/Kconfig index db2f1eac22..7bc6dd090e 100644 --- a/src/mainboard/system76/cml-u/Kconfig +++ b/src/mainboard/system76/cml-u/Kconfig @@ -5,14 +5,13 @@ if BOARD_SYSTEM76_DARP6 || BOARD_SYSTEM76_GALP4 || BOARD_SYSTEM76_LEMP9 config BOARD_SPECIFIC_OPTIONS def_bool y select BOARD_ROMSIZE_KB_16384 + select DRIVERS_EFI_VARIABLE_STORE select DRIVERS_GENERIC_CBFS_SERIAL select DRIVERS_GENERIC_CBFS_UUID select DRIVERS_I2C_HID select EC_SYSTEM76_EC select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES - select HAVE_CMOS_DEFAULT - select HAVE_OPTION_TABLE select HAVE_SPD_IN_CBFS if BOARD_SYSTEM76_LEMP9 select INTEL_GMA_HAVE_VBT select INTEL_LPSS_UART_FOR_CONSOLE diff --git a/src/mainboard/system76/cml-u/cmos.default b/src/mainboard/system76/cml-u/cmos.default deleted file mode 100644 index 0cc5970e49..0000000000 --- a/src/mainboard/system76/cml-u/cmos.default +++ /dev/null @@ -1,5 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -boot_option=Fallback -debug_level=Debug -me_state=Disable diff --git a/src/mainboard/system76/cml-u/cmos.layout b/src/mainboard/system76/cml-u/cmos.layout deleted file mode 100644 index b3df3808cc..0000000000 --- a/src/mainboard/system76/cml-u/cmos.layout +++ /dev/null @@ -1,43 +0,0 @@ -# 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 - -# RTC_CLK_ALTCENTURY -400 8 r 0 century - -412 4 e 6 debug_level -416 1 e 2 me_state -417 3 h 0 me_state_counter - -# CMOS_VSTART_ramtop -800 80 r 0 ramtop - -984 16 h 0 check_sum - -enumerations - -2 0 Enable -2 1 Disable - -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 - -checksums - -checksum 408 799 984 diff --git a/src/mainboard/system76/gaze15/Kconfig b/src/mainboard/system76/gaze15/Kconfig index c0c71f6504..b93b4dec34 100644 --- a/src/mainboard/system76/gaze15/Kconfig +++ b/src/mainboard/system76/gaze15/Kconfig @@ -5,6 +5,7 @@ if BOARD_SYSTEM76_GAZE14 || BOARD_SYSTEM76_GAZE15 config BOARD_SPECIFIC_OPTIONS def_bool y select BOARD_ROMSIZE_KB_16384 + select DRIVERS_EFI_VARIABLE_STORE select DRIVERS_GENERIC_CBFS_SERIAL select DRIVERS_GENERIC_CBFS_UUID select DRIVERS_GFX_NVIDIA @@ -13,8 +14,6 @@ config BOARD_SPECIFIC_OPTIONS select EC_SYSTEM76_EC_DGPU 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 MEMORY_MAPPED_TPM diff --git a/src/mainboard/system76/gaze15/cmos.default b/src/mainboard/system76/gaze15/cmos.default deleted file mode 100644 index 0cc5970e49..0000000000 --- a/src/mainboard/system76/gaze15/cmos.default +++ /dev/null @@ -1,5 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -boot_option=Fallback -debug_level=Debug -me_state=Disable diff --git a/src/mainboard/system76/gaze15/cmos.layout b/src/mainboard/system76/gaze15/cmos.layout deleted file mode 100644 index b3df3808cc..0000000000 --- a/src/mainboard/system76/gaze15/cmos.layout +++ /dev/null @@ -1,43 +0,0 @@ -# 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 - -# RTC_CLK_ALTCENTURY -400 8 r 0 century - -412 4 e 6 debug_level -416 1 e 2 me_state -417 3 h 0 me_state_counter - -# CMOS_VSTART_ramtop -800 80 r 0 ramtop - -984 16 h 0 check_sum - -enumerations - -2 0 Enable -2 1 Disable - -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 - -checksums - -checksum 408 799 984 diff --git a/src/mainboard/system76/kbl-u/Kconfig b/src/mainboard/system76/kbl-u/Kconfig index 0fccdf738c..f18c4c727e 100644 --- a/src/mainboard/system76/kbl-u/Kconfig +++ b/src/mainboard/system76/kbl-u/Kconfig @@ -5,12 +5,11 @@ if BOARD_SYSTEM76_GALP2 || BOARD_SYSTEM76_GALP3 || BOARD_SYSTEM76_GALP3_B config BOARD_SPECIFIC_OPTIONS def_bool y select BOARD_ROMSIZE_KB_8192 + select DRIVERS_EFI_VARIABLE_STORE select DRIVERS_GENERIC_CBFS_SERIAL select DRIVERS_GENERIC_CBFS_UUID 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 MEMORY_MAPPED_TPM diff --git a/src/mainboard/system76/kbl-u/cmos.default b/src/mainboard/system76/kbl-u/cmos.default deleted file mode 100644 index 21863787ef..0000000000 --- a/src/mainboard/system76/kbl-u/cmos.default +++ /dev/null @@ -1,4 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -boot_option=Fallback -debug_level=Debug diff --git a/src/mainboard/system76/kbl-u/cmos.layout b/src/mainboard/system76/kbl-u/cmos.layout deleted file mode 100644 index 7aec087ea3..0000000000 --- a/src/mainboard/system76/kbl-u/cmos.layout +++ /dev/null @@ -1,38 +0,0 @@ -# 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 - -# RTC_CLK_ALTCENTURY -400 8 r 0 century - -412 4 e 6 debug_level - -# CMOS_VSTART_ramtop -800 80 r 0 ramtop - -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 - -checksums - -checksum 408 799 984 diff --git a/src/mainboard/system76/meer9/Kconfig b/src/mainboard/system76/meer9/Kconfig index 3c7cb97593..25cc4ee8d5 100644 --- a/src/mainboard/system76/meer9/Kconfig +++ b/src/mainboard/system76/meer9/Kconfig @@ -4,14 +4,13 @@ config BOARD_SYSTEM76_MEER9_COMMON def_bool n select BOARD_ROMSIZE_KB_32768 select CRB_TPM + select DRIVERS_EFI_VARIABLE_STORE select DRIVERS_GENERIC_CBFS_SERIAL select DRIVERS_GENERIC_CBFS_UUID select DRIVERS_UART_8250IO select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES - select HAVE_CMOS_DEFAULT select HAVE_INTEL_PTT - select HAVE_OPTION_TABLE select INTEL_GMA_HAVE_VBT select MAINBOARD_HAS_TPM2 select NO_UART_ON_SUPERIO @@ -46,9 +45,6 @@ config MAINBOARD_SMBIOS_PRODUCT_NAME config MAINBOARD_VERSION default "meer9" if BOARD_SYSTEM76_MEER9 -config CMOS_DEFAULT_FILE - default "src/mainboard/\$(MAINBOARDDIR)/cmos.default" - config CONSOLE_POST default y diff --git a/src/mainboard/system76/meer9/cmos.default b/src/mainboard/system76/meer9/cmos.default deleted file mode 100644 index d61046df6b..0000000000 --- a/src/mainboard/system76/meer9/cmos.default +++ /dev/null @@ -1,5 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -boot_option=Fallback -debug_level=Debug -me_state=Enable diff --git a/src/mainboard/system76/meer9/cmos.layout b/src/mainboard/system76/meer9/cmos.layout deleted file mode 100644 index b3df3808cc..0000000000 --- a/src/mainboard/system76/meer9/cmos.layout +++ /dev/null @@ -1,43 +0,0 @@ -# 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 - -# RTC_CLK_ALTCENTURY -400 8 r 0 century - -412 4 e 6 debug_level -416 1 e 2 me_state -417 3 h 0 me_state_counter - -# CMOS_VSTART_ramtop -800 80 r 0 ramtop - -984 16 h 0 check_sum - -enumerations - -2 0 Enable -2 1 Disable - -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 - -checksums - -checksum 408 799 984 diff --git a/src/mainboard/system76/mtl/Kconfig b/src/mainboard/system76/mtl/Kconfig index a0515d905c..eaf13daa33 100644 --- a/src/mainboard/system76/mtl/Kconfig +++ b/src/mainboard/system76/mtl/Kconfig @@ -3,6 +3,7 @@ config BOARD_SYSTEM76_MTL_COMMON def_bool n select BOARD_ROMSIZE_KB_32768 + select DRIVERS_EFI_VARIABLE_STORE select DRIVERS_GENERIC_BAYHUB_LV2 select DRIVERS_GENERIC_CBFS_SERIAL select DRIVERS_GENERIC_CBFS_UUID @@ -11,8 +12,6 @@ config BOARD_SYSTEM76_MTL_COMMON select EC_SYSTEM76_EC_LOCKDOWN 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_TPM2 @@ -82,9 +81,6 @@ config MAINBOARD_VERSION default "lemp13" if BOARD_SYSTEM76_LEMP13 default "lemp13-b" if BOARD_SYSTEM76_LEMP13_B -config CMOS_DEFAULT_FILE - default "src/mainboard/\$(MAINBOARDDIR)/cmos.default" - config CONSOLE_POST default y diff --git a/src/mainboard/system76/mtl/cmos.default b/src/mainboard/system76/mtl/cmos.default deleted file mode 100644 index 0cc5970e49..0000000000 --- a/src/mainboard/system76/mtl/cmos.default +++ /dev/null @@ -1,5 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -boot_option=Fallback -debug_level=Debug -me_state=Disable diff --git a/src/mainboard/system76/mtl/cmos.layout b/src/mainboard/system76/mtl/cmos.layout deleted file mode 100644 index b3df3808cc..0000000000 --- a/src/mainboard/system76/mtl/cmos.layout +++ /dev/null @@ -1,43 +0,0 @@ -# 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 - -# RTC_CLK_ALTCENTURY -400 8 r 0 century - -412 4 e 6 debug_level -416 1 e 2 me_state -417 3 h 0 me_state_counter - -# CMOS_VSTART_ramtop -800 80 r 0 ramtop - -984 16 h 0 check_sum - -enumerations - -2 0 Enable -2 1 Disable - -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 - -checksums - -checksum 408 799 984 diff --git a/src/mainboard/system76/oryp5/Kconfig b/src/mainboard/system76/oryp5/Kconfig index a8ea5c805f..e440394753 100644 --- a/src/mainboard/system76/oryp5/Kconfig +++ b/src/mainboard/system76/oryp5/Kconfig @@ -5,6 +5,7 @@ if BOARD_SYSTEM76_ORYP5 config BOARD_SPECIFIC_OPTIONS def_bool y select BOARD_ROMSIZE_KB_16384 + select DRIVERS_EFI_VARIABLE_STORE select DRIVERS_GENERIC_CBFS_SERIAL select DRIVERS_GENERIC_CBFS_UUID select DRIVERS_GFX_NVIDIA @@ -14,8 +15,6 @@ config BOARD_SPECIFIC_OPTIONS select EC_SYSTEM76_EC_DGPU 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 MEMORY_MAPPED_TPM diff --git a/src/mainboard/system76/oryp5/cmos.default b/src/mainboard/system76/oryp5/cmos.default deleted file mode 100644 index 0cc5970e49..0000000000 --- a/src/mainboard/system76/oryp5/cmos.default +++ /dev/null @@ -1,5 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -boot_option=Fallback -debug_level=Debug -me_state=Disable diff --git a/src/mainboard/system76/oryp5/cmos.layout b/src/mainboard/system76/oryp5/cmos.layout deleted file mode 100644 index b3df3808cc..0000000000 --- a/src/mainboard/system76/oryp5/cmos.layout +++ /dev/null @@ -1,43 +0,0 @@ -# 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 - -# RTC_CLK_ALTCENTURY -400 8 r 0 century - -412 4 e 6 debug_level -416 1 e 2 me_state -417 3 h 0 me_state_counter - -# CMOS_VSTART_ramtop -800 80 r 0 ramtop - -984 16 h 0 check_sum - -enumerations - -2 0 Enable -2 1 Disable - -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 - -checksums - -checksum 408 799 984 diff --git a/src/mainboard/system76/oryp6/Kconfig b/src/mainboard/system76/oryp6/Kconfig index 6c6c799e56..7b5ffbcb51 100644 --- a/src/mainboard/system76/oryp6/Kconfig +++ b/src/mainboard/system76/oryp6/Kconfig @@ -5,6 +5,7 @@ if BOARD_SYSTEM76_ORYP6 || BOARD_SYSTEM76_ORYP7 config BOARD_SPECIFIC_OPTIONS def_bool y select BOARD_ROMSIZE_KB_16384 + select DRIVERS_EFI_VARIABLE_STORE select DRIVERS_GENERIC_CBFS_SERIAL select DRIVERS_GENERIC_CBFS_UUID select DRIVERS_GFX_NVIDIA @@ -14,8 +15,6 @@ config BOARD_SPECIFIC_OPTIONS select EC_SYSTEM76_EC_DGPU select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES - select HAVE_CMOS_DEFAULT - select HAVE_OPTION_TABLE select INTEL_GMA_HAVE_VBT select MEMORY_MAPPED_TPM select MAINBOARD_HAS_TPM2 diff --git a/src/mainboard/system76/oryp6/cmos.default b/src/mainboard/system76/oryp6/cmos.default deleted file mode 100644 index 0cc5970e49..0000000000 --- a/src/mainboard/system76/oryp6/cmos.default +++ /dev/null @@ -1,5 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -boot_option=Fallback -debug_level=Debug -me_state=Disable diff --git a/src/mainboard/system76/oryp6/cmos.layout b/src/mainboard/system76/oryp6/cmos.layout deleted file mode 100644 index b3df3808cc..0000000000 --- a/src/mainboard/system76/oryp6/cmos.layout +++ /dev/null @@ -1,43 +0,0 @@ -# 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 - -# RTC_CLK_ALTCENTURY -400 8 r 0 century - -412 4 e 6 debug_level -416 1 e 2 me_state -417 3 h 0 me_state_counter - -# CMOS_VSTART_ramtop -800 80 r 0 ramtop - -984 16 h 0 check_sum - -enumerations - -2 0 Enable -2 1 Disable - -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 - -checksums - -checksum 408 799 984 diff --git a/src/mainboard/system76/rpl/Kconfig b/src/mainboard/system76/rpl/Kconfig index 357266b529..7ea6aca22a 100644 --- a/src/mainboard/system76/rpl/Kconfig +++ b/src/mainboard/system76/rpl/Kconfig @@ -3,6 +3,7 @@ config BOARD_SYSTEM76_RPL_COMMON def_bool n select BOARD_ROMSIZE_KB_32768 + select DRIVERS_EFI_VARIABLE_STORE select DRIVERS_GENERIC_BAYHUB_LV2 if !BOARD_SYSTEM76_BONW15 select DRIVERS_GENERIC_CBFS_SERIAL select DRIVERS_GENERIC_CBFS_UUID @@ -11,8 +12,6 @@ config BOARD_SYSTEM76_RPL_COMMON select EC_SYSTEM76_EC_LOCKDOWN 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_TPM2 @@ -169,10 +168,6 @@ config MAINBOARD_VERSION default "oryp12" if BOARD_SYSTEM76_ORYP12 default "serw13" if BOARD_SYSTEM76_SERW13 -config CMOS_DEFAULT_FILE - default "src/mainboard/\$(MAINBOARDDIR)/cmos-csme.default" if BOARD_SYSTEM76_DARP9 - default "src/mainboard/\$(MAINBOARDDIR)/cmos.default" - config CONSOLE_POST default y diff --git a/src/mainboard/system76/rpl/cmos.default b/src/mainboard/system76/rpl/cmos.default deleted file mode 100644 index 0cc5970e49..0000000000 --- a/src/mainboard/system76/rpl/cmos.default +++ /dev/null @@ -1,5 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -boot_option=Fallback -debug_level=Debug -me_state=Disable diff --git a/src/mainboard/system76/rpl/cmos.layout b/src/mainboard/system76/rpl/cmos.layout deleted file mode 100644 index b3df3808cc..0000000000 --- a/src/mainboard/system76/rpl/cmos.layout +++ /dev/null @@ -1,43 +0,0 @@ -# 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 - -# RTC_CLK_ALTCENTURY -400 8 r 0 century - -412 4 e 6 debug_level -416 1 e 2 me_state -417 3 h 0 me_state_counter - -# CMOS_VSTART_ramtop -800 80 r 0 ramtop - -984 16 h 0 check_sum - -enumerations - -2 0 Enable -2 1 Disable - -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 - -checksums - -checksum 408 799 984 diff --git a/src/mainboard/system76/tgl-h/Kconfig b/src/mainboard/system76/tgl-h/Kconfig index 709a9b0e98..9017d9d3aa 100644 --- a/src/mainboard/system76/tgl-h/Kconfig +++ b/src/mainboard/system76/tgl-h/Kconfig @@ -5,6 +5,7 @@ if BOARD_SYSTEM76_GAZE16_3050 || BOARD_SYSTEM76_GAZE16_3060 || BOARD_SYSTEM76_GA config BOARD_SPECIFIC_OPTIONS def_bool y select BOARD_ROMSIZE_KB_16384 + select DRIVERS_EFI_VARIABLE_STORE select DRIVERS_GENERIC_BAYHUB_LV2 select DRIVERS_GENERIC_CBFS_SERIAL select DRIVERS_GENERIC_CBFS_UUID @@ -16,8 +17,6 @@ config BOARD_SPECIFIC_OPTIONS select EC_SYSTEM76_EC_LOCKDOWN 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 MEMORY_MAPPED_TPM diff --git a/src/mainboard/system76/tgl-h/cmos.default b/src/mainboard/system76/tgl-h/cmos.default deleted file mode 100644 index 0cc5970e49..0000000000 --- a/src/mainboard/system76/tgl-h/cmos.default +++ /dev/null @@ -1,5 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -boot_option=Fallback -debug_level=Debug -me_state=Disable diff --git a/src/mainboard/system76/tgl-h/cmos.layout b/src/mainboard/system76/tgl-h/cmos.layout deleted file mode 100644 index b3df3808cc..0000000000 --- a/src/mainboard/system76/tgl-h/cmos.layout +++ /dev/null @@ -1,43 +0,0 @@ -# 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 - -# RTC_CLK_ALTCENTURY -400 8 r 0 century - -412 4 e 6 debug_level -416 1 e 2 me_state -417 3 h 0 me_state_counter - -# CMOS_VSTART_ramtop -800 80 r 0 ramtop - -984 16 h 0 check_sum - -enumerations - -2 0 Enable -2 1 Disable - -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 - -checksums - -checksum 408 799 984 diff --git a/src/mainboard/system76/tgl-u/Kconfig b/src/mainboard/system76/tgl-u/Kconfig index 92d55160a0..76e762957a 100644 --- a/src/mainboard/system76/tgl-u/Kconfig +++ b/src/mainboard/system76/tgl-u/Kconfig @@ -5,6 +5,7 @@ if BOARD_SYSTEM76_DARP7 || BOARD_SYSTEM76_GALP5 || BOARD_SYSTEM76_LEMP10 config BOARD_SPECIFIC_OPTIONS def_bool y select BOARD_ROMSIZE_KB_16384 + select DRIVERS_EFI_VARIABLE_STORE select DRIVERS_GENERIC_BAYHUB_LV2 select DRIVERS_GENERIC_CBFS_SERIAL select DRIVERS_GENERIC_CBFS_UUID @@ -16,8 +17,6 @@ config BOARD_SPECIFIC_OPTIONS select EC_SYSTEM76_EC_DGPU if BOARD_SYSTEM76_GALP5 select EC_SYSTEM76_EC_LOCKDOWN select HAVE_ACPI_TABLES - select HAVE_CMOS_DEFAULT - select HAVE_OPTION_TABLE select HAVE_SPD_IN_CBFS if BOARD_SYSTEM76_LEMP10 select INTEL_GMA_HAVE_VBT select INTEL_LPSS_UART_FOR_CONSOLE diff --git a/src/mainboard/system76/tgl-u/cmos.default b/src/mainboard/system76/tgl-u/cmos.default deleted file mode 100644 index d61046df6b..0000000000 --- a/src/mainboard/system76/tgl-u/cmos.default +++ /dev/null @@ -1,5 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -boot_option=Fallback -debug_level=Debug -me_state=Enable diff --git a/src/mainboard/system76/tgl-u/cmos.layout b/src/mainboard/system76/tgl-u/cmos.layout deleted file mode 100644 index b3df3808cc..0000000000 --- a/src/mainboard/system76/tgl-u/cmos.layout +++ /dev/null @@ -1,43 +0,0 @@ -# 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 - -# RTC_CLK_ALTCENTURY -400 8 r 0 century - -412 4 e 6 debug_level -416 1 e 2 me_state -417 3 h 0 me_state_counter - -# CMOS_VSTART_ramtop -800 80 r 0 ramtop - -984 16 h 0 check_sum - -enumerations - -2 0 Enable -2 1 Disable - -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 - -checksums - -checksum 408 799 984 diff --git a/src/mainboard/system76/whl-u/Kconfig b/src/mainboard/system76/whl-u/Kconfig index 08b4948db9..41288196bf 100644 --- a/src/mainboard/system76/whl-u/Kconfig +++ b/src/mainboard/system76/whl-u/Kconfig @@ -5,14 +5,13 @@ if BOARD_SYSTEM76_GALP3_C || BOARD_SYSTEM76_DARP5 config BOARD_SPECIFIC_OPTIONS def_bool y select BOARD_ROMSIZE_KB_16384 + select DRIVERS_EFI_VARIABLE_STORE select DRIVERS_GENERIC_CBFS_SERIAL select DRIVERS_GENERIC_CBFS_UUID select DRIVERS_I2C_HID select EC_SYSTEM76_EC 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 MEMORY_MAPPED_TPM diff --git a/src/mainboard/system76/whl-u/cmos.default b/src/mainboard/system76/whl-u/cmos.default deleted file mode 100644 index 0cc5970e49..0000000000 --- a/src/mainboard/system76/whl-u/cmos.default +++ /dev/null @@ -1,5 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -boot_option=Fallback -debug_level=Debug -me_state=Disable diff --git a/src/mainboard/system76/whl-u/cmos.layout b/src/mainboard/system76/whl-u/cmos.layout deleted file mode 100644 index b3df3808cc..0000000000 --- a/src/mainboard/system76/whl-u/cmos.layout +++ /dev/null @@ -1,43 +0,0 @@ -# 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 - -# RTC_CLK_ALTCENTURY -400 8 r 0 century - -412 4 e 6 debug_level -416 1 e 2 me_state -417 3 h 0 me_state_counter - -# CMOS_VSTART_ramtop -800 80 r 0 ramtop - -984 16 h 0 check_sum - -enumerations - -2 0 Enable -2 1 Disable - -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 - -checksums - -checksum 408 799 984