diff options
author | Tom Rini <trini@konsulko.com> | 2020-03-12 01:11:11 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-03-16 23:42:50 +0300 |
commit | a356e7a86b8356ac69715db5bd93adc4ae7d7ad7 (patch) | |
tree | 31366098f2454557f1ec45107453b90591ec41fe | |
parent | ddb87a0b40262ff99d675e946f57427642303938 (diff) | |
download | u-boot-a356e7a86b8356ac69715db5bd93adc4ae7d7ad7.tar.xz |
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 <masahiroy@kernel.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Masahiro Yamada <masahiroy@kernel.org>
-rw-r--r-- | common/spl/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
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 |