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>
This commit is contained in:
@@ -21,7 +21,7 @@ config HAVE_IFD_BIN
|
||||
|
||||
config IFD_BIN_PATH
|
||||
string "Path and filename of the descriptor.bin file"
|
||||
default "3rdparty/blobs/mainboard/$(MAINBOARDDIR)/descriptor.bin"
|
||||
default "3rdparty/blobs/mainboard/\$(MAINBOARDDIR)/descriptor.bin"
|
||||
depends on HAVE_IFD_BIN
|
||||
|
||||
config HAVE_ME_BIN
|
||||
@@ -39,7 +39,7 @@ config HAVE_ME_BIN
|
||||
|
||||
config ME_BIN_PATH
|
||||
string "Path to management engine firmware"
|
||||
default "3rdparty/blobs/mainboard/$(MAINBOARDDIR)/me.bin"
|
||||
default "3rdparty/blobs/mainboard/\$(MAINBOARDDIR)/me.bin"
|
||||
depends on HAVE_ME_BIN
|
||||
|
||||
config CHECK_ME
|
||||
@@ -107,7 +107,7 @@ config HAVE_GBE_BIN
|
||||
config GBE_BIN_PATH
|
||||
string "Path to gigabit ethernet configuration"
|
||||
depends on HAVE_GBE_BIN
|
||||
default "3rdparty/blobs/mainboard/$(MAINBOARDDIR)/gbe.bin"
|
||||
default "3rdparty/blobs/mainboard/\$(MAINBOARDDIR)/gbe.bin"
|
||||
|
||||
config MAINBOARD_USES_IFD_EC_REGION
|
||||
def_bool n
|
||||
@@ -125,7 +125,7 @@ config HAVE_EC_BIN
|
||||
config EC_BIN_PATH
|
||||
string "Path to EC firmware"
|
||||
depends on HAVE_EC_BIN
|
||||
default "3rdparty/blobs/mainboard/$(MAINBOARDDIR)/ec.bin"
|
||||
default "3rdparty/blobs/mainboard/\$(MAINBOARDDIR)/ec.bin"
|
||||
|
||||
choice
|
||||
prompt "Protect flash regions"
|
||||
|
Reference in New Issue
Block a user