Change in coreboot[master]: soc/intel/skylake: Configure MAX_CPUS

[Felix Singer (Code Review)]

Felix Singer has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/49105 )

Change subject: soc/intel/skylake: Configure MAX_CPUS
......................................................................

soc/intel/skylake: Configure MAX_CPUS

Configure MAX_CPUS in SoC Kconfig with 8 as default value and remove it
from every mainboard where 8 is used.

Change-Id: I825625bf842e8cd22dada9a508a7176e5cc2ea57
Signed-off-by: Felix Singer 
---
M src/mainboard/51nb/x210/Kconfig
M src/mainboard/asrock/h110m/Kconfig
M src/mainboard/clevo/kbl-u/Kconfig
M src/mainboard/google/eve/Kconfig
M src/mainboard/google/fizz/Kconfig
M src/mainboard/google/glados/Kconfig
M src/mainboard/google/poppy/Kconfig
M src/mainboard/intel/kblrvp/Kconfig
M src/mainboard/intel/kunimitsu/Kconfig
M src/mainboard/intel/saddlebrook/Kconfig
M src/mainboard/kontron/bsl6/Kconfig
M src/mainboard/purism/librem_skl/Kconfig
M src/mainboard/supermicro/x11-lga1151-series/Kconfig
M src/soc/intel/skylake/Kconfig
14 files changed, 4 insertions(+), 52 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/05/49105/1

diff --git a/src/mainboard/51nb/x210/Kconfig b/src/mainboard/51nb/x210/Kconfig
index 824e8b3..efd21da 100644
--- a/src/mainboard/51nb/x210/Kconfig
+++ b/src/mainboard/51nb/x210/Kconfig
@@ -28,10 +28,6 @@
    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 d923c30..8b32ac6 100644
--- a/src/mainboard/asrock/h110m/Kconfig
+++ b/src/mainboard/asrock/h110m/Kconfig
@@ -29,10 +29,6 @@
    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 ed0600a..d854db4 100644
--- a/src/mainboard/clevo/kbl-u/Kconfig
+++ b/src/mainboard/clevo/kbl-u/Kconfig
@@ -55,10 +55,6 @@
 #	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 ece0119..af5f8cd 100644
--- a/src/mainboard/google/eve/Kconfig
+++ b/src/mainboard/google/eve/Kconfig
@@ -62,10 +62,6 @@
    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 548f2eb..afa8f90 100644
--- a/src/mainboard/google/fizz/Kconfig
+++ b/src/mainboard/google/fizz/Kconfig
@@ -60,10 +60,6 @@
    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 144fe97..bd4e649 100644
--- a/src/mainboard/google/glados/Kconfig
+++ b/src/mainboard/google/glados/Kconfig
@@ -65,10 +65,6 @@
    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 2656d28..134246c 100644
--- a/src/mainboard/google/poppy/Kconfig
+++ b/src/mainboard/google/poppy/Kconfig
@@ -108,10 +108,6 @@
    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 5dccdae..fcce402 100644
--- a/src/mainboard/intel/kblrvp/Kconfig
+++ b/src/mainboard/intel/kblrvp/Kconfig
@@ -43,10 +43,6 @@
    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 b9b7d5a..cf67ca1 100644
--- a/src/mainboard/intel/kunimitsu/Kconfig
+++ b/src/mainboard/intel/kunimitsu/Kconfig
@@ -41,10 +41,6 @@
    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 873f257..e7aaae5 100644
--- a/src/mainboard/intel/saddlebrook/Kconfig
+++ b/src/mainboard/intel/saddlebrook/Kconfig
@@ -32,10 +32,6 @@
    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 437c5a3..8297929 100644
--- a/src/mainboard/kontron/bsl6/Kconfig
+++ b/src/mainboard/kontron/bsl6/Kconfig
@@ -46,10 +46,6 @@
    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 cd8fc66..c59f7fa 100644
--- a/src/mainboard/purism/librem_skl/Kconfig
+++ b/src/mainboard/purism/librem_skl/Kconfig
@@ -47,10 +47,6 @@
    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 533899d..b7057b0 100644
--- a/src/mainboard/supermicro/x11-lga1151-series/Kconfig
+++ b/src/mainboard/supermicro/x11-lga1151-series/Kconfig
@@ -75,10 +75,6 @@
    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 cfc7c52..0a14bc7 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -80,6 +80,10 @@
    select UDELAY_TSC
    select UDK_2015_BINDING

