sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Kconfig: Escape variable to accommodate new Kconfig versions

Browse Source 
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:
Patrick Georgi
2020-06-17 21:06:53 +02:00
parent 3588d7b76f
commit b8fba86b14
90 changed files with 151 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mainboard/intel/cannonlake_rvp/Kconfig
View File

@@ -38,7 +38,7 @@ config MAX_CPUS
config DEVICETREE
string
default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
default "variants/\$(CONFIG_VARIANT_DIR)/devicetree.cb"
config INCLUDE_SND_MAX98357_DA7219_NHLT
bool "Include blobs for audio with MAX98357_DA7219"

2
src/mainboard/intel/cedarisland_crb/Kconfig
View File

@@ -18,6 +18,6 @@ config MAINBOARD_PART_NUMBER
config FMDFILE
string
default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/board.fmd"
default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/board.fmd"
endif

6
src/mainboard/intel/coffeelake_rvp/Kconfig
View File

@@ -64,13 +64,13 @@ config DEVICETREE
config OVERRIDE_DEVICETREE
string
default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb"
config FMDFILE
string
depends on VBOOT
default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/chromeos.fmd" if BOARD_ROMSIZE_KB_16384
default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/chromeos_32MB.fmd" if BOARD_ROMSIZE_KB_32768
default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos.fmd" if BOARD_ROMSIZE_KB_16384
default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos_32MB.fmd" if BOARD_ROMSIZE_KB_32768
config INCLUDE_SND_MAX98357_DA7219_NHLT
bool "Include blobs for audio with MAX98357_DA7219"

2
src/mainboard/intel/galileo/Kconfig
View File

@@ -107,7 +107,7 @@ config DRIVER_TPM_I2C_ADDR
config FMDFILE
string "FMAP description file in fmd format"
depends on VBOOT
default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot.fmd"
default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot.fmd"
help
The build system creates a default FMAP from ROM_SIZE and CBFS_SIZE,
but in some cases more complex setups are required.

2
src/mainboard/intel/icelake_rvp/Kconfig
View File

@@ -40,7 +40,7 @@ config MAX_CPUS
config DEVICETREE
string
default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
default "variants/\$(CONFIG_VARIANT_DIR)/devicetree.cb"
config DIMM_SPD_SIZE
int

2
src/mainboard/intel/jasperlake_rvp/Kconfig
View File

@@ -37,7 +37,7 @@ config MAX_CPUS
config DEVICETREE
string
default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
default "variants/\$(CONFIG_VARIANT_DIR)/devicetree.cb"
config DIMM_SPD_SIZE
int

14
src/mainboard/intel/kblrvp/Kconfig
View File

@@ -57,21 +57,21 @@ config DEVICETREE
config OVERRIDE_DEVICETREE
string
default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb"
config IFD_BIN_PATH
string
depends on HAVE_IFD_BIN
default "3rdparty/blobs/mainboard/$(CONFIG_MAINBOARD_DIR)/descriptor.rvp3.bin" if BOARD_INTEL_KBLRVP3
default "3rdparty/blobs/mainboard/$(CONFIG_MAINBOARD_DIR)/descriptor.rvp7.bin" if BOARD_INTEL_KBLRVP7
default "3rdparty/blobs/mainboard/$(CONFIG_MAINBOARD_DIR)/descriptor.rvp8.bin" if BOARD_INTEL_KBLRVP8
default "3rdparty/blobs/mainboard/\$(CONFIG_MAINBOARD_DIR)/descriptor.rvp3.bin" if BOARD_INTEL_KBLRVP3
default "3rdparty/blobs/mainboard/\$(CONFIG_MAINBOARD_DIR)/descriptor.rvp7.bin" if BOARD_INTEL_KBLRVP7
default "3rdparty/blobs/mainboard/\$(CONFIG_MAINBOARD_DIR)/descriptor.rvp8.bin" if BOARD_INTEL_KBLRVP8
config ME_BIN_PATH
string
depends on HAVE_ME_BIN
default "3rdparty/blobs/mainboard/$(CONFIG_MAINBOARD_DIR)/me.rvp3.bin" if BOARD_INTEL_KBLRVP3
default "3rdparty/blobs/mainboard/$(CONFIG_MAINBOARD_DIR)/me.rvp7.bin" if BOARD_INTEL_KBLRVP7
default "3rdparty/blobs/mainboard/$(CONFIG_MAINBOARD_DIR)/me.rvp8.bin" if BOARD_INTEL_KBLRVP8
default "3rdparty/blobs/mainboard/\$(CONFIG_MAINBOARD_DIR)/me.rvp3.bin" if BOARD_INTEL_KBLRVP3
default "3rdparty/blobs/mainboard/\$(CONFIG_MAINBOARD_DIR)/me.rvp7.bin" if BOARD_INTEL_KBLRVP7
default "3rdparty/blobs/mainboard/\$(CONFIG_MAINBOARD_DIR)/me.rvp8.bin" if BOARD_INTEL_KBLRVP8
config PRERAM_CBMEM_CONSOLE_SIZE
hex

2
src/mainboard/intel/leafhill/Kconfig
View File

@@ -17,7 +17,7 @@ config MAINBOARD_PART_NUMBER
config FMDFILE
string
default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/leafhill.$(CONFIG_COREBOOT_ROMSIZE_KB).fmd"
default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/leafhill.\$(CONFIG_COREBOOT_ROMSIZE_KB).fmd"
config UART_FOR_CONSOLE
default 2

2
src/mainboard/intel/minnow3/Kconfig
View File

@@ -17,7 +17,7 @@ config MAINBOARD_PART_NUMBER
config FMDFILE
string
default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/minnow3.fmd"
default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/minnow3.fmd"
config UART_FOR_CONSOLE
default 2

2
src/mainboard/intel/tglrvp/Kconfig
View File

@@ -51,7 +51,7 @@ config MAX_CPUS
config DEVICETREE
string
default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
default "variants/\$(CONFIG_VARIANT_DIR)/devicetree.cb"
config DIMM_SPD_SIZE
int