diff options
| author | Tom Rini <[email protected]> | 2020-03-17 09:54:45 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-03-17 09:54:45 -0400 |
| commit | 552c3d4c2d3a98658158fdb7213515d631f5e181 (patch) | |
| tree | 8f69c23d27d458081fd3e3dc9d244cd92ad05c96 /common | |
| parent | e24f0a39d0daa2d8c597650aeb3f559d44a195ae (diff) | |
| parent | 33b40389ea4a3c19a00ff63dafa3ba61d18ef0d9 (diff) | |
Merge branch '2020-03-16-kbuild-etc-resync-v4.18' into next
- Update our Kbuild / Kconfig and relate functionality to be in line
with the Linux kernel v4.18 release.
Diffstat (limited to 'common')
| -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 b03a476b9f6..9d52b75cb43 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 |