summaryrefslogtreecommitdiffstats
path: root/src/mainboard/siemens
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/siemens
parent3588d7b76f467c24ae181ace7546ba19b8fcc416 (diff)
downloadcoreboot-b8fba86b143b471a2126411177b0236f08358b8e.tar.gz
coreboot-b8fba86b143b471a2126411177b0236f08358b8e.tar.bz2
coreboot-b8fba86b143b471a2126411177b0236f08358b8e.zip
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/siemens')
-rw-r--r--src/mainboard/siemens/mc_apl1/Kconfig2
-rw-r--r--src/mainboard/siemens/mc_apl1/variants/mc_apl2/Kconfig2
-rw-r--r--src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig2
-rw-r--r--src/mainboard/siemens/mc_apl1/variants/mc_apl5/Kconfig2
-rw-r--r--src/mainboard/siemens/mc_apl1/variants/mc_apl6/Kconfig2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/mainboard/siemens/mc_apl1/Kconfig b/src/mainboard/siemens/mc_apl1/Kconfig
index 52883b8bf58b..0fe4a25a010e 100644
--- a/src/mainboard/siemens/mc_apl1/Kconfig
+++ b/src/mainboard/siemens/mc_apl1/Kconfig
@@ -26,7 +26,7 @@ config VARIANT_DIR
config DEVICETREE
string
- default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
+ default "variants/\$(CONFIG_VARIANT_DIR)/devicetree.cb"
config MAINBOARD_PART_NUMBER
string
diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl2/Kconfig b/src/mainboard/siemens/mc_apl1/variants/mc_apl2/Kconfig
index 0f32907da2fe..86244a2fe83b 100644
--- a/src/mainboard/siemens/mc_apl1/variants/mc_apl2/Kconfig
+++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl2/Kconfig
@@ -24,6 +24,6 @@ config VBOOT
config FMDFILE
string
- default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/mc_apl_vboot.fmd"
+ default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/mc_apl_vboot.fmd"
endif # BOARD_SIEMENS_MC_APL2
diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig b/src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig
index 55fb4b16bbd0..50a390beb864 100644
--- a/src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig
+++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig
@@ -27,6 +27,6 @@ config VBOOT
config FMDFILE
string
- default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/mc_apl_vboot.fmd"
+ default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/mc_apl_vboot.fmd"
endif # BOARD_SIEMENS_MC_APL4
diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl5/Kconfig b/src/mainboard/siemens/mc_apl1/variants/mc_apl5/Kconfig
index bd0b0d7162b7..71dfa0b2f07d 100644
--- a/src/mainboard/siemens/mc_apl1/variants/mc_apl5/Kconfig
+++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl5/Kconfig
@@ -27,6 +27,6 @@ config VBOOT
config FMDFILE
string
- default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/mc_apl_vboot.fmd"
+ default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/mc_apl_vboot.fmd"
endif # BOARD_SIEMENS_MC_APL5
diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl6/Kconfig b/src/mainboard/siemens/mc_apl1/variants/mc_apl6/Kconfig
index 852294a01de0..b34c9d88e81c 100644
--- a/src/mainboard/siemens/mc_apl1/variants/mc_apl6/Kconfig
+++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl6/Kconfig
@@ -23,6 +23,6 @@ config VBOOT
config FMDFILE
string
- default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/mc_apl_vboot.fmd"
+ default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/mc_apl_vboot.fmd"
endif # BOARD_SIEMENS_MC_APL6