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
vserver 1.9.3
[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
10acbe9
..
fa5982a
100644
(file)
--- a/
arch/mips/momentum/jaguar_atx/prom.c
+++ b/
arch/mips/momentum/jaguar_atx/prom.c
@@
-33,7
+33,6
@@
extern void ja_setup_console(void);
struct callvectors *debug_vectors;
struct callvectors *debug_vectors;
-extern unsigned long mv64340_base;
extern unsigned long cpu_clock;
const char *get_system_type(void)
extern unsigned long cpu_clock;
const char *get_system_type(void)
@@
-41,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)
@@
-185,13
+184,13
@@
void __init prom_init(void)
break;
if (strncmp("gtbase", ptr, strlen("gtbase")) == 0) {
break;
if (strncmp("gtbase", ptr, strlen("gtbase")) == 0) {
- m
v64340
_base = simple_strtol(ptr + strlen("gtbase="),
+ m
arvell
_base = simple_strtol(ptr + strlen("gtbase="),
NULL, 16);
NULL, 16);
- if ((m
v64340
_base & 0xffffffff00000000) == 0)
- m
v64340
_base |= 0xffffffff00000000;
+ if ((m
arvell
_base & 0xffffffff00000000) == 0)
+ m
arvell
_base |= 0xffffffff00000000;
- printk("m
v64340_base set to 0x%016lx\n", mv64340
_base);
+ printk("m
arvell_base set to 0x%016lx\n", marvell
_base);
}
if (strncmp("cpuclock", ptr, strlen("cpuclock")) == 0) {
cpu_clock = simple_strtol(ptr + strlen("cpuclock="),
}
if (strncmp("cpuclock", ptr, strlen("cpuclock")) == 0) {
cpu_clock = simple_strtol(ptr + strlen("cpuclock="),
@@
-218,7
+217,7
@@
void __init prom_init(void)
while (*env) {
if (strncmp("gtbase", *env, strlen("gtbase")) == 0) {
while (*env) {
if (strncmp("gtbase", *env, strlen("gtbase")) == 0) {
- m
v64340
_base = simple_strtol(*env + strlen("gtbase="),
+ m
arvell
_base = simple_strtol(*env + strlen("gtbase="),
NULL, 16);
}
if (strncmp("cpuclock", *env, strlen("cpuclock")) == 0) {
NULL, 16);
}
if (strncmp("cpuclock", *env, strlen("cpuclock")) == 0) {
@@
-231,7
+230,7
@@
void __init prom_init(void)
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
@@
-245,20
+244,6
@@
void __init prom_fixup_mem_map(unsigned long start, unsigned long end)
{
}
{
}
-/*
- * SMP support
- */
-int prom_setup_smp(void)
-{
- int num_cpus = 2;
-
- /*
- * We know that the RM9000 on the Jaguar ATX board has 2 cores.
- * Hence, this can be hardcoded for now.
- */
- return num_cpus;
-}
-
int prom_boot_secondary(int cpu, unsigned long sp, unsigned long gp)
{
/* Clear the semaphore */
int prom_boot_secondary(int cpu, unsigned long sp, unsigned long gp)
{
/* Clear the semaphore */