[S] Change in coreboot[main]: mb/google/brox/var/jubilant: Remove STORAGE_UNKNOWN fw_config option

[Karthik Ramasubramanian (Code Review)]

Karthik Ramasubramanian has submitted this change. ( https://review.coreboot.org/c/coreboot/+/84095?usp=email )

Change subject: mb/google/brox/var/jubilant: Remove STORAGE_UNKNOWN fw_config option
......................................................................

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 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/84095
Reviewed-by: Bob Moragues 
Reviewed-by: Ren Kuo 
Tested-by: build bot (Jenkins) 
---
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, 3 insertions(+), 32 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Bob Moragues: Looks good to me, but someone else must approve
  Ren Kuo: Looks good to me, approved

diff --git a/src/mainboard/google/brox/variants/jubilant/fw_config.c b/src/mainboard/google/brox/variants/jubilant/fw_config.c
index 7341afe..5076c73 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 @@
    	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 f6dac2f..52a3236 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 @@
    			.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 @@
    			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 4b214aa..6cbfe19 100644
--- a/src/mainboard/google/brox/variants/jubilant/variant.c
+++ b/src/mainboard/google/brox/variants/jubilant/variant.c
@@ -24,26 +24,3 @@
 {
    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;
-	}
-}