diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/Makefile | 1 | ||||
| -rw-r--r-- | common/cmd_vfd.c | 102 | ||||
| -rw-r--r-- | common/main.c | 11 |
3 files changed, 0 insertions, 114 deletions
diff --git a/common/Makefile b/common/Makefile index f81cff9..224b7cc 100644 --- a/common/Makefile +++ b/common/Makefile @@ -160,7 +160,6 @@ COBJS-$(CONFIG_USB_STORAGE) += usb_storage.o endif COBJS-$(CONFIG_CMD_XIMG) += cmd_ximg.o COBJS-$(CONFIG_YAFFS2) += cmd_yaffs2.o -COBJS-$(CONFIG_VFD) += cmd_vfd.o # others COBJS-$(CONFIG_DDR_SPD) += ddr_spd.o diff --git a/common/cmd_vfd.c b/common/cmd_vfd.c deleted file mode 100644 index 18c14d1..0000000 --- a/common/cmd_vfd.c +++ /dev/null @@ -1,102 +0,0 @@ -/* - * (C) Copyright 2001 - * Wolfgang Denk, DENX Software Engineering, wd@denx.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 - */ - -/* - * Command to load a splash screen to the VFDs. - * NOTE that this will be controlled by a key combination when - * the keyboard stuff works. For now the user has to enter a - * bitmap number (only VFD_TEST_LOGO is supported now - 16.10.2002). - * Added VFD_REMOTE_LOGO (same as VFD_TEST_LOGO but a different color) - * on 20.10.2002. - * - * This rather crudely requires that each bitmap be included as a - * header file. - */ -#include <common.h> -#include <command.h> - -#if defined(CONFIG_CMD_VFD) - -#include <vfd_logo.h> -#define VFD_TEST_LOGO_BMPNR 0 -#define VFD_REMOTE_LOGO_BMPNR 1 - -extern int transfer_pic(unsigned char, unsigned char *, int, int); - -int trab_vfd (ulong bitmap); - -int do_vfd (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) -{ - ulong bitmap; - - if (argc != 2) - return cmd_usage(cmdtp); - - if (argv[1][0] == '/') { /* select bitmap by number */ - bitmap = simple_strtoul(argv[1]+1, NULL, 10); - return (trab_vfd(bitmap)); - } - - /* display bitmap at given address */ - bitmap = simple_strtoul(argv[1], NULL, 16); - transfer_pic(3, (uchar *)bitmap, VFD_LOGO_HEIGHT, VFD_LOGO_WIDTH); - return 0; -} - -U_BOOT_CMD( - vfd, 2, 0, do_vfd, - "load a bitmap to the VFDs on TRAB", - "/N\n" - " - load bitmap N to the VFDs (N is _decimal_ !!!)\n" - "vfd ADDR\n" - " - load bitmap at address ADDR" -); -#endif - -int trab_vfd (ulong bitmap) -{ - uchar *addr; - char *s; - - switch (bitmap) { - case VFD_TEST_LOGO_BMPNR: - if ((s = getenv ("bitmap0")) != NULL) { - addr = (uchar *)simple_strtoul (s, NULL, 16); - } else { - addr = &vfd_test_logo_bitmap[0]; - } - break; - case VFD_REMOTE_LOGO_BMPNR: - if ((s = getenv ("bitmap1")) != NULL) { - addr = (uchar *)simple_strtoul (s, NULL, 16); - } else { - addr = &vfd_remote_logo_bitmap[0]; - } - break; - default: - printf("Unknown bitmap %ld\n", bitmap); - return 1; - } - transfer_pic(3, addr, VFD_LOGO_HEIGHT, VFD_LOGO_WIDTH); - return 0; -} diff --git a/common/main.c b/common/main.c index dcbacc9..2730c6f 100644 --- a/common/main.c +++ b/common/main.c @@ -288,17 +288,6 @@ void main_loop (void) char bcs_set[16]; #endif /* CONFIG_BOOTCOUNT_LIMIT */ -#if defined(CONFIG_VFD) && defined(VFD_TEST_LOGO) - ulong bmp = 0; /* default bitmap */ - extern int trab_vfd (ulong bitmap); - -#ifdef CONFIG_MODEM_SUPPORT - if (do_mdm_init) - bmp = 1; /* alternate bitmap */ -#endif - trab_vfd (bmp); -#endif /* CONFIG_VFD && VFD_TEST_LOGO */ - #ifdef CONFIG_BOOTCOUNT_LIMIT bootcount = bootcount_load(); bootcount++; |