Merge lp:~gesha/linaro-image-tools/1208678 into lp:linaro-image-tools/11.11

[Georgy Redkozubov]

This branch adds zImage as supported kernel image type to boot.
New variable is added to hwpack: kernel_image_type
if it is set to 'zImage' 'kernel_file' is copied to the bootdisk as 'zImage', if it is not set or set to 'uImage' 'kernel_file' is treated as uImage.

Unmerged revisions

646. By Georgy Redkozubov on 2013-10-15

Added zImage as supported kernel image type to boot.

=== modified file 'linaro_image_tools/hwpack/config.py'
--- linaro_image_tools/hwpack/config.py	2013-02-17 13:53:41 +0000
+++ linaro_image_tools/hwpack/config.py	2013-12-10 14:12:52 +0000
@@ -57,6 +57,7 @@
     INITRD_FILE_FIELD,
     KERNEL_ADDR_FIELD,
     KERNEL_FILE_FIELD,
+    KERNEL_TYPE_FIELD,
     LOAD_ADDR_FIELD,
     LOADER_MIN_SIZE_FIELD,
     LOADER_START_FIELD,
@@ -308,6 +309,7 @@
             self._validate_samsung_bl2_len()
 
         self._validate_sources()
+        self._validate_kernel_type()
 
     @property
     def format(self):
@@ -834,6 +836,14 @@
         return self._get_option(KERNEL_FILE_FIELD)
 
     @property
+    def kernel_type(self):
+        """Type of the kernel image.
+
+        A str.
+        """
+        return self._get_option(KERNEL_TYPE_FIELD)
+
+    @property
     def initrd(self):
         """The path to initrd
 
@@ -1458,3 +1468,9 @@
                 self._do_validate_keys_prefix.pop()
 
         self._do_validate_keys_prefix.pop()
+
+    def _validate_kernel_type(self):
+        kernel_type = self.kernel_type
+        if kernel_type not in (None, "uImage", "zImage"):
+            raise HwpackConfigError(
+                "Invalid value for kernel image type: %s" % kernel_type)

=== modified file 'linaro_image_tools/hwpack/hardwarepack.py'
--- linaro_image_tools/hwpack/hardwarepack.py	2013-02-18 13:05:58 +0000
+++ linaro_image_tools/hwpack/hardwarepack.py	2013-12-10 14:12:52 +0000
@@ -50,6 +50,7 @@
     INITRD_FILE_FIELD,
     KERNEL_ADDR_FIELD,
     KERNEL_FILE_FIELD,
+    KERNEL_TYPE_FIELD,
     LOAD_ADDR_FIELD,
     LOADER_MIN_SIZE_FIELD,
     LOADER_START_FIELD,
@@ -172,7 +173,8 @@
         self.samsung_bl2_len = samsung_bl2_len
 
     @classmethod
-    def add_v3_config(self, boards=None, bootloaders=None, dtb_files=None):
+    def add_v3_config(self, boards=None, bootloaders=None, dtb_files=None,
+                      kernel_type=None):
         """Add fields that are specific to the v3 config format.
         These fields are not present in the earlier config files.
 
@@ -182,6 +184,7 @@
         self.boards = boards
         self.bootloaders = bootloaders
         self.dtb_files = dtb_files
+        self.kernel_type = kernel_type
 
     @classmethod
     def from_config(cls, config, version, architecture):
@@ -246,7 +249,8 @@
         if config.format.format_as_string == '3.0':
             metadata.add_v3_config(boards=config.boards,
                                    bootloaders=config.bootloaders,
-                                   dtb_files=config.dtb_files)
+                                   dtb_files=config.dtb_files,
+                                   kernel_type=config.kernel_type)
         return metadata
 
     def __str__(self):
@@ -311,6 +315,8 @@
             metadata += dump({LOADER_START_FIELD: self.loader_start})
         if self.vmlinuz is not None:
             metadata += dump({KERNEL_FILE_FIELD: self.vmlinuz})
+        if self.kernel_type is not None:
+            metadata += dump({KERNEL_TYPE_FIELD: self.kernel_type})
         if self.initrd is not None:
             metadata += dump({INITRD_FILE_FIELD: self.initrd})
         if self.dtb_file is not None:

