diff options
| author | Patrick Georgi <pgeorgi@google.com> | 2020-06-17 21:06:53 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2020-06-19 15:29:04 +0000 |
| commit | b8fba86b143b471a2126411177b0236f08358b8e (patch) | |
| tree | e7abb966c6701dc84f3e9023257d3994ad285bfb /src/security | |
| parent | 3588d7b76f467c24ae181ace7546ba19b8fcc416 (diff) | |
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/security')
| -rw-r--r-- | src/security/vboot/Kconfig | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/security/vboot/Kconfig b/src/security/vboot/Kconfig index 0637edce01..ad5b61e267 100644 --- a/src/security/vboot/Kconfig +++ b/src/security/vboot/Kconfig @@ -181,15 +181,15 @@ config VBOOT_WIPEOUT_SUPPORTED config VBOOT_FWID_MODEL string "Firmware ID model" - default "Google_$(CONFIG_MAINBOARD_PART_NUMBER)" if CHROMEOS - default "$(CONFIG_MAINBOARD_VENDOR)_$(CONFIG_MAINBOARD_PART_NUMBER)" + default "Google_\$(CONFIG_MAINBOARD_PART_NUMBER)" if CHROMEOS + default "\$(CONFIG_MAINBOARD_VENDOR)_\$(CONFIG_MAINBOARD_PART_NUMBER)" help This is the first part of the FWID written to various regions of a vboot firmware image to identify its version. config VBOOT_FWID_VERSION string "Firmware ID version" - default ".$(KERNELVERSION)" + default ".\$(KERNELVERSION)" help This is the second part of the FWID written to various regions of a vboot firmware image to identify its version. @@ -326,23 +326,23 @@ endmenu # GBB menu "Vboot Keys" config VBOOT_ROOT_KEY string "Root key (public)" - default "$(VBOOT_SOURCE)/tests/devkeys/root_key.vbpubk" + default "\$(VBOOT_SOURCE)/tests/devkeys/root_key.vbpubk" config VBOOT_RECOVERY_KEY string "Recovery key (public)" - default "$(VBOOT_SOURCE)/tests/devkeys/recovery_key.vbpubk" + default "\$(VBOOT_SOURCE)/tests/devkeys/recovery_key.vbpubk" config VBOOT_FIRMWARE_PRIVKEY string "Firmware key (private)" - default "$(VBOOT_SOURCE)/tests/devkeys/firmware_data_key.vbprivk" + default "\$(VBOOT_SOURCE)/tests/devkeys/firmware_data_key.vbprivk" config VBOOT_KERNEL_KEY string "Kernel subkey (public)" - default "$(VBOOT_SOURCE)/tests/devkeys/kernel_subkey.vbpubk" + default "\$(VBOOT_SOURCE)/tests/devkeys/kernel_subkey.vbpubk" config VBOOT_KEYBLOCK string "Keyblock to use for the RW regions" - default "$(VBOOT_SOURCE)/tests/devkeys/firmware.keyblock" + default "\$(VBOOT_SOURCE)/tests/devkeys/firmware.keyblock" config VBOOT_KEYBLOCK_VERSION int "Keyblock version number" |