Changes in tools/mkuimage.py [5711f6e:a44ae3dd] in mainline

File:

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

tools/mkuimage.py

@@ -60 +60 @@
         load_addr = 0
         start_addr = 0
-        os_type = 5 #Linux is the default
 
         while len(args) >= 2 and args[0][0] == '-':
@@ -72 +71 @@
                 elif opt == 'saddr':
                         start_addr = (int)(optarg, 0)
-                elif opt == 'ostype':
-                        os_type = (int)(optarg, 0)
                 else:
                         print(base_name + ": Unrecognized option.")
@@ -88 +85 @@
 
         try:
-                mkuimage(inf_name, outf_name, image_name, load_addr, start_addr, os_type)
+                mkuimage(inf_name, outf_name, image_name, load_addr, start_addr)
         except:
                 os.remove(outf_name)
                 raise
 
-def mkuimage(inf_name, outf_name, image_name, load_addr, start_addr, os_type):
+def mkuimage(inf_name, outf_name, image_name, load_addr, start_addr):
         inf = open(inf_name, 'rb')
         outf = open(outf_name, 'wb')
@@ -123 +120 @@
         header.start_addr = start_addr  # Address of entry point
         header.data_crc = data_crc
-        header.os = os_type
+        header.os = 2                   # NetBSD
         header.arch = 2                 # ARM
         header.img_type = 2             # Kernel
         header.compression = 0          # None
-        header.img_name = image_name.encode('ascii')
+        header.img_name = image_name
 
         header_crc = calc_crc32(header.pack())
@@ -143 +140 @@
         signed_crc = zlib.crc32(byteseq, 0)
         if signed_crc < 0:
-                return signed_crc + (1 << 32)
+                return (long(signed_crc) + (long(2) ** long(32))) # 2^32L
         else:
                 return signed_crc
@@ -151 +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')")