summaryrefslogtreecommitdiff
path: root/src/drivers
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/drivers
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/drivers')
-rw-r--r--src/drivers/intel/fsp1_1/Kconfig2
-rw-r--r--src/drivers/intel/fsp2_0/Kconfig8
-rw-r--r--src/drivers/wifi/Kconfig2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/drivers/intel/fsp1_1/Kconfig b/src/drivers/intel/fsp1_1/Kconfig
index b1c6898bb4..d2cfa536c7 100644
--- a/src/drivers/intel/fsp1_1/Kconfig
+++ b/src/drivers/intel/fsp1_1/Kconfig
@@ -88,6 +88,6 @@ config FSP1_1_DISPLAY_LOGO
config FSP1_1_LOGO_FILE_NAME
string "Logo file"
depends on FSP1_1_DISPLAY_LOGO
- default "3rdparty/blobs/mainboard/$(MAINBOARDDIR)/logo.bmp"
+ default "3rdparty/blobs/mainboard/\$(MAINBOARDDIR)/logo.bmp"
endif #PLATFORM_USES_FSP1_1
diff --git a/src/drivers/intel/fsp2_0/Kconfig b/src/drivers/intel/fsp2_0/Kconfig
index c7c44cd849..fc1eaf66b4 100644
--- a/src/drivers/intel/fsp2_0/Kconfig
+++ b/src/drivers/intel/fsp2_0/Kconfig
@@ -87,21 +87,21 @@ config FSP_T_FILE
string "Intel FSP-T (temp RAM init) binary path and filename" if !FSP_USE_REPO
depends on ADD_FSP_BINARIES
depends on FSP_CAR
- default "$(obj)/Fsp_T.fd" if FSP_USE_REPO
+ default "\$(obj)/Fsp_T.fd" if FSP_USE_REPO
help
The path and filename of the Intel FSP-T binary for this platform.
config FSP_M_FILE
string "Intel FSP-M (memory init) binary path and filename" if !FSP_USE_REPO
depends on ADD_FSP_BINARIES
- default "$(obj)/Fsp_M.fd" if FSP_USE_REPO
+ default "\$(obj)/Fsp_M.fd" if FSP_USE_REPO
help
The path and filename of the Intel FSP-M binary for this platform.
config FSP_S_FILE
string "Intel FSP-S (silicon init) binary path and filename" if !FSP_USE_REPO
depends on ADD_FSP_BINARIES
- default "$(obj)/Fsp_S.fd" if FSP_USE_REPO
+ default "\$(obj)/Fsp_S.fd" if FSP_USE_REPO
help
The path and filename of the Intel FSP-S binary for this platform.
@@ -192,7 +192,7 @@ config FSP2_0_DISPLAY_LOGO
config FSP2_0_LOGO_FILE_NAME
string "Logo file"
depends on FSP2_0_DISPLAY_LOGO
- default "3rdparty/blobs/mainboard/$(MAINBOARDDIR)/logo.bmp"
+ default "3rdparty/blobs/mainboard/\$(MAINBOARDDIR)/logo.bmp"
config FSP_COMPRESS_FSP_S_LZMA
bool
diff --git a/src/drivers/wifi/Kconfig b/src/drivers/wifi/Kconfig
index 9b87f844f6..11ac7c1464 100644
--- a/src/drivers/wifi/Kconfig
+++ b/src/drivers/wifi/Kconfig
@@ -45,7 +45,7 @@ config WIFI_SAR_CBFS
config WIFI_SAR_CBFS_FILEPATH
string "The cbfs file which has WIFI SAR defaults"
depends on WIFI_SAR_CBFS
- default "src/mainboard/$(MAINBOARDDIR)/wifi_sar_defaults.hex"
+ default "src/mainboard/\$(MAINBOARDDIR)/wifi_sar_defaults.hex"
config DSAR_SET_NUM
hex "Number of SAR sets when D-SAR is enabled"