+config MAX_CPUS
+	int
+	default 8
+
 config FSP_HYPERTHREADING
    bool "Enable Hyper-Threading"
    default y

Change in coreboot[master]: soc/intel/skylake: Move MAX_CPUS from mb to SoC

[Felix Singer (Code Review)]

Hello Nico Huber, Michael Niewöhner, Patrick Rudolph,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/49105

to look at the new patch set (#2).

Change subject: soc/intel/skylake: Move MAX_CPUS from mb to SoC
......................................................................

soc/intel/skylake: Move MAX_CPUS from mb to SoC

Configure MAX_CPUS in SoC Kconfig with 8 as default value and remove it
from every mainboard where 8 is used.

Change-Id: I825625bf842e8cd22dada9a508a7176e5cc2ea57
Signed-off-by: Felix Singer 
---
M src/mainboard/51nb/x210/Kconfig
M src/mainboard/asrock/h110m/Kconfig
M src/mainboard/clevo/kbl-u/Kconfig
M src/mainboard/google/eve/Kconfig
M src/mainboard/google/fizz/Kconfig
M src/mainboard/google/glados/Kconfig
M src/mainboard/google/poppy/Kconfig
M src/mainboard/intel/kblrvp/Kconfig
M src/mainboard/intel/kunimitsu/Kconfig
M src/mainboard/intel/saddlebrook/Kconfig
M src/mainboard/kontron/bsl6/Kconfig
M src/mainboard/purism/librem_skl/Kconfig
M src/mainboard/supermicro/x11-lga1151-series/Kconfig
M src/soc/intel/skylake/Kconfig
14 files changed, 4 insertions(+), 52 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/05/49105/2

Change in coreboot[master]: soc/intel/skylake: Move MAX_CPUS from mb to SoC

[Matt DeVillier (Code Review)]

Matt DeVillier has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/49105 )

Change subject: soc/intel/skylake: Move MAX_CPUS from mb to SoC
......................................................................

Patch Set 2: Code-Review+1

plan to do the same for other SoCs, e.g. Broadwell?

Change in coreboot[master]: soc/intel/skylake: Move MAX_CPUS from mb to SoC

[Michael Niewöhner (Code Review)]

Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/49105 )

Change subject: soc/intel/skylake: Move MAX_CPUS from mb to SoC
......................................................................

Patch Set 2:

(1 comment)

https://review.coreboot.org/c/coreboot/+/49105/2/src/mainboard/intel/kblrvp/... 
File src/mainboard/intel/kblrvp/Kconfig:

https://review.coreboot.org/c/coreboot/+/49105/2/src/mainboard/intel/kblrvp/... 
PS2, Line 46: MAX_CPUS
hmpf. I wonder, is it CPUs or threads?

Change in coreboot[master]: soc/intel/skylake: Move MAX_CPUS from mb to SoC

[Michael Niewöhner (Code Review)]

Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/49105 )

Change subject: soc/intel/skylake: Move MAX_CPUS from mb to SoC
......................................................................

Patch Set 2: Code-Review+1

Change in coreboot[master]: soc/intel/skylake: Move MAX_CPUS from mb to SoC

[Felix Singer (Code Review)]

Felix Singer has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/49105 )

Change subject: soc/intel/skylake: Move MAX_CPUS from mb to SoC
......................................................................

Patch Set 2:

(1 comment)

https://review.coreboot.org/c/coreboot/+/49105/2/src/mainboard/intel/kblrvp/... 
File src/mainboard/intel/kblrvp/Kconfig:

https://review.coreboot.org/c/coreboot/+/49105/2/src/mainboard/intel/kblrvp/... 
PS2, Line 46: MAX_CPUS
> hmpf. […]

afaik it is the amount of addressable logical cores.

Change in coreboot[master]: soc/intel/skylake: Move MAX_CPUS from mb to SoC

[Patrick Rudolph (Code Review)]

Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/49105 )

Change subject: soc/intel/skylake: Move MAX_CPUS from mb to SoC
......................................................................

Patch Set 2: Code-Review+2

Change in coreboot[master]: soc/intel/skylake: Move MAX_CPUS from mb to SoC

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/49105 )

Change subject: soc/intel/skylake: Move MAX_CPUS from mb to SoC
......................................................................

