sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Kconfig: Escape variable to accommodate new Kconfig versions

Browse Source 
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>
This commit is contained in:
Patrick Georgi
2020-06-17 21:06:53 +02:00
parent 3588d7b76f
commit b8fba86b14
90 changed files with 151 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/device/Kconfig
View File

@@ -779,10 +779,10 @@ config INTEL_GMA_ADD_VBT
config INTEL_GMA_VBT_FILE
string "VBT binary path and filename"
depends on INTEL_GMA_ADD_VBT
default "src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt" \
default "src/mainboard/\$(MAINBOARDDIR)/variants/\$(VARIANT_DIR)/data.vbt" \
if INTEL_GMA_HAVE_VBT && VARIANT_DIR != ""
default "src/mainboard/$(MAINBOARDDIR)/data.vbt" if INTEL_GMA_HAVE_VBT
default "3rdparty/blobs/mainboard/$(MAINBOARDDIR)/vbt.bin"
default "src/mainboard/\$(MAINBOARDDIR)/data.vbt" if INTEL_GMA_HAVE_VBT
default "3rdparty/blobs/mainboard/\$(MAINBOARDDIR)/vbt.bin"
help
The path and filename of the VBT binary.