From: Tom Rini Date: Wed, 11 Mar 2020 22:11:11 +0000 (-0400) Subject: spl: Kconfig: Escape '$(ARCH)' in LDSCRIPT entries X-Git-Tag: v2020.07-rc1~41^2~9^2~8 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a356e7a86b8356ac69715db5bd93adc4ae7d7ad7;p=oweals%2Fu-boot.git spl: Kconfig: Escape '$(ARCH)' in LDSCRIPT entries The default SPL / TPL linker script is in the $(ARCH) directory. The way we use this today works but isn't ideal. With an update to Kconfig to re-sync with the Linux Kernel, we need to escape the '$' here so that it will end up being evaluated by make. Cc: Masahiro Yamada Signed-off-by: Tom Rini Reviewed-by: Masahiro Yamada --- diff --git a/common/spl/Kconfig b/common/spl/Kconfig index b03a476b9f..9d52b75cb4 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -139,7 +139,7 @@ config SPL_HANDOFF config SPL_LDSCRIPT string "Linker script for the SPL stage" - default "arch/$(ARCH)/cpu/u-boot-spl.lds" + default "arch/\$(ARCH)/cpu/u-boot-spl.lds" help The SPL stage will usually require a different linker-script (as it runs from a different memory region) than the regular @@ -1306,7 +1306,7 @@ config TPL_LDSCRIPT string "Linker script for the TPL stage" depends on TPL default "arch/arm/cpu/armv8/u-boot-spl.lds" if ARM64 - default "arch/$(ARCH)/cpu/u-boot-spl.lds" + default "arch/\$(ARCH)/cpu/u-boot-spl.lds" help The TPL stage will usually require a different linker-script (as it runs from a different memory region) than the regular