From f225d761ba1ae6dea878c33668b590fe94293fe5 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Sat, 8 Oct 2022 15:23:59 -0600 Subject: soc/amd/common: Remove buildtime error for unknown cpu This is not critical functionality and doesn't need a build-time error. Having it as a build time error causes a chicken & egg issue where the chipset needs to be added before it can be added to this file, but the header file fails the build because the chipset is unknown. It's not practical to exclude these files from the new platform builds because the PSP functionality is thoroughly embedded into the coreboot structure. Signed-off-by: Martin Roth Change-Id: Ib02bbe1f9ffb343e1ff7c2bfdc45e7edffe7aaed Reviewed-on: https://review.coreboot.org/c/coreboot/+/68245 Tested-by: build bot (Jenkins) Reviewed-by: Marshall Dawson Reviewed-by: Fred Reitberger Reviewed-by: Paul Menzel --- src/soc/amd/common/block/include/amdblocks/psp_efs.h | 3 --- src/soc/amd/common/block/psp/psp_efs.c | 7 +++++++ 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src/soc/amd/common') diff --git a/src/soc/amd/common/block/include/amdblocks/psp_efs.h b/src/soc/amd/common/block/include/amdblocks/psp_efs.h index 1f93807538..51b06a6810 100644 --- a/src/soc/amd/common/block/include/amdblocks/psp_efs.h +++ b/src/soc/amd/common/block/include/amdblocks/psp_efs.h @@ -19,11 +19,8 @@ #elif CONFIG(SOC_AMD_CEZANNE) | CONFIG(SOC_AMD_MENDOCINO) #define SPI_MODE_FIELD spi_readmode_f17_mod_30_3f #define SPI_SPEED_FIELD spi_fastspeed_f17_mod_30_3f -#else - #error #endif - struct second_gen_efs { /* todo: expand for Server products */ uint32_t gen:1; /* Client products only use bit 0 */ uint32_t reserved:31; diff --git a/src/soc/amd/common/block/psp/psp_efs.c b/src/soc/amd/common/block/psp/psp_efs.c index feb0276463..eacd5f637c 100644 --- a/src/soc/amd/common/block/psp/psp_efs.c +++ b/src/soc/amd/common/block/psp/psp_efs.c @@ -2,6 +2,7 @@ #include #include +#include #include #include #include @@ -24,7 +25,13 @@ bool read_efs_spi_settings(uint8_t *mode, uint8_t *speed) if (!efs_is_valid()) return false; +#ifndef SPI_MODE_FIELD + printk(BIOS_ERR, "Unknown cpu in psp_efs.h\n"); + printk(BIOS_ERR, "SPI speed/mode not set.\n"); + return false; +#else *mode = efs->SPI_MODE_FIELD; *speed = efs->SPI_SPEED_FIELD; return true; +#endif } -- cgit v1.2.3