From dcbdedd8277af4cb3ce65b908ff9811d925eb40d Mon Sep 17 00:00:00 2001 From: Fred Reitberger Date: Tue, 28 Jun 2022 17:13:47 -0400 Subject: soc/amd/common/psp: Revert AMD_SOC_SEPARATE_EFS_SECTION Reverting commit 1e25fd426ad8 ("soc/amd/common/block/psp: introduce AMD_SOC_SEPARATE_EFS_SECTION"). A better solution was used in commit c17330c1dddb ("mb/amd/chausie: Add EC blob into CBFS"), and this is no longer necessary. TEST: Boot chausie Signed-off-by: Fred Reitberger Change-Id: I27a8622a1f0d871690b181a79adca225a20996ea Reviewed-on: https://review.coreboot.org/c/coreboot/+/65492 Tested-by: build bot (Jenkins) Reviewed-by: Felix Held --- src/soc/amd/common/block/psp/Kconfig | 8 -------- src/soc/amd/common/block/psp/Makefile.inc | 5 ----- src/soc/amd/common/block/psp/efs_fmap_check.c | 9 --------- 3 files changed, 22 deletions(-) delete mode 100644 src/soc/amd/common/block/psp/efs_fmap_check.c (limited to 'src/soc/amd/common') diff --git a/src/soc/amd/common/block/psp/Kconfig b/src/soc/amd/common/block/psp/Kconfig index aa638b891110..84e021577a93 100644 --- a/src/soc/amd/common/block/psp/Kconfig +++ b/src/soc/amd/common/block/psp/Kconfig @@ -29,14 +29,6 @@ config SOC_AMD_PSP_SELECTABLE_SMU_FW fanned set of blobs. Ask your AMD representative whether your APU is considered fanless. -config AMD_SOC_SEPARATE_EFS_SECTION - bool - help - Use separate EFS FMAP section instead of putting EFS into CBFS. The - FMAP section must begin exactly at the location the EFS needs to be - placed in the flash. This option can be used to place the EFS right - after the 128kByte EC firmware at the beginning of the flash. - config SOC_AMD_COMMON_BLOCK_PSP_FUSE_SPL bool default n diff --git a/src/soc/amd/common/block/psp/Makefile.inc b/src/soc/amd/common/block/psp/Makefile.inc index 41f6ee252160..5dd7fdd94138 100644 --- a/src/soc/amd/common/block/psp/Makefile.inc +++ b/src/soc/amd/common/block/psp/Makefile.inc @@ -8,11 +8,6 @@ smm-y += psp_smm.c bootblock-y += psp_efs.c verstage-y += psp_efs.c -ifeq ($(CONFIG_AMD_SOC_SEPARATE_EFS_SECTION),y) -bootblock-y += efs_fmap_check.c -$(call src-to-obj,bootblock,$(dir)/efs_fmap_check.c) : $(obj)/fmap_config.h -endif # CONFIG_AMD_SOC_SEPARATE_EFS_SECTION - endif # CONFIG_SOC_AMD_COMMON_BLOCK_PSP ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_PSP_GEN1),y) diff --git a/src/soc/amd/common/block/psp/efs_fmap_check.c b/src/soc/amd/common/block/psp/efs_fmap_check.c deleted file mode 100644 index 44dfe70ee0e1..000000000000 --- a/src/soc/amd/common/block/psp/efs_fmap_check.c +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include -#include -#include -#include - -_Static_assert(FMAP_SECTION_EFS_START == (FLASH_BASE_ADDR + EFS_OFFSET), - "FMAP EFS Offset does not match EFS Offset - check your config"); -- cgit v1.2.3