3 files changed, 0 insertions, 40 deletions
diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig
index 1e1b790835..c4a8f330bd 100644
--- a/src/mainboard/google/zork/Kconfig
+++ b/src/mainboard/google/zork/Kconfig
@@ -143,18 +143,6 @@ config PICASSO_FW_B_POSITION
 	  Location of the AMD firmware in the RW_B region. This is the
 	  start of the RW-A region + 64 bytes for the cbfs header.
 
-config VARIANT_HAS_FW_CONFIG
-	bool
-	help
-	  Honor FW_CONFIG in CBI.
-
-config VARIANT_BOARD_VER_FW_CONFIG_VALID
-	int
-	default 256
-	depends on VARIANT_HAS_FW_CONFIG
-	help
-	  Which board version did FW_CONFIG become valid in CBI.
-
 config VARIANT_SUPPORTS_PRE_V3_SCHEMATICS
 	bool
 	default y if BOARD_GOOGLE_TREMBYLE
diff --git a/src/mainboard/google/zork/variants/baseboard/helpers.c b/src/mainboard/google/zork/variants/baseboard/helpers.c
index 7dc9fd3bd1..3f2b0688c7 100644
--- a/src/mainboard/google/zork/variants/baseboard/helpers.c
+++ b/src/mainboard/google/zork/variants/baseboard/helpers.c
@@ -48,36 +48,10 @@ enum {
 	FW_CONFIG_SHIFT_FAN = 27,
 };
 
-int variant_fw_config_valid(void)
-{
-	static uint32_t board_version;
-	const uint32_t bv_valid = CONFIG_VARIANT_BOARD_VER_FW_CONFIG_VALID;
-
-	if (!CONFIG(VARIANT_HAS_FW_CONFIG))
-		return 0;
-
-	/* Fast path for non-zero board version. */
-	if (board_version >= bv_valid)
-		return 1;
-
-	if (google_chromeec_cbi_get_board_version(&board_version)) {
-		printk(BIOS_ERR, "Unable to obtain board version for FW_CONFIG\n");
-		return 0;
-	}
-
-	if (board_version >= bv_valid)
-		return 1;
-
-	return 0;
-}
-
 static int get_fw_config(uint32_t *val)
 {
 	static uint32_t known_value;
 
-	if (!variant_fw_config_valid())
-		return -1;
-
 	if (known_value) {
 		*val = known_value;
 		return 0;
diff --git a/src/mainboard/google/zork/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/zork/variants/baseboard/include/baseboard/variants.h
index 93aad0ff5a..98ba56530a 100644
--- a/src/mainboard/google/zork/variants/baseboard/include/baseboard/variants.h
+++ b/src/mainboard/google/zork/variants/baseboard/include/baseboard/variants.h
@@ -56,8 +56,6 @@ const fsp_dxio_descriptor *baseboard_get_dxio_descriptors(size_t *num);
 const fsp_ddi_descriptor *baseboard_get_ddi_descriptors(size_t *num);
 
 /* Retrieve attributes from FW_CONFIG in CBI. */
-/* Return 1 if FW_CONFIG expected to be valid, else 0. */
-int variant_fw_config_valid(void);
 /* Return 0 if non-existent, 1 if present. */
 int variant_has_emmc(void);
 /* Return 0 if non-existent, 1 if present. */