From e5e978b341e471aa1cbedf1c00fcae9dd41e4ff6 Mon Sep 17 00:00:00 2001
From: Joseph Chen <chenjh@rock-chips.com>
Date: Thu, 10 May 2018 16:16:46 +0800
Subject: [PATCH] make.sh: use RSA PKCS1 V2.1 for RK3308/PX30/RK3326 trust.img
 pack

RSA PKCS1 V2.1 pack magic is "3", so use "--rsa 3" subcmd

Change-Id: Ic35445445121d765385f5cf9673473b061633a3a
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
---
 make.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/make.sh b/make.sh
index 0366d4cbde..51dfb3f4ff 100755
--- a/make.sh
+++ b/make.sh
@@ -178,7 +178,14 @@ pack_trust_image()
 		fi
 
 		cd ${RKBIN}
-		${TOOLCHAIN_RKBIN}/trust_merger --replace tools/rk_tools/ ./ ${RKBIN}/RKTRUST/${RKCHIP}TRUST.ini
+
+		# RK3308/PX30/RK3326 use RSA-PKCS1 V2.1, it's pack magic is "3"
+		if [ $RKCHIP = "PX30" -o $RKCHIP = "RK3326" -o $RKCHIP = "RK3308" ]; then
+			${TOOLCHAIN_RKBIN}/trust_merger --rsa 3 --replace tools/rk_tools/ ./ ${RKBIN}/RKTRUST/${RKCHIP}TRUST.ini
+		else
+			${TOOLCHAIN_RKBIN}/trust_merger --replace tools/rk_tools/ ./ ${RKBIN}/RKTRUST/${RKCHIP}TRUST.ini
+		fi
+
 		cd -
 		mv ${RKBIN}/trust.img ./trust.img
 		echo "pack trust okay! Input: ${RKBIN}/RKTRUST/${RKCHIP}TRUST.ini"