minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 20:52:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

env: fix cmd_env_sub fct pointers if CONFIG_RELOC_FIXUP_WORKS is not defined

Browse Source 
commit ea882baf9c17cd142c99e3ff640d3ab01daa5cec introduces
a command_sub_table for the "env" command. On arm, avr32, m68k,
mips and sparc architectures, relocation needs manual fixups,
so add these fixups for this sub command table too.

Tested on arm/qong board.
          mips board (Ben NanoNote) from Xiangfu Liu
          arm/AT91 board from Reinhard Meyer

Signed-off-by: Heiko Schocher <hs@denx.de>

cc: Wolfgang Denk <wd@denx.de>
cc: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
cc: Xiangfu Liu <xiangfu@openmobilefree.net>
cc: Reinhard Meyer <u-boot@emk-elektronik.de>
cc: sshtylyov@mvista.com
This commit is contained in:
Heiko Schocher 2010-10-05 14:17:00 +02:00 committed by Wolfgang Denk
parent a7d54346e0
commit 60f7da1f42
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/cmd_nvedit.c
View File

@ -837,6 +837,13 @@ static cmd_tbl_t cmd_env_sub[] = {
U_BOOT_CMD_MKENT(set, CONFIG_SYS_MAXARGS, 0, do_env_set, "", ""), U_BOOT_CMD_MKENT(set, CONFIG_SYS_MAXARGS, 0, do_env_set, "", ""),
}; };
#if !defined(CONFIG_RELOC_FIXUP_WORKS)
void env_reloc(void)
{
fixup_cmdtable(cmd_env_sub, ARRAY_SIZE(cmd_env_sub));
}
#endif
static int do_env (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_env (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
cmd_tbl_t *cp; cmd_tbl_t *cp;

5
common/env_common.c
View File

@ -227,6 +227,11 @@ int env_import(const char *buf, int check)
void env_relocate (void) void env_relocate (void)
{ {
#if !defined(CONFIG_RELOC_FIXUP_WORKS)
extern void env_reloc(void);
env_reloc();
#endif
if (gd->env_valid == 0) { if (gd->env_valid == 0) {
#if defined(CONFIG_ENV_IS_NOWHERE) /* Environment not changable */ #if defined(CONFIG_ENV_IS_NOWHERE) /* Environment not changable */
set_default_env(NULL); set_default_env(NULL);