14 files changed, 4 insertions, 52 deletions
diff --git a/src/mainboard/51nb/x210/Kconfig b/src/mainboard/51nb/x210/Kconfig
index 824e8b3608..efd21da26e 100644
--- a/src/mainboard/51nb/x210/Kconfig
+++ b/src/mainboard/51nb/x210/Kconfig
@@ -28,10 +28,6 @@ config MAINBOARD_DIR
 	string
 	default "51nb/x210"
 
-config MAX_CPUS
-	int
-	default 8
-
 config VGA_BIOS_ID
 	string
 	default "8086,5917"
diff --git a/src/mainboard/asrock/h110m/Kconfig b/src/mainboard/asrock/h110m/Kconfig
index d923c30d3c..8b32ac682f 100644
--- a/src/mainboard/asrock/h110m/Kconfig
+++ b/src/mainboard/asrock/h110m/Kconfig
@@ -29,10 +29,6 @@ config MAINBOARD_PART_NUMBER
 	string
 	default "H110M"
 
-config MAX_CPUS
-	int
-	default 8
-
 config DEVICETREE
 	string
 	default "devicetree.cb"
diff --git a/src/mainboard/clevo/kbl-u/Kconfig b/src/mainboard/clevo/kbl-u/Kconfig
index 1229fa4b3e..a99f9c6b23 100644
--- a/src/mainboard/clevo/kbl-u/Kconfig
+++ b/src/mainboard/clevo/kbl-u/Kconfig
@@ -59,10 +59,6 @@ config FMDFILE
 #	default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/fmds/vboot-roa.fmd"	if VBOOT_SLOTS_RW_A && !VBOOT_SLOTS_RW_AB
 #	default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/fmds/vboot-roab.fmd"	if VBOOT_SLOTS_RW_AB
 
-config MAX_CPUS
-	int
-	default 8
-
 config DIMM_MAX
 	int
 	default 2
diff --git a/src/mainboard/google/eve/Kconfig b/src/mainboard/google/eve/Kconfig
index ece0119a3e..af5f8cd0fe 100644
--- a/src/mainboard/google/eve/Kconfig
+++ b/src/mainboard/google/eve/Kconfig
@@ -62,10 +62,6 @@ config MAINBOARD_FAMILY
 	string
 	default "Google_Eve"
 
-config MAX_CPUS
-	int
-	default 8
-
 config INCLUDE_NHLT_BLOBS
 	bool "Include blobs for audio."
 	select NHLT_RT5514
diff --git a/src/mainboard/google/fizz/Kconfig b/src/mainboard/google/fizz/Kconfig
index 548f2ebf13..afa8f90031 100644
--- a/src/mainboard/google/fizz/Kconfig
+++ b/src/mainboard/google/fizz/Kconfig
@@ -60,10 +60,6 @@ config MAINBOARD_FAMILY
 	default "Google_Kalista" if BOARD_GOOGLE_KARMA
 	default "Google_Endeavour" if BOARD_GOOGLE_ENDEAVOUR
 
-config MAX_CPUS
-	int
-	default 8
-
 config DIMM_MAX
 	int
 	default 2
diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig
index 144fe97b8b..bd4e649fbe 100644
--- a/src/mainboard/google/glados/Kconfig
+++ b/src/mainboard/google/glados/Kconfig
@@ -65,10 +65,6 @@ config OVERRIDE_DEVICETREE
 	string
 	default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb"
 
-config MAX_CPUS
-	int
-	default 8
-
 config TPM_PIRQ
 	hex
 	default 0x18  # GPP_E0_IRQ
diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig
index 2656d28173..134246c173 100644
--- a/src/mainboard/google/poppy/Kconfig
+++ b/src/mainboard/google/poppy/Kconfig
@@ -108,10 +108,6 @@ config MAINBOARD_PART_NUMBER
 	default "Rammus" if BOARD_GOOGLE_RAMMUS
 	default "Soraka" if BOARD_GOOGLE_SORAKA
 
-config MAX_CPUS
-	int
-	default 8
-
 config OEM_BIN_FILE
 	string "OEM ID table"
 	default ""
