diff --git a/flashrom.c b/flashrom.c
index e745aad..d65cf9f 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -886,6 +886,18 @@
 				 "eraseblock layout is not defined. ");
 		return 1;
 	}
+
+	if (flash->chip->bustype == BUS_SPI) {
+		const uint8_t *opcode = spi_get_opcode_from_erasefn(eraser.block_erase);
+		for (int i = 0; opcode[i]; i++) {
+			if (!flash->mst->spi.probe_opcode(flash, opcode[i])) {
+				if (log)
+					msg_cdbg("block erase function and layout found "
+						 "but SPI master doesn't support the function. ");
+				return 1;
+			}
+		}
+	}
 	// TODO: Once erase functions are annotated with allowed buses, check that as well.
 	return 0;
 }