summaryrefslogtreecommitdiffstats
path: root/target/linux/ar7-2.6/files/arch/mips/ar7
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-05-24 15:59:32 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-05-24 15:59:32 +0000
commit3f52da61813f2c0ffdd62d663b705ae04f3a74e9 (patch)
tree0b11e7fab11a37bb4c0dd5886fb41ac8e3fe5846 /target/linux/ar7-2.6/files/arch/mips/ar7
parentf0cc040988617eacc9d7e950fe43b75399050501 (diff)
fix ar7 compile
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7331 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar7-2.6/files/arch/mips/ar7')
-rw-r--r--target/linux/ar7-2.6/files/arch/mips/ar7/irq.c2
-rw-r--r--target/linux/ar7-2.6/files/arch/mips/ar7/memory.c4
-rw-r--r--target/linux/ar7-2.6/files/arch/mips/ar7/prom.c1
-rw-r--r--target/linux/ar7-2.6/files/arch/mips/ar7/setup.c9
4 files changed, 6 insertions, 10 deletions
diff --git a/target/linux/ar7-2.6/files/arch/mips/ar7/irq.c b/target/linux/ar7-2.6/files/arch/mips/ar7/irq.c
index 301995227..542a57a24 100644
--- a/target/linux/ar7-2.6/files/arch/mips/ar7/irq.c
+++ b/target/linux/ar7-2.6/files/arch/mips/ar7/irq.c
@@ -117,7 +117,7 @@ static void ar7_mask_secondary_irq(unsigned int irq)
}
void __init arch_init_irq(void) {
- mips_cpu_irq_init(0);
+ mips_cpu_irq_init();
ar7_irq_init(8);
}
diff --git a/target/linux/ar7-2.6/files/arch/mips/ar7/memory.c b/target/linux/ar7-2.6/files/arch/mips/ar7/memory.c
index 10dc09da4..8ff571ce2 100644
--- a/target/linux/ar7-2.6/files/arch/mips/ar7/memory.c
+++ b/target/linux/ar7-2.6/files/arch/mips/ar7/memory.c
@@ -188,7 +188,7 @@ void __init prom_meminit(void)
#endif
}
-unsigned long __init prom_free_prom_memory(void)
+void __init prom_free_prom_memory(void)
{
- return 0;
+ return;
}
diff --git a/target/linux/ar7-2.6/files/arch/mips/ar7/prom.c b/target/linux/ar7-2.6/files/arch/mips/ar7/prom.c
index 00cb4a6de..20926c67e 100644
--- a/target/linux/ar7-2.6/files/arch/mips/ar7/prom.c
+++ b/target/linux/ar7-2.6/files/arch/mips/ar7/prom.c
@@ -279,7 +279,6 @@ static void __init console_config(void)
void __init prom_init(void)
{
- prom_printf("\nLINUX running...\n");
ar7_init_cmdline(fw_arg0, (char **)fw_arg1);
ar7_init_env((struct env_var *)fw_arg2);
console_config();
diff --git a/target/linux/ar7-2.6/files/arch/mips/ar7/setup.c b/target/linux/ar7-2.6/files/arch/mips/ar7/setup.c
index fb3d20c18..7930e90b2 100644
--- a/target/linux/ar7-2.6/files/arch/mips/ar7/setup.c
+++ b/target/linux/ar7-2.6/files/arch/mips/ar7/setup.c
@@ -49,15 +49,13 @@ static void ar7_machine_power_off(void);
static void ar7_machine_restart(char *command)
{
- volatile u32 *softres_reg = (u32 *)ioremap(AR7_REGS_RESET +
+ volatile u32 *softres_reg = (u32 *)ioremap(AR7_REGS_RESET +
AR7_RESET_SOFTWARE, 1);
- prom_printf("Reboot\n");
- *softres_reg = 1;
+ *softres_reg = 1;
}
static void ar7_machine_halt(void)
{
- prom_printf("Halt\n");
while (1);
}
@@ -65,8 +63,7 @@ static void ar7_machine_power_off(void)
{
volatile u32 *power_reg = (u32 *)ioremap(AR7_REGS_POWER, 1);
u32 power_state = *power_reg | (3 << 30);
- prom_printf("Power off\n");
- *power_reg = power_state;
+ *power_reg = power_state;
ar7_machine_halt();
}