diff options
| author | wdenk <wdenk> | 2003-04-27 22:52:51 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2003-04-27 22:52:51 +0000 |
| commit | 4532cb696eb717419022dbaa8d408e7df7df7b68 (patch) | |
| tree | 2b791870499676f1c93b1e8bcc94ace26787ad8e /cpu/mpc8xx | |
| parent | 02c9bed451b36f3b1f11d5fe617da4fe4b9f9ab7 (diff) | |
| download | blackbird-obmc-uboot-4532cb696eb717419022dbaa8d408e7df7df7b68.tar.gz blackbird-obmc-uboot-4532cb696eb717419022dbaa8d408e7df7df7b68.zip | |
* LWMON extensions:
- Splashscreen support
- modem support
- sysmon support
- temperature dependend enabling of LCD
* Allow booting from old "PPCBoot" disk partitions
* Add support for TQM8255 Board / MPC8255 CPU
Diffstat (limited to 'cpu/mpc8xx')
| -rw-r--r-- | cpu/mpc8xx/lcd.c | 7 | ||||
| -rw-r--r-- | cpu/mpc8xx/serial.c | 21 |
2 files changed, 28 insertions, 0 deletions
diff --git a/cpu/mpc8xx/lcd.c b/cpu/mpc8xx/lcd.c index 9e92676d65..3d3b039abc 100644 --- a/cpu/mpc8xx/lcd.c +++ b/cpu/mpc8xx/lcd.c @@ -32,6 +32,9 @@ #include <lcdvideo.h> #include <linux/types.h> #include <devices.h> +#if defined(CONFIG_POST) +#include <post.h> +#endif #ifdef CONFIG_LCD @@ -982,7 +985,11 @@ static void lcd_enable (void) #if defined(CONFIG_LWMON) { uchar c = pic_read (0x60); +#if defined(CONFIG_LCD) && defined(CONFIG_LWMON) && (CONFIG_POST & CFG_POST_SYSMON) + c |= 0x04; /* Chip Enable LCD */ +#else c |= 0x07; /* Power on CCFL, Enable CCFL, Chip Enable LCD */ +#endif pic_write (0x60, c); } #endif /* CONFIG_LWMON */ diff --git a/cpu/mpc8xx/serial.c b/cpu/mpc8xx/serial.c index 2871084fcd..4e5b408896 100644 --- a/cpu/mpc8xx/serial.c +++ b/cpu/mpc8xx/serial.c @@ -246,6 +246,20 @@ serial_setbrg (void) (((gd->cpu_clk / 16 / gd->baudrate)-1) << 1) | CPM_BRG_EN; } +#ifdef CONFIG_MODEM_SUPPORT +void disable_putc(void) +{ + DECLARE_GLOBAL_DATA_PTR; + gd->be_quiet = 1; +} + +void enable_putc(void) +{ + DECLARE_GLOBAL_DATA_PTR; + gd->be_quiet = 0; +} +#endif + void serial_putc(const char c) { @@ -255,6 +269,13 @@ serial_putc(const char c) volatile immap_t *im = (immap_t *)CFG_IMMR; volatile cpm8xx_t *cpmp = &(im->im_cpm); +#ifdef CONFIG_MODEM_SUPPORT + DECLARE_GLOBAL_DATA_PTR; + + if (gd->be_quiet) + return; +#endif + if (c == '\n') serial_putc ('\r'); |
