summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Held <felix-coreboot@felixheld.de>2020-11-04 16:19:35 +0100
committerFelix Held <felix-coreboot@felixheld.de>2020-11-05 19:57:14 +0000
commit1032d22152f1889246cda62e767af1da24407089 (patch)
tree7f33b685430c9069d7aed405caff6fa7f1a372f2
parentb5d9f4a1cfc4022e63a3d47e817920fc5375c952 (diff)
soc/amd/picasso: move MAX_CPUS setting from mainboard to SoC Kconfig
Since the mainboard Kconfig is sourced before the SoC one, it would still be possible to override this setting at mainboard level, even though that shouldn't be needed. The maximum CPU count for Picasso is 8, since the chips have only up to 4 cores with up to two threads each. Change-Id: I53449b8fa73c5d13e6ea77bee6eed8896b7d3ec3 Signed-off-by: Felix Held <felix-coreboot@felixheld.de> Reviewed-on: https://review.coreboot.org/c/coreboot/+/47205 Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/mainboard/amd/mandolin/Kconfig4
-rw-r--r--src/mainboard/google/zork/Kconfig4
-rw-r--r--src/soc/amd/picasso/Kconfig4
3 files changed, 4 insertions, 8 deletions
diff --git a/src/mainboard/amd/mandolin/Kconfig b/src/mainboard/amd/mandolin/Kconfig
index 8e2bd8ba28..f4032d4e1d 100644
--- a/src/mainboard/amd/mandolin/Kconfig
+++ b/src/mainboard/amd/mandolin/Kconfig
@@ -52,10 +52,6 @@ config DEVICETREE
string
default "variants/\$(CONFIG_VARIANT_DIR)/devicetree.cb"
-config MAX_CPUS
- int
- default 8
-
config ONBOARD_VGA_IS_PRIMARY
bool
default y
diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig
index c4f6bf73c4..eb9092a6d1 100644
--- a/src/mainboard/google/zork/Kconfig
+++ b/src/mainboard/google/zork/Kconfig
@@ -96,10 +96,6 @@ config MAINBOARD_FAMILY
string
default "Google_Zork"
-config MAX_CPUS
- int
- default 8
-
config ONBOARD_VGA_IS_PRIMARY
bool
default y
diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig
index 605b0eacea..bae2d2868a 100644
--- a/src/soc/amd/picasso/Kconfig
+++ b/src/soc/amd/picasso/Kconfig
@@ -193,6 +193,10 @@ config VERSTAGE_ADDR
hex
default 0x4000000
+config MAX_CPUS
+ int
+ default 8
+
config VGA_BIOS_ID
string
default "1002,15d8,c1"