From ba0483c94a118f32c750d8ebfbed9efd0b58810f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20=C5=BBygowski?= Date: Thu, 4 Dec 2025 14:49:52 +0100 Subject: [PATCH] soc/amd/common/Makefile.mk: Strip quotes from AMDFW_CONFIG_FILE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Strip quotes from CONFIG_AMDFW_CONFIG_FILE, otherwise the IF condition may not catch the case when CONFIG_AMDFW_CONFIG_FILE is an empty string. TEST=Omit PSP blobs when building coreboot for Gigabyte MZ33-AR1 by clearing the AMDFW_CONFIG_FILE path. Change-Id: I1ecf61844c03c89b3429e23936172f79c8d4b2f4 Signed-off-by: Michał Żygowski Reviewed-on: https://review.coreboot.org/c/coreboot/+/90367 Reviewed-by: Paul Menzel Tested-by: build bot (Jenkins) Reviewed-by: Matt DeVillier Reviewed-by: Felix Held --- src/soc/amd/common/Makefile.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/soc/amd/common/Makefile.mk b/src/soc/amd/common/Makefile.mk index 5d41968493..dbf655737f 100644 --- a/src/soc/amd/common/Makefile.mk +++ b/src/soc/amd/common/Makefile.mk @@ -11,7 +11,7 @@ ifneq ($(V),) OPT_DEBUG_AMDFWTOOL = --debug endif -ifneq ($(CONFIG_AMDFW_CONFIG_FILE), ) +ifneq ($(call strip_quotes, $(CONFIG_AMDFW_CONFIG_FILE)),) FIRMWARE_LOCATION=$(shell grep -e FIRMWARE_LOCATION $(CONFIG_AMDFW_CONFIG_FILE) | awk '{print $$2}') # Add all the files listed in the config file to the dependency list @@ -77,7 +77,7 @@ amdfwread-range-cmd = $(shell ( \ )) endif # ifeq ($(CONFIG_VBOOT_GSCVD),y) -endif # ifneq ($(CONFIG_AMDFW_CONFIG_FILE), ) +endif # ifneq ($(call strip_quotes, $(CONFIG_AMDFW_CONFIG_FILE)),) MAINBOARD_BLOBS_DIR := $(call strip_quotes, $(CONFIG_APCB_BLOBS_DIR))