diff --git a/src/mainboard/intel/kblrvp/Kconfig b/src/mainboard/intel/kblrvp/Kconfig
index 5dccdaed93..fcce402d85 100644
--- a/src/mainboard/intel/kblrvp/Kconfig
+++ b/src/mainboard/intel/kblrvp/Kconfig
@@ -43,10 +43,6 @@ config MAINBOARD_FAMILY
 	string
 	default "Intel_Kblrvp"
 
-config MAX_CPUS
-	int
-	default 8
-
 config TPM_PIRQ
 	hex
 	default 0x18  # GPP_E0_IRQ
diff --git a/src/mainboard/intel/kunimitsu/Kconfig b/src/mainboard/intel/kunimitsu/Kconfig
index b9b7d5a394..cf67ca18d0 100644
--- a/src/mainboard/intel/kunimitsu/Kconfig
+++ b/src/mainboard/intel/kunimitsu/Kconfig
@@ -41,10 +41,6 @@ config MAINBOARD_FAMILY
 	string
 	default "Intel_Kunimitsu"
 
-config MAX_CPUS
-	int
-	default 8
-
 config TPM_PIRQ
 	hex
 	default 0x18  # GPP_E0_IRQ
diff --git a/src/mainboard/intel/saddlebrook/Kconfig b/src/mainboard/intel/saddlebrook/Kconfig
index 873f25727c..e7aaae50c8 100644
--- a/src/mainboard/intel/saddlebrook/Kconfig
+++ b/src/mainboard/intel/saddlebrook/Kconfig
@@ -32,10 +32,6 @@ config MAINBOARD_FAMILY
 	string
 	default "Intel_SaddleBrook"
 
-config MAX_CPUS
-	int
-	default 8
-
 config TPM_PIRQ
 	hex
 	default 0x18  # GPP_E0_IRQ
diff --git a/src/mainboard/kontron/bsl6/Kconfig b/src/mainboard/kontron/bsl6/Kconfig
index fd52d3e751..dd8f4fac48 100644
--- a/src/mainboard/kontron/bsl6/Kconfig
+++ b/src/mainboard/kontron/bsl6/Kconfig
@@ -54,10 +54,6 @@ config CBFS_SIZE
 	hex
 	default 0x600000 if BOARD_SIEMENS_BOXER26
 
-config MAX_CPUS
-	int
-	default 8
-
 config DIMM_MAX
 	int
 	default 2
diff --git a/src/mainboard/purism/librem_skl/Kconfig b/src/mainboard/purism/librem_skl/Kconfig
index cd8fc66c1c..c59f7fa9b0 100644
--- a/src/mainboard/purism/librem_skl/Kconfig
+++ b/src/mainboard/purism/librem_skl/Kconfig
@@ -47,10 +47,6 @@ config OVERRIDE_DEVICETREE
 	string
 	default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb"
 
-config MAX_CPUS
-	int
-	default 8
-
 config VGA_BIOS_ID
 	string
 	default "8086,1916" if BOARD_PURISM_LIBREM13_V2 || BOARD_PURISM_LIBREM15_V3
diff --git a/src/mainboard/supermicro/x11-lga1151-series/Kconfig b/src/mainboard/supermicro/x11-lga1151-series/Kconfig
index 533899dbde..b7057b07c9 100644
--- a/src/mainboard/supermicro/x11-lga1151-series/Kconfig
+++ b/src/mainboard/supermicro/x11-lga1151-series/Kconfig
@@ -75,10 +75,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 18
 
-config MAX_CPUS
-	int
-	default 8
-
 config CONSOLE_POST
 	bool
 	default y
diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig
index cfc7c5239c..0a14bc7fe4 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -80,6 +80,10 @@ config CPU_SPECIFIC_OPTIONS
 	select UDELAY_TSC
 	select UDK_2015_BINDING
 
+config MAX_CPUS
+	int
+	default 8
+
 config FSP_HYPERTHREADING
 	bool "Enable Hyper-Threading"
 	default y