| Message ID | 20200311221118.4579-1-trini@konsulko.com |
|---|---|
| State | Accepted |
| Commit | a356e7a86b8356ac69715db5bd93adc4ae7d7ad7 |
| Headers | show |
| Series | [PATCHv2,1/8] spl: Kconfig: Escape '$(ARCH)' in LDSCRIPT entries | expand |
On Thu, Mar 12, 2020 at 7:11 AM Tom Rini <trini at konsulko.com> wrote: > > 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 at kernel.org> > Signed-off-by: Tom Rini <trini at konsulko.com> Reviewed-by: Masahiro Yamada <masahiroy at kernel.org>
On Wed, Mar 11, 2020 at 06:11:11PM -0400, Tom Rini wrote: > 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 at kernel.org> > Signed-off-by: Tom Rini <trini at konsulko.com> > Reviewed-by: Masahiro Yamada <masahiroy at kernel.org> Applied to u-boot/next, thanks!
diff --git a/common/spl/Kconfig b/common/spl/Kconfig index b03a476b9f69..9d52b75cb434 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
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 at kernel.org> Signed-off-by: Tom Rini <trini at konsulko.com> --- Changes in v2: - Only escape common/spl/Kconfig, reword commit. --- common/spl/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)