mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
fix ar7 compile
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7331 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user