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