=== modified file 'linaro_image_tools/hwpack/hwpack_fields.py'
--- linaro_image_tools/hwpack/hwpack_fields.py	2013-02-17 13:53:41 +0000
+++ linaro_image_tools/hwpack/hwpack_fields.py	2013-12-10 14:12:52 +0000
@@ -42,6 +42,7 @@
 INITRD_FILE_FIELD = 'initrd_file'
 KERNEL_ADDR_FIELD = 'kernel_addr'
 KERNEL_FILE_FIELD = 'kernel_file'
+KERNEL_TYPE_FIELD = 'kernel_type'
 LOAD_ADDR_FIELD = 'load_addr'
 LOADER_MIN_SIZE_FIELD = 'loader_min_size'
 LOADER_START_FIELD = 'loader_start'
@@ -131,6 +132,7 @@
     PARTITION_LAYOUT_FIELD: None,
     KERNEL_FILE_FIELD: None,
     KERNEL_ADDR_FIELD: None,
+    KERNEL_TYPE_FIELD: None,
     INITRD_FILE_FIELD: None,
     INITRD_ADDR_FIELD: None,
     LOAD_ADDR_FIELD: None,

=== modified file 'linaro_image_tools/media_create/boards.py'
--- linaro_image_tools/media_create/boards.py	2013-09-23 09:55:03 +0000
+++ linaro_image_tools/media_create/boards.py	2013-12-10 14:12:52 +0000
@@ -218,6 +218,7 @@
         # XXX: attributes that are not listed in hwpackV3, should be removed?
         self.vmlinuz = None
         self.initrd = None
+        self.kernel_type = None
 
     # XXX: can be removed when killing v1 hwpack.
     def _get_live_serial_options(self):
@@ -719,7 +720,7 @@
                 self._dd_file(bootloader_file, boot_device_or_file,
                               self.bootloader_dd)
 
-        make_uImage(self.load_addr, k_img_data, boot_dir)
+        make_kernel(self.load_addr, k_img_data, boot_dir, self.kernel_type)
 
         if i_img_data is not None:
             make_uInitrd(i_img_data, boot_dir)
@@ -959,7 +960,7 @@
         # XXX: delete this method when hwpacks V1 can die
         assert self.hwpack_format == HardwarepackHandler.FORMAT_1
         install_omap_boot_loader(chroot_dir, boot_dir, self)
-        make_uImage(self.load_addr, k_img_data, boot_dir)
+        make_kernel(self.load_addr, k_img_data, boot_dir, self.kernel_type)
         make_uInitrd(i_img_data, boot_dir)
         make_dtb(d_img_data, boot_dir)
         boot_script_path = os.path.join(boot_dir, self.boot_script)
@@ -1047,7 +1048,7 @@
                          d_img_data):
         # XXX: delete this method when hwpacks V1 can die
         assert self.hwpack_format == HardwarepackHandler.FORMAT_1
-        make_uImage(self.load_addr, k_img_data, boot_dir)
+        make_kernel(self.load_addr, k_img_data, boot_dir, self.kernel_type)
         make_uInitrd(i_img_data, boot_dir)
         make_dtb(d_img_data, boot_dir)
         boot_script_path = os.path.join(boot_dir, self.boot_script)
@@ -1078,7 +1079,7 @@
                          d_img_data):
         # XXX: delete this method when hwpacks V1 can die
         assert self.hwpack_format == HardwarepackHandler.FORMAT_1
-        make_uImage(self.load_addr, k_img_data, boot_dir)
+        make_kernel(self.load_addr, k_img_data, boot_dir, self.kernel_type)
         make_uInitrd(i_img_data, boot_dir)
         boot_script_path = os.path.join(boot_dir, self.boot_script)
         make_boot_script(boot_env, boot_script_path)
@@ -1098,7 +1099,7 @@
                          d_img_data):
         # XXX: delete this method when hwpacks V1 can die
         assert self.hwpack_format == HardwarepackHandler.FORMAT_1
