diff options
| author | Stefan Roese <sr@denx.de> | 2008-10-21 11:43:08 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-10-21 11:43:08 +0200 |
| commit | f61f1e150c84f5b9347fca79a4bc5f2286c545d2 (patch) | |
| tree | ab90f076f18e56b2b3e8c9375b95917daa78c1d9 /common/cmd_display.c | |
| parent | ec081c2c190148b374e86a795fb6b1c49caeb549 (diff) | |
| parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
| download | olio-uboot-2014.01-f61f1e150c84f5b9347fca79a4bc5f2286c545d2.tar.xz olio-uboot-2014.01-f61f1e150c84f5b9347fca79a4bc5f2286c545d2.zip | |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Diffstat (limited to 'common/cmd_display.c')
| -rw-r--r-- | common/cmd_display.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/cmd_display.c b/common/cmd_display.c index a29345c6b..982e09dab 100644 --- a/common/cmd_display.c +++ b/common/cmd_display.c @@ -36,7 +36,7 @@ int do_display (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) 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) @@ -46,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 @@ -70,7 +70,7 @@ int do_display (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) /***************************************************/ U_BOOT_CMD( - display, CFG_MAXARGS, 1, do_display, + display, CONFIG_SYS_MAXARGS, 1, do_display, "display- display string on dot matrix display\n", "[<string>]\n" " - with <string> argument: display <string> on dot matrix display\n" |