Drop linker-generated array creation when CONFIG_CMDLINE is disabled

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 80a48dd47e
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>
This commit is contained in:
Andrej Rosano 2019-07-29 09:24:53 +02:00 committed by Tom Rini
parent 090b30db09
commit 81b1158897

View File

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