diff options
| author | wdenk <wdenk> | 2003-07-14 22:13:32 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2003-07-14 22:13:32 +0000 |
| commit | 8564acf936726c5568d71e4fa93a0ae9814e0d07 (patch) | |
| tree | 05fa981555adf1d333970f3d52d0683008fe3cfb /board/lwmon/lwmon.c | |
| parent | 5702923e23238df6c6f62d53f73863462ae62f4e (diff) | |
| download | u-boot-imx-8564acf936726c5568d71e4fa93a0ae9814e0d07.zip u-boot-imx-8564acf936726c5568d71e4fa93a0ae9814e0d07.tar.gz u-boot-imx-8564acf936726c5568d71e4fa93a0ae9814e0d07.tar.bz2 | |
* Patches by Yuli Barcohen, 13 Jul 2003:
- Correct flash and JFFS2 support for MPC8260ADS
- fix PVR values and clock generation for PowerQUICC II family
(8270/8275/8280)
* Patch by Bernhard Kuhn, 08 Jul 2003:
- add support for M68K targets
* Patch by Ken Chou, 3 Jul:
- Fix PCI config table for A3000
- Fix iobase for natsemi.c
(PCI_BASE_ADDRESS_0 is the IO base register for DP83815)
* Allow to enable "slow" POST routines by key press on power-on
* Fix temperature dependend switching of LCD backlight on LWMON
* Tweak output format for LWMON
Diffstat (limited to 'board/lwmon/lwmon.c')
| -rw-r--r-- | board/lwmon/lwmon.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/board/lwmon/lwmon.c b/board/lwmon/lwmon.c index 2aa990c..04721a3 100644 --- a/board/lwmon/lwmon.c +++ b/board/lwmon/lwmon.c @@ -184,7 +184,7 @@ V* Verification: dzu@denx.de ***********************************************************************/ int checkboard (void) { - puts ("Board: Litronic Monitor IV\n"); + puts ("Board: LICCON Konsole LCD2\n"); return (0); } @@ -1071,3 +1071,23 @@ static int key_pressed(void) return (compare_magic(kbd_data, CONFIG_MODEM_KEY_MAGIC) == 0); } #endif /* CONFIG_MODEM_SUPPORT */ + +#ifdef CONFIG_POST +/* + * Returns 1 if keys pressed to start the power-on long-running tests + * Called from board_init_f(). + */ +int post_hotkeys_pressed(gd_t *gd) +{ + uchar kbd_data[KEYBD_DATALEN]; + uchar val; + + /* Read keys */ + val = KEYBD_CMD_READ_KEYS; + i2c_write (kbd_addr, 0, 0, &val, 1); + i2c_read (kbd_addr, 0, 0, kbd_data, KEYBD_DATALEN); + + return (gd->post_hotkeys_latch = + (compare_magic(kbd_data, CONFIG_POST_KEY_MAGIC) == 0)); +} +#endif |