summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Schwierzeck <daniel.schwierzeck@googlemail.com>2011-10-18 11:12:22 +0000
committerWolfgang Denk <wd@denx.de>2011-10-23 23:32:44 +0200
commit3668d8fa0417a3082aa57dd5e0db8fbe887c31e0 (patch)
treef00bbcfc8ebd7a77cdc64dea3899e9e9a6c06248
parentc1044a1ec182be4c9c0b64d42ac9bf8f623d3f68 (diff)
downloadu-boot-imx-3668d8fa0417a3082aa57dd5e0db8fbe887c31e0.zip
u-boot-imx-3668d8fa0417a3082aa57dd5e0db8fbe887c31e0.tar.gz
u-boot-imx-3668d8fa0417a3082aa57dd5e0db8fbe887c31e0.tar.bz2
common: fix missing function pointer relocation in fixup_cmdtable()
In commit fa28bd2eef588ec2048ccafedb2b384d5a355858 patch v1 was applied instead of v2. This is an incremental patch to update that commit to version 2. Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
-rw-r--r--common/command.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/common/command.c b/common/command.c
index 2c0bf53..c5cecd3 100644
--- a/common/command.c
+++ b/common/command.c
@@ -479,7 +479,8 @@ void fixup_cmdtable(cmd_tbl_t *cmdtp, int size)
#ifdef CONFIG_AUTO_COMPLETE
if (cmdtp->complete) {
addr = (ulong)(cmdtp->complete) + gd->reloc_off;
- cmdtp->complete = (char *)addr;
+ cmdtp->complete =
+ (int (*)(int, char * const [], char, int, char * []))addr;
}
#endif
cmdtp++;