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

@@ -49,10 +49,6 @@ config UART_FOR_CONSOLE
 	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

@@ -45,10 +45,6 @@ config PCIEXP_CLK_PM
 	bool
 	default n
 
-config MAX_CPUS
-	int
-	default 16
-
 config CONSOLE_POST
 	bool
 	default y

src/mainboard/system76/bonw14/Kconfig

@@ -45,9 +45,6 @@ config CONSOLE_POST
 config UART_FOR_CONSOLE
 	default 2
 
-config MAX_CPUS
-	default 20
-
 config DIMM_MAX
 	default 4
 

src/mainboard/system76/gaze15/Kconfig

@@ -58,9 +58,6 @@ config ONBOARD_VGA_IS_PRIMARY
 config UART_FOR_CONSOLE
 	default 2
 
-config MAX_CPUS
-	default 16
-
 config DIMM_MAX
 	default 2
 

src/mainboard/system76/lemp9/Kconfig

@@ -48,10 +48,6 @@ config UART_FOR_CONSOLE
 	int
 	default 2
 
-config MAX_CPUS
-	int
-	default 8
-
 config DIMM_MAX
 	default 2
 

src/mainboard/system76/oryp5/Kconfig

@@ -53,10 +53,6 @@ config UART_FOR_CONSOLE
 	int
 	default 2
 
-config MAX_CPUS
-	int
-	default 12
-
 config DIMM_MAX
 	default 2
 

src/mainboard/system76/oryp6/Kconfig

@@ -56,9 +56,6 @@ config CONSOLE_POST
 config ONBOARD_VGA_IS_PRIMARY
 	default y
 
-config MAX_CPUS
-	default 16
-
 config DIMM_MAX
 	default 2
 

src/soc/intel/cannonlake/Kconfig

@@ -119,7 +119,10 @@ config CPU_SPECIFIC_OPTIONS
 
 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