summaryrefslogtreecommitdiff
path: root/src/mainboard/gigabyte
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/gigabyte
parent3588d7b76f467c24ae181ace7546ba19b8fcc416 (diff)
downloadcoreboot-b8fba86b143b471a2126411177b0236f08358b8e.tar.xz
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/gigabyte')
-rw-r--r--src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig2
-rw-r--r--src/mainboard/gigabyte/ga-b75m-d3h/Kconfig4
-rw-r--r--src/mainboard/gigabyte/ga-h61m-series/Kconfig4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig b/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig
index 8709083c88..9a8bf5bc90 100644
--- a/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig
+++ b/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig
@@ -43,6 +43,6 @@ config MAX_CPUS
# Override the default variant behavior, since the data.vbt is the same
config INTEL_GMA_VBT_FILE
- default "src/mainboard/$(MAINBOARDDIR)/data.vbt"
+ default "src/mainboard/\$(MAINBOARDDIR)/data.vbt"
endif
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig
index 4eda2676d0..6edbe01c0f 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig
@@ -43,11 +43,11 @@ config MAINBOARD_PART_NUMBER
config OVERRIDE_DEVICETREE
string
- default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" if BOARD_GIGABYTE_GA_B75_D3V
+ default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" if BOARD_GIGABYTE_GA_B75_D3V
# Override the default variant behavior, since the data.vbt is the same
config INTEL_GMA_VBT_FILE
string
- default "src/mainboard/$(MAINBOARDDIR)/data.vbt"
+ default "src/mainboard/\$(MAINBOARDDIR)/data.vbt"
endif # BOARD_GIGABYTE_GA_B75*
diff --git a/src/mainboard/gigabyte/ga-h61m-series/Kconfig b/src/mainboard/gigabyte/ga-h61m-series/Kconfig
index 60d516b261..cfbed99962 100644
--- a/src/mainboard/gigabyte/ga-h61m-series/Kconfig
+++ b/src/mainboard/gigabyte/ga-h61m-series/Kconfig
@@ -36,11 +36,11 @@ config MAINBOARD_PART_NUMBER
config OVERRIDE_DEVICETREE
string
- default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+ default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb"
# Override the default variant behavior, since the data.vbt is the same
config INTEL_GMA_VBT_FILE
- default "src/mainboard/$(MAINBOARDDIR)/data.vbt"
+ default "src/mainboard/\$(MAINBOARDDIR)/data.vbt"
config USBDEBUG_HCD_INDEX # Bottom left port seen from rear
int