[Feature][ZXW-179]merge P52U02 version
Only Configure: No
Affected branch: master
Affected module: unknow
Is it affected on both ZXIC and MTK: only ZXIC
Self-test: Yes
Doc Update: No
Change-Id: I4fa8f86757e71388ae88400914dae8b50cd00338
diff --git a/allbins/tools/resign_tool/fileseek b/allbins/tools/resign_tool/fileseek
index c63a901..82052df8 100755
--- a/allbins/tools/resign_tool/fileseek
+++ b/allbins/tools/resign_tool/fileseek
Binary files differ
diff --git a/allbins/tools/resign_tool/fileseek.exe b/allbins/tools/resign_tool/fileseek.exe
index bb1590b..b36894a 100755
--- a/allbins/tools/resign_tool/fileseek.exe
+++ b/allbins/tools/resign_tool/fileseek.exe
Binary files differ
diff --git a/allbins/tools/resign_tool/filewrite b/allbins/tools/resign_tool/filewrite
index 0edcc84..7f8fd64 100755
--- a/allbins/tools/resign_tool/filewrite
+++ b/allbins/tools/resign_tool/filewrite
Binary files differ
diff --git a/allbins/tools/resign_tool/filewrite.exe b/allbins/tools/resign_tool/filewrite.exe
index ffd4129..f5d66ba 100755
--- a/allbins/tools/resign_tool/filewrite.exe
+++ b/allbins/tools/resign_tool/filewrite.exe
Binary files differ
diff --git a/allbins/tools/resign_tool/resign.bat b/allbins/tools/resign_tool/resign.bat
index 27d352c..dd0bf26 100755
--- a/allbins/tools/resign_tool/resign.bat
+++ b/allbins/tools/resign_tool/resign.bat
@@ -73,17 +73,13 @@
SignImage -d -i "%WORK_DIR%\verity\raw_table" -o "%WORK_DIR%\verity\raw_table.signed" -k %PRIVATE_KEY% -t %HASH_STR% || EXIT /B 1
fileseek "%WORK_DIR%\ap_caprootfs.img" "%WORK_DIR%\verity\sign" > "%WORK_DIR%\verity\sign_offset"
if %ERRORLEVEL% NEQ 0 EXIT /B 1
- set /p sign_offset=<"%WORK_DIR%\verity\sign_offset"
- echo caprootfs sign_offset %sign_offset%
- filewrite "%WORK_DIR%\ap_caprootfs.img" %sign_offset% %WORK_DIR%\verity\raw_table.signed "%WORK_DIR%\ap_caprootfs.img" || EXIT /B 1
+ filewrite "%WORK_DIR%\ap_caprootfs.img" "%WORK_DIR%\verity\sign_offset" %WORK_DIR%\verity\raw_table.signed "%WORK_DIR%\ap_caprootfs.img" || EXIT /B 1
del /f /q "%WORK_DIR%\verity\sign_offset"
::fix ap_caprootfs.img.dm
fileseek "%WORK_DIR%\ap_caprootfs.img.dm" "%WORK_DIR%\verity\sign" > "%WORK_DIR%\verity\sign_offset2"
if %ERRORLEVEL% NEQ 0 EXIT /B 1
- set /p sign_offset2=<"%WORK_DIR%\verity\sign_offset2"
- echo caprootfs dm sign_offset %sign_offset2%
- filewrite "%WORK_DIR%\ap_caprootfs.img.dm" %sign_offset2% %WORK_DIR%\verity\raw_table.signed "%WORK_DIR%\ap_caprootfs.img.dm" || EXIT /B 1
+ filewrite "%WORK_DIR%\ap_caprootfs.img.dm" "%WORK_DIR%\verity\sign_offset2" %WORK_DIR%\verity\raw_table.signed "%WORK_DIR%\ap_caprootfs.img.dm" || EXIT /B 1
del /f /q "%WORK_DIR%\verity\sign_offset2"
echo "ap_caprootfs.img resign success"
)
@@ -96,17 +92,13 @@
SignImage -d -i "%WORK_DIR%\verity\raw_table" -o "%WORK_DIR%\verity\raw_table.signed" -k %PRIVATE_KEY% -t %HASH_STR% || EXIT /B 1
fileseek "%WORK_DIR%\cap_oem.img" "%WORK_DIR%\verity\sign" > "%WORK_DIR%\verity\sign_offset3"
if %ERRORLEVEL% NEQ 0 EXIT /B 1
- set /p sign_offset3=<"%WORK_DIR%\verity\sign_offset3"
- echo oem sign_offset %sign_offset3%
- filewrite "%WORK_DIR%\cap_oem.img" %sign_offset3% %WORK_DIR%\verity\raw_table.signed "%WORK_DIR%\cap_oem.img" || EXIT /B 1
+ filewrite "%WORK_DIR%\cap_oem.img" "%WORK_DIR%\verity\sign_offset3" %WORK_DIR%\verity\raw_table.signed "%WORK_DIR%\cap_oem.img" || EXIT /B 1
del /f /q "%WORK_DIR%\verity\sign_offset3"
::fix cap_oem.img.dm
fileseek "%WORK_DIR%\cap_oem.img.dm" "%WORK_DIR%\verity\sign" > "%WORK_DIR%\verity\sign_offset4"
if %ERRORLEVEL% NEQ 0 EXIT /B 1
- set /p sign_offset4=<"%WORK_DIR%\verity\sign_offset4"
- echo oem dm sign_offset %sign_offset4%
- filewrite "%WORK_DIR%\cap_oem.img.dm" %sign_offset4% %WORK_DIR%\verity\raw_table.signed "%WORK_DIR%\cap_oem.img.dm" || EXIT /B 1
+ filewrite "%WORK_DIR%\cap_oem.img.dm" "%WORK_DIR%\verity\sign_offset4" %WORK_DIR%\verity\raw_table.signed "%WORK_DIR%\cap_oem.img.dm" || EXIT /B 1
del /f /q "%WORK_DIR%\verity\sign_offset4"
echo "cap_oem.img resign success"
)
diff --git a/allbins/tools/resign_tool/resign.sh b/allbins/tools/resign_tool/resign.sh
index 37144f2..9a2f163 100755
--- a/allbins/tools/resign_tool/resign.sh
+++ b/allbins/tools/resign_tool/resign.sh
@@ -42,7 +42,7 @@
#old v3t device for mdl/mifi etc.
SignImage -z -i $WORK_DIR/zloader.bin -k $PRIVATE_KEY -t $HASH_STR
fi
- SignImage -z -i $WORK_DIR/tloader.bin -k $PRIVATE_KEY -t $HASH_STR
+ SignImage -z -i $WORK_DIR/tloader.bin -k $PRIVATE_KEY -t $HASH_STR
fi
echo "HASH_STR:" $HASH_STR
SignImage -r -i $WORK_DIR/uboot.bin -k $PRIVATE_KEY -t $HASH_STR
@@ -71,15 +71,11 @@
zxic_parse_squashfs_verity $WORK_DIR/ap_caprootfs.img.dm $WORK_DIR/verity/sign $WORK_DIR/verity/raw_table $WORK_DIR/verity/hash_tree_offset
SignImage -d -i $WORK_DIR/verity/raw_table -o $WORK_DIR/verity/raw_table.signed -k $PRIVATE_KEY -t $HASH_STR
fileseek $WORK_DIR/ap_caprootfs.img $WORK_DIR/verity/sign > $WORK_DIR/verity/sign_offset
- sign_offset=` sed -n '/found/p' $WORK_DIR/verity/sign_offset | awk '{print $2}' `
- echo caprootfs sign_offset $sign_offset
- filewrite $WORK_DIR/ap_caprootfs.img $sign_offset $WORK_DIR/verity/raw_table.signed $WORK_DIR/ap_caprootfs.img
+ filewrite $WORK_DIR/ap_caprootfs.img $WORK_DIR/verity/sign_offset $WORK_DIR/verity/raw_table.signed $WORK_DIR/ap_caprootfs.img
#fix ap_caprootfs.img.dm
fileseek $WORK_DIR/ap_caprootfs.img.dm $WORK_DIR/verity/sign > $WORK_DIR/verity/sign_offset
- sign_offset=` sed -n '/found/p' $WORK_DIR/verity/sign_offset | awk '{print $2}' `
- echo caprootfs dm sign_offset $sign_offset
- filewrite $WORK_DIR/ap_caprootfs.img.dm $sign_offset $WORK_DIR/verity/raw_table.signed $WORK_DIR/ap_caprootfs.img.dm
+ filewrite $WORK_DIR/ap_caprootfs.img.dm $WORK_DIR/verity/sign_offset $WORK_DIR/verity/raw_table.signed $WORK_DIR/ap_caprootfs.img.dm
echo "ap_caprootfs.img resign success"
fi
@@ -89,15 +85,11 @@
zxic_parse_squashfs_verity $WORK_DIR/cap_oem.img.dm $WORK_DIR/verity/sign $WORK_DIR/verity/raw_table $WORK_DIR/verity/hash_tree_offset
SignImage -d -i $WORK_DIR/verity/raw_table -o $WORK_DIR/verity/raw_table.signed -k $PRIVATE_KEY -t $HASH_STR
fileseek $WORK_DIR/cap_oem.img $WORK_DIR/verity/sign > $WORK_DIR/verity/sign_offset
- sign_offset=` sed -n '/found/p' $WORK_DIR/verity/sign_offset | awk '{print $2}' `
- echo oem sign_offset $sign_offset
- filewrite $WORK_DIR/cap_oem.img $sign_offset $WORK_DIR/verity/raw_table.signed $WORK_DIR/cap_oem.img
+ filewrite $WORK_DIR/cap_oem.img $WORK_DIR/verity/sign_offset $WORK_DIR/verity/raw_table.signed $WORK_DIR/cap_oem.img
#fix cap_oem.img.dm
fileseek $WORK_DIR/cap_oem.img.dm $WORK_DIR/verity/sign > $WORK_DIR/verity/sign_offset
- sign_offset=` sed -n '/found/p' $WORK_DIR/verity/sign_offset | awk '{print $2}' `
- echo oem dm sign_offset $sign_offset
- filewrite $WORK_DIR/cap_oem.img.dm $sign_offset $WORK_DIR/verity/raw_table.signed $WORK_DIR/cap_oem.img.dm
+ filewrite $WORK_DIR/cap_oem.img.dm $WORK_DIR/verity/sign_offset $WORK_DIR/verity/raw_table.signed $WORK_DIR/cap_oem.img.dm
echo "cap_oem.img resign success"
fi