Changeset 850235d in mainline for tools/mkuimage.py

Timestamp:

2013-03-10T14:56:21Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

05bab88

Parents:

ea906c29 (diff), 2277e03 (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

@@ -60 +60 @@
         load_addr = 0
         start_addr = 0
+        os_type = 5 #Linux is the default
 
         while len(args) >= 2 and args[0][0] == '-':
@@ -71 +72 @@
                 elif opt == 'saddr':
                         start_addr = (int)(optarg, 0)
+                elif opt == 'ostype':
+                        os_type = (int)(optarg, 0)
                 else:
                         print(base_name + ": Unrecognized option.")
@@ -85 +88 @@
 
         try:
-                mkuimage(inf_name, outf_name, image_name, load_addr, start_addr)
+                mkuimage(inf_name, outf_name, image_name, load_addr, start_addr, os_type)
         except:
                 os.remove(outf_name)
                 raise
 
-def mkuimage(inf_name, outf_name, image_name, load_addr, start_addr):
+def mkuimage(inf_name, outf_name, image_name, load_addr, start_addr, os_type):
         inf = open(inf_name, 'rb')
         outf = open(outf_name, 'wb')
@@ -120 +123 @@
         header.start_addr = start_addr  # Address of entry point
         header.data_crc = data_crc
-        header.os = 5                   # Linux
+        header.os = os_type
         header.arch = 2                 # ARM
         header.img_type = 2             # Kernel