From: andrej.rosano at f-secure.com <andrej.rosano@f-secure.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] Drop linker-generated array creation when CONFIG_CMDLINE is disabled
Date: Wed, 24 Jul 2019 14:54:42 +0200 [thread overview]
Message-ID: <20190724125442.18961-1-andrej.rosano@f-secure.com> (raw)
From: Andrej Rosano <andrej.rosano@f-secure.com>
Linker generated array entry is not needed when the command line is
disabled. Remove this code in that case.
This is required as the commit 80a48dd47e3bf3ede676fae5a630cb6c80de3e69
breaks the linking stage when CONFIG_CMDLINE=n:
..
LDS u-boot.lds
LD u-boot
u-boot contains unexpected relocations: R_ARM_NONE
R_ARM_RELATIVE
make: *** [Makefile:1775: checkarmreloc] Error 1
Signed-off-by: Andrej Rosano <andrej.rosano@f-secure.com>
---
cmd/help.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/cmd/help.c b/cmd/help.c
index fa2010c67e..a1a0b99b6f 100644
--- a/cmd/help.c
+++ b/cmd/help.c
@@ -27,6 +27,7 @@ U_BOOT_CMD(
" - print detailed usage of 'command'"
);
+#ifdef CONFIG_CMDLINE
/* This does not use the U_BOOT_CMD macro as ? can't be used in symbol names */
ll_entry_declare(cmd_tbl_t, question_mark, cmd) = {
"?", CONFIG_SYS_MAXARGS, cmd_always_repeatable, do_help,
@@ -35,3 +36,4 @@ ll_entry_declare(cmd_tbl_t, question_mark, cmd) = {
""
#endif /* CONFIG_SYS_LONGHELP */
};
+#endif
--
2.22.0
next reply other threads:[~2019-07-24 12:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-24 12:54 andrej.rosano at f-secure.com [this message]
2019-07-29 7:24 [U-Boot] [PATCH] Drop linker-generated array creation when CONFIG_CMDLINE is disabled andrej.rosano at f-secure.com
2019-07-30 1:24 ` 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=20190724125442.18961-1-andrej.rosano@f-secure.com \
--to=andrej.rosano@f-secure.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.