diff --git a/src/northbridge/amd/amdfam10/Kconfig b/src/northbridge/amd/amdfam10/Kconfig
index ae16e04df9..5fb040186e 100644
--- a/src/northbridge/amd/amdfam10/Kconfig
+++ b/src/northbridge/amd/amdfam10/Kconfig
@@ -129,54 +129,6 @@ menu "HyperTransport setup"
 	#could be implemented for K8 (NORTHBRIDGE_AMD_AMDK8)
 	depends on (NORTHBRIDGE_AMD_AMDFAM10) && EXPERT
 
-choice
-	prompt "HyperTransport frequency"
-	default LIMIT_HT_SPEED_AUTO
-	help
-	  This option sets the maximum permissible HyperTransport link
-	  frequency.
-
-	  Use of this option will only limit the autodetected HT frequency.
-	  It will not (and cannot) increase the frequency beyond the
-	  autodetected limits.
-
-	  This is primarily used to work around poorly designed or laid out
-	  HT traces on certain motherboards.
-
-config LIMIT_HT_SPEED_200
-	bool "Limit HT frequency to 200MHz"
-config LIMIT_HT_SPEED_300
-	bool "Limit HT frequency to 300MHz"
-config LIMIT_HT_SPEED_400
-	bool "Limit HT frequency to 400MHz"
-config LIMIT_HT_SPEED_500
-	bool "Limit HT frequency to 500MHz"
-config LIMIT_HT_SPEED_600
-	bool "Limit HT frequency to 600MHz"
-config LIMIT_HT_SPEED_800
-	bool "Limit HT frequency to 800MHz"
-config LIMIT_HT_SPEED_1000
-	bool "Limit HT frequency to 1.0GHz"
-config LIMIT_HT_SPEED_1200
-	bool "Limit HT frequency to 1.2GHz"
-config LIMIT_HT_SPEED_1400
-	bool "Limit HT frequency to 1.4GHz"
-config LIMIT_HT_SPEED_1600
-	bool "Limit HT frequency to 1.6GHz"
-config LIMIT_HT_SPEED_1800
-	bool "Limit HT frequency to 1.8GHz"
-config LIMIT_HT_SPEED_2000
-	bool "Limit HT frequency to 2.0GHz"
-config LIMIT_HT_SPEED_2200
-	bool "Limit HT frequency to 2.2GHz"
-config LIMIT_HT_SPEED_2400
-	bool "Limit HT frequency to 2.4GHz"
-config LIMIT_HT_SPEED_2600
-	bool "Limit HT frequency to 2.6GHz"
-config LIMIT_HT_SPEED_AUTO
-	bool "Autodetect HT frequency"
-endchoice
-
 choice
 	prompt "HyperTransport downlink width"
 	default LIMIT_HT_DOWN_WIDTH_16
diff --git a/src/northbridge/amd/amdht/h3finit.c b/src/northbridge/amd/amdht/h3finit.c
index 88d5b6a43b..faa2636a59 100644
--- a/src/northbridge/amd/amdht/h3finit.c
+++ b/src/northbridge/amd/amdht/h3finit.c
@@ -1331,39 +1331,10 @@ static void selectOptimalWidthAndFrequency(sMainData *pDat)
 
 	for (i = 0; i < pDat->TotalLinks*2; i += 2)
 	{
-#if CONFIG_EXPERT && CONFIG_LIMIT_HT_SPEED_200
-		cbPCBFreqLimit = 0x0001;
-#elif CONFIG_EXPERT && CONFIG_LIMIT_HT_SPEED_300
-		cbPCBFreqLimit = 0x0003;
-#elif CONFIG_EXPERT && CONFIG_LIMIT_HT_SPEED_400
-		cbPCBFreqLimit = 0x0007;
-#elif CONFIG_EXPERT && CONFIG_LIMIT_HT_SPEED_500
-		cbPCBFreqLimit = 0x000F;
-#elif CONFIG_EXPERT && CONFIG_LIMIT_HT_SPEED_600
-		cbPCBFreqLimit = 0x001F;
-#elif CONFIG_EXPERT && CONFIG_LIMIT_HT_SPEED_800
-		cbPCBFreqLimit = 0x003F;
-#elif CONFIG_EXPERT && CONFIG_LIMIT_HT_SPEED_1000
-		cbPCBFreqLimit = 0x007F;
-#elif CONFIG_EXPERT && CONFIG_LIMIT_HT_SPEED_1200
-		cbPCBFreqLimit = 0x00FF;
-#elif CONFIG_EXPERT && CONFIG_LIMIT_HT_SPEED_1400
-		cbPCBFreqLimit = 0x01FF;
-#elif CONFIG_EXPERT && CONFIG_LIMIT_HT_SPEED_1600
-		cbPCBFreqLimit = 0x03FF;
-#elif CONFIG_EXPERT && CONFIG_LIMIT_HT_SPEED_1800
-		cbPCBFreqLimit = 0x07FF;
-#elif CONFIG_EXPERT && CONFIG_LIMIT_HT_SPEED_2000
-		cbPCBFreqLimit = 0x0FFF;
-#elif CONFIG_EXPERT && CONFIG_LIMIT_HT_SPEED_2200
-		cbPCBFreqLimit = 0x1FFF;
-#elif CONFIG_EXPERT && CONFIG_LIMIT_HT_SPEED_2400
-		cbPCBFreqLimit = 0x3FFF;
-#elif CONFIG_EXPERT && CONFIG_LIMIT_HT_SPEED_2600
-		cbPCBFreqLimit = 0x7FFF;
-#else
+		/* FIXME
+		 * Mainboards need to be able to set cbPCBFreqLimit
+		 */
 		cbPCBFreqLimit = 0xFFFF;		// Maximum allowed by autoconfiguration
-#endif
 
 #if CONFIG_EXPERT && CONFIG_LIMIT_HT_DOWN_WIDTH_8
 		cbPCBABDownstreamWidth = 8;