s5pc1xx: serial: fix the error check logic

[karo-tx-uboot.git] / cpu / mpc83xx / ecc.c

diff --git a/cpu/mpc83xx/ecc.c b/cpu/mpc83xx/ecc.c
index 6f13094243a1cacaadb6a531c9d0a141abee76a2..f3942b411f65c172924f8c88052b3db6cb4ba94a 100644 (file)
--- a/cpu/mpc83xx/ecc.c
+++ b/cpu/mpc83xx/ecc.c
@@ -20,7 +20,7 @@
 #if defined(CONFIG_DDR_ECC) && defined(CONFIG_DDR_ECC_CMD)
 void ecc_print_status(void)
 {
-       volatile immap_t *immap = (immap_t *) CFG_IMMR;
+       volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
        volatile ddr83xx_t *ddr = &immap->ddr;
 
        printf("\nECC mode: %s\n\n",
@@ -45,7 +45,7 @@ void ecc_print_status(void)
               (ddr->err_disable & ECC_ERROR_DISABLE_MSED) ? 1 : 0);
 
        /* Error injection */
-       printf("Memory Data Path Error Injection Mask High/Low: %08lx %08lx\n",
+       printf("Memory Data Path Error Injection Mask High/Low: %08x %08x\n",
               ddr->data_err_inject_hi, ddr->data_err_inject_lo);
 
        printf("Memory Data Path Error Injection Mask ECC:\n");
@@ -75,8 +75,8 @@ void ecc_print_status(void)
               (ddr->err_detect & ECC_ERROR_DETECT_MSE) ? 1 : 0);
 
        /* Capture data */
-       printf("Memory Error Address Capture: 0x%08lx\n", ddr->capture_address);
-       printf("Memory Data Path Read Capture High/Low: %08lx %08lx\n",
+       printf("Memory Error Address Capture: 0x%08x\n", ddr->capture_address);
+       printf("Memory Data Path Read Capture High/Low: %08x %08x\n",
               ddr->capture_data_hi, ddr->capture_data_lo);
        printf("Memory Data Path Read Capture ECC: 0x%02x\n\n",
               ddr->capture_ecc & CAPTURE_ECC_ECE);
@@ -100,7 +100,7 @@ void ecc_print_status(void)
 
 int do_ecc(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 {
-       volatile immap_t *immap = (immap_t *) CFG_IMMR;
+       volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
        volatile ddr83xx_t *ddr = &immap->ddr;
        volatile u32 val;
        u64 *addr;
@@ -119,7 +119,7 @@ int do_ecc(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        writeback[1] = 0x89abcdefUL;
 
        if (argc > 4) {
-               printf("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -350,12 +350,12 @@ int do_ecc(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
                        return 0;
                }
        }
-       printf("Usage:\n%s\n", cmdtp->usage);
+       cmd_usage(cmdtp);
        return 1;
 }
 
 U_BOOT_CMD(ecc, 4, 0, do_ecc,
-          "ecc     - support for DDR ECC features\n",
+          "support for DDR ECC features",
           "status              - print out status info\n"
           "ecc captureclear        - clear capture regs data\n"
           "ecc sbecnt <val>        - set Single-Bit Error counter\n"