diff --git a/src/cpu/amd/pi/00730F01/model_16_init.c b/src/cpu/amd/pi/00730F01/model_16_init.c
index caf4647467..d7c23daf10 100644
--- a/src/cpu/amd/pi/00730F01/model_16_init.c
+++ b/src/cpu/amd/pi/00730F01/model_16_init.c
@@ -25,20 +25,18 @@ static void model_16_init(struct device *dev)
 	/* zero the machine check error status registers */
 	mca_clear_status();
 
-	if (CONFIG(LOGICAL_CPUS)) {
-		siblings = get_cpu_count() - 1; // minus BSP
+	siblings = get_cpu_count() - 1; // minus BSP
 
-		if (siblings > 0) {
-			msr = rdmsr_amd(CPU_ID_FEATURES_MSR);
-			msr.lo |= 1 << 28;
-			wrmsr_amd(CPU_ID_FEATURES_MSR, msr);
+	if (siblings > 0) {
+		msr = rdmsr_amd(CPU_ID_FEATURES_MSR);
+		msr.lo |= 1 << 28;
+		wrmsr_amd(CPU_ID_FEATURES_MSR, msr);
 
-			msr = rdmsr_amd(CPU_ID_EXT_FEATURES_MSR);
-			msr.hi |= 1 << (33 - 32);
-			wrmsr_amd(CPU_ID_EXT_FEATURES_MSR, msr);
-		}
-		printk(BIOS_DEBUG, "siblings = %02d, ", siblings);
+		msr = rdmsr_amd(CPU_ID_EXT_FEATURES_MSR);
+		msr.hi |= 1 << (33 - 32);
+		wrmsr_amd(CPU_ID_EXT_FEATURES_MSR, msr);
 	}
+	printk(BIOS_DEBUG, "siblings = %02d, ", siblings);
 
 	/* DisableCf8ExtCfg */
 	msr = rdmsr(NB_CFG_MSR);
diff --git a/src/cpu/x86/Kconfig b/src/cpu/x86/Kconfig
index d95e6cc4c3..50766cdac1 100644
--- a/src/cpu/x86/Kconfig
+++ b/src/cpu/x86/Kconfig
@@ -126,10 +126,6 @@ config SETUP_XIP_CACHE
 	  non-eviction mode and therefore need to be careful to avoid
 	  eviction.
 
-config LOGICAL_CPUS
-	bool
-	default y
-
 config HAVE_SMI_HANDLER
 	bool
 	default n