#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/mv64340.h>
+#include <asm/pmon.h>
#include "jaguar_atx_fpga.h"
extern void ja_setup_console(void);
-struct callvectors {
- int (*open) (char*, int, int); /* 0 */
- int (*close) (int); /* 4 */
- int (*read) (int, void*, int); /* 8 */
- int (*write) (int, void*, int); /* 12 */
- off_t (*lseek) (int, off_t, int); /* 16 */
- int (*printf) (const char*, ...); /* 20 */
- void (*cacheflush) (void); /* 24 */
- char* (*gets) (char*); /* 28 */
-};
-
struct callvectors *debug_vectors;
-extern unsigned long mv64340_base;
extern unsigned long cpu_clock;
const char *get_system_type(void)
return "Momentum Jaguar-ATX";
}
-#ifdef CONFIG_MV64340_ETH
+#ifdef CONFIG_MV643XX_ETH
extern unsigned char prom_mac_addr_base[6];
static void burn_clocks(void)
/* 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);
}
}
#endif
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
unsigned long signext(unsigned long addr)
{
return p;
}
-#endif /* CONFIG_MIPS64 */
+#endif /* CONFIG_64BIT */
/* PMON passes arguments in C main() style */
void __init prom_init(void)
// ja_setup_console(); /* The very first thing. */
#endif
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
char *ptr;
printk("Mips64 Jaguar-ATX\n");
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="),
}
printk("arcs_cmdline: %s\n", arcs_cmdline);
-#else /* CONFIG_MIPS64 */
+#else /* CONFIG_64BIT */
/* save the PROM vectors for debugging use */
debug_vectors = cv;
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) {
}
env++;
}
-#endif /* CONFIG_MIPS64 */
+#endif /* CONFIG_64BIT */
mips_machgroup = MACH_GROUP_MOMENCO;
mips_machtype = MACH_MOMENCO_JAGUAR_ATX;
-#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
}
-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)
{
}
-/*
- * 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 */