From f96fcd6a6632d7522aff79e85c25efd77ce852d0 Mon Sep 17 00:00:00 2001 From: Wentao Qin Date: Wed, 9 Oct 2024 20:00:21 +0800 Subject: mb/google/brox/lotso: Enable devices on unprovisioned fw_config Setting devices to unprovisioned allows us to perform functional testing without having to rewrite the fw config during the SMT phase of factory production. BUG=None TEST=Build lotso firmware and boot to OS when fw_config is unprovisioned and ensure all devices are enable. Change-Id: I3b8285ce335ee0f3595d184eb0921f697bdbd0c2 Signed-off-by: Wentao Qin Reviewed-on: https://review.coreboot.org/c/coreboot/+/84714 Reviewed-by: Jian Tong Tested-by: build bot (Jenkins) Reviewed-by: Karthik Ramasubramanian --- src/mainboard/google/brox/variants/lotso/overridetree.cb | 7 ++++++- src/mainboard/google/brox/variants/lotso/variant.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'src/mainboard/google') diff --git a/src/mainboard/google/brox/variants/lotso/overridetree.cb b/src/mainboard/google/brox/variants/lotso/overridetree.cb index ae940cc023..60e258a34a 100644 --- a/src/mainboard/google/brox/variants/lotso/overridetree.cb +++ b/src/mainboard/google/brox/variants/lotso/overridetree.cb @@ -222,7 +222,10 @@ chip soc/intel/alderlake register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_E21)" register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_E20)" register "enable_delay_ms" = "3" - device spi 0 on end + device spi 0 on + probe FP FP_PRESENT + probe unprovisioned + end end # FPMCU end device ref pmc hidden @@ -350,6 +353,7 @@ chip soc/intel/alderlake device generic 0 on end end probe WIFI_BT WIFI_PCIE_WIFI7 + probe unprovisioned end device ref pcie_rp6 on # Enable SD Card PCIE6 rp6 using clk 3 @@ -375,6 +379,7 @@ chip soc/intel/alderlake device generic 0 on end end probe WIFI_BT WIFI_CNVI_WIFI6E + probe unprovisioned end device ref ish on chip drivers/intel/ish diff --git a/src/mainboard/google/brox/variants/lotso/variant.c b/src/mainboard/google/brox/variants/lotso/variant.c index 72b7cbe5f0..e8bab44b5e 100644 --- a/src/mainboard/google/brox/variants/lotso/variant.c +++ b/src/mainboard/google/brox/variants/lotso/variant.c @@ -8,7 +8,7 @@ void variant_update_soc_chip_config(struct soc_intel_alderlake_config *config) { - if (fw_config_probe(FW_CONFIG(WIFI_BT, WIFI_CNVI_WIFI6E))) { + if (fw_config_probe(FW_CONFIG(WIFI_BT, WIFI_CNVI_WIFI6E)) || !fw_config_is_provisioned()) { printk(BIOS_INFO, "CNVi bluetooth enabled by fw_config\n"); config->cnvi_bt_core = true; } -- cgit v1.2.3