diff options
| author | Karthikeyan Ramasubramanian <kramasub@google.com> | 2024-08-23 11:21:50 -0600 |
|---|---|---|
| committer | Karthik Ramasubramanian <kramasub@google.com> | 2024-09-05 13:33:21 +0000 |
| commit | 3cb75c50b8274dc6ff11be521acd61a2184ba666 (patch) | |
| tree | eb1efd2d34cfcb40759ae3b42b97c4d9a597527b /src/mainboard/google/brox | |
| parent | 1ef8da2f5bc36c5a9276e25d5ff0f7ce4b6a5d19 (diff) | |
mb/google/brox/var/jubilant: Remove STORAGE_UNKNOWN fw_config option
With `probe unprovisioned` fw_config rule, there is no need to define an
explicit STORAGE_UNKNOWN option. Hence remove it.
BUG=None
TEST=Build Jubilant FW image.
Change-Id: I4f6ace4b39a1ee0b63486d3872b20c8da719ae4a
Signed-off-by: Karthikeyan Ramasubramanian <kramasub@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/84095
Reviewed-by: Bob Moragues <moragues@google.com>
Reviewed-by: Ren Kuo <ren.kuo@quanta.corp-partner.google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard/google/brox')
3 files changed, 3 insertions, 32 deletions
diff --git a/src/mainboard/google/brox/variants/jubilant/fw_config.c b/src/mainboard/google/brox/variants/jubilant/fw_config.c index 7341afe9df..5076c73613 100644 --- a/src/mainboard/google/brox/variants/jubilant/fw_config.c +++ b/src/mainboard/google/brox/variants/jubilant/fw_config.c @@ -74,11 +74,9 @@ static void fw_config_handle(void *unused) gpio_configure_pads(lte_disable_pads, ARRAY_SIZE(lte_disable_pads)); } - 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)); - } + 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)); } } BOOT_STATE_INIT_ENTRY(BS_DEV_ENABLE, BS_ON_ENTRY, fw_config_handle, NULL); diff --git a/src/mainboard/google/brox/variants/jubilant/overridetree.cb b/src/mainboard/google/brox/variants/jubilant/overridetree.cb index f6dac2fc9e..52a3236d38 100644 --- a/src/mainboard/google/brox/variants/jubilant/overridetree.cb +++ b/src/mainboard/google/brox/variants/jubilant/overridetree.cb @@ -1,6 +1,5 @@ fw_config field STORAGE 2 3 - option STORAGE_UNKNOWN 0 option STORAGE_UFS 1 option STORAGE_NVME 2 end @@ -278,7 +277,6 @@ chip soc/intel/alderlake .flags = PCIE_RP_LTR | PCIE_RP_AER, }" probe STORAGE STORAGE_NVME - probe STORAGE STORAGE_UNKNOWN probe unprovisioned end device ref pcie_rp5 on @@ -320,12 +318,10 @@ chip soc/intel/alderlake device generic 0 alias ish_conf on end end probe STORAGE STORAGE_UFS - probe STORAGE STORAGE_UNKNOWN probe unprovisioned end device ref ufs on probe STORAGE STORAGE_UFS - probe STORAGE STORAGE_UNKNOWN probe unprovisioned end device ref i2c0 on diff --git a/src/mainboard/google/brox/variants/jubilant/variant.c b/src/mainboard/google/brox/variants/jubilant/variant.c index 4b214aace6..6cbfe19dfe 100644 --- a/src/mainboard/google/brox/variants/jubilant/variant.c +++ b/src/mainboard/google/brox/variants/jubilant/variant.c @@ -24,26 +24,3 @@ const char *get_wifi_sar_cbfs_filename(void) { return get_wifi_sar_fw_config_filename(FW_CONFIG_FIELD(WIFI_BT)); } - -void variant_devtree_update(void) -{ - struct device *ufs = DEV_PTR(ufs); - struct device *ish = DEV_PTR(ish); - struct device *nvme_rp = DEV_PTR(pcie4_0); - - 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; - } - - if (!fw_config_probe(FW_CONFIG(STORAGE, STORAGE_NVME))) { - printk(BIOS_INFO, "NVMe disabled by fw_config.\n"); - nvme_rp->enabled = 0; - } - - if (!fw_config_probe(FW_CONFIG(STORAGE, STORAGE_UFS))) { - printk(BIOS_INFO, "UFS disabled by fw_config.\n"); - ufs->enabled = 0; - ish->enabled = 0; - } -} |