git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[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
49ac302
..
e923644
100644
(file)
--- a/
arch/mips/momentum/ocelot_c/prom.c
+++ b/
arch/mips/momentum/ocelot_c/prom.c
@@
-19,10
+19,10
@@
#include <linux/mm.h>
#include <linux/sched.h>
#include <linux/bootmem.h>
#include <linux/mm.h>
#include <linux/sched.h>
#include <linux/bootmem.h>
+#include <linux/mv643xx.h>
#include <asm/addrspace.h>
#include <asm/bootinfo.h>
#include <asm/addrspace.h>
#include <asm/bootinfo.h>
-#include <asm/mv64340.h>
#include <asm/pmon.h>
#include "ocelot_c_fpga.h"
#include <asm/pmon.h>
#include "ocelot_c_fpga.h"
@@
-67,7
+67,7
@@
static u8 exchange_bit(u8 val, u8 cs)
/* turn the clock off and read-strobe */
OCELOT_FPGA_WRITE((val << 2) | cs | 0x10, EEPROM_MODE);
/* turn the clock off and read-strobe */
OCELOT_FPGA_WRITE((val << 2) | cs | 0x10, EEPROM_MODE);
-
+
/* return the data */
return ((OCELOT_FPGA_READ(EEPROM_MODE) >> 3) & 0x1);
}
/* return the data */
return ((OCELOT_FPGA_READ(EEPROM_MODE) >> 3) & 0x1);
}
@@
-94,7
+94,7
@@
void get_mac(char dest[6])
#endif
#endif
-#ifdef CONFIG_
MIPS64
+#ifdef CONFIG_
64BIT
unsigned long signext(unsigned long addr)
{
unsigned long signext(unsigned long addr)
{
@@
-144,7
+144,7
@@
char *arg64(unsigned long addrin, int arg_index)
p = (char *)get_arg(args, arg_index);
return p;
}
p = (char *)get_arg(args, arg_index);
return p;
}
-#endif /* CONFIG_
MIPS64
*/
+#endif /* CONFIG_
64BIT
*/
void __init prom_init(void)
void __init prom_init(void)
@@
-155,7
+155,7
@@
void __init prom_init(void)
struct callvectors *cv = (struct callvectors *) fw_arg3;
int i;
struct callvectors *cv = (struct callvectors *) fw_arg3;
int i;
-#ifdef CONFIG_
MIPS64
+#ifdef CONFIG_
64BIT
char *ptr;
printk("prom_init - MIPS64\n");
char *ptr;
printk("prom_init - MIPS64\n");
@@
-197,7
+197,7
@@
void __init prom_init(void)
}
printk("arcs_cmdline: %s\n", arcs_cmdline);
}
printk("arcs_cmdline: %s\n", arcs_cmdline);
-#else /* CONFIG_
MIPS64
*/
+#else /* CONFIG_
64BIT
*/
/* save the PROM vectors for debugging use */
debug_vectors = cv;
/* save the PROM vectors for debugging use */
debug_vectors = cv;
@@
-222,7
+222,7
@@
void __init prom_init(void)
}
env++;
}
}
env++;
}
-#endif /* CONFIG_
MIPS64
*/
+#endif /* CONFIG_
64BIT
*/
mips_machgroup = MACH_GROUP_MOMENCO;
mips_machtype = MACH_MOMENCO_OCELOT_C;
mips_machgroup = MACH_GROUP_MOMENCO;
mips_machtype = MACH_MOMENCO_OCELOT_C;
@@
-232,7
+232,7
@@
void __init prom_init(void)
get_mac(prom_mac_addr_base);
#endif
get_mac(prom_mac_addr_base);
#endif
-#ifndef CONFIG_
MIPS64
+#ifndef CONFIG_
64BIT
debug_vectors->printf("Booting Linux kernel...\n");
#endif
}
debug_vectors->printf("Booting Linux kernel...\n");
#endif
}