From: Tom Rini <trini@konsulko.com>
To: u-boot@lists.denx.de
Subject: [PATCH 3/7] Kconfig: Escape variables to make in default strings
Date: Mon, 24 Feb 2020 13:05:37 -0500 [thread overview]
Message-ID: <20200224180541.3654-3-trini@konsulko.com> (raw)
In-Reply-To: <20200224180541.3654-1-trini@konsulko.com>
We have some variables that need to include a variable to pass to make
to evaluate later, typically ARCH and BOARDDIR, to find a file to use.
The way we're doing this today isn't correct but works. With an update
to Kconfig we will need to escape these properly, so do so.
Cc: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
arch/arm/mach-davinci/Kconfig | 2 +-
arch/arm/mach-orion5x/Kconfig | 2 +-
common/spl/Kconfig | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig
index 8a81c078811d..83f749c0440a 100644
--- a/arch/arm/mach-davinci/Kconfig
+++ b/arch/arm/mach-davinci/Kconfig
@@ -135,6 +135,6 @@ source "board/davinci/da8xxevm/Kconfig"
source "board/lego/ev3/Kconfig"
config SPL_LDSCRIPT
- default "board/$(BOARDDIR)/u-boot-spl-da850evm.lds"
+ default "board/\$(BOARDDIR)/u-boot-spl-da850evm.lds"
endif
diff --git a/arch/arm/mach-orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig
index 2984a3edda21..c4bc524eb81e 100644
--- a/arch/arm/mach-orion5x/Kconfig
+++ b/arch/arm/mach-orion5x/Kconfig
@@ -16,6 +16,6 @@ config SYS_SOC
source "board/LaCie/edminiv2/Kconfig"
config SPL_LDSCRIPT
- default "$(CPUDIR)/orion5x/u-boot-spl.lds" if ORION5X
+ default "\$(CPUDIR)/orion5x/u-boot-spl.lds" if ORION5X
endif
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
--
2.17.1
next prev parent reply other threads:[~2020-02-24 18:05 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-24 18:05 [PATCH 1/7] misc: Add more -I$(objtree)/$(obj) lines Tom Rini
2020-02-24 18:05 ` [PATCH 2/7] mx31pdk: Move CONFIG_SPL_LDSCRIPT to defconfig Tom Rini
2020-02-24 19:22 ` Magnus Lilja
2020-03-17 15:30 ` Tom Rini
2020-02-24 18:05 ` Tom Rini [this message]
2020-02-26 2:35 ` [PATCH 3/7] Kconfig: Escape variables to make in default strings Masahiro Yamada
2020-02-26 15:22 ` Tom Rini
2020-02-24 18:05 ` [PATCH 4/7] Kconfig: Remove redundant variable sets Tom Rini
2020-02-26 2:41 ` Masahiro Yamada
2020-02-26 15:23 ` Tom Rini
2020-02-24 18:05 ` [PATCH 5/7] Azure / GitLab / Travis: Add Kconfig unit tests to a job Tom Rini
2020-02-26 2:44 ` Masahiro Yamada
2020-02-24 18:05 ` [PATCH 6/7] scripts/dtc: Update to upstream version v1.4.6-21-g84e414b0b5bc Tom Rini
2020-02-24 18:05 ` [PATCH 7/7] kconfig / kbuild: re-sync with Linux 4.18 Tom Rini
2020-02-26 1:04 ` Masahiro Yamada
2020-02-26 3:32 ` Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200224180541.3654-3-trini@konsulko.com \
--to=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox