[coreboot-gerrit] Change in coreboot[master]: soc/amd/picasso: move MAX_CPUS setting from mainboard to SoC Kconfig

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/47205 )

Change subject: soc/amd/picasso: move MAX_CPUS setting from mainboard to SoC Kconfig
......................................................................

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 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/47205
Reviewed-by: Marshall Dawson 
Reviewed-by: Angel Pons 
Tested-by: build bot (Jenkins) 
---
M src/mainboard/amd/mandolin/Kconfig
M src/mainboard/google/zork/Kconfig
M src/soc/amd/picasso/Kconfig
3 files changed, 4 insertions(+), 8 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Marshall Dawson: Looks good to me, approved
  Angel Pons: Looks good to me, approved

diff --git a/src/mainboard/amd/mandolin/Kconfig b/src/mainboard/amd/mandolin/Kconfig
index 8e2bd8b..f4032d4 100644
--- a/src/mainboard/amd/mandolin/Kconfig
+++ b/src/mainboard/amd/mandolin/Kconfig
@@ -52,10 +52,6 @@
    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 c4f6bf7..eb9092a 100644
--- a/src/mainboard/google/zork/Kconfig
+++ b/src/mainboard/google/zork/Kconfig
@@ -96,10 +96,6 @@
    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 605b0ea..bae2d28 100644
--- a/src/soc/amd/picasso/Kconfig
+++ b/src/soc/amd/picasso/Kconfig
@@ -193,6 +193,10 @@
    hex
    default 0x4000000

+config MAX_CPUS
+	int
+	default 8
+
 config VGA_BIOS_ID
    string
    default "1002,15d8,c1"