Changeset 6843a9c in mainline for tools/mkuimage.py

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

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

tools/mkuimage.py

@@ -124 +124 @@
         header.img_type = 2             # Kernel
         header.compression = 0          # None
-        header.img_name = image_name
+        header.img_name = image_name.encode('ascii')
 
         header_crc = calc_crc32(header.pack())
@@ -140 +140 @@
         signed_crc = zlib.crc32(byteseq, 0)
         if signed_crc < 0:
-                return (long(signed_crc) + (long(2) ** long(32))) # 2^32L
+                return signed_crc + (1 << 32)
         else:
                 return signed_crc
@@ -148 +148 @@
 def print_syntax(cmd):
         print("syntax: " + cmd + " [<options>] <raw_image> <uImage>")
-        print
+        print()
         print("\traw_image\tInput image name (raw binary data)")
         print("\tuImage\t\tOutput uImage name (U-Boot image)")
-        print
+        print()
         print("options:")
         print("\t-name <name>\tImage name (default: 'Noname')")