Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/83935?usp=email )
(
3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: mb/google/brox/jubilant: Update fw_config ......................................................................
mb/google/brox/jubilant: Update fw_config
Change STORAGE_UNPROVISIONED to STORAGE_UNKNOWN depend on depthcharge setting.
BUG=None TEST=emerge-brox coreboot Set STORAGE_UNKNOWN on jubilant, check that NVMe and UFS can boot.
Change-Id: I4cfd7322c2940862dfbae46e85522715cd7534c1 Signed-off-by: Morris Hsu morris-hsu@quanta.corp-partner.google.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/83935 Reviewed-by: Ren Kuo ren.kuo@quanta.corp-partner.google.com Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: YH Lin yueherngl@google.com Reviewed-by: Bob Moragues moragues@google.com --- M src/mainboard/google/brox/variants/jubilant/fw_config.c M src/mainboard/google/brox/variants/jubilant/overridetree.cb M src/mainboard/google/brox/variants/jubilant/variant.c 3 files changed, 6 insertions(+), 6 deletions(-)
Approvals: build bot (Jenkins): Verified Ren Kuo: Looks good to me, approved YH Lin: Looks good to me, but someone else must approve Bob Moragues: Looks good to me, but someone else must approve
diff --git a/src/mainboard/google/brox/variants/jubilant/fw_config.c b/src/mainboard/google/brox/variants/jubilant/fw_config.c index 230605f..ec95c57 100644 --- a/src/mainboard/google/brox/variants/jubilant/fw_config.c +++ b/src/mainboard/google/brox/variants/jubilant/fw_config.c @@ -74,7 +74,7 @@ gpio_configure_pads(lte_disable_pads, ARRAY_SIZE(lte_disable_pads)); }
- if (!fw_config_probe(FW_CONFIG(STORAGE, STORAGE_UNPROVISIONED))) { + if (!fw_config_probe(FW_CONFIG(STORAGE, STORAGE_UNKNOWN))) { if (!fw_config_probe(FW_CONFIG(STORAGE, STORAGE_NVME))) { printk(BIOS_INFO, "Disable NVMe GPIO pins by fw_config.\n"); gpio_configure_pads(nvme_disable_pads, ARRAY_SIZE(nvme_disable_pads)); diff --git a/src/mainboard/google/brox/variants/jubilant/overridetree.cb b/src/mainboard/google/brox/variants/jubilant/overridetree.cb index 99b6192..0613ff9 100644 --- a/src/mainboard/google/brox/variants/jubilant/overridetree.cb +++ b/src/mainboard/google/brox/variants/jubilant/overridetree.cb @@ -1,8 +1,8 @@ fw_config field STORAGE 2 3 + option STORAGE_UNKNOWN 0 option STORAGE_UFS 1 option STORAGE_NVME 2 - option STORAGE_UNPROVISIONED 3 end field WIFI_BT 4 4 option WIFI_BT_CNVI 0 @@ -294,7 +294,7 @@ .flags = PCIE_RP_LTR | PCIE_RP_AER, }" probe STORAGE STORAGE_NVME - probe STORAGE STORAGE_UNPROVISIONED + probe STORAGE STORAGE_UNKNOWN end device ref pcie_rp5 on register "pch_pcie_rp[PCH_RP(5)]" = "{ @@ -332,11 +332,11 @@ device generic 0 alias ish_conf on end end probe STORAGE STORAGE_UFS - probe STORAGE STORAGE_UNPROVISIONED + probe STORAGE STORAGE_UNKNOWN end device ref ufs on probe STORAGE STORAGE_UFS - probe STORAGE STORAGE_UNPROVISIONED + probe STORAGE STORAGE_UNKNOWN end device ref i2c0 on chip drivers/i2c/generic diff --git a/src/mainboard/google/brox/variants/jubilant/variant.c b/src/mainboard/google/brox/variants/jubilant/variant.c index dda054e..c6b2626 100644 --- a/src/mainboard/google/brox/variants/jubilant/variant.c +++ b/src/mainboard/google/brox/variants/jubilant/variant.c @@ -31,7 +31,7 @@ struct device *ish = DEV_PTR(ish); struct device *nvme_rp = DEV_PTR(pcie4_0);
- if (fw_config_probe(FW_CONFIG(STORAGE, STORAGE_UNPROVISIONED))) { + if (fw_config_probe(FW_CONFIG(STORAGE, STORAGE_UNKNOWN))) { printk(BIOS_INFO, "fw_config storage is unknown so enable all storage devices.\n"); return; }