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 <felix-coreboot@felixheld.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/41518
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Felix Held 2020-05-18 20:43:49 +02:00 committed by Felix Held
parent bf21308705
commit f36c38355b
2 changed files with 3 additions and 13 deletions

View File

@ -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

View File

@ -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)