-        make_uImage(self.load_addr, k_img_data, boot_dir)
+        make_kernel(self.load_addr, k_img_data, boot_dir, self.kernel_type)
         boot_script_path = os.path.join(boot_dir, self.boot_script)
         make_boot_script(boot_env, boot_script_path)
 
@@ -1156,7 +1157,7 @@
                          d_img_data):
         # XXX: delete this method when hwpacks V1 can die
         assert self.hwpack_format == HardwarepackHandler.FORMAT_1
-        make_uImage(self.load_addr, k_img_data, boot_dir)
+        make_kernel(self.load_addr, k_img_data, boot_dir, self.kernel_type)
         boot_script_path = os.path.join(boot_dir, self.boot_script)
         make_boot_script(boot_env, boot_script_path)
         self.populate_raw_partition(boot_device_or_file, chroot_dir)
@@ -1325,7 +1326,7 @@
                     'u-boot.imx'))
             install_mx5_boot_loader(bootloader_file, boot_device_or_file,
                                     self.LOADER_MIN_SIZE_S)
-        make_uImage(self.load_addr, k_img_data, boot_dir)
+        make_kernel(self.load_addr, k_img_data, boot_dir, self.kernel_type)
         make_uInitrd(i_img_data, boot_dir)
         make_dtb(d_img_data, boot_dir)
         boot_script_path = os.path.join(boot_dir, self.boot_script)
@@ -1401,7 +1402,7 @@
     def _make_boot_files(self, boot_env, chroot_dir, boot_dir,
                          boot_device_or_file, k_img_data, i_img_data,
                          d_img_data):
-        make_uImage(self.load_addr, k_img_data, boot_dir)
+        make_kernel(self.load_addr, k_img_data, boot_dir, self.kernel_type)
         make_uInitrd(i_img_data, boot_dir)
 
 
@@ -1496,7 +1497,7 @@
         env_file = make_flashable_env(boot_env, env_size)
         _dd(env_file, boot_device_or_file, seek=self.samsung_env_start)
 
-        make_uImage(self.load_addr, k_img_data, boot_dir)
+        make_kernel(self.load_addr, k_img_data, boot_dir, self.kernel_type)
         make_uInitrd(i_img_data, boot_dir)
 
         # unused at the moment once FAT support enabled for the
@@ -1694,7 +1695,7 @@
                 self._dd_file(bootloader_file, boot_device_or_file,
                               self.bootloader_dd)
 
-        make_uImage(self.load_addr, k_img_data, boot_dir)
+        make_kernel(self.load_addr, k_img_data, boot_dir, self.kernel_type)
 
         if i_img_data is not None:
             make_uInitrd(i_img_data, boot_dir)
@@ -1909,9 +1910,19 @@
         raise ValueError("Too many files matching '%s' found." % regex)
 
 
-def make_uImage(load_addr, img_data, boot_disk):
-    img = '%s/uImage' % boot_disk
-    return _run_mkimage('kernel', load_addr, load_addr, 'Linux', img_data, img)
+def make_kernel(load_addr, img_data, boot_disk, kernel_type):
+    if kernel_type is None:
+        kernel_type = 'uImage'
+    img = '%s/%s' % (boot_disk, kernel_type)
+    if kernel_type == 'zImage':
+        # Copy kernel to boot partition as zImage
+        proc = cmd_runner.run(['cp', img_data, img], as_root=True)
+        proc.wait()
+        return proc.returncode
+    else:
+        # Make uImage kernel and place it on boot partition as uImage
+        return _run_mkimage('kernel', load_addr, load_addr, 'Linux', img_data,
+                            img)
 
 
 def make_uInitrd(img_data, boot_disk):

=== modified file 'linaro_image_tools/media_create/tests/test_media_create.py'
--- linaro_image_tools/media_create/tests/test_media_create.py	2013-11-29 10:16:06 +0000
+++ linaro_image_tools/media_create/tests/test_media_create.py	2013-12-10 14:12:52 +0000
@@ -57,7 +57,7 @@
     install_mx5_boot_loader,
     install_omap_boot_loader,
     make_boot_script,
-    make_uImage,
+    make_kernel,
     make_uInitrd,
     make_dtb,
     _get_file_matching,
