diff --git a/src/Kconfig b/src/Kconfig
index 24b21060b6..bce3e32884 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -1024,6 +1024,24 @@ config DEBUG_ADA_CODE
 	  Add the compiler switch `-gnata` to compile code guarded by
 	  `pragma Debug`.
 
+config HAVE_EM100_SUPPORT
+	bool "Platform can support the Dediprog EM100 SPI emulator"
+	help
+	  This is enabled by platforms which can support using the EM100.
+
+config EM100
+	bool "Configure image for EM100 usage"
+	depends on HAVE_EM100_SUPPORT
+	help
+	  The Dediprog EM100 SPI emulator allows fast loading of new SPI images
+	  over USB. However it only supports a maximum SPI clock of 20MHz and
+	  single data output. Enable this option to use a 20MHz SPI clock and
+	  disable "Dual Output Fast Read" Support.
+
+	  On AMD platforms this changes the SPI speed at run-time if the
+	  mainboard code supports this. On supported Intel platforms this works
+	  by changing the settings in the descriptor.bin file.
+
 endmenu
 
 
diff --git a/src/mainboard/google/kahlee/Kconfig b/src/mainboard/google/kahlee/Kconfig
index ef7db041d4..2e44a72865 100644
--- a/src/mainboard/google/kahlee/Kconfig
+++ b/src/mainboard/google/kahlee/Kconfig
@@ -39,6 +39,7 @@ config BOARD_GOOGLE_BASEBOARD_KAHLEE
 	select DRIVERS_GENERIC_ADAU7002
 	select DRIVERS_GENERIC_MAX98357A
 	select DRIVERS_I2C_DA7219
+	select HAVE_EM100_SUPPORT
 
 if BOARD_GOOGLE_BASEBOARD_KAHLEE
 
diff --git a/src/southbridge/intel/common/firmware/Kconfig b/src/southbridge/intel/common/firmware/Kconfig
index 30c9aaf262..c9cf6f8760 100644
--- a/src/southbridge/intel/common/firmware/Kconfig
+++ b/src/southbridge/intel/common/firmware/Kconfig
@@ -26,6 +26,7 @@ comment "Intel Firmware"
 
 config HAVE_IFD_BIN
 	bool "Add Intel descriptor.bin file"
+	select HAVE_EM100_SUPPORT  # We use ifdtool to enable this.
 	help
 	  The descriptor binary
 
@@ -34,12 +35,6 @@ config IFD_BIN_PATH
 	default "3rdparty/blobs/mainboard/$(MAINBOARDDIR)/descriptor.bin"
 	depends on HAVE_IFD_BIN && !BUILD_WITH_FAKE_IFD
 
-config EM100
-	bool "Configure IFD for EM100 usage"
-	depends on HAVE_IFD_BIN && !BUILD_WITH_FAKE_IFD
-	help
-	  Set SPI frequency to 20MHz and disable Dual Output Fast Read Support
-
 config HAVE_ME_BIN
 	bool "Add Intel ME/TXE firmware"
 	depends on HAVE_IFD_BIN