From 27ad6dc364c9a1bb33719aa9bf2d64db5f4d6d66 Mon Sep 17 00:00:00 2001 From: "snickersun@163.com" Date: Wed, 18 Jun 2025 05:59:58 +0000 Subject: [PATCH] Merge #1858 into sdk602patch0911 from refs/changes/1858/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Code review from snickersun@163.com * refs/changes/1858/head: (2 commits squashed) - 更新modem固件，专门给N9,W9提交了一个固件版本 - Merge branch 'sdk602patch0911' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0911 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/1858 --- autobuild.sh | 56 ++----------------- ...TE_OCPU_QPY_BETA0312_20250226-2022_V18.zip | 0 ...OCPU_QPY_BETA0312_20250226-2022_V18_W9.zip | 3 - ...U_QPY_BETA0312_20250226-2022_V18_W9_V2.zip | 3 + 4 files changed, 8 insertions(+), 54 deletions(-) rename cat1modem/{ => fd230}/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20250226-2022_V18.zip (100%) delete mode 100644 cat1modem/w9/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20250226-2022_V18_W9.zip create mode 100644 cat1modem/w9/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20250226-2022_V18_W9_V2.zip diff --git a/autobuild.sh b/autobuild.sh index 97f90dd93..dfbe6649b 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -47,6 +47,7 @@ RECOVERY_NAME=$DEFAULT_RECOVERY_NAME RELEASE_BUILD=$DEFAULT_BUILD_TYPE CLEAN= BUILD_NAME=_FD230 +CAT1_FW_DIR=fd230 checkarguments() { if [ "$1" == "clean" ] @@ -70,50 +71,6 @@ then RELEASE_BUILD=release fi -if [ "$1" == "user" ] -then -TARGET_PACK_NAME=$DEFAULT_TARGET_PACK_NAME_USER -APPLICATION_NAME=$DEFAULT_APPLICATION_NAME_USER -BUILD_NAME=_USER -fi -if [ "$1" == "u8m" ] -then -TARGET_PACK_NAME=pack_brandy_native_js_u8m -APPLICATION_NAME=brandy-native-js-u8m -DEFAULT_SSB_NAME=brandy-ssb-u8m -BUILD_NAME=_U8M -fi - -if [ "$1" == "uoffline" ] -then -TARGET_PACK_NAME=pack_brandy_native_js_uoffline -APPLICATION_NAME=brandy-native-js-uoffline -BUILD_NAME=_OFFLINELOG -fi - -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 - -if [ "$1" == "z1" ] -then -TARGET_PACK_NAME=pack_brandy_native_js_z1 -APPLICATION_NAME=brandy-native-js-z1 -BUILD_NAME=_Z1 -fi - -if [ "$1" == "4part" ] -then -TARGET_PACK_NAME=pack_brandy_native_js_4part -APPLICATION_NAME=brandy-native-js-4part -RECOVERY_NAME=brandy-native-js-r-4part -BUILD_NAME=_4PART -fi - if [ "$1" == "w9" ] then TARGET_PACK_NAME=pack_brandy_native_js_w9 @@ -121,6 +78,7 @@ APPLICATION_NAME=brandy-native-js-w9 RECOVERY_NAME=brandy-native-js-w9-r DEFAULT_SSB_NAME=brandy-native-js-w9-ssb BUILD_NAME=_W9 +CAT1_FW_DIR=w9 fi if [ "$1" == "fd230" ] @@ -139,6 +97,7 @@ APPLICATION_NAME=brandy-native-js-n9 RECOVERY_NAME=brandy-native-js-n9-r DEFAULT_SSB_NAME=brandy-native-js-n9-ssb BUILD_NAME=_N9 +CAT1_FW_DIR=w9 fi if [ "$1" == "leakcheck" ] @@ -160,12 +119,7 @@ TARGET_PACK_NAME=pack_brandy_native_js_autootacli APPLICATION_NAME=brandy-native-js-autootacli BUILD_NAME=_AUTOOTACLI fi -if [ "$1" == "obu" ] -then -TARGET_PACK_NAME=pack_brandy_native_js_obu -APPLICATION_NAME=brandy-native-js-obu -BUILD_NAME=_OBU -fi + if [ "$1" == "cm" ] then TARGET_PACK_NAME=pack_brandy_native_js_cm @@ -226,7 +180,7 @@ cp_releasepackage() cp -r $bt_path $dspmain_path $dspoverlay_path $nv_path $releasedir/bin/ cp -r $resfile_path $releasedir/bin/ cp -r $HOMEDIR/build.log $releasedir/ - cp -r $HOMEDIR/cat1modem/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312* $releasedir/ + cp -r $HOMEDIR/cat1modem/$CAT1_FW_DIR/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312* $releasedir/ cp $packsource $releasedir/$filename echo $filename > $releasedir/readme.txt diff --git a/cat1modem/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20250226-2022_V18.zip b/cat1modem/fd230/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20250226-2022_V18.zip similarity index 100% rename from cat1modem/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20250226-2022_V18.zip rename to cat1modem/fd230/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20250226-2022_V18.zip diff --git a/cat1modem/w9/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20250226-2022_V18_W9.zip b/cat1modem/w9/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20250226-2022_V18_W9.zip deleted file mode 100644 index 235a07229..000000000 --- a/cat1modem/w9/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20250226-2022_V18_W9.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d768ead69350b4da8efebf2ca1bd96c4ab7f004cec542d0600f17703659d3e6 -size 11624867 diff --git a/cat1modem/w9/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20250226-2022_V18_W9_V2.zip b/cat1modem/w9/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20250226-2022_V18_W9_V2.zip new file mode 100644 index 000000000..d2f4c3254 --- /dev/null +++ b/cat1modem/w9/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20250226-2022_V18_W9_V2.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0cd7ea10d9efadcf292cb730f5d3347f36e968174b3ab104651cb815b8310a9 +size 11624867 -- 2.17.1