]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
Drop linker-generated array creation when CONFIG_CMDLINE is disabled
authorAndrej Rosano <andrej.rosano@f-secure.com>
Mon, 29 Jul 2019 07:24:53 +0000 (09:24 +0200)
committerTom Rini <trini@konsulko.com>
Mon, 29 Jul 2019 13:32:09 +0000 (09:32 -0400)
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

index fa2010c67eb1379eedc1c5d85dc580f030039f7f..a1a0b99b6ffac7c8e3888837c5d1af97f64f75fc 100644 (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