ramips: switch to 2.6.36
[openwrt.git] / target / linux / ramips / patches-2.6.34 / 100-mips-ralink-core.patch
1 --- a/arch/mips/Makefile
2 +++ b/arch/mips/Makefile
3 @@ -181,6 +181,26 @@ ifeq (,$(findstring march=octeon, $(cfla
4  cflags-$(CONFIG_CPU_CAVIUM_OCTEON) += -Wa,-march=octeon
5  endif
6  
7 +#
8 +# Ralink SoC common stuff
9 +#
10 +core-$(CONFIG_MIPS_RALINK)     += arch/mips/ralink/common/
11 +cflags-$(CONFIG_MIPS_RALINK)   += -I$(srctree)/arch/mips/include/asm/mach-ralink
12 +
13 +#
14 +# Ralink RT288x
15 +#
16 +core-$(CONFIG_RALINK_RT288X)   += arch/mips/ralink/rt288x/
17 +cflags-$(CONFIG_RALINK_RT288X) += -I$(srctree)//arch/mips/include/asm/mach-ralink/rt288x
18 +load-$(CONFIG_RALINK_RT288X)   += 0xffffffff88000000
19 +
20 +#
21 +# Ralink RT305x
22 +#
23 +core-$(CONFIG_RALINK_RT305X)   += arch/mips/ralink/rt305x/
24 +cflags-$(CONFIG_RALINK_RT305X) += -I$(srctree)/arch/mips/include/asm/mach-ralink/rt305x
25 +load-$(CONFIG_RALINK_RT305X)   += 0xffffffff80000000
26 +
27  cflags-$(CONFIG_CPU_R4000_WORKAROUNDS) += $(call cc-option,-mfix-r4000,)
28  cflags-$(CONFIG_CPU_R4400_WORKAROUNDS) += $(call cc-option,-mfix-r4400,)
29  cflags-$(CONFIG_CPU_DADDI_WORKAROUNDS) += $(call cc-option,-mno-daddi,)
30 --- a/arch/mips/Kconfig
31 +++ b/arch/mips/Kconfig
32 @@ -48,6 +48,9 @@ config AR7
33           Support for the Texas Instruments AR7 System-on-a-Chip
34           family: TNETD7100, 7200 and 7300.
35  
36 +config MIPS_RALINK
37 +       bool "Ralink MIPS SoC based boards"
38 +
39  config BCM47XX
40         bool "Broadcom BCM47XX based boards"
41         select CEVT_R4K
42 @@ -688,6 +691,7 @@ source "arch/mips/bcm63xx/Kconfig"
43  source "arch/mips/jazz/Kconfig"
44  source "arch/mips/lasat/Kconfig"
45  source "arch/mips/pmc-sierra/Kconfig"
46 +source "arch/mips/ralink/Kconfig"
47  source "arch/mips/powertv/Kconfig"
48  source "arch/mips/sgi-ip27/Kconfig"
49  source "arch/mips/sibyte/Kconfig"
50 @@ -1044,7 +1048,7 @@ config BOOT_ELF32
51  
52  config MIPS_L1_CACHE_SHIFT
53         int
54 -       default "4" if MACH_DECSTATION || MIKROTIK_RB532 || PMC_MSP4200_EVAL
55 +       default "4" if MACH_DECSTATION || MIKROTIK_RB532 || PMC_MSP4200_EVAL || RALINK_RT288X
56         default "6" if MIPS_CPU_SCACHE
57         default "7" if SGI_IP22 || SGI_IP27 || SGI_IP28 || SNI_RM || CPU_CAVIUM_OCTEON
58         default "5"