Merge branch 'mpc85xx'

[oweals/u-boot.git] / cpu / mpc5xx / cpu.c

diff --git a/cpu/mpc5xx/cpu.c b/cpu/mpc5xx/cpu.c
index cc695118e043a4c4aff42d0657940037e37928fc..4bef90c48ad97755ce644736a31d1054df0baf6f 100644 (file)
--- a/cpu/mpc5xx/cpu.c
+++ b/cpu/mpc5xx/cpu.c
@@ -34,6 +34,7 @@
 #include <command.h>
 #include <mpc5xx.h>
 
+DECLARE_GLOBAL_DATA_PTR;
 
 #if (defined(CONFIG_MPC555))
 #  define      ID_STR  "MPC555/556"
@@ -62,8 +63,6 @@ static int check_cpu_version (long clock, uint pvr, uint immr)
  */
 int checkcpu (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        ulong clock = gd->cpu_clk;
        uint immr = get_immr (0);       /* Return full IMMR contents */
        uint pvr = get_pvr ();          /* Retrieve PVR register */
@@ -104,7 +103,6 @@ void reset_5xx_watchdog (volatile immap_t * immr)
  */
 unsigned long get_tbclk (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
        volatile immap_t *immr = (volatile immap_t *) CFG_IMMR;
        ulong oscclk, factor;
 
@@ -122,12 +120,30 @@ unsigned long get_tbclk (void)
        return (oscclk / 16);
 }
 
+void dcache_enable (void)
+{
+       return;
+}
+
+void dcache_disable (void)
+{
+       return;
+}
+
+int dcache_status (void)
+{
+       return 0;       /* always off */
+}
 
 /*
  * Reset board
  */
 int do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 {
+#if defined(CONFIG_PATI)
+       volatile ulong *addr = (ulong *) CFG_RESET_ADDRESS;
+       *addr = 1;
+#else
        ulong addr;
 
        /* Interrupts off, enable reset */
@@ -150,5 +166,6 @@ int do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        addr = CFG_MONITOR_BASE - sizeof (ulong);
 #endif
        ((void (*) (void)) addr) ();
+#endif  /* #if defined(CONFIG_PATI) */
        return 1;
 }