Patch Set 2: Code-Review+1
> Patch Set 2: Code-Review+1
>
> plan to do the same for other SoCs, e.g. Broadwell?

CB:46952 fixes the outlier for Broadwell.

Change in coreboot[master]: soc/intel/skylake: Move MAX_CPUS from mb to SoC

[Matt DeVillier (Code Review)]

Matt DeVillier has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/49105 )

Change subject: soc/intel/skylake: Move MAX_CPUS from mb to SoC
......................................................................

Patch Set 2:
> Patch Set 2: Code-Review+1
> > Patch Set 2: Code-Review+1
> >
> > plan to do the same for other SoCs, e.g. Broadwell?
>
> CB:46952 fixes the outlier for Broadwell.

I meant in terms of having MAX_CPUS defined at the SoC level vs board level

Change in coreboot[master]: soc/intel/skylake: Move MAX_CPUS from mb to SoC

[Felix Singer (Code Review)]

Felix Singer has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/49105 )

Change subject: soc/intel/skylake: Move MAX_CPUS from mb to SoC
......................................................................

Patch Set 3:
> plan to do the same for other SoCs, e.g. Broadwell?

I created a seperate patch for Broadwell. See CB:49122

Change in coreboot[master]: soc/intel/skylake: Move MAX_CPUS from mb to SoC

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/49105 )

Change subject: soc/intel/skylake: Move MAX_CPUS from mb to SoC
......................................................................

Patch Set 3: Code-Review+2

(1 comment)

https://review.coreboot.org/c/coreboot/+/49105/2/src/mainboard/intel/kblrvp/... 
File src/mainboard/intel/kblrvp/Kconfig:

https://review.coreboot.org/c/coreboot/+/49105/2/src/mainboard/intel/kblrvp/... 
PS2, Line 46: MAX_CPUS
> afaik it is the amount of addressable logical cores.

It's logical cores, and there's no problem if using a larger value.

Change in coreboot[master]: soc/intel/skylake: Move MAX_CPUS from mb to SoC

[Tim Wawrzynczak (Code Review)]

Tim Wawrzynczak has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/49105 )

Change subject: soc/intel/skylake: Move MAX_CPUS from mb to SoC
......................................................................

Patch Set 3: Code-Review+2

Change in coreboot[master]: soc/intel/skylake: Move MAX_CPUS from mb to SoC

[Michael Niewöhner (Code Review)]

Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/49105 )

Change subject: soc/intel/skylake: Move MAX_CPUS from mb to SoC
......................................................................

Patch Set 3: Code-Review+2

Change in coreboot[master]: soc/intel/skylake: Move MAX_CPUS from mb to SoC

[Michael Niewöhner (Code Review)]

Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/49105 )

Change subject: soc/intel/skylake: Move MAX_CPUS from mb to SoC
......................................................................

Patch Set 3:

(1 comment)

https://review.coreboot.org/c/coreboot/+/49105/2/src/mainboard/intel/kblrvp/... 
File src/mainboard/intel/kblrvp/Kconfig:

https://review.coreboot.org/c/coreboot/+/49105/2/src/mainboard/intel/kblrvp/... 
PS2, Line 46: MAX_CPUS
> It's logical cores, and there's no problem if using a larger value.

yeah sure, it's just another confusing use of the term "CPUS" that I noticed; no blocker, no todo ;)

Change in coreboot[master]: soc/intel/skylake: Move MAX_CPUS from mb to SoC

[Michael Niewöhner (Code Review)]

