Kconfig: Escape variables

New kconfig parsers interpret $(var) themselves, leading to empty
fields. Old kconfig understands \$(var), so use that.

Change-Id: I927fc9dc7a66211bfe51d4324cf7c51b555ea3a8
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/55912
Reviewed-by:  Felix Singer <felixsinger@posteo.net>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Patrick Georgi 2021-06-28 18:16:11 +02:00
parent 8790b9a083
commit 46bee3f48c
7 changed files with 12 additions and 12 deletions

View File

@ -39,7 +39,7 @@ config MAINBOARD_VERSION
config DEVICETREE
string
default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
default "variants/\$(CONFIG_VARIANT_DIR)/devicetree.cb"
config CBFS_SIZE
hex

View File

@ -49,14 +49,14 @@ config CBFS_SIZE
config DEVICETREE
string
default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
default "variants/\$(CONFIG_VARIANT_DIR)/devicetree.cb"
config FMDFILE
string
default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/variants/$(CONFIG_VARIANT_DIR)/fmds/vboot-ro.fmd" if VBOOT && !VBOOT_SLOTS_RW_A
default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/variants/\$(CONFIG_VARIANT_DIR)/fmds/vboot-ro.fmd" if VBOOT && !VBOOT_SLOTS_RW_A
# TODO
# default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/fmds/vboot-roa.fmd" if VBOOT_SLOTS_RW_A && !VBOOT_SLOTS_RW_AB
# default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/fmds/vboot-roab.fmd" if VBOOT_SLOTS_RW_AB
# default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/fmds/vboot-roa.fmd" if VBOOT_SLOTS_RW_A && !VBOOT_SLOTS_RW_AB
# default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/fmds/vboot-roab.fmd" if VBOOT_SLOTS_RW_AB
config DIMM_MAX
int

View File

@ -49,10 +49,10 @@ config MAINBOARD_PART_NUMBER
config DEVICETREE
string
default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
default "variants/\$(CONFIG_VARIANT_DIR)/devicetree.cb"
config OVERRIDE_DEVICETREE
string
default "carriers/$(CONFIG_CARRIER_DIR)/overridetree.cb"
default "carriers/\$(CONFIG_CARRIER_DIR)/overridetree.cb"
endif

View File

@ -37,7 +37,7 @@ config VARIANT_DIR
config DEVICETREE
string
default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
default "variants/\$(CONFIG_VARIANT_DIR)/devicetree.cb"
config CBFS_SIZE
hex

View File

@ -53,11 +53,11 @@ config VARIANT_DIR
config DEVICETREE
string
default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
default "variants/\$(CONFIG_VARIANT_DIR)/devicetree.cb"
config INTEL_GMA_VBT_FILE
string
default "src/mainboard/$(MAINBOARDDIR)/variants/$(CONFIG_VARIANT_DIR)/data.vbt"
default "src/mainboard/\$(MAINBOARDDIR)/variants/\$(CONFIG_VARIANT_DIR)/data.vbt"
config CBFS_SIZE
hex

View File

@ -32,7 +32,7 @@ config VARIANT_DIR
config OVERRIDE_DEVICETREE
string
default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb"
config MAINBOARD_PART_NUMBER
string

View File

@ -32,6 +32,6 @@ config UART_FOR_CONSOLE
config FMDFILE
string
default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/board.fmd"
default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/board.fmd"
endif # BOARD_TI_BEAGLEBONE