diff options
| author | Tom Rini <trini@konsulko.com> | 2015-12-07 08:23:29 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-12-07 08:35:23 -0500 |
| commit | cbb2df2018ab07cb8887715d30d445584e108366 (patch) | |
| tree | 7703310f12dc3c77f918606f55ccdb49ddbb607f | |
| parent | dcf4cb068e19a7f39e4a295102b247376bd27c95 (diff) | |
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>
| -rw-r--r-- | common/board_r.c | 1 | ||||
| -rw-r--r-- | include/command.h | 5 | ||||
| -rw-r--r-- | test/dm/cmd_dm.c | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/common/board_r.c b/common/board_r.c index 5af32dd65b..75ee43e2d7 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -15,6 +15,7 @@ #if defined(CONFIG_CMD_BEDBUG) #include <bedbug/type.h> #endif +#include <command.h> #include <console.h> #ifdef CONFIG_HAS_DATAFLASH #include <dataflash.h> diff --git a/include/command.h b/include/command.h index 6c04cd9007..2ae9b6c2e6 100644 --- a/include/command.h +++ b/include/command.h @@ -142,6 +142,7 @@ enum command_ret_t { int cmd_process(int flag, int argc, char * const argv[], int *repeatable, unsigned long *ticks); +void fixup_cmdtable(cmd_tbl_t *cmdtp, int size); #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) \ 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 */ diff --git a/test/dm/cmd_dm.c b/test/dm/cmd_dm.c index b6e7109149..a3c5971a8b 100644 --- a/test/dm/cmd_dm.c +++ b/test/dm/cmd_dm.c @@ -8,6 +8,7 @@ */ #include <common.h> +#include <command.h> #include <dm.h> #include <malloc.h> #include <mapmem.h> |