From 4c426262d7c53cf25823daa416e2026fff24ff0e Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Sat, 17 Jul 2021 05:27:18 +0200 Subject: mb/google/brya: Deduplicate chipset lockdown config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Due to an issue in sconfig, move `chipset_lockdown` out of `common_soc_config` and configure it separately in the baseboard's devicetree since it might get overwritten if a variant configures `common_soc_config`. Also, deduplicate the configuration of `chipset_lockdown`. Change-Id: Id969346df06aa82ab2ad2b1aa4884a9bcd876d75 Signed-off-by: Felix Singer Reviewed-on: https://review.coreboot.org/c/coreboot/+/56408 Reviewed-by: Angel Pons Reviewed-by: Michael Niewöhner Reviewed-by: Tim Wawrzynczak Reviewed-by: Paul Menzel Tested-by: build bot (Jenkins) --- src/mainboard/google/brya/variants/baseboard/devicetree.cb | 2 +- src/mainboard/google/brya/variants/primus/overridetree.cb | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/mainboard/google/brya/variants/baseboard/devicetree.cb b/src/mainboard/google/brya/variants/baseboard/devicetree.cb index 8137df30fa..12bff55b68 100644 --- a/src/mainboard/google/brya/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/brya/variants/baseboard/devicetree.cb @@ -92,8 +92,8 @@ chip soc/intel/alderlake #| | for TPM communication | #| I2C5 | Trackpad | #+-------------------+---------------------------+ + register "common_soc_config.chipset_lockdown" = "CHIPSET_LOCKDOWN_COREBOOT" register "common_soc_config" = "{ - .chipset_lockdown = CHIPSET_LOCKDOWN_COREBOOT, .i2c[0] = { .speed = I2C_SPEED_FAST, }, diff --git a/src/mainboard/google/brya/variants/primus/overridetree.cb b/src/mainboard/google/brya/variants/primus/overridetree.cb index 2d68c367c3..6464b8bcbf 100644 --- a/src/mainboard/google/brya/variants/primus/overridetree.cb +++ b/src/mainboard/google/brya/variants/primus/overridetree.cb @@ -27,7 +27,6 @@ chip soc/intel/alderlake #+-------------------+---------------------------+ #| Field | Value | #+-------------------+---------------------------+ - #| chipset_lockdown | CHIPSET_LOCKDOWN_COREBOOT | #| GSPI1 | Fingerprint MCU | #| I2C0 | Audio | #| I2C1 | Touchscreen | @@ -38,7 +37,6 @@ chip soc/intel/alderlake #| I2C5 | Trackpad | #+-------------------+---------------------------+ register "common_soc_config" = "{ - .chipset_lockdown = CHIPSET_LOCKDOWN_COREBOOT, .i2c[0] = { .speed = I2C_SPEED_FAST, }, -- cgit v1.2.3