diff --git a/bios/bios_software_manager.cpp b/bios/bios_software_manager.cpp
index 163c827..3f4099a 100644
--- a/bios/bios_software_manager.cpp
+++ b/bios/bios_software_manager.cpp
@@ -47,6 +47,13 @@
         co_return false;
     }
 
+    enum FlashTool tool = flashToolNone;
+
+    if (config.configType == "IntelSPIFlash")
+    {
+        tool = flashToolFlashrom;
+    }
+
     const std::string configIfaceMux = configIface + ".MuxOutputs";
 
     std::vector<std::string> names;
@@ -74,7 +81,6 @@
     }
 
     enum FlashLayout layout = flashLayoutFlat;
-    enum FlashTool tool = flashToolNone;
 
     debug("SPI device: {INDEX1}:{INDEX2}", "INDEX1", spiControllerIndex.value(),
           "INDEX2", spiDeviceIndex.value());
diff --git a/bios/spi_device.cpp b/bios/spi_device.cpp
index e6917b5..fbf6fe9 100644
--- a/bios/spi_device.cpp
+++ b/bios/spi_device.cpp
@@ -407,7 +407,20 @@
         co_return 1;
     }
 
-    std::string cmd = "flashrom -p linux_mtd:dev=" + devPath.value();
+    size_t devNum = 0;
+
+    try
+    {
+        devNum = std::stoi(devPath.value().substr(8));
+    }
+    catch (std::exception& e)
+    {
+        error("could not parse mtd device number from {STR}: {ERROR}", "STR",
+              devPath.value(), "ERROR", e);
+        co_return 1;
+    }
+
+    std::string cmd = "flashrom -p linux_mtd:dev=" + std::to_string(devNum);
 
     if (layout == flashLayoutFlat)
     {