From f3f71c9bf92449cb2c1abab116a32c934962461f Mon Sep 17 00:00:00 2001 From: zhkag Date: Tue, 26 Sep 2023 10:42:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20dist=20=E4=B9=8B?= =?UTF-8?q?=E5=90=8E=20Kconfig=20=E6=96=87=E4=BB=B6=E6=89=BE=E4=B8=8D?= =?UTF-8?q?=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libcpu/Kconfig | 21 +++++++++++++++++---- libcpu/aarch64/Kconfig | 19 ------------------- 2 files changed, 17 insertions(+), 23 deletions(-) delete mode 100644 libcpu/aarch64/Kconfig diff --git a/libcpu/Kconfig b/libcpu/Kconfig index 1b215112004..f7177b264e6 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 ac280832b45..00000000000 --- 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 From 9fb9b4f7ddbc96e4dce3eff134c7498b34bc894b Mon Sep 17 00:00:00 2001 From: zhkag Date: Tue, 26 Sep 2023 10:43:23 +0800 Subject: [PATCH 2/2] [ci] add menuconfig check --- .github/workflows/action_tools.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/action_tools.yml b/.github/workflows/action_tools.yml index 8df7fb42240..f5afc17a563 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