From 0c2a94cb431368e2a374721b30c71a0045ed6a29 Mon Sep 17 00:00:00 2001 From: "snickersun@163.com" Date: Thu, 7 Nov 2024 08:49:06 +0000 Subject: [PATCH] Merge #1363 into sdk602patch0911 from refs/changes/1363/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit release 中添加application.map * refs/changes/1363/head: (2 commits squashed) - release 中添加application.map - 修复硬狗超时无法保存norflash bin的问题 Signed-off-by: snickersun@163.com Reviewed-by: Caisking <3449750381@qq.com> Reviewed-by: 罗正 <1732036298@qq.com> Reviewed-by: aliyun8003852482 <1224667075@qq.com> Reviewed-by: snickersun@163.com Reviewed-by: aliyun6865282430 <1624952103@qq.com> Merged-by: Caisking <3449750381@qq.com> CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1363 --- autobuild.sh | 3 ++- code/sdk/application/brandy/brandy_standard/thread_pri_init.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/autobuild.sh b/autobuild.sh index d20f6c72f..78ee8520d 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -133,6 +133,7 @@ cp_releasepackage() application_path=$package_dir/$APPLICATION_NAME/application.bin applicationelf_path=$package_dir/$APPLICATION_NAME/application.elf applicationlst_path=$package_dir/$APPLICATION_NAME/application.lst + applicationmap_path=$package_dir/$APPLICATION_NAME/application.map recovery_path=$package_dir/$RECOVERY_NAME/recovery.bin recoveryelf_path=$package_dir/$RECOVERY_NAME/recovery.elf recoverylst_path=$package_dir/$RECOVERY_NAME/recovery.lst @@ -153,7 +154,7 @@ cp_releasepackage() echo do release copy mkdir -p $releasedir/bin - cp -r $application_path $applicationelf_path $applicationlst_path $releasedir/bin/ + cp -r $application_path $applicationelf_path $applicationlst_path $applicationmap_path $releasedir/bin/ cp -r $recovery_path $recoveryelf_path $recoverylst_path $releasedir/bin/ cp -r $ssb_path $ssbelf_path $ssblst_path $releasedir/bin/ cp -r $bt_path $dspmain_path $dspoverlay_path $nv_path $releasedir/bin/ diff --git a/code/sdk/application/brandy/brandy_standard/thread_pri_init.c b/code/sdk/application/brandy/brandy_standard/thread_pri_init.c index cfebd2ca5..48bfe8333 100755 --- a/code/sdk/application/brandy/brandy_standard/thread_pri_init.c +++ b/code/sdk/application/brandy/brandy_standard/thread_pri_init.c @@ -56,6 +56,7 @@ #endif #endif /* DSP_EXIST */ #include "panic.h" +#include "los_exc.h" #include "board_init.h" #include "kernel_init.h" #ifdef SUPPORT_AT_OHOSFWK @@ -405,7 +406,7 @@ static void thread_main(const void *unused) PRINT("nmi reboot cause: 0x%x, reason: 0x%x"NEWLINE, cause, get_fault_reason()); // save cputrace memory if chip watchdog reset hal_cpu_trace_clock_enable(); - panic(PANIC_ASSERT, cause); + LOS_Panic("PANIC_ASSERT"); } uapi_pm_control(PM_DISPLAY_POWER_UP_AND_RUN); -- 2.17.1