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
/
jaguar_atx
/
prom.c
diff --git
a/arch/mips/momentum/jaguar_atx/prom.c
b/arch/mips/momentum/jaguar_atx/prom.c
index
df52d2a
..
1cadaa9
100644
(file)
--- a/
arch/mips/momentum/jaguar_atx/prom.c
+++ b/
arch/mips/momentum/jaguar_atx/prom.c
@@
-21,10
+21,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 "jaguar_atx_fpga.h"
#include <asm/pmon.h>
#include "jaguar_atx_fpga.h"
@@
-40,7
+40,7
@@
const char *get_system_type(void)
return "Momentum Jaguar-ATX";
}
return "Momentum Jaguar-ATX";
}
-#ifdef CONFIG_MV643
40
_ETH
+#ifdef CONFIG_MV643
XX
_ETH
extern unsigned char prom_mac_addr_base[6];
static void burn_clocks(void)
extern unsigned char prom_mac_addr_base[6];
static void burn_clocks(void)
@@
-64,7
+64,7
@@
static u8 exchange_bit(u8 val, u8 cs)
/* turn the clock off and read-strobe */
JAGUAR_FPGA_WRITE((val << 2) | cs | 0x10, EEPROM_MODE);
/* turn the clock off and read-strobe */
JAGUAR_FPGA_WRITE((val << 2) | cs | 0x10, EEPROM_MODE);
-
+
/* return the data */
return ((JAGUAR_FPGA_READ(EEPROM_MODE) >> 3) & 0x1);
}
/* return the data */
return ((JAGUAR_FPGA_READ(EEPROM_MODE) >> 3) & 0x1);
}
@@
-90,7
+90,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)
{
@@
-143,7
+143,7
@@
char *arg64(unsigned long addrin, int arg_index)
return p;
}
return p;
}
-#endif /* CONFIG_
MIPS64
*/
+#endif /* CONFIG_
64BIT
*/
/* PMON passes arguments in C main() style */
void __init prom_init(void)
/* PMON passes arguments in C main() style */
void __init prom_init(void)
@@
-158,7
+158,7
@@
void __init prom_init(void)
// ja_setup_console(); /* The very first thing. */
#endif
// ja_setup_console(); /* The very first thing. */
#endif
-#ifdef CONFIG_
MIPS64
+#ifdef CONFIG_
64BIT
char *ptr;
printk("Mips64 Jaguar-ATX\n");
char *ptr;
printk("Mips64 Jaguar-ATX\n");
@@
-201,7
+201,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;
@@
-226,18
+226,19
@@
void __init prom_init(void)
}
env++;
}
}
env++;
}
-#endif /* CONFIG_
MIPS64
*/
+#endif /* CONFIG_
64BIT
*/
mips_machgroup = MACH_GROUP_MOMENCO;
mips_machtype = MACH_MOMENCO_JAGUAR_ATX;
mips_machgroup = MACH_GROUP_MOMENCO;
mips_machtype = MACH_MOMENCO_JAGUAR_ATX;
-#ifdef CONFIG_MV643
40
_ETH
+#ifdef CONFIG_MV643
XX
_ETH
/* get the base MAC address for on-board ethernet ports */
get_mac(prom_mac_addr_base);
#endif
}
/* get the base MAC address for on-board ethernet ports */
get_mac(prom_mac_addr_base);
#endif
}
-
void
__init prom_free_prom_memory(void)
+
unsigned long
__init prom_free_prom_memory(void)
{
{
+ return 0;
}
void __init prom_fixup_mem_map(unsigned long start, unsigned long end)
}
void __init prom_fixup_mem_map(unsigned long start, unsigned long end)