From 9fb0218203dcd67690884304e00ed3057fa12e5b Mon Sep 17 00:00:00 2001 From: Joseph Chen Date: Thu, 31 Jan 2019 18:10:51 +0800 Subject: [PATCH] tools: trust_merger: support "--ignore-bl32" Ignore bl32 image pack even SEC=1 of [BL32_OPTION]. Change-Id: I3ee903d6fd0ca128d39b2cf06374fe72b5b7e58a Signed-off-by: Joseph Chen --- tools/trust_merger | Bin 53228 -> 53346 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/tools/trust_merger b/tools/trust_merger index 37fcba9107baaa4a7015c70d799769af55d103a7..ebeefbd4e7a39c5dcea516fb6f63642f775f09e1 100755 GIT binary patch delta 10146 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

{9dw351LYD z`d=n=@S$2r*Fj2ot1%}HDqmdddDafQv{~rvFcIdOIlsX~I6zYCw~&glPp5q})#6}D z?M7YVn|IiY)3D}HPXV(hr-_mt=P&dM4nV|3|E59Fwv>9sb3BiEgqB`pO4&j~daux7 zY>JT1HZi?sHN=;Qx%}ascK1Bfwq~+n`+#Ztn8}a-8YD!B@tI?)-joDXI zwSg9|yuS;p?U1Hm882&>liem7{hCPEdUK`zkgTNR!uGPM(`05KUSS<^rl3qVnG00B z$7DWpmtD%@jkpgL^f+;!CGPWi)^0mqG)ZS2>Gvgt2!`ev{KHI2+8G z__xVV@fiH?O#T0ue5aY29Fu?4Q=A-;-yFZi9iGNqFNWa_hX!nq`#y2oo7K8R1= zla(+me+d8U9;fZ@yYHL#&^>qGojc@u_b|R`&*