brcm63xx: update bmips patches with upstream submission
[openwrt.git] / target / linux / brcm63xx / patches-3.10 / 069-MIPS-BCM63XX-let-the-individual-SoCs-select-the-appr.patch
1 From 949b88531a779af4f6456ff43d3de2d4f74e44ee 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 V2 10/13] 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  arch/mips/Kconfig         | 1 -
14  arch/mips/bcm63xx/Kconfig | 8 ++++++++
15  2 files changed, 8 insertions(+), 1 deletion(-)
16
17 --- a/arch/mips/Kconfig
18 +++ b/arch/mips/Kconfig
19 @@ -130,7 +130,6 @@ config BCM63XX
20         select DMA_NONCOHERENT
21         select IRQ_CPU
22         select SYS_HAS_CPU_MIPS32_R1
23 -       select SYS_HAS_CPU_BMIPS4350 if !BCM63XX_CPU_6338 && !BCM63XX_CPU_6345 && !BCM63XX_CPU_6348
24         select NR_CPUS_DEFAULT_2
25         select SYS_SUPPORTS_32BIT_KERNEL
26         select SYS_SUPPORTS_BIG_ENDIAN
27 --- a/arch/mips/bcm63xx/Kconfig
28 +++ b/arch/mips/bcm63xx/Kconfig
29 @@ -3,33 +3,41 @@ menu "CPU support"
30  
31  config BCM63XX_CPU_3368
32         bool "support 3368 CPU"
33 +       select SYS_HAS_CPU_BMIPS4350
34         select HW_HAS_PCI
35  
36  config BCM63XX_CPU_6328
37         bool "support 6328 CPU"
38 +       select SYS_HAS_CPU_BMIPS4350
39         select HW_HAS_PCI
40  
41  config BCM63XX_CPU_6338
42         bool "support 6338 CPU"
43 +       select SYS_HAS_CPU_BMIPS32_3300
44         select HW_HAS_PCI
45  
46  config BCM63XX_CPU_6345
47         bool "support 6345 CPU"
48 +       select SYS_HAS_CPU_BMIPS32_3300
49  
50  config BCM63XX_CPU_6348
51         bool "support 6348 CPU"
52 +       select SYS_HAS_CPU_BMIPS32_3300
53         select HW_HAS_PCI
54  
55  config BCM63XX_CPU_6358
56         bool "support 6358 CPU"
57 +       select SYS_HAS_CPU_BMIPS4350
58         select HW_HAS_PCI
59  
60  config BCM63XX_CPU_6362
61         bool "support 6362 CPU"
62 +       select SYS_HAS_CPU_BMIPS4350
63         select HW_HAS_PCI
64  
65  config BCM63XX_CPU_6368
66         bool "support 6368 CPU"
67 +       select SYS_HAS_CPU_BMIPS4350
68         select HW_HAS_PCI
69  endmenu
70