diff options
| author | zhkag <[email protected]> | 2023-09-26 11:35:27 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-09-26 11:35:27 +0800 |
| commit | b2433129b224e54b1bb362633f6f91aa94270873 (patch) | |
| tree | adaea60f90eec880a31dd05b9aef68abd23ecbe9 | |
| parent | f941dfcf138131aadb04a63b98fec1b608f4dda1 (diff) | |
[tools]fix scons --dist , menuconfig will error (#8069)
| -rw-r--r-- | .github/workflows/action_tools.yml | 2 | ||||
| -rw-r--r-- | libcpu/Kconfig | 21 | ||||
| -rw-r--r-- | libcpu/aarch64/Kconfig | 19 |
3 files changed, 19 insertions, 23 deletions
diff --git a/.github/workflows/action_tools.yml b/.github/workflows/action_tools.yml index 8df7fb4224..f5afc17a56 100644 --- a/.github/workflows/action_tools.yml +++ b/.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 diff --git a/libcpu/Kconfig b/libcpu/Kconfig index 1b21511200..f7177b264e 100644 --- a/libcpu/Kconfig +++ b/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 diff --git a/libcpu/aarch64/Kconfig b/libcpu/aarch64/Kconfig deleted file mode 100644 index ac280832b4..0000000000 --- a/libcpu/aarch64/Kconfig +++ /dev/null @@ -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 |