Changeset 5711f6e in mainline

Timestamp:

2012-09-19T21:44:01Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

40ad375

Parents:

3896974

Message:

Add configuration option to select uImage os type

NetBSD stage 2 for beagleboardxm, Linux for everything else.

Files:

• HelenOS.config (modified) (1 diff)
• boot/Makefile.uboot (modified) (1 diff)
• tools/mkuimage.py (modified) (4 diffs)

HelenOS.config

@@ -615 +615 @@
 @ "efi" GRUB for UEFI
 ! [PLATFORM=ia32|PLATFORM=amd64] GRUB_ARCH (choice)
+
+% uImage OS type
+@ "2" NetBSD stage 2 boot loader
+! [PLATFORM=arm32&MACHINE=beagleboardxm] UIMAGE_OS (choice)
+
+% uImage OS type
+@ "5" Linux kernel
+! [PLATFORM=arm32&MACHINE!=beagleboardxm] UIMAGE_OS (choice)

boot/Makefile.uboot

@@ -40 +40 @@
 
 $(POST_OUTPUT): $(BIN_OUTPUT)
-        $(MKUIMAGE) -name "$(IMAGE_NAME)" -laddr $(LADDR) -saddr $(SADDR) $< $@
+        $(MKUIMAGE) -name "$(IMAGE_NAME)" -laddr $(LADDR) -saddr $(SADDR) -ostype $(UIMAGE_OS) $< $@
 
 clean:

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 = 2                   # NetBSD
+        header.os = os_type
         header.arch = 2                 # ARM
         header.img_type = 2             # Kernel