@@ -1272,14 +1272,14 @@
         board_conf = boards.VexpressConfig()
         board_conf.hwpack_format = HardwarepackHandler.FORMAT_1
         self.make_boot_files(board_conf)
-        expected = ['make_uImage', 'make_uInitrd']
+        expected = ['make_kernel', 'make_uInitrd']
         self.assertEqual(expected, self.funcs_calls)
 
     def test_vexpress_a9_steps(self):
         board_conf = boards.VexpressA9Config()
         board_conf.hwpack_format = HardwarepackHandler.FORMAT_1
         self.make_boot_files(board_conf)
-        expected = ['make_uImage', 'make_uInitrd']
+        expected = ['make_kernel', 'make_uInitrd']
         self.assertEqual(expected, self.funcs_calls)
 
     def test_mx5_steps(self):
@@ -1292,7 +1292,7 @@
             lambda: HardwarepackHandler.FORMAT_1)
         self.make_boot_files(board_conf)
         expected = [
-            'install_mx5_boot_loader', 'make_uImage', 'make_uInitrd',
+            'install_mx5_boot_loader', 'make_kernel', 'make_uInitrd',
             'make_dtb', 'make_boot_script']
         self.assertEqual(expected, self.funcs_calls)
 
@@ -1311,7 +1311,7 @@
         self.make_boot_files(board_conf)
         expected = [
             'install_samsung_boot_loader', 'make_flashable_env', '_dd',
-            'make_uImage', 'make_uInitrd', 'make_boot_script']
+            'make_kernel', 'make_uInitrd', 'make_boot_script']
         self.assertEqual(expected, self.funcs_calls)
 
     def test_origen_steps(self):
@@ -1329,7 +1329,7 @@
         self.make_boot_files(board_conf)
         expected = [
             'install_samsung_boot_loader', 'make_flashable_env', '_dd',
-            'make_uImage', 'make_uInitrd', 'make_boot_script']
+            'make_kernel', 'make_uInitrd', 'make_boot_script']
         self.assertEqual(expected, self.funcs_calls)
 
     def test_origen_quad_steps(self):
@@ -1348,7 +1348,7 @@
         self.make_boot_files(board_conf)
         expected = [
             'install_samsung_boot_loader', 'make_flashable_env', '_dd',
-            'make_uImage', 'make_uInitrd', 'make_boot_script']
+            'make_kernel', 'make_uInitrd', 'make_boot_script']
         self.assertEqual(expected, self.funcs_calls)
 
     def test_arndale_steps(self):
@@ -1367,21 +1367,21 @@
         self.make_boot_files(board_conf)
         expected = [
             'install_samsung_boot_loader', 'make_flashable_env', '_dd',
-            'make_uImage', 'make_uInitrd', 'make_boot_script']
+            'make_kernel', 'make_uInitrd', 'make_boot_script']
         self.assertEqual(expected, self.funcs_calls)
 
     def test_ux500_steps(self):
         board_conf = boards.Ux500Config()
         board_conf.hwpack_format = HardwarepackHandler.FORMAT_1
         self.make_boot_files(board_conf)
-        expected = ['make_uImage', 'make_uInitrd', 'make_boot_script']
+        expected = ['make_kernel', 'make_uInitrd', 'make_boot_script']
         self.assertEqual(expected, self.funcs_calls)
 
     def test_snowball_sd_steps(self):
         board_conf = boards.SnowballSdConfig()
         board_conf.hwpack_format = HardwarepackHandler.FORMAT_1
         self.make_boot_files(board_conf)
-        expected = ['make_uImage', 'make_boot_script']
+        expected = ['make_kernel', 'make_boot_script']
         self.assertEqual(expected, self.funcs_calls)
 
     def test_panda_steps(self):
@@ -1390,7 +1390,7 @@
         self.mock_set_appropriate_serial_tty(board_conf)
         self.make_boot_files(board_conf)
         expected = [
-            'install_omap_boot_loader', 'make_uImage', 'make_uInitrd',
+            'install_omap_boot_loader', 'make_kernel', 'make_uInitrd',
             'make_dtb', 'make_boot_script', 'make_boot_ini']
         self.assertEqual(expected, self.funcs_calls)
 
