V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

CONFIG_NEEDS_MANUAL_RELOC: Fix warnings when not set 

Now that we may compile (but not link) code calling fixup_cmdtable when
this is not set, we need to always have the declaration available.  We
should also make sure that anyone calling the function includes
<command.h> as that's where the function declaration is.

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2015-12-07 08:23:29 -05:00
parent dcf4cb068e
commit cbb2df2018
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/board_r.c
View File

@ -15,6 +15,7 @@
#if defined(CONFIG_CMD_BEDBUG) #if defined(CONFIG_CMD_BEDBUG)
#include <bedbug/type.h> #include <bedbug/type.h>
#endif #endif
#include <command.h>
#include <console.h> #include <console.h>
#ifdef CONFIG_HAS_DATAFLASH #ifdef CONFIG_HAS_DATAFLASH
#include <dataflash.h> #include <dataflash.h>

5
include/command.h
View File

@ -142,6 +142,7 @@ enum command_ret_t {
int cmd_process(int flag, int argc, char * const argv[], int cmd_process(int flag, int argc, char * const argv[],
int *repeatable, unsigned long *ticks); int *repeatable, unsigned long *ticks);
void fixup_cmdtable(cmd_tbl_t *cmdtp, int size);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
/* /*
@ -179,8 +180,4 @@ int cmd_process(int flag, int argc, char * const argv[],
#define U_BOOT_CMD(_name, _maxargs, _rep, _cmd, _usage, _help) \ #define U_BOOT_CMD(_name, _maxargs, _rep, _cmd, _usage, _help) \
U_BOOT_CMD_COMPLETE(_name, _maxargs, _rep, _cmd, _usage, _help, NULL) U_BOOT_CMD_COMPLETE(_name, _maxargs, _rep, _cmd, _usage, _help, NULL)
#if defined(CONFIG_NEEDS_MANUAL_RELOC)
void fixup_cmdtable(cmd_tbl_t *cmdtp, int size);
#endif
#endif /* __COMMAND_H */ #endif /* __COMMAND_H */

1
test/dm/cmd_dm.c
View File

@ -8,6 +8,7 @@
*/ */
#include <common.h> #include <common.h>
#include <command.h>
#include <dm.h> #include <dm.h>
#include <malloc.h> #include <malloc.h>
#include <mapmem.h> #include <mapmem.h>