浏览代码

powerpc/e500: split CPU_FTRS_ALWAYS/CPU_FTRS_POSSIBLE

Split e500 (v1/v2) and e500mc/e5500 to allow optimization of feature
checks that differ between the two.

Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Avi Kivity <avi@redhat.com>
Scott Wood 14 年之前
父节点
当前提交
06aae86799
共有 1 个文件被更改,包括 8 次插入4 次删除
  1. 8 4
      arch/powerpc/include/asm/cputable.h

+ 8 - 4
arch/powerpc/include/asm/cputable.h

@@ -487,8 +487,10 @@ enum {
 	    CPU_FTRS_E200 |
 	    CPU_FTRS_E200 |
 #endif
 #endif
 #ifdef CONFIG_E500
 #ifdef CONFIG_E500
-	    CPU_FTRS_E500 | CPU_FTRS_E500_2 | CPU_FTRS_E500MC |
-	    CPU_FTRS_E5500 | CPU_FTRS_E6500 |
+	    CPU_FTRS_E500 | CPU_FTRS_E500_2 |
+#endif
+#ifdef CONFIG_PPC_E500MC
+	    CPU_FTRS_E500MC | CPU_FTRS_E5500 | CPU_FTRS_E6500 |
 #endif
 #endif
 	    0,
 	    0,
 };
 };
@@ -532,8 +534,10 @@ enum {
 	    CPU_FTRS_E200 &
 	    CPU_FTRS_E200 &
 #endif
 #endif
 #ifdef CONFIG_E500
 #ifdef CONFIG_E500
-	    CPU_FTRS_E500 & CPU_FTRS_E500_2 & CPU_FTRS_E500MC &
-	    CPU_FTRS_E5500 & CPU_FTRS_E6500 &
+	    CPU_FTRS_E500 & CPU_FTRS_E500_2 &
+#endif
+#ifdef CONFIG_PPC_E500MC
+	    CPU_FTRS_E500MC & CPU_FTRS_E5500 & CPU_FTRS_E6500 &
 #endif
 #endif
 	    CPU_FTRS_POSSIBLE,
 	    CPU_FTRS_POSSIBLE,
 };
 };