瀏覽代碼

[tools]fix scons --dist , menuconfig will error (#8069)

zhkag 1 年之前
父節點
當前提交
b2433129b2
共有 3 個文件被更改,包括 19 次插入23 次删除
  1. 2 0
      .github/workflows/action_tools.yml
  2. 17 4
      libcpu/Kconfig
  3. 0 19
      libcpu/aarch64/Kconfig

+ 2 - 0
.github/workflows/action_tools.yml

@@ -80,6 +80,8 @@ jobs:
         scons --dist-ide -C $TEST_BSP_ROOT
         ls $TEST_BSP_ROOT
         ls $TEST_BSP_ROOT/dist
+        scons --pyconfig-silent -C $TEST_BSP_ROOT/dist/project
+        scons --pyconfig-silent -C $TEST_BSP_ROOT/rt-studio-project
         scons -C $TEST_BSP_ROOT/dist/project
         scons -C $TEST_BSP_ROOT/rt-studio-project
         

+ 17 - 4
libcpu/Kconfig

@@ -1,3 +1,20 @@
+if ARCH_ARMV8 && ARCH_CPU_64BIT
+    menu "AArch64 Architecture Configuration"
+    config ARCH_TEXT_OFFSET
+        hex "Text offset"
+        default 0x200000
+    config ARCH_RAM_OFFSET
+        hex "RAM offset"
+        default 0
+    config ARCH_SECONDARY_CPU_STACK_SIZE
+        int "Secondary CPU stack size"
+        default 4096
+    config ARCH_HAVE_EFFICIENT_UNALIGNED_ACCESS
+        bool
+        default y
+    endmenu
+endif
+
 config ARCH_CPU_64BIT
     bool
 
@@ -236,7 +253,3 @@ config ARCH_HOST_SIMULATOR
 config ARCH_CPU_STACK_GROWS_UPWARD
     bool
     default n
-
-if ARCH_ARMV8 && ARCH_CPU_64BIT
-    source "$RTT_DIR/libcpu/aarch64/Kconfig"
-endif

+ 0 - 19
libcpu/aarch64/Kconfig

@@ -1,19 +0,0 @@
-menu "AArch64 Architecture Configuration"
-
-config ARCH_TEXT_OFFSET
-    hex "Text offset"
-    default 0x200000
-
-config ARCH_RAM_OFFSET
-    hex "RAM offset"
-    default 0
-
-config ARCH_SECONDARY_CPU_STACK_SIZE
-    int "Secondary CPU stack size"
-    default 4096
-
-config ARCH_HAVE_EFFICIENT_UNALIGNED_ACCESS
-    bool
-    default y
-
-endmenu