@@ -1400,7 +1400,7 @@
         self.mock_set_appropriate_serial_tty(board_conf)
         self.make_boot_files(board_conf)
         expected = [
-            'install_omap_boot_loader', 'make_uImage', 'make_uInitrd',
+            'install_omap_boot_loader', 'make_kernel', 'make_uInitrd',
             'make_dtb', 'make_boot_script', 'make_boot_ini']
         self.assertEqual(expected, self.funcs_calls)
 
@@ -1410,7 +1410,7 @@
         self.mock_set_appropriate_serial_tty(board_conf)
         self.make_boot_files(board_conf)
         expected = [
-            'make_uImage', 'make_uInitrd', 'make_dtb', 'make_boot_script',
+            'make_kernel', 'make_uInitrd', 'make_dtb', 'make_boot_script',
             'make_boot_ini']
         self.assertEqual(expected, self.funcs_calls)
 
@@ -1420,7 +1420,7 @@
         self.mock_set_appropriate_serial_tty(board_conf)
         self.make_boot_files(board_conf)
         expected = [
-            'install_omap_boot_loader', 'make_uImage', 'make_uInitrd',
+            'install_omap_boot_loader', 'make_kernel', 'make_uInitrd',
             'make_dtb', 'make_boot_script', 'make_boot_ini']
         self.assertEqual(expected, self.funcs_calls)
 
@@ -1436,7 +1436,7 @@
         self.mock_set_appropriate_serial_tty(board_conf)
         self.make_boot_files(board_conf)
         expected = [
-            'install_omap_boot_loader', 'make_uImage', 'make_uInitrd',
+            'install_omap_boot_loader', 'make_kernel', 'make_uInitrd',
             'make_dtb', 'make_boot_script', 'make_boot_ini']
         self.assertEqual(expected, self.funcs_calls)
 
@@ -2462,14 +2462,36 @@
         self.useFixture(fixture)
         return fixture
 
-    def test_make_uImage(self):
-        self._mock_get_file_matching()
-        fixture = self._mock_Popen()
-        make_uImage('load_addr', 'parts_dir/vmlinuz-*-sub_arch', 'boot_disk')
-        expected = [
-            '%s mkimage -A arm -O linux -T kernel -C none -a load_addr '
-            '-e load_addr -n Linux -d parts_dir/vmlinuz-*-sub_arch '
-            'boot_disk/uImage' % sudo_args]
+    def test_make_kernel_uImage(self):
+        self._mock_get_file_matching()
+        fixture = self._mock_Popen()
+        make_kernel('load_addr', 'parts_dir/vmlinuz-*-sub_arch', 'boot_disk',
+                    'uImage')
+        expected = [
+            '%s mkimage -A arm -O linux -T kernel -C none -a load_addr '
+            '-e load_addr -n Linux -d parts_dir/vmlinuz-*-sub_arch '
+            'boot_disk/uImage' % sudo_args]
+        self.assertEqual(expected, fixture.mock.commands_executed)
+
+    def test_make_kernel_uImage_None(self):
+        self._mock_get_file_matching()
+        fixture = self._mock_Popen()
+        make_kernel('load_addr', 'parts_dir/vmlinuz-*-sub_arch', 'boot_disk',
+                    None)
+        expected = [
+            '%s mkimage -A arm -O linux -T kernel -C none -a load_addr '
+            '-e load_addr -n Linux -d parts_dir/vmlinuz-*-sub_arch '
+            'boot_disk/uImage' % sudo_args]
+        self.assertEqual(expected, fixture.mock.commands_executed)
+
+    def test_make_kernel_zImage(self):
+        self._mock_get_file_matching()
+        fixture = self._mock_Popen()
+        make_kernel('load_addr', 'parts_dir/vmlinuz-*-sub_arch', 'boot_disk',
+                    'zImage')
+        expected = [
+            '%s cp parts_dir/vmlinuz-*-sub_arch '
+            'boot_disk/zImage' % sudo_args]
         self.assertEqual(expected, fixture.mock.commands_executed)
 
     def test_make_uInitrd(self):