From b8fba86b143b471a2126411177b0236f08358b8e Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Wed, 17 Jun 2020 21:06:53 +0200 Subject: Kconfig: Escape variable to accommodate new Kconfig versions Kconfig 4.17 started using the $(..) syntax for environment variable expansion while we want to keep expansion to the build system. Older Kconfig versions (like ours) simply drop the escapes, not changing the behavior. While we could let Kconfig expand some of the variables, that only splits the handling in two places, making debugging harder and potentially messing with reproducible builds (e.g. when paths end up in configs), so escape them all. Change-Id: Ibc4087fdd76089352bd8dd0edb1351ec79ea4faa Signed-off-by: Patrick Georgi Reviewed-on: https://review.coreboot.org/c/coreboot/+/42481 Tested-by: build bot (Jenkins) Reviewed-by: Werner Zeh Reviewed-by: Paul Menzel Reviewed-by: Frans Hendriks Reviewed-by: Wim Vervoorn --- src/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Kconfig') diff --git a/src/Kconfig b/src/Kconfig index 621a582252..1b49e2bd7e 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -417,7 +417,7 @@ config OVERRIDE_DEVICETREE config FMDFILE string "fmap description file in fmd format" - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/chromeos.fmd" if CHROMEOS + default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos.fmd" if CHROMEOS default "" help The build system creates a default FMAP from ROM_SIZE and CBFS_SIZE, @@ -1188,7 +1188,7 @@ config BOOTBLOCK_CUSTOM config MEMLAYOUT_LD_FILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/memlayout.ld" + default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/memlayout.ld" help This variable allows SoC/mainboard to supply in a custom linker file if required. This determines the linker file used for all the stages -- cgit v1.2.3