From 50c62513c23e958aaaa826b0bfe3dd5acbebe51e Mon Sep 17 00:00:00 2001 From: cjf Date: Sat, 25 May 2013 15:27:28 +0800 Subject: [PATCH] update boot_merger, parse extra chip type defs in CHIP.ini --- CHIP.ini | 2 ++ boot_merger | Bin 29457 -> 29533 bytes 2 files changed, 2 insertions(+) create mode 100644 CHIP.ini diff --git a/CHIP.ini b/CHIP.ini new file mode 100644 index 00000000..c719ab31 --- /dev/null +++ b/CHIP.ini @@ -0,0 +1,2 @@ +[CHIP_TYPES] +RK310B=0x71 diff --git a/boot_merger b/boot_merger index ab0b1cc5a6aa8f63745e2c2425600cca639d5743..c86f0dd8f09c8536c0f2376f71f59c65170d40e2 100755 GIT binary patch delta 11499 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 M#?*$Rl?DC&ACVz>F8}}l delta 10563 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 WP?;I2+1X4}7o^E(38|Yg?Ee8>cseQo