kernel: update 3.10 to 3.10.9
[openwrt.git] / target / linux / brcm63xx / patches-3.10 / 105-MIPS-BCM63XX-let-the-individual-SoCs-select-the-appr.patch
1 From 9d1e9d7abd2f2d067169fb0c62e34cf080bbd7a1 Mon Sep 17 00:00:00 2001
2 From: Jonas Gorski <jogo@openwrt.org>
3 Date: Sun, 23 Jun 2013 12:25:49 +0200
4 Subject: [PATCH 06/10] MIPS: BCM63XX: let the individual SoCs select the
5  appropriate CPUs
6
7 Let each supported chip select the appropirate SYS_HAS_CPU_BMIPS*
8 option for its embedded processor, so support will be conditionally
9 included.
10
11 Signed-off-by: Jonas Gorski <jogo@openwrt.org>
12
13 fix bmips selection
14 ---
15  arch/mips/Kconfig         |    1 -
16  arch/mips/bcm63xx/Kconfig |    8 ++++++++
17  2 files changed, 8 insertions(+), 1 deletion(-)
18
19 --- a/arch/mips/Kconfig
20 +++ b/arch/mips/Kconfig
21 @@ -131,7 +131,6 @@ config BCM63XX
22         select IRQ_CPU
23         select SYS_HAS_CPU_MIPS32_R1
24         select SYS_HAS_CPU_BMIPS
25 -       select SYS_HAS_CPU_BMIPS4350 if !BCM63XX_CPU_6338 && !BCM63XX_CPU_6345 && !BCM63XX_CPU_6348
26         select NR_CPUS_DEFAULT_2
27         select SYS_SUPPORTS_32BIT_KERNEL
28         select SYS_SUPPORTS_BIG_ENDIAN
29 --- a/arch/mips/bcm63xx/Kconfig
30 +++ b/arch/mips/bcm63xx/Kconfig
31 @@ -3,33 +3,41 @@ menu "CPU support"
32  
33  config BCM63XX_CPU_3368
34         bool "support 3368 CPU"
35 +       select SYS_HAS_CPU_BMIPS4350
36         select HW_HAS_PCI
37  
38  config BCM63XX_CPU_6328
39         bool "support 6328 CPU"
40 +       select SYS_HAS_CPU_BMIPS4350
41         select HW_HAS_PCI
42  
43  config BCM63XX_CPU_6338
44         bool "support 6338 CPU"
45 +       select SYS_HAS_CPU_BMIPS3300
46         select HW_HAS_PCI
47  
48  config BCM63XX_CPU_6345
49         bool "support 6345 CPU"
50 +       select SYS_HAS_CPU_BMIPS3300
51  
52  config BCM63XX_CPU_6348
53         bool "support 6348 CPU"
54 +       select SYS_HAS_CPU_BMIPS3300
55         select HW_HAS_PCI
56  
57  config BCM63XX_CPU_6358
58         bool "support 6358 CPU"
59 +       select SYS_HAS_CPU_BMIPS4350
60         select HW_HAS_PCI
61  
62  config BCM63XX_CPU_6362
63         bool "support 6362 CPU"
64 +       select SYS_HAS_CPU_BMIPS4350
65         select HW_HAS_PCI
66  
67  config BCM63XX_CPU_6368
68         bool "support 6368 CPU"
69 +       select SYS_HAS_CPU_BMIPS4350
70         select HW_HAS_PCI
71  endmenu
72