vserver 1.9.3

[linux-2.6.git] / arch / mips / momentum / ocelot_c / prom.c

diff --git a/arch/mips/momentum/ocelot_c/prom.c b/arch/mips/momentum/ocelot_c/prom.c
index cf6c180..49ac302 100644 (file)
--- a/arch/mips/momentum/ocelot_c/prom.c
+++ b/arch/mips/momentum/ocelot_c/prom.c
@@ -23,26 +23,16 @@
 #include <asm/addrspace.h>
 #include <asm/bootinfo.h>
 #include <asm/mv64340.h>
+#include <asm/pmon.h>
 
 #include "ocelot_c_fpga.h"
 
-struct callvectors {
-       int     (*open) (char*, int, int);
-       int     (*close) (int);
-       int     (*read) (int, void*, int);
-       int     (*write) (int, void*, int);
-       off_t   (*lseek) (int, off_t, int);
-       int     (*printf) (const char*, ...);
-       void    (*cacheflush) (void);
-       char*   (*gets) (char*);
-};
-
 struct callvectors* debug_vectors;
 
-extern unsigned long mv64340_base;
+extern unsigned long marvell_base;
 extern unsigned long cpu_clock;
 
-#ifdef CONFIG_MV64340_ETH
+#ifdef CONFIG_MV643XX_ETH
 extern unsigned char prom_mac_addr_base[6];
 #endif
 
@@ -55,7 +45,7 @@ const char *get_system_type(void)
 #endif
 }
 
-#ifdef CONFIG_MV64340_ETH
+#ifdef CONFIG_MV643XX_ETH
 static void burn_clocks(void)
 {
        int i;
@@ -157,13 +147,14 @@ char *arg64(unsigned long addrin, int arg_index)
 #endif  /* CONFIG_MIPS64 */
 
 
-/* [jsun@junsun.net] PMON passes arguments in C main() style */
 void __init prom_init(void)
 {
        int argc = fw_arg0;
        char **arg = (char **) fw_arg1;
        char **env = (char **) fw_arg2;
+       struct callvectors *cv = (struct callvectors *) fw_arg3;
        int i;
+
 #ifdef CONFIG_MIPS64
        char *ptr;
 
@@ -189,13 +180,13 @@ void __init prom_init(void)
                        break;
 
                if (strncmp("gtbase", ptr, strlen("gtbase")) == 0) {
-                       mv64340_base = simple_strtol(ptr + strlen("gtbase="),
+                       marvell_base = simple_strtol(ptr + strlen("gtbase="),
                                                        NULL, 16);
 
-                       if ((mv64340_base & 0xffffffff00000000) == 0)
-                               mv64340_base |= 0xffffffff00000000;
+                       if ((marvell_base & 0xffffffff00000000) == 0)
+                               marvell_base |= 0xffffffff00000000;
 
-                       printk("mv64340_base set to 0x%016lx\n", mv64340_base);
+                       printk("marvell_base set to 0x%016lx\n", marvell_base);
                }
                if (strncmp("cpuclock", ptr, strlen("cpuclock")) == 0) {
                        cpu_clock = simple_strtol(ptr + strlen("cpuclock="),
@@ -222,7 +213,7 @@ void __init prom_init(void)
 
        while (*env) {
                if (strncmp("gtbase", *env, strlen("gtbase")) == 0) {
-                       mv64340_base = simple_strtol(*env + strlen("gtbase="),
+                       marvell_base = simple_strtol(*env + strlen("gtbase="),
                                                        NULL, 16);
                }
                if (strncmp("cpuclock", *env, strlen("cpuclock")) == 0) {
@@ -236,7 +227,7 @@ void __init prom_init(void)
        mips_machgroup = MACH_GROUP_MOMENCO;
        mips_machtype = MACH_MOMENCO_OCELOT_C;
 
-#ifdef CONFIG_MV64340_ETH
+#ifdef CONFIG_MV643XX_ETH
        /* get the base MAC address for on-board ethernet ports */
        get_mac(prom_mac_addr_base);
 #endif