浏览代码

bootm: relocate names of sub-command table for archs with CONFIG_NEEDS_MANUAL_RELOC

To make bootm sub-command feature working on archs with CONFIG_NEEDS_MANUAL_RELOC,
the name pointers in the sub-command table need to be relocated.

Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Daniel Schwierzeck 12 年之前
父节点
当前提交
58bd77db9d
共有 1 个文件被更改,包括 7 次插入1 次删除
  1. 7 1
      common/cmd_bootm.c

+ 7 - 1
common/cmd_bootm.c

@@ -592,12 +592,18 @@ int do_bootm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 #ifdef CONFIG_NEEDS_MANUAL_RELOC
 #ifdef CONFIG_NEEDS_MANUAL_RELOC
 	static int relocated = 0;
 	static int relocated = 0;
 
 
-	/* relocate boot function table */
 	if (!relocated) {
 	if (!relocated) {
 		int i;
 		int i;
+
+		/* relocate boot function table */
 		for (i = 0; i < ARRAY_SIZE(boot_os); i++)
 		for (i = 0; i < ARRAY_SIZE(boot_os); i++)
 			if (boot_os[i] != NULL)
 			if (boot_os[i] != NULL)
 				boot_os[i] += gd->reloc_off;
 				boot_os[i] += gd->reloc_off;
+
+		/* relocate names of sub-command table */
+		for (i = 0; i < ARRAY_SIZE(cmd_bootm_sub); i++)
+			cmd_bootm_sub[i].name += gd->reloc_off;
+
 		relocated = 1;
 		relocated = 1;
 	}
 	}
 #endif
 #endif