From eb24edeb45c2d6a9fda5ed400249fcbfdf171a2f Mon Sep 17 00:00:00 2001 From: weicheng Date: Wed, 31 May 2023 14:54:55 +0800 Subject: [PATCH] Revert bump third_pary/asr, because #27000 PR --- examples/all-clusters-minimal-app/asr/.gn | 9 ++------- examples/lock-app/asr/src/AppTask.cpp | 10 ---------- src/platform/ASR/PlatformManagerImpl.h | 2 ++ third_party/asr/asr582x/asr_sdk | 2 +- third_party/asr/asr595x/asr_sdk | 2 +- 5 files changed, 6 insertions(+), 19 deletions(-) diff --git a/examples/all-clusters-minimal-app/asr/.gn b/examples/all-clusters-minimal-app/asr/.gn index e46517bff1e734..8d75f1eafcdb89 100755 --- a/examples/all-clusters-minimal-app/asr/.gn +++ b/examples/all-clusters-minimal-app/asr/.gn @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//build_overrides/asr.gni") import("//build_overrides/build.gni") # The location of the build configuration file. @@ -22,12 +21,8 @@ buildconfig = "${build_root}/config/BUILDCONFIG.gn" check_system_includes = true default_args = { - if (asr_ic_family == "asr582x") { - target_cpu = "arm" - } - if (asr_ic_family == "asr595x") { - target_cpu = "riscv" - } + target_cpu = "arm" + target_os = "freertos" import("//args.gni") diff --git a/examples/lock-app/asr/src/AppTask.cpp b/examples/lock-app/asr/src/AppTask.cpp index 0b6533f7596cfb..d46069955dc6ab 100644 --- a/examples/lock-app/asr/src/AppTask.cpp +++ b/examples/lock-app/asr/src/AppTask.cpp @@ -495,13 +495,3 @@ void AppTask::UpdateClusterState(void) { chip::DeviceLayer::PlatformMgr().ScheduleWork(UpdateCluster, reinterpret_cast(nullptr)); } - -void vApplicationStackOverflowHook(TaskHandle_t pxTask, char * pcTaskName) -{ - (void) pxTask; - - /* Run time stack overflow checking is performed if - configCHECK_FOR_STACK_OVERFLOW is defined to 1 or 2. This hook - function is called if a stack overflow is detected. */ - printf("ERROR: stack overflow with task %s\r\n", pcTaskName); -} diff --git a/src/platform/ASR/PlatformManagerImpl.h b/src/platform/ASR/PlatformManagerImpl.h index 890fefd72f74de..1a16797c8a9bcc 100644 --- a/src/platform/ASR/PlatformManagerImpl.h +++ b/src/platform/ASR/PlatformManagerImpl.h @@ -29,6 +29,8 @@ #include #endif #include +#include + namespace chip { namespace DeviceLayer { diff --git a/third_party/asr/asr582x/asr_sdk b/third_party/asr/asr582x/asr_sdk index 041a32c8f079fc..3c26f86d72abbb 160000 --- a/third_party/asr/asr582x/asr_sdk +++ b/third_party/asr/asr582x/asr_sdk @@ -1 +1 @@ -Subproject commit 041a32c8f079fc7bcab9d795f60ecd86dd00a8fa +Subproject commit 3c26f86d72abbb167b6d6bed3d712a4790f8d023 diff --git a/third_party/asr/asr595x/asr_sdk b/third_party/asr/asr595x/asr_sdk index c1908f296f9634..7f5547c5439121 160000 --- a/third_party/asr/asr595x/asr_sdk +++ b/third_party/asr/asr595x/asr_sdk @@ -1 +1 @@ -Subproject commit c1908f296f96349613880e05e105a1f62d2e7048 +Subproject commit 7f5547c5439121ec81623be99fa40b37ffaf9f4c