hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[AR7] make current AR7 code 2.6.24 aware, for future use 

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10415 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Matteo Croce 2008-02-08 00:21:08 +00:00
parent 815e1daffa
commit 38a72d306a
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
target/linux/ar7/files/arch/mips/ar7/setup.c
View File

@ -17,16 +17,19 @@
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
*/ */
#include <linux/version.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/pm.h> #include <linux/pm.h>
#include <asm/mips-boards/prom.h>
#include <asm/reboot.h> #include <asm/reboot.h>
#include <asm/time.h> #include <asm/time.h>
#include <asm/ar7/ar7.h> #include <asm/ar7/ar7.h>
#include <asm/ar7/prom.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24) /* TODO remove when 2.6.24 is stable */
extern void ar7_time_init(void); extern void ar7_time_init(void);
#endif
static void ar7_machine_restart(char *command); static void ar7_machine_restart(char *command);
static void ar7_machine_halt(void); static void ar7_machine_halt(void);
static void ar7_machine_power_off(void); static void ar7_machine_power_off(void);
@ -85,7 +88,9 @@ void __init plat_mem_setup(void)
_machine_restart = ar7_machine_restart; _machine_restart = ar7_machine_restart;
_machine_halt = ar7_machine_halt; _machine_halt = ar7_machine_halt;
pm_power_off = ar7_machine_power_off; pm_power_off = ar7_machine_power_off;
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24) /* TODO remove when 2.6.24 is stable */
board_time_init = ar7_time_init; board_time_init = ar7_time_init;
#endif
panic_timeout = 3; panic_timeout = 3;
io_base = (unsigned long)ioremap(AR7_REGS_BASE, 0x10000); io_base = (unsigned long)ioremap(AR7_REGS_BASE, 0x10000);

15
target/linux/ar7/files/arch/mips/ar7/time.c
View File

@ -20,15 +20,20 @@
* Setting up the clock on the MIPS boards. * Setting up the clock on the MIPS boards.
*/ */
#include <linux/version.h>
#include <asm/time.h> #include <asm/time.h>
#include <asm/ar7/ar7.h> #include <asm/ar7/ar7.h>
void __init ar7_time_init(void) #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24) /* TODO remove when 2.6.24 is stable */
{
mips_hpt_frequency = ar7_cpu_freq() / 2;
}
void __init plat_timer_setup(struct irqaction *irq) void __init plat_timer_setup(struct irqaction *irq)
{ {
setup_irq(7, irq); setup_irq(7, irq);
} }
void __init ar7_time_init(void)
#else
void __init plat_time_init(void)
#endif
{
mips_hpt_frequency = ar7_cpu_freq() / 2;
}

1
target/linux/ar7/files/include/asm-mips/ar7/prom.h
View File

@ -21,5 +21,6 @@
extern char *prom_getenv(char *name); extern char *prom_getenv(char *name);
extern void prom_printf(char *fmt, ...); extern void prom_printf(char *fmt, ...);
extern void prom_meminit(void);
#endif /* __PROM_H__ */ #endif /* __PROM_H__ */