diff --git a/src/mainboard/google/octopus/Kconfig b/src/mainboard/google/octopus/Kconfig
index 4c0cdff860..b9c6a1ba34 100644
--- a/src/mainboard/google/octopus/Kconfig
+++ b/src/mainboard/google/octopus/Kconfig
@@ -97,10 +97,6 @@ config MAINBOARD_FAMILY
 	string
 	default "Google_Octopus"
 
-config MAX_CPUS
-	int
-	default 4
-
 config UART_FOR_CONSOLE
 	int
 	default 2
diff --git a/src/mainboard/intel/glkrvp/Kconfig b/src/mainboard/intel/glkrvp/Kconfig
index 86920ca6e2..7b1b564e52 100644
--- a/src/mainboard/intel/glkrvp/Kconfig
+++ b/src/mainboard/intel/glkrvp/Kconfig
@@ -68,10 +68,6 @@ config MAINBOARD_FAMILY
 	string
 	default "Intel_Glkrvp" if BOARD_INTEL_GLKRVP
 
-config MAX_CPUS
-	int
-	default 4
-
 config UART_FOR_CONSOLE
 	int
 	default 2
diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index fec0fc94cf..f5d932396b 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -108,6 +108,10 @@ config CPU_SPECIFIC_OPTIONS
 	select INTEL_GMA_SWSMISCI
 	select HAVE_ASAN_IN_ROMSTAGE
 
+config MAX_CPUS
+	int
+	default 4 if SOC_INTEL_GEMINILAKE
+
 config CHROMEOS
 	select CHROMEOS_RAMOOPS_DYNAMIC