Michael Niewöhner has submitted this change. ( https://review.coreboot.org/c/coreboot/+/49105 )

Change subject: soc/intel/skylake: Move MAX_CPUS from mb to SoC
......................................................................

soc/intel/skylake: Move MAX_CPUS from mb to SoC

Configure MAX_CPUS in SoC Kconfig with 8 as default value and remove it
from every mainboard where 8 is used.

Change-Id: I825625bf842e8cd22dada9a508a7176e5cc2ea57
Signed-off-by: Felix Singer 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/49105
Reviewed-by: Angel Pons 
Reviewed-by: Tim Wawrzynczak 
Reviewed-by: Michael Niewöhner 
Reviewed-by: Matt DeVillier 
Reviewed-by: Patrick Rudolph 
Tested-by: build bot (Jenkins) 
---
M src/mainboard/51nb/x210/Kconfig
M src/mainboard/asrock/h110m/Kconfig
M src/mainboard/clevo/kbl-u/Kconfig
M src/mainboard/google/eve/Kconfig
M src/mainboard/google/fizz/Kconfig
M src/mainboard/google/glados/Kconfig
M src/mainboard/google/poppy/Kconfig
M src/mainboard/intel/kblrvp/Kconfig
M src/mainboard/intel/kunimitsu/Kconfig
M src/mainboard/intel/saddlebrook/Kconfig
M src/mainboard/kontron/bsl6/Kconfig
M src/mainboard/purism/librem_skl/Kconfig
M src/mainboard/supermicro/x11-lga1151-series/Kconfig
M src/soc/intel/skylake/Kconfig
14 files changed, 4 insertions(+), 52 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Matt DeVillier: Looks good to me, but someone else must approve
  Patrick Rudolph: Looks good to me, approved
  Angel Pons: Looks good to me, approved
  Tim Wawrzynczak: Looks good to me, approved
  Michael Niewöhner: Looks good to me, approved

diff --git a/src/mainboard/51nb/x210/Kconfig b/src/mainboard/51nb/x210/Kconfig
index 824e8b3..efd21da 100644
--- a/src/mainboard/51nb/x210/Kconfig
+++ b/src/mainboard/51nb/x210/Kconfig
@@ -28,10 +28,6 @@
    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 d923c30..8b32ac6 100644
--- a/src/mainboard/asrock/h110m/Kconfig
+++ b/src/mainboard/asrock/h110m/Kconfig
@@ -29,10 +29,6 @@
    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 1229fa4..a99f9c6 100644
--- a/src/mainboard/clevo/kbl-u/Kconfig
+++ b/src/mainboard/clevo/kbl-u/Kconfig
@@ -59,10 +59,6 @@
 #	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 ece0119..af5f8cd 100644
--- a/src/mainboard/google/eve/Kconfig
+++ b/src/mainboard/google/eve/Kconfig
@@ -62,10 +62,6 @@
    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 548f2eb..afa8f90 100644
--- a/src/mainboard/google/fizz/Kconfig
+++ b/src/mainboard/google/fizz/Kconfig
@@ -60,10 +60,6 @@
    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 144fe97..bd4e649 100644
--- a/src/mainboard/google/glados/Kconfig
+++ b/src/mainboard/google/glados/Kconfig
@@ -65,10 +65,6 @@
    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 2656d28..134246c 100644
--- a/src/mainboard/google/poppy/Kconfig
+++ b/src/mainboard/google/poppy/Kconfig
@@ -108,10 +108,6 @@
    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 5dccdae..fcce402 100644
--- a/src/mainboard/intel/kblrvp/Kconfig
+++ b/src/mainboard/intel/kblrvp/Kconfig
@@ -43,10 +43,6 @@
    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 b9b7d5a..cf67ca1 100644
--- a/src/mainboard/intel/kunimitsu/Kconfig
+++ b/src/mainboard/intel/kunimitsu/Kconfig
@@ -41,10 +41,6 @@
    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 873f257..e7aaae5 100644
--- a/src/mainboard/intel/saddlebrook/Kconfig
+++ b/src/mainboard/intel/saddlebrook/Kconfig
@@ -32,10 +32,6 @@
    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 fd52d3e..dd8f4fa 100644
--- a/src/mainboard/kontron/bsl6/Kconfig
+++ b/src/mainboard/kontron/bsl6/Kconfig
@@ -54,10 +54,6 @@
    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 cd8fc66..c59f7fa 100644
--- a/src/mainboard/purism/librem_skl/Kconfig
+++ b/src/mainboard/purism/librem_skl/Kconfig
@@ -47,10 +47,6 @@
    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 533899d..b7057b0 100644
--- a/src/mainboard/supermicro/x11-lga1151-series/Kconfig
+++ b/src/mainboard/supermicro/x11-lga1151-series/Kconfig
@@ -75,10 +75,6 @@
    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 cfc7c52..0a14bc7 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -80,6 +80,10 @@
    select UDELAY_TSC
    select UDK_2015_BINDING

+config MAX_CPUS
+	int
+	default 8
+
 config FSP_HYPERTHREADING
    bool "Enable Hyper-Threading"
    default y