[M] Change in coreboot[master]: mb/starlabs/starbook: Add variant specific cmos.layout and cmos.default
Martin Roth has submitted this change. ( https://review.coreboot.org/c/coreboot/+/66296 )
Change subject: mb/starlabs/starbook: Add variant specific cmos.layout and cmos.default ......................................................................
mb/starlabs/starbook: Add variant specific cmos.layout and cmos.default
Add variant specific cmos files, which avoid options like "Thunderbolt" existing in platforms that don't support such options.
This change also removes entries that were never used, including: * smi_handler * usb_always_on
Signed-off-by: Sean Rhodes sean@starlabs.systems Change-Id: I359e5c5bbf29eb474f2d3bc42a8e80afc0a5d38a Reviewed-on: https://review.coreboot.org/c/coreboot/+/66296 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Angel Pons th3fanbus@gmail.com --- M src/mainboard/starlabs/starbook/Kconfig M src/mainboard/starlabs/starbook/cmos.default M src/mainboard/starlabs/starbook/cmos.layout A src/mainboard/starlabs/starbook/variants/tgl/cmos.default A src/mainboard/starlabs/starbook/variants/tgl/cmos.layout 5 files changed, 157 insertions(+), 6 deletions(-)
Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved
diff --git a/src/mainboard/starlabs/starbook/Kconfig b/src/mainboard/starlabs/starbook/Kconfig index 0e23ecf..8f51db4 100644 --- a/src/mainboard/starlabs/starbook/Kconfig +++ b/src/mainboard/starlabs/starbook/Kconfig @@ -60,6 +60,12 @@ default 6 if BOARD_STARLABS_LABTOP_CML default 3
+config CMOS_DEFAULT_FILE + default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/variants/$(CONFIG_VARIANT_DIR)/cmos.default" if BOARD_STARLABS_STARBOOK_TGL + +config CMOS_LAYOUT_FILE + default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/variants/$(CONFIG_VARIANT_DIR)/cmos.layout" if BOARD_STARLABS_STARBOOK_TGL + config DEVICETREE default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
diff --git a/src/mainboard/starlabs/starbook/cmos.default b/src/mainboard/starlabs/starbook/cmos.default index 0783adf..f1276cc 100644 --- a/src/mainboard/starlabs/starbook/cmos.default +++ b/src/mainboard/starlabs/starbook/cmos.default @@ -7,14 +7,11 @@ vtd=Enable power_profile=Balanced me_state=Disable -smi_handler=Enable # Devices wireless=Enable webcam=Enable microphone=Enable legacy_8254_timer=Disable -usb_always_on=Disable -thunderbolt=Disable # EC kbl_timeout=30 seconds fn_ctrl_swap=Disable diff --git a/src/mainboard/starlabs/starbook/cmos.layout b/src/mainboard/starlabs/starbook/cmos.layout index 85ec477..887c0b2 100644 --- a/src/mainboard/starlabs/starbook/cmos.layout +++ b/src/mainboard/starlabs/starbook/cmos.layout @@ -22,15 +22,12 @@ 424 2 e 7 power_profile 432 1 e 5 me_state 440 4 h 0 me_state_counter -448 1 e 1 smi_handler
# coreboot config options: Devices 504 1 e 1 wireless 512 1 e 1 webcam 520 1 e 1 microphone 528 1 e 1 legacy_8254_timer -536 1 e 1 usb_always_on -544 1 e 1 thunderbolt
# coreboot config options: EC 600 3 e 4 kbl_timeout diff --git a/src/mainboard/starlabs/starbook/variants/tgl/cmos.default b/src/mainboard/starlabs/starbook/variants/tgl/cmos.default new file mode 100644 index 0000000..cfc9a61 --- /dev/null +++ b/src/mainboard/starlabs/starbook/variants/tgl/cmos.default @@ -0,0 +1,25 @@ +# hardcoded +boot_option=Fallback +# console +debug_level=Debug +# cpu +hyper_threading=Enable +vtd=Enable +power_profile=Balanced +me_state=Disable +# Devices +wireless=Enable +webcam=Enable +microphone=Enable +legacy_8254_timer=Disable +thunderbolt=Disable +# EC +kbl_timeout=30 seconds +fn_ctrl_swap=Disable +# southbridge +power_on_after_fail=Disable +# Functions +fn_lock_state=0x1 +trackpad_state=0x1 +kbl_brightness=0x0 +kbl_state=0x1 diff --git a/src/mainboard/starlabs/starbook/variants/tgl/cmos.layout b/src/mainboard/starlabs/starbook/variants/tgl/cmos.layout new file mode 100644 index 0000000..c4a49c5 --- /dev/null +++ b/src/mainboard/starlabs/starbook/variants/tgl/cmos.layout @@ -0,0 +1,106 @@ +# SPDX-License-Identifier: GPL-2.0-only + +# ----------------------------------------------------------------- +entries + +# Bank: 1 +# ----------------------------------------------------------------- +0 120 r 0 reserved_memory + +# ----------------------------------------------------------------- +# RTC_BOOT_BYTE (coreboot hardcoded) +384 1 e 2 boot_option +388 4 h 0 reboot_counter + +# ----------------------------------------------------------------- +# coreboot config options: console +395 4 e 3 debug_level +# coreboot config options: cpu +#400 8 r 0 reserved for century byte +408 1 e 1 hyper_threading +416 1 e 1 vtd +424 2 e 7 power_profile +432 1 e 5 me_state +440 4 h 0 me_state_counter + +# coreboot config options: Devices +504 1 e 1 wireless +512 1 e 1 webcam +520 1 e 1 microphone +528 1 e 1 legacy_8254_timer +536 1 e 1 thunderbolt + +# coreboot config options: EC +600 3 e 4 kbl_timeout +608 1 e 1 fn_ctrl_swap +616 2 e 8 max_charge +624 2 e 9 fan_mode + +# coreboot config options: southbridge +800 2 e 6 power_on_after_fail + +# coreboot config options: check sums +984 16 h 0 check_sum + +# Bank: 2 +# embedded controller settings (outside the checksummed area) +1024 8 h 1 fn_lock_state +1032 8 h 1 trackpad_state +1040 8 h 10 kbl_brightness +1048 8 h 1 kbl_state + +# ----------------------------------------------------------------- + +enumerations + +#ID value text +1 0 Disable +1 1 Enable + +2 0 Fallback +2 1 Normal + +3 0 Emergency +3 1 Alert +3 2 Critical +3 3 Error +3 4 Warning +3 5 Notice +3 6 Info +3 7 Debug +3 8 Spew + +4 0 30 seconds +4 1 1 minute +4 2 3 minutes +4 3 5 minutes +4 4 Never + +5 0 Enable +5 1 Disable + +6 0 Disable +6 1 Enable +6 2 Keep + +7 0 Power Saver +7 1 Balanced +7 2 Performance + +8 0 100% +8 1 80% +8 2 60% + +9 0 Normal +9 1 Aggressive +9 2 Quiet + +10 0 Off +10 1 Low +10 2 High +10 3 On + +# ----------------------------------------------------------------- +checksums + +checksum 392 983 984
-
Martin Roth (Code Review)