ppx4xx: Fix sdram init on PMC440 boards

[oweals/u-boot.git] / common / cmd_reginfo.c

diff --git a/common/cmd_reginfo.c b/common/cmd_reginfo.c
index ee5e14f8fcedf4c6ebf4b77b1076087ea7eb0382..bb6aa30d18a3ba7ae8aa0247296a38012a8af3eb 100644 (file)
--- a/common/cmd_reginfo.c
+++ b/common/cmd_reginfo.c
@@ -29,8 +29,9 @@
 #include <asm/processor.h>
 #elif defined (CONFIG_5xx)
 #include <mpc5xx.h>
+#elif defined (CONFIG_MPC5200)
+#include <mpc5xxx.h>
 #endif
-#if (CONFIG_COMMANDS & CFG_CMD_REGINFO)
 
 int do_reginfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
@@ -87,7 +88,6 @@ int do_reginfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
         * May be some CPM info here?
         */
 
-/* DBU[dave@cray.com]   For the CRAY-L1, but should be generically 405gp */
 #elif defined (CONFIG_405GP)
        printf ("\n405GP registers; MSR=%08x\n",mfmsr());
        printf ("\nUniversal Interrupt Controller Regs\n"
@@ -175,7 +175,7 @@ int do_reginfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        mtdcr(ebccfga,pb7ap);   printf ("%08x ", mfdcr(ebccfgd));
 
        puts ("\n\n");
-/* For the BUBINGA (IBM 405EP eval) but should be generically 405ep */
+
 #elif defined(CONFIG_405EP)
        printf ("\n405EP registers; MSR=%08x\n",mfmsr());
        printf ("\nUniversal Interrupt Controller Regs\n"
@@ -275,17 +275,69 @@ int do_reginfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        puts ("\nU-Bus to IMB3 Bus Interface\n");
        printf("\tUMCR\t0x%08X\tUIPEND\t0x%08X \n", uimb->uimb_umcr, uimb->uimb_uipend);
        puts ("\n\n");
-#endif /* CONFIG_5xx */
+
+#elif defined(CONFIG_MPC5200)
+       puts ("\nMPC5200 registers\n");
+       printf ("MBAR=%08x\n", CFG_MBAR);
+       puts ("Memory map registers\n");
+       printf ("\tCS0: start %08X\tstop %08X\tconfig %08X\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",
+               *(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",
+               *(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",
+               *(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",
+               *(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",
+               *(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",
+               *(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",
+               *(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",
+               *(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",
+               *(volatile ulong*)MPC5XXX_SDRAM_CS0CFG);
+       printf ("\tSDRAMCS1: %08X\n",
+               *(volatile ulong*)MPC5XXX_SDRAM_CS1CFG);
+#endif /* CONFIG_MPC5200 */
        return 0;
 }
 
-#endif /* CONFIG_COMMANDS & CFG_CMD_REGINFO */
-
-
  /**************************************************/
 
-#if (defined(CONFIG_8xx) || defined(CONFIG_405GP) || defined(CONFIG_405EP)) && \
-     (CONFIG_COMMANDS & CFG_CMD_REGINFO)
+#if ( defined(CONFIG_8xx)   || defined(CONFIG_405GP) || \
+      defined(CONFIG_405EP) || defined(CONFIG_MPC5200)  ) && \
+    defined(CONFIG_CMD_REGINFO)
 
 U_BOOT_CMD(
        reginfo,        2,      1,      do_reginfo,