[Feature][API-1197][partition] change update partition script & update vertion to b16.02_PU
Only Configure: No
Affected branch: GSW3.0-Temp-PU
Affected module: fota
Is it addected on both ZXIC and MTK: only MTK
Self-test: Yes
Doc Update: No
Change-Id: I47eb56d43a3f421a9a91a7eaf37ac6e4348b4756
diff --git a/meta-sdk/prebuilt/firmware/bl2sp/real-update.sh b/meta-sdk/prebuilt/firmware/bl2sp/real-update.sh
index 1f9ad3a..15e79e7 100755
--- a/meta-sdk/prebuilt/firmware/bl2sp/real-update.sh
+++ b/meta-sdk/prebuilt/firmware/bl2sp/real-update.sh
@@ -12,7 +12,7 @@
fi
sdk_ver=$(uci get lynq_uci_ro.lynq_version.LYNQ_SW_INSIDE_VERSION)
-if [ "$sdk_ver" != "T800_GSW_v02.MP1_MR3.02b16.01.00_PU" ]; then
+if [ "$sdk_ver" != "T800_GSW_v02.MP1_MR3.02b16.02_PU" ]; then
echo "lynq sdk version is $sdk_ver, can't update" > /dev/kmsg
exit 1
fi
@@ -88,14 +88,6 @@
fi
}
-padding_ff()
-{
- for((i=0;i<$1;i++))
- do
- tr '\000' '\377' < /dev/zero | dd of=$2 bs=64k seek=$(($3+$i)) count=1 2>/dev/null >/dev/null
- done
-}
-
copy_and_check_img_in_delta_dat()
{
if [ ! -f $1 ];then
@@ -110,8 +102,8 @@
#echo "ssss count $count, $4"
dd if=$1 of=$2 bs=64k seek=$3 2>/dev/null >/dev/null
- tr '\000' '\377' < /dev/zero | dd of=$2 bs=1 seek=$(($3*64*1024+$img_size)) count=$(($count*64*1024-$img_size)) 2>/dev/null >/dev/null
- padding_ff $(($4/64/1024-$count)) $2 $(($3+$count))
+ dd if=$5 of=$2 bs=1 seek=$(($3*64*1024+$img_size)) count=$(($count*64*1024-$img_size)) 2>/dev/null >/dev/null
+ dd if=$5 of=$2 bs=64k seek=$(($3+$count)) count=$(($4/64/1024-$count)) 2>/dev/null >/dev/null
dd if=$2 of=/tmp/work_dir/image_all bs=64k skip=$3 count=$count 2>/dev/null >/dev/null
split -b $img_size /tmp/work_dir/image_all -d
diff $1 /tmp/work_dir/x00 2>/dev/null >/dev/null
@@ -176,12 +168,14 @@
calc_bs_cnt_64 $hsm_bl_offset $((0x40000))
flash_erase $real_delta_part 0 0 2>/dev/null >/dev/null
+all_ff_dat="/tmp/update/all_ff"
+dd if=$real_delta_part of=$all_ff_dat bs=256k count=4 2>/dev/null >/dev/null
-copy_and_check_img_in_delta_dat /tmp/update/bl2.img $delta_dat 0 $bl2_size
-copy_and_check_img_in_delta_dat /tmp/update/bl33.img $delta_dat $bl33_offset $bl33_size
-copy_and_check_img_in_delta_dat /tmp/update/hsm_os.img $delta_dat $hsm_os_offset $hsm_os_size
+copy_and_check_img_in_delta_dat /tmp/update/bl2.img $delta_dat 0 $bl2_size $all_ff_dat
+copy_and_check_img_in_delta_dat /tmp/update/bl33.img $delta_dat $bl33_offset $bl33_size $all_ff_dat
+copy_and_check_img_in_delta_dat /tmp/update/hsm_os.img $delta_dat $hsm_os_offset $hsm_os_size $all_ff_dat
-dd if=$delta_dat of=$real_delta_part bs=256k
+dd if=$delta_dat of=$real_delta_part bs=256k 2>/dev/null >/dev/null
copy_and_check_img_in_delta /tmp/update/mcupm.img $real_delta_part $(($mcupm_offset*64*1024))
copy_and_check_img_in_delta /tmp/update/sspm.img $real_delta_part $(($sspm_offset*64*1024))
diff --git a/meta-sdk/prebuilt/firmware/bl2sp/update-partitions.sh b/meta-sdk/prebuilt/firmware/bl2sp/update-partitions.sh
index 9e2a877..ac4171b 100755
--- a/meta-sdk/prebuilt/firmware/bl2sp/update-partitions.sh
+++ b/meta-sdk/prebuilt/firmware/bl2sp/update-partitions.sh
@@ -13,7 +13,7 @@
fi
sdk_ver=$(uci get lynq_uci_ro.lynq_version.LYNQ_SW_INSIDE_VERSION)
-if [ "$sdk_ver" != "T800_GSW_v02.MP1_MR3.02b16.01.00_PU" ]; then
+if [ "$sdk_ver" != "T800_GSW_v02.MP1_MR3.02b16.02_PU" ]; then
echo "lynq sdk version is $sdk_ver, can't update" > /dev/kmsg
exit 1
fi
diff --git a/update_version.sh b/update_version.sh
index 8039824..da0e981 100644
--- a/update_version.sh
+++ b/update_version.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-LYNQ_SW_INSIDE_VERSION="LYNQ_CONFIG_VERSION = \"T800_GSW_v02.MP1_MR3.02b16.01.00_PU\""
-LYNQ_SW_VERSION="LYNQ_CONFIG_SW_VERSION = \"T800_GSW_v02.MP1_MR3.02b16.01_PU\""
+LYNQ_SW_INSIDE_VERSION="LYNQ_CONFIG_VERSION = \"T800_GSW_v02.MP1_MR3.02b16.02_PU\""
+LYNQ_SW_VERSION="LYNQ_CONFIG_SW_VERSION = \"T800_GSW_v02.MP1_MR3.02b16.02_PU\""
COMMIT_ID="$(git rev-parse --short HEAD)"
LYNQ_COMMITID="LYNQ_CONFIG_COMMITID = \"${COMMIT_ID}\""