All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH] Drop linker-generated array creation when CONFIG_CMDLINE is disabled
@ 2019-07-24 12:54 andrej.rosano at f-secure.com
  0 siblings, 0 replies; 3+ messages in thread
From: andrej.rosano at f-secure.com @ 2019-07-24 12:54 UTC (permalink / raw)
  To: u-boot

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

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [U-Boot] [PATCH] Drop linker-generated array creation when CONFIG_CMDLINE is disabled
  2019-07-29  7:24 andrej.rosano at f-secure.com
@ 2019-07-30  1:24 ` Tom Rini
  0 siblings, 0 replies; 3+ messages in thread
From: Tom Rini @ 2019-07-30  1:24 UTC (permalink / raw)
  To: u-boot

On Mon, Jul 29, 2019 at 09:24:53AM +0200, andrej.rosano at f-secure.com wrote:

> 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>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190729/67e8e424/attachment.sig>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [U-Boot] [PATCH] Drop linker-generated array creation when CONFIG_CMDLINE is disabled
@ 2019-07-29  7:24 andrej.rosano at f-secure.com
  2019-07-30  1:24 ` Tom Rini
  0 siblings, 1 reply; 3+ messages in thread
From: andrej.rosano at f-secure.com @ 2019-07-29  7:24 UTC (permalink / raw)
  To: u-boot

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

^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-07-30  1:24 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-24 12:54 [U-Boot] [PATCH] Drop linker-generated array creation when CONFIG_CMDLINE is disabled andrej.rosano at f-secure.com
2019-07-29  7:24 andrej.rosano at f-secure.com
2019-07-30  1:24 ` Tom Rini

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.