X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=common%2Fcmd_display.c;h=6c11aa6e3e0e209d560a157d39e8dfe1d9081037;hb=bc8f8c2614c8e104a66198633d8d765b720ed907;hp=d19f412819d2aba58a364122b8c714b6940bcba5;hpb=b706d63559aeec352bc72dd86d7d5423c15f6a60;p=u-boot

diff --git a/common/cmd_display.c b/common/cmd_display.c
index d19f412819..6c11aa6e3e 100644
--- a/common/cmd_display.c
+++ b/common/cmd_display.c
@@ -24,21 +24,19 @@
 #include <common.h>
 #include <command.h>
 
-#if defined(CONFIG_CMD_DISPLAY)
-
 #undef DEBUG_DISP
 
 #define DISP_SIZE	8
 #define CWORD_CLEAR	0x80
 #define CLEAR_DELAY	(110 * 2)
 
-int do_display (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_display (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
 	int i;
 	int pos;
 
 	/* Clear display */
-	*((volatile char*)(CFG_DISP_CWORD)) = CWORD_CLEAR;
+	*((volatile char*)(CONFIG_SYS_DISP_CWORD)) = CWORD_CLEAR;
 	udelay(1000 * CLEAR_DELAY);
 
 	if (argc < 2)
@@ -48,14 +46,14 @@ int do_display (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 		char *p = argv[i], c;
 
 		if (i > 1) {
-			*((volatile uchar *) (CFG_DISP_CHR_RAM + pos++)) = ' ';
+			*((volatile uchar *) (CONFIG_SYS_DISP_CHR_RAM + pos++)) = ' ';
 #ifdef DEBUG_DISP
 			putc(' ');
 #endif
 		}
 
 		while ((c = *p++) != '\0' && pos < DISP_SIZE) {
-			*((volatile uchar *) (CFG_DISP_CHR_RAM + pos++)) = c;
+			*((volatile uchar *) (CONFIG_SYS_DISP_CHR_RAM + pos++)) = c;
 #ifdef DEBUG_DISP
 			putc(c);
 #endif
@@ -72,11 +70,9 @@ int do_display (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 /***************************************************/
 
 U_BOOT_CMD(
-	display,	CFG_MAXARGS,	1,	do_display,
-	"display- display string on dot matrix display\n",
+	display,	CONFIG_SYS_MAXARGS,	1,	do_display,
+	"display string on dot matrix display",
 	"[<string>]\n"
 	"    - with <string> argument: display <string> on dot matrix display\n"
-	"    - without arguments: clear dot matrix display\n"
+	"    - without arguments: clear dot matrix display"
 );
-
-#endif