diff --git a/src/cpu/intel/socket_FCBGA559/Kconfig b/src/cpu/intel/socket_FCBGA559/Kconfig
index e6e904dccc..5105f095e9 100644
--- a/src/cpu/intel/socket_FCBGA559/Kconfig
+++ b/src/cpu/intel/socket_FCBGA559/Kconfig
@@ -27,4 +27,8 @@ config DCACHE_BSP_STACK_SIZE
 	  The amount of anticipated stack usage in CAR by bootblock and
 	  other stages.
 
+config MAX_CPUS
+	int
+	default 4
+
 endif
diff --git a/src/mainboard/foxconn/d41s/Kconfig b/src/mainboard/foxconn/d41s/Kconfig
index a272d1e898..93ce389134 100644
--- a/src/mainboard/foxconn/d41s/Kconfig
+++ b/src/mainboard/foxconn/d41s/Kconfig
@@ -18,10 +18,6 @@ config BOARD_SPECIFIC_OPTIONS
 	select DRIVERS_I2C_CK505
 	select INTEL_GMA_HAVE_VBT
 
-config MAX_CPUS
-	int
-	default 4
-
 config MAINBOARD_DIR
 	string
 	default "foxconn/d41s"
diff --git a/src/mainboard/intel/d510mo/Kconfig b/src/mainboard/intel/d510mo/Kconfig
index be0190f84b..cd6260bbae 100644
--- a/src/mainboard/intel/d510mo/Kconfig
+++ b/src/mainboard/intel/d510mo/Kconfig
@@ -18,10 +18,6 @@ config BOARD_SPECIFIC_OPTIONS
 	select DRIVERS_I2C_CK505
 	select INTEL_GMA_HAVE_VBT
 
-config MAX_CPUS
-	int
-	default 4
-
 config MAINBOARD_DIR
 	string
 	default "intel/d510mo"