commit ff93c93fefbe19e0f149c70eac816a69ec011ac6
author Felix Singer <felixsinger@posteo.net> Fri Jul 22 09:45:45 2022 -0600
committer Martin Roth <martin.roth@amd.corp-partner.google.com> Sat Jul 23 19:48:56 2022 +0000
tree fa8803ae8aace26c3ba9b33489804716f4af7d1f
parent 4cd1711cc1ea00e9bd5084fcb41a37f5c56c3c51

soc/intel/cannonlake: Set MAX_CPUS based on the SoC and PCH

Set the default value for MAX_CPUS in the SoC config and drop it from
the mainboards where it is set to those values.

Change-Id: Ib56fdcfe770ef736a2c5e183481d9f9966570e6d
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Signed-off-by: Tim Crawford <tcrawford@system76.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/52607
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>

src/mainboard/clevo/cml-u/Kconfig

diff --git a/src/mainboard/clevo/cml-u/Kconfig b/src/mainboard/clevo/cml-u/Kconfig
index 7d7ff80..f557e6e 100644
--- a/src/mainboard/clevo/cml-u/Kconfig
+++ b/src/mainboard/clevo/cml-u/Kconfig
@@ -49,10 +49,6 @@
 	int
 	default 2
 
-config MAX_CPUS
-	int
-	default 8 if BOARD_CLEVO_L140CU_BASE
-
 config DIMM_MAX
 	default 2 if BOARD_CLEVO_L140CU_BASE
 

src/mainboard/prodrive/hermes/Kconfig

diff --git a/src/mainboard/prodrive/hermes/Kconfig b/src/mainboard/prodrive/hermes/Kconfig
index 49fb6c4..e4ccd2d 100644
--- a/src/mainboard/prodrive/hermes/Kconfig
+++ b/src/mainboard/prodrive/hermes/Kconfig
@@ -45,10 +45,6 @@
 	bool
 	default n
 
-config MAX_CPUS
-	int
-	default 16
-
 config CONSOLE_POST
 	bool
 	default y

src/mainboard/system76/bonw14/Kconfig

diff --git a/src/mainboard/system76/bonw14/Kconfig b/src/mainboard/system76/bonw14/Kconfig
index 6a83830..b3f1707 100644
--- a/src/mainboard/system76/bonw14/Kconfig
+++ b/src/mainboard/system76/bonw14/Kconfig
@@ -45,9 +45,6 @@
 config UART_FOR_CONSOLE
 	default 2
 
-config MAX_CPUS
-	default 20
-
 config DIMM_MAX
 	default 4
 

src/mainboard/system76/gaze15/Kconfig

diff --git a/src/mainboard/system76/gaze15/Kconfig b/src/mainboard/system76/gaze15/Kconfig
index 2a53168..3627cb1 100644
--- a/src/mainboard/system76/gaze15/Kconfig
+++ b/src/mainboard/system76/gaze15/Kconfig
@@ -58,9 +58,6 @@
 config UART_FOR_CONSOLE
 	default 2
 
-config MAX_CPUS
-	default 16
-
 config DIMM_MAX
 	default 2
 

src/mainboard/system76/lemp9/Kconfig

diff --git a/src/mainboard/system76/lemp9/Kconfig b/src/mainboard/system76/lemp9/Kconfig
index 26507b5..dbc9de2 100644
--- a/src/mainboard/system76/lemp9/Kconfig
+++ b/src/mainboard/system76/lemp9/Kconfig
@@ -48,10 +48,6 @@
 	int
 	default 2
 
-config MAX_CPUS
-	int
-	default 8
-
 config DIMM_MAX
 	default 2
 

src/mainboard/system76/oryp5/Kconfig

diff --git a/src/mainboard/system76/oryp5/Kconfig b/src/mainboard/system76/oryp5/Kconfig
index bb2a2c7..9a0a323 100644
--- a/src/mainboard/system76/oryp5/Kconfig
+++ b/src/mainboard/system76/oryp5/Kconfig
@@ -53,10 +53,6 @@
 	int
 	default 2
 
-config MAX_CPUS
-	int
-	default 12
-
 config DIMM_MAX
 	default 2
 

src/mainboard/system76/oryp6/Kconfig

diff --git a/src/mainboard/system76/oryp6/Kconfig b/src/mainboard/system76/oryp6/Kconfig
index e90f680..0aef4a6 100644
--- a/src/mainboard/system76/oryp6/Kconfig
+++ b/src/mainboard/system76/oryp6/Kconfig
@@ -56,9 +56,6 @@
 config ONBOARD_VGA_IS_PRIMARY
 	default y
 
-config MAX_CPUS
-	default 16
-
 config DIMM_MAX
 	default 2
 

src/soc/intel/cannonlake/Kconfig

diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig
index c0f543e..2a66f8a 100644
--- a/src/soc/intel/cannonlake/Kconfig
+++ b/src/soc/intel/cannonlake/Kconfig
@@ -119,7 +119,10 @@
 
 config MAX_CPUS
 	int
-	default 12
+	default 20 if SOC_INTEL_CANNONLAKE_PCH_H && SOC_INTEL_COMETLAKE
+	default 16 if SOC_INTEL_CANNONLAKE_PCH_H && SOC_INTEL_COFFEELAKE
+	default 12 if !SOC_INTEL_CANNONLAKE_PCH_H && SOC_INTEL_COMETLAKE
+	default 8
 
 config DIMM_SPD_SIZE
 	default 512