From 21c70b1d0b1ebfde3f4d0aa1f45342e377be2e15 Mon Sep 17 00:00:00 2001 From: Raul E Rangel Date: Fri, 16 Jul 2021 14:36:01 -0600 Subject: [PATCH] soc/amd/{cezanne,picasso}: Escape PSP_VERSTAGE_FILE default If we don't escape the $ then the actual $(obj) path will be written into the .config file. With this change `$(obj)` is written into the .config file. The Makefile then does: PSP_VERSTAGE_FILE=$(call strip_quotes,$(CONFIG_PSP_VERSTAGE_FILE)) Since this is a recursive assignment the $(obj) will be expanded at that point. This change makes it easier to compare full .config files. BUG=none TEST=Build ezkinil Signed-off-by: Raul E Rangel Change-Id: Ic961df148d3f22585f3441d75c3f2454329c678a Reviewed-on: https://review.coreboot.org/c/coreboot/+/56395 Tested-by: build bot (Jenkins) Reviewed-by: Kangheui Won --- src/soc/amd/cezanne/Kconfig | 2 +- src/soc/amd/picasso/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/soc/amd/cezanne/Kconfig b/src/soc/amd/cezanne/Kconfig index b58e45398e..fab31d4f0e 100644 --- a/src/soc/amd/cezanne/Kconfig +++ b/src/soc/amd/cezanne/Kconfig @@ -379,7 +379,7 @@ config PSP_SOFTFUSE_BITS config PSP_VERSTAGE_FILE string "Specify the PSP_verstage file path" depends on VBOOT_STARTS_BEFORE_BOOTBLOCK - default "$(obj)/psp_verstage.bin" + default "\$(obj)/psp_verstage.bin" help Add psp_verstage file to the build & PSP Directory Table diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig index 88bff50179..eb1780ae8d 100644 --- a/src/soc/amd/picasso/Kconfig +++ b/src/soc/amd/picasso/Kconfig @@ -432,7 +432,7 @@ config PSP_UNLOCK_SECURE_DEBUG config PSP_VERSTAGE_FILE string "Specify the PSP_verstage file path" depends on VBOOT_STARTS_BEFORE_BOOTBLOCK - default "$(obj)/psp_verstage.bin" + default "\$(obj)/psp_verstage.bin" help Add psp_verstage file to the build & PSP Directory Table