[coreboot-gerrit] Change in coreboot[master]: soc/amd/picasso/soc_util: use socket type detection

[Felix Held (Code Review)]

Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/41518 )

Change subject: soc/amd/picasso/soc_util: use socket type detection
......................................................................

soc/amd/picasso/soc_util: use socket type detection

Remove the Kconfig options for per board socket type selection and use
the runtime detection instead.

Change-Id: I82cf922661c24e2a529fa4927893727b643660e3
Signed-off-by: Felix Held 
---
M src/soc/amd/picasso/Kconfig
M src/soc/amd/picasso/soc_util.c
2 files changed, 3 insertions(+), 13 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/18/41518/1

diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig
index 48e1cc2..71630b8 100644
--- a/src/soc/amd/picasso/Kconfig
+++ b/src/soc/amd/picasso/Kconfig
@@ -53,16 +53,6 @@
    select UDK_2017_BINDING
    select HAVE_CF9_RESET

-config AMD_FP5
-	def_bool y if !AMD_FT5
-	help
-	  The FP5 package supports higher-wattage parts and dual channel DDR4 memory.
-
-config AMD_FT5
-	def_bool n
-	help
-	  The FT5 package supports low-power parts and single-channel DDR4 memory.
-
 config PRERAM_CBMEM_CONSOLE_SIZE
    hex
    default 0x1600
diff --git a/src/soc/amd/picasso/soc_util.c b/src/soc/amd/picasso/soc_util.c
index a70d833..f828110 100644
--- a/src/soc/amd/picasso/soc_util.c
+++ b/src/soc/amd/picasso/soc_util.c
@@ -39,7 +39,7 @@

int soc_is_pollock(void)
 {
-	return soc_is_zen_plus() && CONFIG(AMD_FT5);
+	return soc_is_zen_plus() && get_socket_type() == SOCKET_FT5;
 }

/*
@@ -48,12 +48,12 @@
  */
 int soc_is_dali(void)
 {
-	return soc_is_raven2() && CONFIG(AMD_FP5);
+	return soc_is_raven2() && get_socket_type() == SOCKET_FP5;
 }

int soc_is_picasso(void)
 {
-	return soc_is_zen_plus() && CONFIG(AMD_FP5);
+	return soc_is_zen_plus() && get_socket_type() == SOCKET_FP5;
 }

int soc_is_raven2(void)