diff options
| author | wdenk <wdenk> | 2003-04-20 14:04:18 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2003-04-20 14:04:18 +0000 |
| commit | d791b1dc3e64a6a6317293245d884589bc5c6277 (patch) | |
| tree | 32f7bfaa5f3112cae01cf78252b1f3c66fcc4354 /common/console.c | |
| parent | 4a6fd34b267dbf4a72080ab9a085bb45c63660fb (diff) | |
* Make sure Block Lock Bits get cleared in R360MPI flash driver
* MPC823 LCD driver: Fill color map backwards, to allow for steady
display when Linux takes over
* Patch by Erwin Rol, 27 Feb 2003:
Add support for RTEMS (this time for real).
* Add support for "bmp info" and "bmp display" commands to load
bitmap images; this can be used (for example in a "preboot"
command) to display a splash screen very quickly after poweron.
* Add support for 133 MHz clock on INCA-IP board
Diffstat (limited to 'common/console.c')
| -rw-r--r-- | common/console.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/common/console.c b/common/console.c index 13ba63b9467..86ed5842115 100644 --- a/common/console.c +++ b/common/console.c @@ -355,7 +355,7 @@ int console_init_f (void) return (0); } -#ifdef CFG_CONSOLE_IS_IN_ENV +#if defined(CFG_CONSOLE_IS_IN_ENV) || defined(CONFIG_SPLASH_SCREEN) /* search a device */ device_t *search_device (int flags, char *name) { @@ -374,7 +374,7 @@ device_t *search_device (int flags, char *name) } return dev; } -#endif /* CFG_CONSOLE_IS_IN_ENV */ +#endif /* CFG_CONSOLE_IS_IN_ENV || CONFIG_SPLASH_SCREEN */ #ifdef CFG_CONSOLE_IS_IN_ENV /* Called after the relocation - use desired console functions */ @@ -469,6 +469,11 @@ int console_init_r (void) device_t *inputdev = NULL, *outputdev = NULL; int i, items = ListNumItems (devlist); +#ifdef CONFIG_SPLASH_SCREEN + /* suppress all output if splash screen is enabled */ + outputdev = search_device (DEV_FLAGS_OUTPUT, "nulldev"); +#endif + /* Scan devices looking for input and output devices */ for (i = 1; (i <= items) && ((inputdev == NULL) || (outputdev == NULL)); |