From f36c38355b45a03b5ad009fae965024e2bfe5c90 Mon Sep 17 00:00:00 2001 From: Felix Held Date: Mon, 18 May 2020 20:43:49 +0200 Subject: 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/41518 Reviewed-by: Raul Rangel Tested-by: build bot (Jenkins) --- src/soc/amd/picasso/Kconfig | 10 ---------- src/soc/amd/picasso/soc_util.c | 6 +++--- 2 files changed, 3 insertions(+), 13 deletions(-) (limited to 'src/soc') diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig index 48e1cc2e6b..71630b8d9e 100644 --- a/src/soc/amd/picasso/Kconfig +++ b/src/soc/amd/picasso/Kconfig @@ -53,16 +53,6 @@ config CPU_SPECIFIC_OPTIONS 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 a70d833d80..f82811053c 100644 --- a/src/soc/amd/picasso/soc_util.c +++ b/src/soc/amd/picasso/soc_util.c @@ -39,7 +39,7 @@ void print_socket_type(void) 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_pollock(void) */ 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) -- cgit v1.2.3