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 80a48dd 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 <[email protected]>
grygoriyS · Jul 29, 2019 · 81b1158 · 81b1158
1 parent 090b30d
commit 81b1158
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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