From: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
Date: Tue, 18 Oct 2011 11:12:22 +0000 (+0000)
Subject: common: fix missing function pointer relocation in fixup_cmdtable()
X-Git-Tag: v2011.12-rc1~459
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3668d8fa0417a3082aa57dd5e0db8fbe887c31e0;p=u-boot

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>
---

diff --git a/common/command.c b/common/command.c
index 2c0bf53449..c5cecd3bf5 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++;