8360, kmeter1: added bootcount feature.

[karo-tx-uboot.git] / common / cmd_reginfo.c

diff --git a/common/cmd_reginfo.c b/common/cmd_reginfo.c
index 1669d7496299066abc56d2498295c4e0e35b1adf..0e28c05b850e0a92d69ebe512dc478bbeb90234b 100644 (file)
--- a/common/cmd_reginfo.c
+++ b/common/cmd_reginfo.c
@@ -38,7 +38,7 @@ extern void mpc86xx_reginfo(void);
 int do_reginfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
 #if defined(CONFIG_8xx)
-       volatile immap_t     *immap  = (immap_t *)CFG_IMMR;
+       volatile immap_t     *immap  = (immap_t *)CONFIG_SYS_IMMR;
        volatile memctl8xx_t *memctl = &immap->im_memctl;
        volatile sysconf8xx_t *sysconf = &immap->im_siu_conf;
        volatile sit8xx_t *timers = &immap->im_sit;
@@ -93,11 +93,10 @@ int do_reginfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 #elif defined (CONFIG_405GP)
        printf ("\n405GP registers; MSR=%08x\n",mfmsr());
        printf ("\nUniversal Interrupt Controller Regs\n"
-           "uicsr    uicsrs   uicer    uiccr    uicpr    uictr    uicmsr   uicvr    uicvcr"
+           "uicsr    uicer    uiccr    uicpr    uictr    uicmsr   uicvr    uicvcr"
            "\n"
-           "%08x %08x %08x %08x %08x %08x %08x %08x %08x\n",
+           "%08x %08x %08x %08x %08x %08x %08x %08x\n",
        mfdcr(uicsr),
-       mfdcr(uicsrs),
        mfdcr(uicer),
        mfdcr(uiccr),
        mfdcr(uicpr),
@@ -245,7 +244,7 @@ int do_reginfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        puts ("\n\n");
 #elif defined(CONFIG_5xx)
 
-       volatile immap_t        *immap  = (immap_t *)CFG_IMMR;
+       volatile immap_t        *immap  = (immap_t *)CONFIG_SYS_IMMR;
        volatile memctl5xx_t    *memctl = &immap->im_memctl;
        volatile sysconf5xx_t   *sysconf = &immap->im_siu_conf;
        volatile sit5xx_t       *timers = &immap->im_sit;
@@ -280,56 +279,56 @@ int do_reginfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 #elif defined(CONFIG_MPC5200)
        puts ("\nMPC5200 registers\n");
-       printf ("MBAR=%08x\n", CFG_MBAR);
+       printf ("MBAR=%08x\n", CONFIG_SYS_MBAR);
        puts ("Memory map registers\n");
-       printf ("\tCS0: start %08X\tstop %08X\tconfig %08X\ten %d\n",
+       printf ("\tCS0: start %08lX\tstop %08lX\tconfig %08lX\ten %d\n",
                *(volatile ulong*)MPC5XXX_CS0_START,
                *(volatile ulong*)MPC5XXX_CS0_STOP,
                *(volatile ulong*)MPC5XXX_CS0_CFG,
                (*(volatile ulong*)MPC5XXX_ADDECR & 0x00010000) ? 1 : 0);
-       printf ("\tCS1: start %08X\tstop %08X\tconfig %08X\ten %d\n",
+       printf ("\tCS1: start %08lX\tstop %08lX\tconfig %08lX\ten %d\n",
                *(volatile ulong*)MPC5XXX_CS1_START,
                *(volatile ulong*)MPC5XXX_CS1_STOP,
                *(volatile ulong*)MPC5XXX_CS1_CFG,
                (*(volatile ulong*)MPC5XXX_ADDECR & 0x00020000) ? 1 : 0);
-       printf ("\tCS2: start %08X\tstop %08X\tconfig %08X\ten %d\n",
+       printf ("\tCS2: start %08lX\tstop %08lX\tconfig %08lX\ten %d\n",
                *(volatile ulong*)MPC5XXX_CS2_START,
                *(volatile ulong*)MPC5XXX_CS2_STOP,
                *(volatile ulong*)MPC5XXX_CS2_CFG,
                (*(volatile ulong*)MPC5XXX_ADDECR & 0x00040000) ? 1 : 0);
-       printf ("\tCS3: start %08X\tstop %08X\tconfig %08X\ten %d\n",
+       printf ("\tCS3: start %08lX\tstop %08lX\tconfig %08lX\ten %d\n",
                *(volatile ulong*)MPC5XXX_CS3_START,
                *(volatile ulong*)MPC5XXX_CS3_STOP,
                *(volatile ulong*)MPC5XXX_CS3_CFG,
                (*(volatile ulong*)MPC5XXX_ADDECR & 0x00080000) ? 1 : 0);
-       printf ("\tCS4: start %08X\tstop %08X\tconfig %08X\ten %d\n",
+       printf ("\tCS4: start %08lX\tstop %08lX\tconfig %08lX\ten %d\n",
                *(volatile ulong*)MPC5XXX_CS4_START,
                *(volatile ulong*)MPC5XXX_CS4_STOP,
                *(volatile ulong*)MPC5XXX_CS4_CFG,
                (*(volatile ulong*)MPC5XXX_ADDECR & 0x00100000) ? 1 : 0);
-       printf ("\tCS5: start %08X\tstop %08X\tconfig %08X\ten %d\n",
+       printf ("\tCS5: start %08lX\tstop %08lX\tconfig %08lX\ten %d\n",
                *(volatile ulong*)MPC5XXX_CS5_START,
                *(volatile ulong*)MPC5XXX_CS5_STOP,
                *(volatile ulong*)MPC5XXX_CS5_CFG,
                (*(volatile ulong*)MPC5XXX_ADDECR & 0x00200000) ? 1 : 0);
-       printf ("\tCS6: start %08X\tstop %08X\tconfig %08X\ten %d\n",
+       printf ("\tCS6: start %08lX\tstop %08lX\tconfig %08lX\ten %d\n",
                *(volatile ulong*)MPC5XXX_CS6_START,
                *(volatile ulong*)MPC5XXX_CS6_STOP,
                *(volatile ulong*)MPC5XXX_CS6_CFG,
                (*(volatile ulong*)MPC5XXX_ADDECR & 0x04000000) ? 1 : 0);
-       printf ("\tCS7: start %08X\tstop %08X\tconfig %08X\ten %d\n",
+       printf ("\tCS7: start %08lX\tstop %08lX\tconfig %08lX\ten %d\n",
                *(volatile ulong*)MPC5XXX_CS7_START,
                *(volatile ulong*)MPC5XXX_CS7_STOP,
                *(volatile ulong*)MPC5XXX_CS7_CFG,
                (*(volatile ulong*)MPC5XXX_ADDECR & 0x08000000) ? 1 : 0);
-       printf ("\tBOOTCS: start %08X\tstop %08X\tconfig %08X\ten %d\n",
+       printf ("\tBOOTCS: start %08lX\tstop %08lX\tconfig %08lX\ten %d\n",
                *(volatile ulong*)MPC5XXX_BOOTCS_START,
                *(volatile ulong*)MPC5XXX_BOOTCS_STOP,
                *(volatile ulong*)MPC5XXX_BOOTCS_CFG,
                (*(volatile ulong*)MPC5XXX_ADDECR & 0x02000000) ? 1 : 0);
-       printf ("\tSDRAMCS0: %08X\n",
+       printf ("\tSDRAMCS0: %08lX\n",
                *(volatile ulong*)MPC5XXX_SDRAM_CS0CFG);
-       printf ("\tSDRAMCS1: %08X\n",
+       printf ("\tSDRAMCS1: %08lX\n",
                *(volatile ulong*)MPC5XXX_SDRAM_CS1CFG);
 #elif defined(CONFIG_MPC86xx)
        mpc86xx_reginfo();
@@ -383,6 +382,6 @@ int do_reginfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 #if defined(CONFIG_CMD_REGINFO)
 U_BOOT_CMD(
        reginfo,        2,      1,      do_reginfo,
-       "reginfo - print register information\n",
+       "print register information",
 );
 #endif