summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPatrick Georgi <pgeorgi@google.com>2020-08-19 20:26:17 +0200
committerPatrick Georgi <pgeorgi@google.com>2020-08-20 19:30:00 +0000
commitf290e6298f215e92598144a404571aaf32581154 (patch)
tree4771afad2d6b31dd283cd5222a397026f5f868f7 /src
parent176d005c645339476a97e9afdd1f82896694bb13 (diff)
src/mainboard: Escape variable expansion in Kconfig
Kconfig 5.8 interprets $(...) itself using environment variables, which generally means that they expand to the empty string. \$(...) works with both our current and new Kconfig with the desired behavior (to pass it through unmodified). Change-Id: I726567eeb61d2035560152677d2b4548c1472be9 Signed-off-by: Patrick Georgi <pgeorgi@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/44584 Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/google/dedede/Kconfig4
-rw-r--r--src/mainboard/kontron/bsl6/Kconfig2
-rw-r--r--src/mainboard/ocp/deltalake/Kconfig2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/mainboard/google/dedede/Kconfig b/src/mainboard/google/dedede/Kconfig
index d5057c714f..d4c4d06447 100644
--- a/src/mainboard/google/dedede/Kconfig
+++ b/src/mainboard/google/dedede/Kconfig
@@ -54,8 +54,8 @@ config DRIVER_TPM_SPI_BUS
config FMDFILE
string
- default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/chromeos-dedede-16MiB.fmd" if BOARD_ROMSIZE_KB_16384
- default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/chromeos-dedede-32MiB.fmd" if BOARD_ROMSIZE_KB_32768
+ default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos-dedede-16MiB.fmd" if BOARD_ROMSIZE_KB_16384
+ default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos-dedede-32MiB.fmd" if BOARD_ROMSIZE_KB_32768
config MAINBOARD_DIR
string
diff --git a/src/mainboard/kontron/bsl6/Kconfig b/src/mainboard/kontron/bsl6/Kconfig
index 2da8f44146..437c5a3e52 100644
--- a/src/mainboard/kontron/bsl6/Kconfig
+++ b/src/mainboard/kontron/bsl6/Kconfig
@@ -40,7 +40,7 @@ config VARIANT_DIR
config OVERRIDE_DEVICETREE
string
- default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+ default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb"
config CBFS_SIZE
hex
diff --git a/src/mainboard/ocp/deltalake/Kconfig b/src/mainboard/ocp/deltalake/Kconfig
index fbdb067e1c..b229c94b7d 100644
--- a/src/mainboard/ocp/deltalake/Kconfig
+++ b/src/mainboard/ocp/deltalake/Kconfig
@@ -40,7 +40,7 @@ config MAX_SOCKET
config FMDFILE
string
- default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/board.fmd"
+ default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/board.fmd"
# Deltalake is single socket server, the platform design has 1 DIMM per channel
config DIMM_MAX