diff options
author | wdenk <wdenk> | 2005-03-31 18:42:15 +0000 |
---|---|---|
committer | wdenk <wdenk> | 2005-03-31 18:42:15 +0000 |
commit | 83e40ba75d7f8d0c2e2ecdd203db96ccd79a0340 (patch) | |
tree | c744211f014f6ba34b524c98f78d624e554261f0 /drivers | |
parent | 0c1c117cf18ffa3fdc0342dfc47c6003fc5fc5a0 (diff) | |
download | u-boot-83e40ba75d7f8d0c2e2ecdd203db96ccd79a0340.zip u-boot-83e40ba75d7f8d0c2e2ecdd203db96ccd79a0340.tar.gz u-boot-83e40ba75d7f8d0c2e2ecdd203db96ccd79a0340.tar.bz2 |
* Patch by Detlev Zundel, 31 Mar 2005:
Cleanup duplicate definition of overwrite_console()
* Update TQM5200 configuration;
prepare for Rev. 200 starter kit boards
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/keyboard.c | 10 | ||||
-rw-r--r-- | drivers/sm501.h | 48 |
2 files changed, 4 insertions, 54 deletions
diff --git a/drivers/keyboard.c b/drivers/keyboard.c index f12de83..1579095 100644 --- a/drivers/keyboard.c +++ b/drivers/keyboard.c @@ -262,12 +262,10 @@ void handle_scancode(unsigned char scancode) #ifdef CFG_CONSOLE_OVERWRITE_ROUTINE extern int overwrite_console (void); +#define OVERWRITE_CONSOLE overwrite_console () #else -int overwrite_console (void) -{ - return (0); -} -#endif +#define OVERWRITE_CONSOLE 0 +#endif /* CFG_CONSOLE_OVERWRITE_ROUTINE */ int kbd_init (void) { @@ -290,7 +288,7 @@ int kbd_init (void) /* check if this is the standard input device */ if(strcmp(stdinname,DEVNAME)==0) { /* reassign the console */ - if(overwrite_console()) { + if(OVERWRITE_CONSOLE) { return 1; } error=console_assign(stdin,DEVNAME); diff --git a/drivers/sm501.h b/drivers/sm501.h deleted file mode 100644 index d8f26fb..0000000 --- a/drivers/sm501.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * (C) Copyright 2002 - * Stäubli Faverges - <www.staubli.com> - * Pierre AUBERT p.aubert@staubli.com - * - * (C) Copyright 2005 - * Martin Krause TQ-Systems GmbH martin.krause@tqs.de - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -/* - * Basic video support for SMI SM501 "Voyager" graphic controller - */ - -#ifndef _SM501_H_ -#define _SM501_H_ - -typedef struct { - unsigned int Index; - unsigned int Value; -} SMI_REGS; - -/* Board specific functions */ -unsigned int board_video_init (void); -void board_validate_screen (unsigned int base); -const SMI_REGS *board_get_regs (void); -int board_get_width (void); -int board_get_height (void); -unsigned int board_video_get_fb (void); - -#endif /* _SM501_H_ */ |