From b8fba86b143b471a2126411177b0236f08358b8e Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Wed, 17 Jun 2020 21:06:53 +0200 Subject: 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/42481 Tested-by: build bot (Jenkins) Reviewed-by: Werner Zeh Reviewed-by: Paul Menzel Reviewed-by: Frans Hendriks Reviewed-by: Wim Vervoorn --- src/mainboard/asus/p2b/Kconfig | 2 +- src/mainboard/asus/p5qc/Kconfig | 4 ++-- src/mainboard/asus/p5qpl-am/Kconfig | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/mainboard/asus') diff --git a/src/mainboard/asus/p2b/Kconfig b/src/mainboard/asus/p2b/Kconfig index f21de714c8..00295be947 100644 --- a/src/mainboard/asus/p2b/Kconfig +++ b/src/mainboard/asus/p2b/Kconfig @@ -49,7 +49,7 @@ config VARIANT_DIR config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config IRQ_SLOT_COUNT int diff --git a/src/mainboard/asus/p5qc/Kconfig b/src/mainboard/asus/p5qc/Kconfig index 41c11c0288..a0fddfb1f1 100644 --- a/src/mainboard/asus/p5qc/Kconfig +++ b/src/mainboard/asus/p5qc/Kconfig @@ -35,7 +35,7 @@ config MAINBOARD_PART_NUMBER config DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb" + default "variants/\$(CONFIG_VARIANT_DIR)/devicetree.cb" config GPIO_C string @@ -50,6 +50,6 @@ config GPIO_C config PAYLOAD_CONFIGFILE string default "" if PAYLOAD_SEABIOS && BOARD_ASUS_P5QL_PRO - default "$(top)/src/mainboard/$(MAINBOARDDIR)/config_seabios" if PAYLOAD_SEABIOS + default "\$(top)/src/mainboard/\$(MAINBOARDDIR)/config_seabios" if PAYLOAD_SEABIOS endif # BOARD_ASUS_P5Q* diff --git a/src/mainboard/asus/p5qpl-am/Kconfig b/src/mainboard/asus/p5qpl-am/Kconfig index 07ba8def29..cfa4c59aa9 100644 --- a/src/mainboard/asus/p5qpl-am/Kconfig +++ b/src/mainboard/asus/p5qpl-am/Kconfig @@ -35,10 +35,10 @@ config MAINBOARD_PART_NUMBER config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" # Override the default variant behavior, since the data.vbt is the same config INTEL_GMA_VBT_FILE - default "src/mainboard/$(MAINBOARDDIR)/data.vbt" + default "src/mainboard/\$(MAINBOARDDIR)/data.vbt" endif # BOARD_ASUS_P5QPL_AM || BOARD_ASUS_P5G41T_M_LX -- cgit v1.2.3