leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spl: Kconfig: Escape '$(ARCH)' in LDSCRIPT entries

Browse Source 
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>
This commit is contained in:
Tom Rini 2020-03-11 18:11:11 -04:00
parent ddb87a0b40
commit a356e7a86b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/spl/Kconfig
View File

@ -139,7 +139,7 @@ config SPL_HANDOFF
config SPL_LDSCRIPT config SPL_LDSCRIPT
string "Linker script for the SPL stage" string "Linker script for the SPL stage"
default "arch/$(ARCH)/cpu/u-boot-spl.lds" default "arch/\$(ARCH)/cpu/u-boot-spl.lds"
help help
The SPL stage will usually require a different linker-script The SPL stage will usually require a different linker-script
(as it runs from a different memory region) than the regular (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" string "Linker script for the TPL stage"
depends on TPL depends on TPL
default "arch/arm/cpu/armv8/u-boot-spl.lds" if ARM64 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 help
The TPL stage will usually require a different linker-script The TPL stage will usually require a different linker-script
(as it runs from a different memory region) than the regular (as it runs from a different memory region) than the regular