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:
@ -39,7 +39,7 @@ config MAINBOARD_VERSION
|
|||||||
|
|
||||||
config DEVICETREE
|
config DEVICETREE
|
||||||
string
|
string
|
||||||
default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
|
default "variants/\$(CONFIG_VARIANT_DIR)/devicetree.cb"
|
||||||
|
|
||||||
config CBFS_SIZE
|
config CBFS_SIZE
|
||||||
hex
|
hex
|
||||||
|
@ -49,14 +49,14 @@ config CBFS_SIZE
|
|||||||
|
|
||||||
config DEVICETREE
|
config DEVICETREE
|
||||||
string
|
string
|
||||||
default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
|
default "variants/\$(CONFIG_VARIANT_DIR)/devicetree.cb"
|
||||||
|
|
||||||
config FMDFILE
|
config FMDFILE
|
||||||
string
|
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
|
# 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-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-roab.fmd" if VBOOT_SLOTS_RW_AB
|
||||||
|
|
||||||
config DIMM_MAX
|
config DIMM_MAX
|
||||||
int
|
int
|
||||||
|
@ -49,10 +49,10 @@ config MAINBOARD_PART_NUMBER
|
|||||||
|
|
||||||
config DEVICETREE
|
config DEVICETREE
|
||||||
string
|
string
|
||||||
default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
|
default "variants/\$(CONFIG_VARIANT_DIR)/devicetree.cb"
|
||||||
|
|
||||||
config OVERRIDE_DEVICETREE
|
config OVERRIDE_DEVICETREE
|
||||||
string
|
string
|
||||||
default "carriers/$(CONFIG_CARRIER_DIR)/overridetree.cb"
|
default "carriers/\$(CONFIG_CARRIER_DIR)/overridetree.cb"
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
@ -37,7 +37,7 @@ config VARIANT_DIR
|
|||||||
|
|
||||||
config DEVICETREE
|
config DEVICETREE
|
||||||
string
|
string
|
||||||
default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
|
default "variants/\$(CONFIG_VARIANT_DIR)/devicetree.cb"
|
||||||
|
|
||||||
config CBFS_SIZE
|
config CBFS_SIZE
|
||||||
hex
|
hex
|
||||||
|
@ -53,11 +53,11 @@ config VARIANT_DIR
|
|||||||
|
|
||||||
config DEVICETREE
|
config DEVICETREE
|
||||||
string
|
string
|
||||||
default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
|
default "variants/\$(CONFIG_VARIANT_DIR)/devicetree.cb"
|
||||||
|
|
||||||
config INTEL_GMA_VBT_FILE
|
config INTEL_GMA_VBT_FILE
|
||||||
string
|
string
|
||||||
default "src/mainboard/$(MAINBOARDDIR)/variants/$(CONFIG_VARIANT_DIR)/data.vbt"
|
default "src/mainboard/\$(MAINBOARDDIR)/variants/\$(CONFIG_VARIANT_DIR)/data.vbt"
|
||||||
|
|
||||||
config CBFS_SIZE
|
config CBFS_SIZE
|
||||||
hex
|
hex
|
||||||
|
@ -32,7 +32,7 @@ config VARIANT_DIR
|
|||||||
|
|
||||||
config OVERRIDE_DEVICETREE
|
config OVERRIDE_DEVICETREE
|
||||||
string
|
string
|
||||||
default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
|
default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb"
|
||||||
|
|
||||||
config MAINBOARD_PART_NUMBER
|
config MAINBOARD_PART_NUMBER
|
||||||
string
|
string
|
||||||
|
@ -32,6 +32,6 @@ config UART_FOR_CONSOLE
|
|||||||
|
|
||||||
config FMDFILE
|
config FMDFILE
|
||||||
string
|
string
|
||||||
default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/board.fmd"
|
default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/board.fmd"
|
||||||
|
|
||||||
endif # BOARD_TI_BEAGLEBONE
|
endif # BOARD_TI_BEAGLEBONE
|
||||||
|
Reference in New Issue
Block a user