Drop linker-generated array creation when CONFIG_CMDLINE is disabled
PATCH 1/1 Drop linker-generated array creation when CONFIG_CMDLINE is disabled
From: Andrej Rosano <[email protected]>
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
--- cmd/help.c | 2 ++ 1 file changed, 2 insertions(+)
cmd/help.c +2 -0
@@ -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
Signature · 1 line
2.22.0
PATCH 1/1 Drop linker-generated array creation when CONFIG_CMDLINE is disabled
Quoted 8 lines · andrej.rosano at f-secure.com
From: Andrej Rosano <[email protected]>
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
80a48dd47e3bf3ede676fae5a630cb6c80de3e69breaks the linking stage whenCONFIG_CMDLINE=n:
Quoted 8 lines
..
LDSu-boot.lds
LD u-boot
u-boot contains unexpected relocations:R_ARM_NONER_ARM_RELATIVE
make: *** [Makefile:1775: checkarmreloc] Error 1Signed-off-by Andrej Rosano <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
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>