diff --git a/src/device/pci_rom.c b/src/device/pci_rom.c
index 27f2d8d..6af20e8 100644
--- a/src/device/pci_rom.c
+++ b/src/device/pci_rom.c
@@ -27,11 +27,17 @@
 
 struct rom_header *pci_rom_probe(struct device *dev)
 {
-	struct rom_header *rom_header;
+	struct rom_header *rom_header = NULL;
 	struct pci_data *rom_data;
 
 	/* If it's in FLASH, then don't check device for ROM. */
-	rom_header = cbfs_boot_map_optionrom(dev->vendor, dev->device);
+	if (CONFIG(CHECK_REV_IN_OPROM_NAME)) {
+		uint8_t rev = pci_read_config8(dev, PCI_REVISION_ID);
+		rom_header = cbfs_boot_map_optionrom_revision(dev->vendor, dev->device, rev);
+	}
+
+	if (!rom_header)
+		rom_header = cbfs_boot_map_optionrom(dev->vendor, dev->device);
 
 	u32 vendev = (dev->vendor << 16) | dev->device;
 	u32 mapped_vendev;