diff options
| author | Joe Hershberger <joe.hershberger@ni.com> | 2012-12-11 22:16:19 -0600 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-12-13 11:46:54 -0700 |
| commit | c4e0057fa78ebb524b9241ad7245fcd1074ba414 (patch) | |
| tree | 5edef36e43886efa384a8fb373263e0a62c228d4 /common/console.c | |
| parent | e772cb30f649c1bb8c9cb15e4c05cbf0760f2f61 (diff) | |
| download | olio-uboot-2014.01-c4e0057fa78ebb524b9241ad7245fcd1074ba414.tar.xz olio-uboot-2014.01-c4e0057fa78ebb524b9241ad7245fcd1074ba414.zip | |
env: Refactor do_apply to a flag
Use a flag in hsearch_r for insert mode passed from import to allow the
behavior be different based on use.
Now that "do_check" is called for all imports, ensure console init is
complete before updating the console on relocation import
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Diffstat (limited to 'common/console.c')
| -rw-r--r-- | common/console.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/console.c b/common/console.c index 25b141a32..c21934d1b 100644 --- a/common/console.c +++ b/common/console.c @@ -681,8 +681,6 @@ int console_init_r(void) done: #endif - gd->flags |= GD_FLG_DEVINIT; /* device initialization completed */ - #ifndef CONFIG_SYS_CONSOLE_INFO_QUIET stdio_print_current_devices(); #endif /* CONFIG_SYS_CONSOLE_INFO_QUIET */ @@ -694,6 +692,8 @@ done: } #endif /* CONFIG_SYS_CONSOLE_ENV_OVERWRITE */ + gd->flags |= GD_FLG_DEVINIT; /* device initialization completed */ + #if 0 /* If nothing usable installed, use only the initial console */ if ((stdio_devices[stdin] == NULL) && (stdio_devices[stdout] == NULL)) @@ -758,8 +758,6 @@ int console_init_r(void) #endif } - gd->flags |= GD_FLG_DEVINIT; /* device initialization completed */ - #ifndef CONFIG_SYS_CONSOLE_INFO_QUIET stdio_print_current_devices(); #endif /* CONFIG_SYS_CONSOLE_INFO_QUIET */ @@ -769,6 +767,8 @@ int console_init_r(void) setenv(stdio_names[i], stdio_devices[i]->name); } + gd->flags |= GD_FLG_DEVINIT; /* device initialization completed */ + #if 0 /* If nothing usable installed, use only the initial console */ if ((stdio_devices[stdin] == NULL) && (stdio_devices[stdout] == NULL)) |