Patch by Kenneth Johansson, 30 Jun 2003:

[people/ms/u-boot.git] / common / cmd_immap.c

diff --git a/common/cmd_immap.c b/common/cmd_immap.c
index 443335b2ce385138819f5bf5ca35947d97986580..4bb6e0cc49de2715b131ea626e4dc9133dabdc05 100644 (file)
--- a/common/cmd_immap.c
+++ b/common/cmd_immap.c
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2000
+ * (C) Copyright 2000-2003
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * See file CREDITS for list of people who contributed to this
@@ -27,7 +27,6 @@
 
 #include <common.h>
 #include <command.h>
-#include <cmd_immap.h>
 
 #if (CONFIG_COMMANDS & CFG_CMD_IMMAP) && \
     (defined(CONFIG_8xx) || defined(CONFIG_8260))
@@ -150,7 +149,24 @@ do_icinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 int
 do_carinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
-       unimplemented (cmdtp, flag, argc, argv);
+       volatile immap_t *immap = (immap_t *) CFG_IMMR;
+
+#if defined(CONFIG_8xx)
+       volatile car8xx_t *car = &immap->im_clkrst;
+#elif defined(CONFIG_8260)
+       volatile car8260_t *car = &immap->im_clkrst;
+#endif
+
+#if defined(CONFIG_8xx)
+       printf ("SCCR  = %08x\n", car->car_sccr);
+       printf ("PLPRCR= %08x\n", car->car_plprcr);
+       printf ("RSR   = %08x\n", car->car_rsr);
+#elif defined(CONFIG_8260)
+       printf ("SCCR  = %08x\n", car->car_sccr);
+       printf ("SCMR  = %08x\n", car->car_scmr);
+       printf ("RSR   = %08x\n", car->car_rsr);
+       printf ("RMR   = %08x\n", car->car_rmr);
+#endif
        return 0;
 }
 
@@ -168,7 +184,7 @@ header(void)
        int i;
 
        if (counter % 2)
-       putc('\n');
+               putc('\n');
        counter = 0;
 
        for (i = 0; i < 4; i++, data += 79)
@@ -575,4 +591,112 @@ do_mccinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        unimplemented (cmdtp, flag, argc, argv);
        return 0;
 }
+
+/***************************************************/
+
+U_BOOT_CMD(
+       siuinfo,        1,      1,      do_siuinfo,
+       "siuinfo - print System Interface Unit (SIU) registers\n",
+       NULL
+);
+
+U_BOOT_CMD(
+       memcinfo,       1,      1,      do_memcinfo,
+       "memcinfo- print Memory Controller registers\n",
+       NULL
+);
+
+U_BOOT_CMD(
+       sitinfo,        1,      1,      do_sitinfo,
+       "sitinfo - print System Integration Timers (SIT) registers\n",
+       NULL
+);
+
+#ifdef CONFIG_8260
+U_BOOT_CMD(
+       icinfo, 1,      1,      do_icinfo,
+       "icinfo  - print Interrupt Controller registers\n",
+       NULL
+);
+#endif
+
+U_BOOT_CMD(
+       carinfo,        1,      1,      do_carinfo,
+       "carinfo - print Clocks and Reset registers\n",
+       NULL
+);
+
+U_BOOT_CMD(
+       iopinfo,        1,      1,      do_iopinfo,
+       "iopinfo - print I/O Port registers\n",
+       NULL
+);
+
+U_BOOT_CMD(
+       iopset, 5,      0,      do_iopset,
+       "iopset - set I/O Port registers\n",
+       "PORT PIN CMD VALUE\nPORT: A-D, PIN: 0-31, CMD: [dat|dir|odr|sor], VALUE: 0|1"
+);
+
+U_BOOT_CMD(
+       dmainfo,        1,      1,      do_dmainfo,
+       "dmainfo - print SDMA/IDMA registers\n",
+       NULL
+);
+
+U_BOOT_CMD(
+       fccinfo,        1,      1,      do_fccinfo,
+       "fccinfo - print FCC registers\n",
+       NULL
+);
+
+U_BOOT_CMD(
+       brginfo,        1,      1,      do_brginfo,
+       "brginfo - print Baud Rate Generator (BRG) registers\n",
+       NULL
+);
+
+U_BOOT_CMD(
+       i2cinfo,        1,      1,      do_i2cinfo,
+       "i2cinfo - print I2C registers\n",
+       NULL
+);
+
+U_BOOT_CMD(
+       sccinfo,        1,      1,      do_sccinfo,
+       "sccinfo - print SCC registers\n",
+       NULL
+);
+
+U_BOOT_CMD(
+       smcinfo,        1,      1,      do_smcinfo,
+       "smcinfo - print SMC registers\n",
+       NULL
+);
+
+U_BOOT_CMD(
+       spiinfo,        1,      1,      do_spiinfo,
+       "spiinfo - print Serial Peripheral Interface (SPI) registers\n",
+       NULL
+);
+
+U_BOOT_CMD(
+       muxinfo,        1,      1,      do_muxinfo,
+       "muxinfo - print CPM Multiplexing registers\n",
+       NULL
+);
+
+U_BOOT_CMD(
+       siinfo, 1,      1,      do_siinfo,
+       "siinfo  - print Serial Interface (SI) registers\n",
+       NULL
+);
+
+U_BOOT_CMD(
+       mccinfo,        1,      1,      do_mccinfo,
+       "mccinfo - print MCC registers\n",
+       NULL
+);
+
+
 #endif /* CFG_CMD_IMMAP && (CONFIG_8xx || CONFIG_8260) */