From 1c9a5ccbe5cb66fad2dfa93382e1a94170721c7f Mon Sep 17 00:00:00 2001 From: Raul E Rangel Date: Wed, 16 Dec 2020 10:35:49 -0700 Subject: [PATCH] soc/amd/picasso: Disable CBFS MCACHE again This is still causing boot errors on zork: coreboot-4.13-3659-g269e03d5c42f Fri May 7 22:03:11 UTC 2021 bootblock starting (log level: 8)... Family_Model: 00820f01 PSP boot mode: Development Silicon level: Pre-Production Set power off after power failure. PMxC0 STATUS: 0x800 BIT11 I2C bus 3 version 0x3132322a DW I2C bus 3 at 0xfedc5000 (400 KHz) FMAP: area COREBOOT found @ 875000 (7909376 bytes) ASSERTION ERROR: file 'src/commonlib/bsd/cbfs_mcache.c', line 106 BUG=b:177323348 TEST=Boot ezkinil to OS Signed-off-by: Raul E Rangel Change-Id: I68b4b73670e750207414f0d85ff96f21481be8ce Reviewed-on: https://review.coreboot.org/c/coreboot/+/53933 Reviewed-by: Martin Roth Tested-by: build bot (Jenkins) --- src/soc/amd/picasso/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig index e69fb62c19..55b38c0df0 100644 --- a/src/soc/amd/picasso/Kconfig +++ b/src/soc/amd/picasso/Kconfig @@ -66,6 +66,7 @@ config CPU_SPECIFIC_OPTIONS select FSP_COMPRESS_FSP_S_LZMA select UDK_2017_BINDING select HAVE_CF9_RESET + select NO_CBFS_MCACHE if VBOOT_STARTS_BEFORE_BOOTBLOCK config SOC_AMD_COMMON_BLOCK_UCODE_SIZE default 3200