minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-13 05:55:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add support for arbitrary bitmaps for TRAB's VFD command;

Browse Source 
allow to pass boot bitmap addresses in environment variables;
allow for zero boot delay
This commit is contained in:
wdenk 2003-05-21 20:26:20 +00:00
parent 82226bf4d2
commit c8c3a8be2d
4 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@ -2,7 +2,9 @@
Changes since U-Boot 0.3.1: Changes since U-Boot 0.3.1:
====================================================================== ======================================================================
* Add support for arbitrary bitmaps for TRAB's VFD command * Add support for arbitrary bitmaps for TRAB's VFD command;
allow to pass boot bitmap addresses in environment variables;
allow for zero boot delay
* Patch by Christian Geißinger, 19 May 2002: * Patch by Christian Geißinger, 19 May 2002:
On TRAB: wait until the dummy byte has been completely sent On TRAB: wait until the dummy byte has been completely sent

7
board/trab/vfd.c
View File

@ -346,9 +346,10 @@ void transfer_pic(int display, unsigned char *adr, int height, int width)
} }
} }
} }
display++; if (display > 0)
if (display > 3) display--;
display = 0; else
display = 3;
} }
} }

26
common/cmd_vfd.c
View File

@ -61,7 +61,7 @@ int do_vfd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
/* display bitmap at given address */ /* display bitmap at given address */
bitmap = simple_strtoul(argv[1], NULL, 16); bitmap = simple_strtoul(argv[1], NULL, 16);
transfer_pic(1, (uchar *)bitmap, VFD_LOGO_HEIGHT, VFD_LOGO_WIDTH); transfer_pic(3, (uchar *)bitmap, VFD_LOGO_HEIGHT, VFD_LOGO_WIDTH);
return 0; return 0;
} }
#endif /* CFG_CMD_VFD */ #endif /* CFG_CMD_VFD */
@ -69,19 +69,31 @@ int do_vfd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
#ifdef CONFIG_VFD #ifdef CONFIG_VFD
int trab_vfd (ulong bitmap) int trab_vfd (ulong bitmap)
{ {
uchar *addr;
char *s;
switch (bitmap) { switch (bitmap) {
case VFD_TEST_LOGO_BMPNR: case VFD_TEST_LOGO_BMPNR:
transfer_pic(1, &vfd_test_logo_bitmap[0], if ((s = getenv ("bitmap0")) != NULL) {
VFD_LOGO_HEIGHT, VFD_LOGO_WIDTH); addr = (uchar *)simple_strtoul (s, NULL, 16);
return 0; } else {
addr = &vfd_test_logo_bitmap[0];
}
break;
case VFD_REMOTE_LOGO_BMPNR: case VFD_REMOTE_LOGO_BMPNR:
transfer_pic(1, &vfd_remote_logo_bitmap[0], transfer_pic(3, &vfd_remote_logo_bitmap[0],
VFD_LOGO_HEIGHT, VFD_LOGO_WIDTH); VFD_LOGO_HEIGHT, VFD_LOGO_WIDTH);
return 0; if ((s = getenv ("bitmap1")) != NULL) {
addr = (uchar *)simple_strtoul (s, NULL, 16);
} else {
addr = &vfd_remote_logo_bitmap[0];
}
break;
default: default:
printf("Unknown bitmap %ld\n", bitmap); printf("Unknown bitmap %ld\n", bitmap);
return 1; return 1;
} }
/* NOTREACHED */ transfer_pic(3, addr, VFD_LOGO_HEIGHT, VFD_LOGO_WIDTH);
return 0;
} }
#endif /* CONFIG_VFD */ #endif /* CONFIG_VFD */

1
include/configs/trab.h
View File

@ -118,6 +118,7 @@
#include <cmd_confdefs.h> #include <cmd_confdefs.h>
#define CONFIG_BOOTDELAY 5 #define CONFIG_BOOTDELAY 5
#define CONFIG_ZERO_BOOTDELAY_CHECK /* allow to break in always */
#define CONFIG_PREBOOT "echo;echo *** booting ***;echo" #define CONFIG_PREBOOT "echo;echo *** booting ***;echo"
#define CONFIG_BOOTARGS "console=ttyS0" #define CONFIG_BOOTARGS "console=ttyS0"
#define CONFIG_NETMASK 255.255.0.0 #define CONFIG_NETMASK 255.255.0.0