target/linux/brcm63xx/patches-3.13/017-MIPS-cpu-type-guard-BMIPS-variants-with-SYS_HAS_CPU_.patch

   1 From c515f21d7680015bc94e0c081b73aba5a3d74680 Mon Sep 17 00:00:00 2001
   2 From: Jonas Gorski <jogo@openwrt.org>
   3 Date: Thu, 17 Oct 2013 13:14:48 +0200
   4 Subject: [PATCH V2 12/13] MIPS: cpu-type: guard BMIPS variants with
   5  SYS_HAS_CPU_BMIPS*
   6
   7 BMIPS32 and  BMIPS3300 also need to be available for MIPS32R1, as
   8 bcm47xx might not select BMIPS.
   9
  10 Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  11 ---
  12  arch/mips/include/asm/cpu-type.h | 13 ++++++++++---
  13  1 file changed, 10 insertions(+), 3 deletions(-)
  14
  15 --- a/arch/mips/include/asm/cpu-type.h
  16 +++ b/arch/mips/include/asm/cpu-type.h
  17 @@ -27,10 +27,7 @@ static inline int __pure __get_cpu_type(
  18  #ifdef CONFIG_SYS_HAS_CPU_MIPS32_R1
  19         case CPU_4KC:
  20         case CPU_ALCHEMY:
  21 -       case CPU_BMIPS3300:
  22 -       case CPU_BMIPS4350:
  23         case CPU_PR4450:
  24 -       case CPU_BMIPS32:
  25         case CPU_JZRISC:
  26  #endif
  27
  28 @@ -163,6 +160,16 @@ static inline int __pure __get_cpu_type(
  29         case CPU_CAVIUM_OCTEON2:
  30  #endif
  31
  32 +#if defined(CONFIG_SYS_HAS_CPU_BMIPS32_3300) || \
  33 +       defined (CONFIG_SYS_HAS_CPU_MIPS32_R1)
  34 +       case CPU_BMIPS32:
  35 +       case CPU_BMIPS3300:
  36 +#endif
  37 +
  38 +#ifdef CONFIG_SYS_HAS_CPU_BMIPS4350
  39 +       case CPU_BMIPS4350:
  40 +#endif
  41 +
  42  #ifdef CONFIG_SYS_HAS_CPU_BMIPS4380
  43         case CPU_BMIPS4380:
  44  #endif