Changeset 60898b6 in mainline for tools/mkuimage.py

Timestamp:

2010-11-05T16:17:48Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

08042bd

Parents:

a63ff7d (diff), a66e2993 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• tools/mkuimage.py (modified) (4 diffs)

tools/mkuimage.py

@@ -72 +72 @@
                         start_addr = (int)(optarg, 0)
                 else:
-                        print base_name + ": Unrecognized option."
+                        print(base_name + ": Unrecognized option.")
                         print_syntax(cmd_name)
                         return
 
         if len(args) < 2:
-                print base_name + ": Argument missing."
+                print(base_name + ": Argument missing.")
                 print_syntax(cmd_name)
                 return
@@ -91 +91 @@
 
 def mkuimage(inf_name, outf_name, image_name, load_addr, start_addr):
-        inf = file(inf_name, 'rb')
-        outf = file(outf_name, 'wb')
+        inf = open(inf_name, 'rb')
+        outf = open(outf_name, 'wb')
 
         header = xstruct.create(UIMAGE_HEADER)
@@ -140 +140 @@
         signed_crc = zlib.crc32(byteseq, 0)
         if signed_crc < 0:
-                return (long(signed_crc) + 4294967296L) # 2^32L
+                return (long(signed_crc) + (long(2) ** long(32))) # 2^32L
         else:
                 return signed_crc
@@ -147 +147 @@
 #
 def print_syntax(cmd):
-        print "syntax: " + cmd + " [<options>] <raw_image> <uImage>"
+        print("syntax: " + cmd + " [<options>] <raw_image> <uImage>")
         print
-        print "\traw_image\tInput image name (raw binary data)"
-        print "\tuImage\t\tOutput uImage name (U-Boot image)"
+        print("\traw_image\tInput image name (raw binary data)")
+        print("\tuImage\t\tOutput uImage name (U-Boot image)")
         print
-        print "options:"
-        print "\t-name <name>\tImage name (default: 'Noname')"
-        print "\t-laddr <name>\tLoad address (default: 0x00000000)"
-        print "\t-saddr <name>\tStart address (default: 0x00000000)"
+        print("options:")
+        print("\t-name <name>\tImage name (default: 'Noname')")
+        print("\t-laddr <name>\tLoad address (default: 0x00000000)")
+        print("\t-saddr <name>\tStart address (default: 0x00000000)")
 
 if __name__ == '__main__':