Merge branch 'master' of /home/wd/git/u-boot/custodians

[J-u-boot.git] / common / cmd_vfd.c

diff --git a/common/cmd_vfd.c b/common/cmd_vfd.c
index 3ef1395b2a349a87d3440bf86d06aacd6ace4f7b..104c3105612e5917b746db523e72bdef1f769ed3 100644 (file)
--- a/common/cmd_vfd.c
+++ b/common/cmd_vfd.c
@@ -35,7 +35,7 @@
 #include <common.h>
 #include <command.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_VFD)
+#if defined(CONFIG_CMD_VFD)
 
 #include <vfd_logo.h>
 #define VFD_TEST_LOGO_BMPNR 0
@@ -54,7 +54,7 @@ int do_vfd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                return 1;
        }
 
-       if (argv[1][0] == '#') {        /* select bitmap by number */
+       if (argv[1][0] == '/') {        /* select bitmap by number */
                bitmap = simple_strtoul(argv[1]+1, NULL, 10);
                return (trab_vfd(bitmap));
        }
@@ -64,7 +64,16 @@ int do_vfd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        transfer_pic(3, (uchar *)bitmap, VFD_LOGO_HEIGHT, VFD_LOGO_WIDTH);
        return 0;
 }
-#endif /* CFG_CMD_VFD */
+
+U_BOOT_CMD(
+       vfd,    2,      0,      do_vfd,
+       "vfd     - load a bitmap to the VFDs on TRAB\n",
+       "/N\n"
+       "    - load bitmap N to the VFDs (N is _decimal_ !!!)\n"
+       "vfd ADDR\n"
+       "    - load bitmap at address ADDR\n"
+);
+#endif
 
 #ifdef CONFIG_VFD
 int trab_vfd (ulong bitmap)
@@ -81,8 +90,6 @@ int trab_vfd (ulong bitmap)
                }
                break;
        case VFD_REMOTE_LOGO_BMPNR:
-               transfer_pic(3, &vfd_remote_logo_bitmap[0],
-                       VFD_LOGO_HEIGHT, VFD_LOGO_WIDTH);
                if ((s = getenv ("bitmap1")) != NULL) {
                        addr = (uchar *)simple_strtoul (s, NULL, 16);
                } else {