From 8e2e2d4193e410bb63bffed85f41f3543ce0746e Mon Sep 17 00:00:00 2001 From: Kever Yang Date: Wed, 5 Dec 2018 16:33:04 +0800 Subject: [PATCH] tools: boot_merger: support add rc4 for legacy soc The legacy chips like rk3188 maskrom require all IDB data with RC4, the boot_merger pack the loader with a rc4 flag in header, and the upgrade_tool will write the data with rc4 to IDB area. usage: boot_merger --rc4 RKBOOT/RK310BMINIALL.ini Change-Id: I7788011885f153046117f193c9c9cbabe725eefa Signed-off-by: Kever Yang --- tools/boot_merger | Bin 33345 -> 33379 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/tools/boot_merger b/tools/boot_merger index 0828394689f9960f4d00178f95e69a3284faf98a..686cac333d9f344a38d72998cac844fb11b2357a 100755 GIT binary patch delta 10397 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 delta 10240 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