Merge #1363 into sdk602patch0911 from refs/changes/1363/head

release 中添加application.map

* refs/changes/1363/head: (2 commits squashed)

  - release 中添加application.map

  - 修复硬狗超时无法保存norflash bin的问题

Signed-off-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1363

diff --git a/autobuild.sh b/autobuild.sh
index d20f6c7..78ee852 100755 (executable)
--- 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 cfebd2c..48bfe83 100755 (executable)
--- 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\r
 #endif /* DSP_EXIST */\r
 #include "panic.h"\r
+#include "los_exc.h"\r
 #include "board_init.h"\r
 #include "kernel_init.h"\r
 #ifdef SUPPORT_AT_OHOSFWK\r
@@ -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());\r
         // save cputrace memory if chip watchdog reset\r
         hal_cpu_trace_clock_enable();\r
-        panic(PANIC_ASSERT, cause);\r
+        LOS_Panic("PANIC_ASSERT");\r
     }\r
 \r
     uapi_pm_control(PM_DISPLAY_POWER_UP_AND_RUN);\r