From 632b9e5784b9af5904b80882e6d5e6a4a65d5e93 Mon Sep 17 00:00:00 2001
From: SnickerSun <snickersun@163.com>
Date: Mon, 21 Oct 2024 17:25:09 +0800
Subject: [PATCH] fix oob128 do release copy

---
 autobuild.sh                                              | 8 +++++---
 .../brandy/mk_fs_image/fd230/mkyaffs2tool.py              | 5 +++--
 tools/scripts/unyaffs2tool_singleuser.py                  | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/autobuild.sh b/autobuild.sh
index f84916ba5..fe463ddcb 100755
--- a/autobuild.sh
+++ b/autobuild.sh
@@ -6,6 +6,7 @@ HOMEDIR=$PWD
 DEFAULT_BUILD_TYPE=release
 DEFAULT_TARGET_PACK_NAME=pack_brandy_native_js
 DEFAULT_APPLICATION_NAME=brandy-native-js
+DEFAULT_SSB_NAME=brandy-ssb
 DEFAULT_TARGET_PACK_NAME_USER=pack_brandy_native_js_user
 DEFAULT_APPLICATION_NAME_USER=brandy-native-js-user
 DEFAULT_CUSTOM_FW_VERSION=1.3.71
@@ -48,6 +49,7 @@ if [ "$1" == "oob128" ]
 then
 TARGET_PACK_NAME=pack_brandy_native_js_oob128
 APPLICATION_NAME=brandy-native-js-oob128
+DEFAULT_SSB_NAME=brandy-ssb-oob128
 BUILD_NAME=_OOB128
 fi
 
@@ -109,9 +111,9 @@ cp_releasepackage()
 	recovery_path=$package_dir/brandy-native-js-r/recovery.bin
 	recoveryelf_path=$package_dir/brandy-native-js-r/recovery.elf 
 	recoverylst_path=$package_dir/brandy-native-js-r/recovery.lst
-	ssb_path=$package_dir/brandy-ssb/ssb.bin
-	ssbelf_path=$package_dir/brandy-ssb/ssb.elf 
-	ssblst_path=$package_dir/brandy-ssb/ssb.lst
+	ssb_path=$package_dir/$DEFAULT_SSB_NAME/ssb.bin
+	ssbelf_path=$package_dir/$DEFAULT_SSB_NAME/ssb.elf 
+	ssblst_path=$package_dir/$DEFAULT_SSB_NAME/ssb.lst
 	
 	dspmain_path=$HOMEDIR/code/sdk/tools/pkg/bin/brandy/dsp/normal/dsp_main.bin
 	dspoverlay_path=$HOMEDIR/code/sdk/tools/pkg/bin/brandy/dsp/normal/dsp_overlay.bin
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/mkyaffs2tool.py b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/mkyaffs2tool.py
index 8a6bb3bfc..d20637d45 100644
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/mkyaffs2tool.py
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/mkyaffs2tool.py
@@ -43,10 +43,11 @@ partition_list = [
     [os.path.join(cur_dir, 'fs', 'update'), "0xcc0000"],
     [os.path.join(cur_dir, 'fs', 'music'), "0xcc0000"],
     [os.path.join(cur_dir, 'fs', 'user'), "null"]
-]
+    ]
+
 partition_list_single = [
     [os.path.join(cur_dir, 'fs', 'user'), "null"]
-]
+    ]
 
 # 将生成image文件转换大小端，保存成另外文件
 def convert(src_file, dest_file):
diff --git a/tools/scripts/unyaffs2tool_singleuser.py b/tools/scripts/unyaffs2tool_singleuser.py
index bf2652aff..752c48777 100644
--- a/tools/scripts/unyaffs2tool_singleuser.py
+++ b/tools/scripts/unyaffs2tool_singleuser.py
@@ -49,7 +49,7 @@ partition_list = [
     # ["system","0x0", "0xcc0000"],
     # ["update","0xcc0000","0xcc0000"],
     # ["music", "0x1980000","0xcc0000"],
-    ["user", "0x2640000","null"]
+    ["user", "0x0","null"]
 ]
 
 # 将生成image文件转换大小端，保存成另外文件
-- 
2.17.1