summaryrefslogtreecommitdiff
path: root/src/mainboard/google/brox/variants
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard/google/brox/variants')
-rw-r--r--src/mainboard/google/brox/variants/jubilant/fw_config.c2
-rw-r--r--src/mainboard/google/brox/variants/jubilant/overridetree.cb7
-rw-r--r--src/mainboard/google/brox/variants/jubilant/variant.c6
3 files changed, 11 insertions, 4 deletions
diff --git a/src/mainboard/google/brox/variants/jubilant/fw_config.c b/src/mainboard/google/brox/variants/jubilant/fw_config.c
index ec95c5773b..7341afe9df 100644
--- a/src/mainboard/google/brox/variants/jubilant/fw_config.c
+++ b/src/mainboard/google/brox/variants/jubilant/fw_config.c
@@ -60,7 +60,7 @@ static const struct pad_config nvme_disable_pads[] = {
static void fw_config_handle(void *unused)
{
if (!fw_config_is_provisioned()) {
- printk(BIOS_WARNING, "FW_CONFIG is not provisioned. Exiting...\n");
+ printk(BIOS_WARNING, "FW_CONFIG is unprovisioned. Skip disable device's pads.\n");
return;
}
diff --git a/src/mainboard/google/brox/variants/jubilant/overridetree.cb b/src/mainboard/google/brox/variants/jubilant/overridetree.cb
index 01ac731cf5..6d7c3f834f 100644
--- a/src/mainboard/google/brox/variants/jubilant/overridetree.cb
+++ b/src/mainboard/google/brox/variants/jubilant/overridetree.cb
@@ -232,6 +232,7 @@ chip soc/intel/alderlake
register "type" = "UPC_TYPE_INTERNAL"
device ref usb2_port4 on
probe DB_USB DB_1A_LTE
+ probe unprovisioned
end
end
chip drivers/usb/acpi
@@ -281,6 +282,7 @@ chip soc/intel/alderlake
register "type" = "UPC_TYPE_INTERNAL"
device ref usb3_port4 on
probe DB_USB DB_1A_LTE
+ probe unprovisioned
end
end
end
@@ -308,6 +310,7 @@ chip soc/intel/alderlake
register "add_acpi_dma_property" = "true"
device pci 00.0 on
probe WIFI_BT WIFI_BT_PCIE
+ probe unprovisioned
end
end
chip soc/intel/common/block/pcie/rtd3
@@ -317,6 +320,7 @@ chip soc/intel/alderlake
device generic 0 on end
end
probe WIFI_BT WIFI_BT_PCIE
+ probe unprovisioned
end
device ref cnvi_wifi on
chip drivers/wifi/generic
@@ -326,6 +330,7 @@ chip soc/intel/alderlake
device generic 0 on end
end
probe WIFI_BT WIFI_BT_CNVI
+ probe unprovisioned
end
device ref ish on
chip drivers/intel/ish
@@ -441,6 +446,7 @@ chip soc/intel/alderlake
register "input_analog_gain" = "1"
device i2c 28 on
probe DB_USB DB_1A_LTE
+ probe unprovisioned
end
end
end
@@ -458,6 +464,7 @@ chip soc/intel/alderlake
register "enable_delay_ms" = "3"
device spi 0 on
probe FPMCU FPMCU_NUVOTON
+ probe unprovisioned
end
end # FPMCU
end
diff --git a/src/mainboard/google/brox/variants/jubilant/variant.c b/src/mainboard/google/brox/variants/jubilant/variant.c
index c6b2626009..4b214aace6 100644
--- a/src/mainboard/google/brox/variants/jubilant/variant.c
+++ b/src/mainboard/google/brox/variants/jubilant/variant.c
@@ -9,7 +9,7 @@
void variant_update_soc_chip_config(struct soc_intel_alderlake_config *config)
{
- if (fw_config_probe(FW_CONFIG(WIFI_BT, WIFI_BT_CNVI))) {
+ if (fw_config_probe(FW_CONFIG(WIFI_BT, WIFI_BT_CNVI)) || (!fw_config_is_provisioned())) {
printk(BIOS_INFO, "CNVi bluetooth enabled by fw_config\n");
config->cnvi_bt_core = true;
config->cnvi_bt_audio_offload = true;
@@ -31,8 +31,8 @@ void variant_devtree_update(void)
struct device *ish = DEV_PTR(ish);
struct device *nvme_rp = DEV_PTR(pcie4_0);
- if (fw_config_probe(FW_CONFIG(STORAGE, STORAGE_UNKNOWN))) {
- printk(BIOS_INFO, "fw_config storage is unknown so enable all storage devices.\n");
+ if (fw_config_probe(FW_CONFIG(STORAGE, STORAGE_UNKNOWN)) || (!fw_config_is_provisioned())) {
+ printk(BIOS_INFO, "fw_config is unprovisioned or storage is unknown so enable all storage's configs.\n");
return;
}