[ar71xx] move inclusion of the mach-ar71xx/Kconfig into the right patch
[openwrt/svn-archive/archive.git] / target / linux / ar71xx / patches-2.6.26 / 001-ar71xx_core.patch
1 --- a/arch/mips/Makefile
2 +++ b/arch/mips/Makefile
3 @@ -597,6 +597,13 @@
4 cflags-$(CONFIG_TOSHIBA_RBTX4938) += -Iinclude/asm-mips/mach-tx49xx
5 load-$(CONFIG_TOSHIBA_RBTX4938) += 0xffffffff80100000
6
7 +#
8 +# Atheros AR71xx
9 +#
10 +core-$(CONFIG_ATHEROS_AR71XX) += arch/mips/ar71xx/
11 +cflags-$(CONFIG_ATHEROS_AR71XX) += -Iinclude/asm-mips/mach-ar71xx
12 +load-$(CONFIG_ATHEROS_AR71XX) += 0xffffffff80060000
13 +
14 # temporary until string.h is fixed
15 cflags-y += -ffreestanding
16
17 --- a/include/asm-mips/bootinfo.h
18 +++ b/include/asm-mips/bootinfo.h
19 @@ -79,6 +79,16 @@
20 #define MACH_LASAT_200 1 /* Masquerade PRO/SP200 */
21
22 /*
23 + * Valid machtype for Atheros AR71xx based boards
24 + */
25 +#define MACH_AR71XX_GENERIC 0
26 +#define MACH_AR71XX_WP543 1 /* Compex WP543 */
27 +#define MACH_AR71XX_RB_411 2 /* MikroTik RouterBOARD 411/411A/411AH */
28 +#define MACH_AR71XX_RB_433 3 /* MikroTik RouterBOARD 433/433AH */
29 +#define MACH_AR71XX_RB_450 4 /* MikroTik RouterBOARD 450 */
30 +#define MACH_AR71XX_RB_493 5 /* Mikrotik RouterBOARD 493/493AH */
31 +
32 +/*
33 * Valid machtype for group NEC EMMA2RH
34 */
35 #define MACH_NEC_MARKEINS 0 /* NEC EMMA2RH Mark-eins */
36 --- a/arch/mips/Kconfig
37 +++ b/arch/mips/Kconfig
38 @@ -21,6 +21,24 @@
39 config MACH_ALCHEMY
40 bool "Alchemy processor based machines"
41
42 +config ATHEROS_AR71XX
43 + bool "Atheros AR71xx based boards"
44 + select CEVT_R4K
45 + select CSRC_R4K
46 + select DMA_NONCOHERENT
47 + select HW_HAS_PCI
48 + select IRQ_CPU
49 + select GENERIC_GPIO
50 + select HAVE_GPIO_LIB
51 + select SYS_HAS_CPU_MIPS32_R1
52 + select SYS_HAS_CPU_MIPS32_R2
53 + select SYS_SUPPORTS_32BIT_KERNEL
54 + select SYS_SUPPORTS_BIG_ENDIAN
55 + select SYS_HAS_EARLY_PRINTK
56 + select MIPS_MACHINE
57 + help
58 + Support for Atheros AR71xx based boards.
59 +
60 config BASLER_EXCITE
61 bool "Basler eXcite smart camera"
62 select CEVT_R4K
63 @@ -687,6 +705,7 @@
64
65 endchoice
66
67 +source "arch/mips/ar71xx/Kconfig"
68 source "arch/mips/au1000/Kconfig"
69 source "arch/mips/basler/excite/Kconfig"
70 source "arch/mips/jazz/Kconfig"