diff options
| author | Patrick Georgi <pgeorgi@google.com> | 2020-06-17 21:06:53 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2020-06-19 15:29:04 +0000 |
| commit | b8fba86b143b471a2126411177b0236f08358b8e (patch) | |
| tree | e7abb966c6701dc84f3e9023257d3994ad285bfb /src/Kconfig | |
| parent | 3588d7b76f467c24ae181ace7546ba19b8fcc416 (diff) | |
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 <pgeorgi@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42481
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Werner Zeh <werner.zeh@siemens.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Frans Hendriks <fhendriks@eltan.com>
Reviewed-by: Wim Vervoorn <wvervoorn@eltan.com>
Diffstat (limited to 'src/Kconfig')
| -rw-r--r-- | src/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
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 |