[Feature][ZXW-130]merge P50U02 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: I4f29ec5bb7c59385f23738d2b7ca84e67c100f69
diff --git a/boot/common/scripts/build/build_tloader.sh b/boot/common/scripts/build/build_tloader.sh
index a670737..326af64 100755
--- a/boot/common/scripts/build/build_tloader.sh
+++ b/boot/common/scripts/build/build_tloader.sh
@@ -24,17 +24,10 @@
if [ $is_ok -eq 1 ];then
echo "";
- echo "Configuring ["$chip"_"$board"_tloader_config] for ["$chip" "$board" "$key_path"] board ...";
+ echo "Configuring ["$chip"_"$board"_tloader_config] for ["$chip" "$board"] board ...";
- mkdir -p $KEYS_PATH/Input
- mkdir -p $KEYS_PATH/Output
chmod -R 777 $SRC_PATH/
- cp z-load.bin $KEYS_PATH/Input/tloader.bin
- cd $KEYS_PATH
- ./SignImage -z ./Input/tloader.bin ./test_key/$key_path/private.k
- cp ./Input/tloader.bin $SRC_PATH/prj/$chip/$board/bin/tloader.bin
- rm -rf Input
- rm -rf Output
+ $SRC_PATH/../tools/SignTool/SignImage -z -i z-load.bin -o $SRC_PATH/prj/$chip/$board/bin/tloader.bin -k $SRC_PATH/../tools/SignTool/key/RSA_1024/private.k
echo "--Finished build [tloader.bin ] ...";
echo "................................................OK....";
diff --git a/boot/common/scripts/build/build_uboot.sh b/boot/common/scripts/build/build_uboot.sh
index 17ce8d3..54a1b1b 100755
--- a/boot/common/scripts/build/build_uboot.sh
+++ b/boot/common/scripts/build/build_uboot.sh
@@ -48,18 +48,9 @@
cp uboot.bin tboot.bin
mv tboot.bin $BIN_PATH/tboot.bin
- mkdir -p $KEYS_PATH/Input
- mkdir -p $KEYS_PATH/Output
chmod -R 777 $SRC_PATH/
- cp uboot.bin $KEYS_PATH/Input/uboot.bin
- rm uboot.bin;
- chmod -R a+x $KEYS_PATH/
- cd $KEYS_PATH/
- ./SignImage -s ./Input/uboot.bin ./Output/uboot.bin ./test_key/"$key_path"/private.k
- cp ./Output/uboot.bin $BIN_PATH/uboot.bin
+ $SRC_PATH/../tools/SignTool/SignImage -i uboot.bin -o $BIN_PATH/uboot.bin -k $SRC_PATH/../tools/SignTool/$key_path
cp $BIN_PATH/uboot.bin $BIN_PATH/uboot-mirr.bin
- rm -rf Input
- rm -rf Output
cd $SRC_PATH/common/src/uboot;
cp ./u-boot $BIN_PATH
diff --git a/boot/common/scripts/build/build_zloader_dloff.sh b/boot/common/scripts/build/build_zloader_dloff.sh
index 9f90a34..198394e 100755
--- a/boot/common/scripts/build/build_zloader_dloff.sh
+++ b/boot/common/scripts/build/build_zloader_dloff.sh
@@ -23,21 +23,14 @@
if [ $is_ok -eq 1 ];then
echo "";
- echo "Configuring ["$chip"_"$board"_zloader_dloff_config] for ["$chip" "$board" "$key_path"] board ...";
+ echo "Configuring ["$chip"_"$board"_zloader_dloff_config] for ["$chip" "$board"] board ...";
cp z-load.bin $SRC_PATH/common/scripts/tools;
cd $SRC_PATH/common/scripts/tools;
./expand z-load.bin;
- mkdir -p $KEYS_PATH/Input
- mkdir -p $KEYS_PATH/Output
chmod -R 777 $SRC_PATH/
- mv z-load.bin $KEYS_PATH/Input/zloader.bin
- cd $KEYS_PATH
- ./SignImage -z ./Input/zloader.bin ./test_key/$key_path/private.k
- cp ./Input/zloader.bin $SRC_PATH/prj/$chip/$board/bin/dl_off/zloader.bin
- rm -rf Input
- rm -rf Output
+ $SRC_PATH/../tools/SignTool/SignImage -z -i z-load.bin -o $SRC_PATH/prj/$chip/$board/bin/dl_off/zloader.bin -k $SRC_PATH/../tools/SignTool/key/RSA_1024/private.k
echo "--Finished build [zloader.bin] ...";
echo "................................................OK....";
diff --git a/boot/common/scripts/build/build_zloader_dlon.sh b/boot/common/scripts/build/build_zloader_dlon.sh
index bfc6394..b5daa43 100755
--- a/boot/common/scripts/build/build_zloader_dlon.sh
+++ b/boot/common/scripts/build/build_zloader_dlon.sh
@@ -23,22 +23,15 @@
if [ $is_ok -eq 1 ];then
echo "";
- echo "Configuring ["$chip"_"$board"_zloader_dlon_config] for ["$chip" "$board" "$key_path"] board ...";
+ echo "Configuring ["$chip"_"$board"_zloader_dlon_config] for ["$chip" "$board"] board ...";
cp z-load.bin $SRC_PATH/common/scripts/tools;
cd $SRC_PATH/common/scripts/tools;
./expand z-load.bin;
-
- mkdir -p $KEYS_PATH/Input
- mkdir -p $KEYS_PATH/Output
+
chmod -R 777 $SRC_PATH/
- mv z-load.bin $KEYS_PATH/Input/zloader.bin
- cd $KEYS_PATH
- ./SignImage -z ./Input/zloader.bin ./test_key/$key_path/private.k
- cp ./Input/zloader.bin $SRC_PATH/prj/$chip/$board/bin/dl_on/zloader.bin
- rm -rf Input
- rm -rf Output
-
+ $SRC_PATH/../tools/SignTool/SignImage -z -i z-load.bin -o $SRC_PATH/prj/$chip/$board/bin/dl_on/zloader.bin -k $SRC_PATH/../tools/SignTool/key/RSA_1024/private.k
+
echo "--Finished build [zloader.bin] ...";
echo "................................................OK....";
echo "";