aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/clevo/cml-u/Kconfig4
-rw-r--r--src/mainboard/prodrive/hermes/Kconfig4
-rw-r--r--src/mainboard/system76/bonw14/Kconfig3
-rw-r--r--src/mainboard/system76/gaze15/Kconfig3
-rw-r--r--src/mainboard/system76/lemp9/Kconfig4
-rw-r--r--src/mainboard/system76/oryp5/Kconfig4
-rw-r--r--src/mainboard/system76/oryp6/Kconfig3
-rw-r--r--src/soc/intel/cannonlake/Kconfig5
8 files changed, 4 insertions, 26 deletions
diff --git a/src/mainboard/clevo/cml-u/Kconfig b/src/mainboard/clevo/cml-u/Kconfig
index 7d7ff8012a..f557e6e7d7 100644
--- a/src/mainboard/clevo/cml-u/Kconfig
+++ b/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
diff --git a/src/mainboard/prodrive/hermes/Kconfig b/src/mainboard/prodrive/hermes/Kconfig
index 49fb6c4c12..e4ccd2d99f 100644
--- a/src/mainboard/prodrive/hermes/Kconfig
+++ b/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
diff --git a/src/mainboard/system76/bonw14/Kconfig b/src/mainboard/system76/bonw14/Kconfig
index 6a83830f8e..b3f1707873 100644
--- a/src/mainboard/system76/bonw14/Kconfig
+++ b/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
diff --git a/src/mainboard/system76/gaze15/Kconfig b/src/mainboard/system76/gaze15/Kconfig
index 2a531684ff..3627cb110b 100644
--- a/src/mainboard/system76/gaze15/Kconfig
+++ b/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
diff --git a/src/mainboard/system76/lemp9/Kconfig b/src/mainboard/system76/lemp9/Kconfig
index 26507b5d93..dbc9de20b8 100644
--- a/src/mainboard/system76/lemp9/Kconfig
+++ b/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
diff --git a/src/mainboard/system76/oryp5/Kconfig b/src/mainboard/system76/oryp5/Kconfig
index bb2a2c732c..9a0a323be9 100644
--- a/src/mainboard/system76/oryp5/Kconfig
+++ b/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
diff --git a/src/mainboard/system76/oryp6/Kconfig b/src/mainboard/system76/oryp6/Kconfig
index e90f6806d1..0aef4a6047 100644
--- a/src/mainboard/system76/oryp6/Kconfig
+++ b/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
diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig
index c0f543e29a..2a66f8a245 100644
--- a/src/soc/intel/cannonlake/Kconfig
+++ b/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