ソースを参照

SoC/evalsoc: Fix HPM default feature in cpufeature.h after XLCFG optimization

Signed-off-by: Huaqi Fang <578567190@qq.com>
Huaqi Fang 1 週間 前
コミット
8a718c87bf
1 ファイル変更8 行追加14 行削除
  1. 8 14
      SoC/evalsoc/Common/Include/cpufeature.h

+ 8 - 14
SoC/evalsoc/Common/Include/cpufeature.h

@@ -43,15 +43,13 @@ extern "C" {
 #define CFG_CPU_SERIES              0xFFFFFF
 #define CFG_CPU_VER                 0xFFFFFF
 
-#if defined(XLCFG_ECLIC)
+// NOTE: By default enabled features
+
+#if !(defined(XLCFG_ECLIC) && XLCFG_ECLIC == 0)
 #define CFG_HAS_CLIC
 #if XLCFG_ECLIC == 2
 #define CFG_HAS_ECLICV2
-#elif XLCFG_ECLIC == 0
-#undef CFG_HAS_CLIC
 #endif
-#else
-#define CFG_HAS_CLIC
 #endif
 
 // External Interrupt Number
@@ -161,17 +159,13 @@ extern "C" {
 #define CFG_HAS_DDR
 #endif
 
-#if defined(XLCFG_HPM)
-#define CFG_HPM_VER                 1
-#if XLCFG_HPM == 2
-#define CFG_HPM_VER                 2
-#elif XLCFG_HPM == 0
-#undef CFG_HPM_VER
-#endif
-#else
-#define CFG_HPM_VER                 1
+#if !(defined(XLCFG_HPM) && XLCFG_HPM == 0)
+#define CFG_HAS_HPM
+#define CFG_HPM_VER                 XLCFG_HPM
 #endif
 
+// NOTE: By default disabled features
+
 #if defined(XLCFG_CCM) && XLCFG_CCM != 0
 #define CFG_HAS_CCM
 #endif