aboutsummaryrefslogtreecommitdiff
path: root/src/mainboard/purism
diff options
context:
space:
mode:
authorPatrick Georgi <pgeorgi@google.com>2020-06-17 21:06:53 +0200
committerPatrick Georgi <pgeorgi@google.com>2020-06-19 15:29:04 +0000
commitb8fba86b143b471a2126411177b0236f08358b8e (patch)
treee7abb966c6701dc84f3e9023257d3994ad285bfb /src/mainboard/purism
parent3588d7b76f467c24ae181ace7546ba19b8fcc416 (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/mainboard/purism')
-rw-r--r--src/mainboard/purism/librem_bdw/Kconfig4
-rw-r--r--src/mainboard/purism/librem_skl/Kconfig4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mainboard/purism/librem_bdw/Kconfig b/src/mainboard/purism/librem_bdw/Kconfig
index 202a35d79e..275594b48d 100644
--- a/src/mainboard/purism/librem_bdw/Kconfig
+++ b/src/mainboard/purism/librem_bdw/Kconfig
@@ -19,7 +19,7 @@ config VARIANT_DIR
config OVERRIDE_DEVICETREE
string
- default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+ default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb"
config DRIVERS_UART_8250IO
def_bool n
@@ -68,7 +68,7 @@ config VGA_BIOS_ID
# Override the default variant behavior, since the data.vbt is the same
# for both variants.
config INTEL_GMA_VBT_FILE
- default "src/mainboard/$(MAINBOARDDIR)/data.vbt"
+ default "src/mainboard/\$(MAINBOARDDIR)/data.vbt"
# This platform has limited means to display POST codes
config NO_POST
diff --git a/src/mainboard/purism/librem_skl/Kconfig b/src/mainboard/purism/librem_skl/Kconfig
index c86ebf18e9..cd8fc66c1c 100644
--- a/src/mainboard/purism/librem_skl/Kconfig
+++ b/src/mainboard/purism/librem_skl/Kconfig
@@ -45,7 +45,7 @@ config MAINBOARD_DIR
config OVERRIDE_DEVICETREE
string
- default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+ default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb"
config MAX_CPUS
int
@@ -59,7 +59,7 @@ config VGA_BIOS_ID
# Override the default variant behavior, since same VBT
# is used for all variants.
config INTEL_GMA_VBT_FILE
- default "src/mainboard/$(MAINBOARDDIR)/data.vbt"
+ default "src/mainboard/\$(MAINBOARDDIR)/data.vbt"
config DIMM_MAX
int