Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx

[u-boot] / board / inka4x0 / inkadiag.c

diff --git a/board/inka4x0/inkadiag.c b/board/inka4x0/inkadiag.c
index 06c980713bd78d4e19b02e85f2a2d940078f16d7..0a75abde3f33d2816ce5a014507823b65ba01e6b 100644 (file)
--- a/board/inka4x0/inkadiag.c
+++ b/board/inka4x0/inkadiag.c
@@ -280,48 +280,48 @@ static int do_inkadiag_serial(cmd_tbl_t *cmdtp, int flag, int argc,
        if ((num >= 0) && (num <= 7)) {
                if (mode & 1) {
                        /* turn on 'loopback' mode */
-                       out_8(&uart->mcr, MCR_LOOP);
+                       out_8(&uart->mcr, UART_MCR_LOOP);
                } else {
                        /*
                         * establish the UART's operational parameters
                         * set DLAB=1, so rbr accesses DLL
                         */
-                       out_8(&uart->lcr, LCR_DLAB);
+                       out_8(&uart->lcr, UART_LCR_DLAB);
                        /* set baudrate */
                        out_8(&uart->rbr, combrd);
                        /* set data-format: 8-N-1 */
-                       out_8(&uart->lcr, LCR_WLS_8);
+                       out_8(&uart->lcr, UART_LCR_WLS_8);
                }
 
                if (mode & 2) {
                        /* set request to send */
-                       out_8(&uart->mcr, MCR_RTS);
+                       out_8(&uart->mcr, UART_MCR_RTS);
                        udelay(10);
                        /* check clear to send */
-                       if ((in_8(&uart->msr) & MSR_CTS) == 0x00)
+                       if ((in_8(&uart->msr) & UART_MSR_CTS) == 0x00)
                                return -1;
                }
                if (mode & 4) {
                        /* set data terminal ready */
-                       out_8(&uart->mcr, MCR_DTR);
+                       out_8(&uart->mcr, UART_MCR_DTR);
                        udelay(10);
                        /* check data set ready and carrier detect */
-                       if ((in_8(&uart->msr) & (MSR_DSR | MSR_DCD))
-                           != (MSR_DSR | MSR_DCD))
+                       if ((in_8(&uart->msr) & (UART_MSR_DSR | UART_MSR_DCD))
+                           != (UART_MSR_DSR | UART_MSR_DCD))
                                return -1;
                }
 
                /* write each message-character, read it back, and display it */
                for (i = 0, len = strlen(argv[3]); i < len; ++i) {
                        j = 0;
-                       while ((in_8(&uart->lsr) & LSR_THRE) == 0x00) {
+                       while ((in_8(&uart->lsr) & UART_LSR_THRE) ==    0x00) {
                                if (j++ > CONFIG_SYS_HZ)
                                        break;
                                udelay(10);
                        }
                        out_8(&uart->rbr, argv[3][i]);
                        j = 0;
-                       while ((in_8(&uart->lsr) & LSR_DR) == 0x00) {
+                       while ((in_8(&uart->lsr) & UART_LSR_DR) == 0x00) {
                                if (j++ > CONFIG_SYS_HZ)
                                        break;
                                udelay(10);
@@ -439,14 +439,14 @@ static int do_inkadiag_help(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
 
 cmd_tbl_t cmd_inkadiag_sub[] = {
        U_BOOT_CMD_MKENT(io, 1, 1, do_inkadiag_io, "read digital input",
-        "<drawer1|drawer2|other> [value] - get or set specified signal\n"),
+        "<drawer1|drawer2|other> [value] - get or set specified signal"),
        U_BOOT_CMD_MKENT(serial, 4, 1, do_inkadiag_serial, "test serial port",
         "<num> <mode> <baudrate> <msg>  - test uart num [0..11] in mode\n"
-        "and baudrate with msg\n"),
+        "and baudrate with msg"),
        U_BOOT_CMD_MKENT(buzzer, 2, 1, do_inkadiag_buzzer, "activate buzzer",
-        "<period> <freq> - turn buzzer on for period ms with freq hz\n"),
+        "<period> <freq> - turn buzzer on for period ms with freq hz"),
        U_BOOT_CMD_MKENT(help, 4, 1, do_inkadiag_help, "get help",
-        "[command] - get help for command\n"),
+        "[command] - get help for command"),
 };
 
 static int do_inkadiag_help(cmd_tbl_t *cmdtp, int flag,
@@ -483,32 +483,4 @@ U_BOOT_CMD(inkadiag, 6, 1, do_inkadiag,
           "inkadiag - inka diagnosis\n",
           "[inkadiag what ...]\n"
           "    - perform a diagnosis on inka hardware\n"
-          "'inkadiag' performs hardware tests.\n\n");
-
-/* Relocate the command table function pointers when running in RAM */
-int inkadiag_init_r (void) {
-       cmd_tbl_t *cmdtp;
-
-       for (cmdtp = &cmd_inkadiag_sub[0]; cmdtp !=
-                    &cmd_inkadiag_sub[ARRAY_SIZE(cmd_inkadiag_sub)]; cmdtp++) {
-               ulong addr;
-
-               addr = (ulong) (cmdtp->cmd) + gd->reloc_off;
-               cmdtp->cmd = (int (*)(struct cmd_tbl_s *, int, int, char *[]))addr;
-
-               addr = (ulong)(cmdtp->name) + gd->reloc_off;
-               cmdtp->name = (char *)addr;
-
-               if (cmdtp->usage) {
-                       addr = (ulong)(cmdtp->usage) + gd->reloc_off;
-                       cmdtp->usage = (char *)addr;
-               }
-#ifdef CONFIG_SYS_LONGHELP
-               if (cmdtp->help) {
-                       addr = (ulong)(cmdtp->help) + gd->reloc_off;
-                       cmdtp->help = (char *)addr;
-               }
-#endif
-       }
-       return 0;
-}
+          "'inkadiag' performs hardware tests.");