[coreboot-gerrit] Patch set updated for coreboot: rockchip: update make_idb.py

[Lin Huang (hl@rock-chips.com)]

Lin Huang (hl at rock-chips.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13913

-gerrit

commit abc62fd9c1f3bd454bbc8f9c389d392a055142e7
Author: huang lin <hl at rock-chips.com>
Date:   Wed Mar 2 16:02:45 2016 +0800

    rockchip: update make_idb.py
    
    make_idb.py only support RK3288 before, add chip parameter, so we can
    support RK3399 either.
    
    Change-Id: I6811acb7f0cdaf1930af9942a70db54765d544d5
    Signed-off-by: huang lin <hl at rock-chips.com>
---
 src/soc/rockchip/rk3288/Makefile.inc |  2 +-
 util/rockchip/make_idb.py            | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/soc/rockchip/rk3288/Makefile.inc b/src/soc/rockchip/rk3288/Makefile.inc
index 0ce6425..0df7eb7 100644
--- a/src/soc/rockchip/rk3288/Makefile.inc
+++ b/src/soc/rockchip/rk3288/Makefile.inc
@@ -74,6 +74,6 @@ CPPFLAGS_common += -Isrc/soc/rockchip/rk3288/include/
 $(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.raw.bin
 	@printf "Generating: $(subst $(obj)/,,$(@))\n"
 	@mkdir -p $(dir $@)
-	@$(IDBTOOL) --from=$< --to=$@ --enable-align
+	@$(IDBTOOL) --from=$< --to=$@ --enable-align --chip=RK32
 
 endif
diff --git a/util/rockchip/make_idb.py b/util/rockchip/make_idb.py
index 12ef83c..1ffb910 100755
--- a/util/rockchip/make_idb.py
+++ b/util/rockchip/make_idb.py
@@ -29,7 +29,7 @@ class IDBTool:
       k = (S[i] + S[j]) % 256
       buf[x] = struct.pack('B', ord(buf[x]) ^ S[k])
 
-  def makeIDB(self, from_file, to_file, rc4_flag = False, align_flag = False):
+  def makeIDB(self, chip, from_file, to_file, rc4_flag = False, align_flag = False):
     try:
       fin = open(from_file, 'rb')
     except:
@@ -52,7 +52,7 @@ class IDBTool:
     sectors = pages * PAGE_ALIGN;
 
     buf = [B'\0'] * sectors * SECTOR_SIZE
-    buf[:4] = "RK32"
+    buf[:4] = chip
     buf[4 : 4+data_len] = data
 
     idblock = [B'\0'] * 4 * SECTOR_SIZE
@@ -95,11 +95,13 @@ class IDBTool:
     print "DONE"
 
 def usage():
-  print "Usage: make_idb.py [--enable-rc4] [--enable-align] [--to=out] --from=in"
+  print "Usage: make_idb.py [--chip=RKXX] [--enable-rc4] [--enable-align] [--to=out] --from=in"
+  print "       --chip: default is RK32"
 
 if __name__ == '__main__':
   rc4_flag = align_flag = False
   to_file = "IDBlock.bin"
+  chip = "RK32"
 
   for para in sys.argv[1:]:
     if (para == "--enable-rc4"):
@@ -110,6 +112,8 @@ if __name__ == '__main__':
       to_file = para.split('=')[1]
     elif (para.startswith("--from=")):
       from_file = para.split('=')[1]
+    elif (para.startswith("--chip=")):
+      chip = para.split('=')[1]
     elif (para == "--help" or para == "-h"):
       usage()
       sys.exit()
@@ -121,4 +125,4 @@ if __name__ == '__main__':
     sys.exit()
 
   idbtool = IDBTool()
-  idbtool.makeIDB(from_file, to_file, rc4_flag, align_flag)
+  idbtool.makeIDB(chip, from_file, to_file, rc4_flag, align_flag)