3 files changed, 0 insertions, 33 deletions
diff --git a/futility/updater.c b/futility/updater.c
index 336ec6d7..49a94b8e 100644
--- a/futility/updater.c
+++ b/futility/updater.c
@@ -1162,9 +1162,6 @@ enum updater_error_codes update_firmware(struct updater_config *cfg)
 	     image_to->file_name, image_to->ro_version,
 	     image_to->rw_version_a, image_to->rw_version_b);
 
-	if (try_apply_quirk(QUIRK_DISABLE_COMPATIBLE_PLATFORM_CHECK, cfg))
-		return UPDATE_ERR_PLATFORM;
-
 	if (try_apply_quirk(QUIRK_MIN_PLATFORM_VERSION, cfg))
 		return UPDATE_ERR_PLATFORM;
 
diff --git a/futility/updater.h b/futility/updater.h
index 5013a789..e11cc745 100644
--- a/futility/updater.h
+++ b/futility/updater.h
@@ -44,7 +44,6 @@ enum quirk_types {
 	QUIRK_ALLOW_EMPTY_WLTAG,
 	QUIRK_EC_PARTIAL_RECOVERY,
 	QUIRK_OVERRIDE_SIGNATURE_ID,
-	QUIRK_DISABLE_COMPATIBLE_PLATFORM_CHECK,
 	QUIRK_MAX,
 };
 
diff --git a/futility/updater_quirks.c b/futility/updater_quirks.c
index 22543de8..457a79b0 100644
--- a/futility/updater_quirks.c
+++ b/futility/updater_quirks.c
@@ -59,18 +59,6 @@ static const struct quirks_record quirks_records[] = {
         { .match = "Google_Wizpig.", .quirks = "allow_empty_wltag" },
 
         { .match = "Google_Phaser.", .quirks = "override_signature_id" },
-
-	/* Zork Boards */
-	{ .match = "Google_Berknip.",
-		.quirks = "disable_compatible_platform_check" },
-	{ .match = "Google_Dalboz.",
-		.quirks = "disable_compatible_platform_check" },
-	{ .match = "Google_Ezkinil.",
-		.quirks = "disable_compatible_platform_check" },
-	{ .match = "Google_Morphius.",
-		.quirks = "disable_compatible_platform_check" },
-	{ .match = "Google_Trembyle.",
-		.quirks = "disable_compatible_platform_check" },
 };
 
 /* Preserves meta data and reload image contents from given file path. */
@@ -393,16 +381,6 @@ static int quirk_ec_partial_recovery(struct updater_config *cfg)
 }
 
 /*
- * Disables compatible platform check.
- * The compatible platform check ensures the current platform and update
- * start with the same name.
- */
-static int quirk_disable_compatible_platform_check(struct updater_config *cfg) {
-	cfg->check_platform = 0;
-	return 0;
-}
-
-/*
  * Registers known quirks to a updater_config object.
  */
 void updater_register_quirks(struct updater_config *cfg)
@@ -455,13 +433,6 @@ void updater_register_quirks(struct updater_config *cfg)
 	quirks->help = "chromium/146876241; override signature id for "
 			"devices shipped with different root key.";
 	quirks->apply = NULL; /* Simple config. */
-
-	quirks = &cfg->quirks[QUIRK_DISABLE_COMPATIBLE_PLATFORM_CHECK];
-	quirks->name = "disable_compatible_platform_check";
-	quirks->help = "b/155941790; Disables compatible platform check."
-		       "The compatible platform check ensures the current"
-		       " platform and update start with the same name.";
-	quirks->apply = quirk_disable_compatible_platform_check;
 }
 
 /*