diff --git a/src/mainboard/asus/f2a85-m/Kconfig b/src/mainboard/asus/f2a85-m/Kconfig
index fc43ed9d78..100b33cd7a 100644
--- a/src/mainboard/asus/f2a85-m/Kconfig
+++ b/src/mainboard/asus/f2a85-m/Kconfig
@@ -30,7 +30,6 @@ config BOARD_SPECIFIC_OPTIONS
 	select SUPERIO_NUVOTON_NCT6779D if BOARD_ASUS_F2A85_M_PRO
 	select BOARD_ROMSIZE_KB_8192
 	select GFXUMA
-	select HUDSON_DISABLE_IMC
 
 choice
 	prompt "DDR3 memory voltage"
diff --git a/src/mainboard/gizmosphere/gizmo2/Kconfig b/src/mainboard/gizmosphere/gizmo2/Kconfig
index f5c948139b..94158baa7a 100644
--- a/src/mainboard/gizmosphere/gizmo2/Kconfig
+++ b/src/mainboard/gizmosphere/gizmo2/Kconfig
@@ -28,6 +28,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select HAVE_ACPI_TABLES
 	select BOARD_ROMSIZE_KB_4096
 	select GFXUMA
+	select HUDSON_IMC_ENABLE
 
 config MAINBOARD_DIR
 	string
diff --git a/src/mainboard/msi/ms7721/Kconfig b/src/mainboard/msi/ms7721/Kconfig
index 29d49155d7..5fa4768083 100644
--- a/src/mainboard/msi/ms7721/Kconfig
+++ b/src/mainboard/msi/ms7721/Kconfig
@@ -30,7 +30,6 @@ config BOARD_SPECIFIC_OPTIONS
 	select SUPERIO_FINTEK_F71869AD
 	select BOARD_ROMSIZE_KB_8192
 	select GFXUMA
-	select HUDSON_DISABLE_IMC
 
 config MAINBOARD_DIR
 	string
diff --git a/src/mainboard/pcengines/apu2/Kconfig b/src/mainboard/pcengines/apu2/Kconfig
index 78addb240a..6e65a6e155 100644
--- a/src/mainboard/pcengines/apu2/Kconfig
+++ b/src/mainboard/pcengines/apu2/Kconfig
@@ -28,7 +28,6 @@ config BOARD_SPECIFIC_OPTIONS
 	select HAVE_MP_TABLE
 	select HAVE_ACPI_TABLES
 	select BOARD_ROMSIZE_KB_8192
-	select HUDSON_DISABLE_IMC
 	select USE_BLOBS
 	select GENERIC_SPD_BIN
 	select MAINBOARD_HAS_LPC_TPM
diff --git a/src/southbridge/amd/agesa/hudson/Kconfig b/src/southbridge/amd/agesa/hudson/Kconfig
index b80f73462f..22e0b6f536 100644
--- a/src/southbridge/amd/agesa/hudson/Kconfig
+++ b/src/southbridge/amd/agesa/hudson/Kconfig
@@ -55,8 +55,13 @@ config HUDSON_XHCI_FWM
 	help
 	  Add Hudson 2/3/4 XHCI Firmware to support the onboard USB 3.0
 
+config HUDSON_IMC_ENABLE
+	bool
+	default n
+
 config HUDSON_IMC_FWM
-	bool "Add imc firmware"
+	bool "Add IMC firmware"
+	depends on HUDSON_IMC_ENABLE
 	default y if USE_BLOBS
 	select SPI_FLASH_HAS_VOLATILE_GROUP if SPI_FLASH
 	help
diff --git a/src/southbridge/amd/pi/hudson/Kconfig b/src/southbridge/amd/pi/hudson/Kconfig
index 3c70c2ad0a..76ba480280 100644
--- a/src/southbridge/amd/pi/hudson/Kconfig
+++ b/src/southbridge/amd/pi/hudson/Kconfig
@@ -22,9 +22,6 @@ config SOUTHBRIDGE_AMD_PI_AVALON
 config SOUTHBRIDGE_AMD_PI_KERN
 	bool
 
-config HUDSON_DISABLE_IMC
-	bool
-
 if SOUTHBRIDGE_AMD_PI_AVALON || SOUTHBRIDGE_AMD_PI_BOLTON || SOUTHBRIDGE_AMD_PI_KERN
 
 config SOUTHBRIDGE_SPECIFIC_OPTIONS # dummy
@@ -58,9 +55,13 @@ config HUDSON_XHCI_FWM
 	help
 	  Add Hudson 2/3/4 XHCI Firmware to support the onboard USB 3.0
 
+config HUDSON_IMC_ENABLE
+	bool
+	default n
+
 config HUDSON_IMC_FWM
 	bool "Add IMC firmware"
-	depends on !HUDSON_DISABLE_IMC
+	depends on HUDSON_IMC_ENABLE
 	default y
 	help
 	  Add Hudson 2/3/4 IMC Firmware to support the onboard fan control
diff --git a/src/vendorcode/amd/Kconfig b/src/vendorcode/amd/Kconfig
index 0c52b2f8f5..3fe0c82240 100644
--- a/src/vendorcode/amd/Kconfig
+++ b/src/vendorcode/amd/Kconfig
@@ -29,7 +29,6 @@ choice
 
 config CPU_AMD_AGESA_BINARY_PI
 	bool "binary PI"
-	select HUDSON_DISABLE_IMC if CPU_AMD_PI_00730F01 || CPU_AMD_PI_00630F01
 	help
 	  Use a binary PI package.  Generally, these will be stored in the
 	  "3rdparty/blobs" directory.  For some processors, these must be obtained