From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Thu, 20 Aug 2009 17:30:11 +0000 (-0500)
Subject: fwcutter: mklist.py - Update to new library and skip some sections
X-Git-Tag: b43-fwcutter-013~13
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=4c01539a4e8c9e87ce41789ec1e00ffae2e563aa;hp=b5c31c378cb5353d92c52f522d44db1955348733;p=b43-tools.git

fwcutter: mklist.py - Update to new library and skip some sections

Switch from the deprecated md5 library to hashlib.

Detect the ro section that describes the firmware version,
print the address of the data, and and skip some ro sections
that are not of interest.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Michael Buesch <mb@bu3sch.de>
---

diff --git a/fwcutter/mklist.py b/fwcutter/mklist.py
index 1bc8351..40e6cb8 100755
--- a/fwcutter/mklist.py
+++ b/fwcutter/mklist.py
@@ -30,7 +30,7 @@
 import sys
 import os
 import re
-import md5
+import hashlib
 
 if len(sys.argv) != 2:
 	print "Usage: %s path/to/wl.o" % sys.argv[0]
@@ -55,7 +55,7 @@ if rodata_fileoffset == None:
 	print "ERROR: Could not find .rodata fileoffset"
 	sys.exit(1)
 
-md5sum = md5.md5(file(fn, "r").read())
+md5sum = hashlib.md5(file(fn, "r").read())
 
 print "static struct extract _%s[] =" % md5sum.hexdigest()
 print "{"
@@ -80,6 +80,14 @@ for sym in syms:
 		size -= 8
 	if "pcm" in name:
 		type = "EXT_PCM"
+	if "bommajor" in name:
+		print "\t/* ucode major version at offset 0x%x */" % pos
+		continue
+	if "bomminor" in name:
+		print "\t/* ucode minor version at offset 0x%x */" % pos
+		continue
+	if "ucode_2w" in name:
+		continue
 	m = ucode_re.match(name)
 	if m:
 		corerev = int(m.group(1))