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

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>
This commit is contained in:
Daniel Schwierzeck 2013-01-07 06:54:52 +00:00 committed by Tom Rini
parent d2af028db3
commit 58bd77db9d
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/cmd_bootm.c
View File

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