Merge lp:~salgado/linaro-image-tools/panda into lp:linaro-image-tools/11.11

[Guilherme Salgado]

l-m-c expects the kernel images for panda boards to have a 'omap4' suffix but that's not the case as panda (currently) use the same kernel as beagle. This branch fixes that.

[James Westby (james-w)]

Is this really a bug in the hwpacks?

Shouldn't they use omap4 for omap4?

Either way I have no problem with this change as the config should match the hwpacks.

Thanks,

James

review: Approve

[Guilherme Salgado (salgado)]

Do you mean that the hwpack wrongly includes omap3 packages instead of
the omap4 ones?

[Guilherme Salgado (salgado)]

Indeed there's a x-loader-omap4 package which has the MLO under /usr/lib/x-loader-omap4 and a -omap4 linux-image package which contain the vmlinuz-...-omap4 file that l-m-c expects. Given that I think this is really a bug on hwpacks.

[Guilherme Salgado (salgado)]

as per bug 702645, the new x-loader-omap will place the MLO file in different directories, but there are concerns that this is not optimal so it may be changed again. John suggested running a find on /usr/lib for a file named MLO as there should be only one there.

also, the -omap kernel is the one we should use for pandas, so indeed we seem to need to change sub_arch on PandaConfig to 'omap', but since that attr is only used to lookup the appropriate vmlinuz image, we might as well rename it to reflect that

[Loïc Minier (lool)]

The -omap kernel package is the right one though, at least for a mainline-based omap4 kernel package (we use the same binary kernel for OMAP3 and OMAP4). There might still be an omap4 package for some time.

We really ought to move this information in the hwpack itself so that the name doesn't matter too much.

[Guilherme Salgado (salgado)]

On Tue, 2011-01-18 at 23:56 +0000, Loïc Minier wrote:
> The -omap kernel package is the right one though, at least for a
> mainline-based omap4 kernel package (we use the same binary kernel for
> OMAP3 and OMAP4). There might still be an omap4 package for some
> time.

The -omap kernel is the one used for panda on this branch, so I assume
you're concurring with my changes?

>
> We really ought to move this information in the hwpack itself so that
> the name doesn't matter too much.

Indeed.

[Loïc Minier (lool)]

Yes, I think it's the right change

Now to the scary part: it might make sense to provide a panda hwpack built from mainline kernels, and then a TI BSP based one; I don't know how we would name them, maybe -panda and -ti-panda. Again this will be really confusing unless we move the meat of the boards' data to the hwpacks themselves.

[Steve Langasek (vorlon)]

On Wed, Jan 19, 2011 at 02:13:14PM -0000, Loïc Minier wrote:
> Now to the scary part: it might make sense to provide a panda hwpack built
> from mainline kernels, and then a TI BSP based one; I don't know how we
> would name them, maybe -panda and -ti-panda.

What about "panda-bsp" or "bsp-panda"? Calling it "-ti-" is also ambiguous.

[Loïc Minier (lool)]

review: Approve

=== modified file 'linaro_media_create/boards.py'
--- linaro_media_create/boards.py	2011-01-18 17:22:00 +0000
+++ linaro_media_create/boards.py	2011-01-18 18:08:52 +0000
@@ -31,7 +31,7 @@
     kernel_addr = None
     initrd_addr = None
     load_addr = None
-    sub_arch = None
+    kernel_suffix = None
     boot_script = None
 
     @classmethod
@@ -101,8 +101,9 @@
     def _make_boot_files(cls, uboot_parts_dir, boot_cmd, chroot_dir,
                          boot_dir, boot_script, boot_device_or_file):
         install_omap_boot_loader(chroot_dir, boot_dir)
-        make_uImage(cls.load_addr, uboot_parts_dir, cls.sub_arch, boot_dir)
-        make_uInitrd(uboot_parts_dir, cls.sub_arch, boot_dir)
+        make_uImage(
+            cls.load_addr, uboot_parts_dir, cls.kernel_suffix, boot_dir)
+        make_uInitrd(uboot_parts_dir, cls.kernel_suffix, boot_dir)
         make_boot_script(boot_cmd, boot_script)
         make_boot_ini(boot_script, boot_dir)
 
@@ -114,7 +115,7 @@
     kernel_addr = '0x80000000'
     initrd_addr = '0x81600000'
     load_addr = '0x80008000'
-    sub_arch = 'linaro-omap'
+    kernel_suffix = 'linaro-omap'
     boot_script = 'boot.scr'
     extra_boot_args_options = (
         'earlyprintk fixrtc nocompcache vram=12M omapfb.debug=y '
@@ -128,7 +129,7 @@
     kernel_addr = '0x80200000'
     initrd_addr = '0x81600000'
     load_addr = '0x80008000'
-    sub_arch = 'omap4'
+    kernel_suffix = 'linaro-omap'
     boot_script = 'boot.scr'
     extra_boot_args_options = (
         'earlyprintk fixrtc nocompcache vram=32M omapfb.debug=y '
@@ -141,8 +142,9 @@
     @classmethod
     def _make_boot_files(cls, uboot_parts_dir, boot_cmd, chroot_dir,
                          boot_dir, boot_script, boot_device_or_file):
-        make_uImage(cls.load_addr, uboot_parts_dir, cls.sub_arch, boot_dir)
-        make_uInitrd(uboot_parts_dir, cls.sub_arch, boot_dir)
+        make_uImage(
+            cls.load_addr, uboot_parts_dir, cls.kernel_suffix, boot_dir)
+        make_uInitrd(uboot_parts_dir, cls.kernel_suffix, boot_dir)
         make_boot_script(boot_cmd, boot_script)
         make_boot_ini(boot_script, boot_dir)
 
@@ -153,7 +155,7 @@
     kernel_addr = '0x00100000'
     initrd_addr = '0x08000000'
     load_addr = '0x00008000'
-    sub_arch = 'ux500'
+    kernel_suffix = 'ux500'
     boot_script = 'flash.scr'
     extra_boot_args_options = (
         'earlyprintk rootdelay=1 fixrtc nocompcache '
@@ -165,8 +167,9 @@
     @classmethod
     def _make_boot_files(cls, uboot_parts_dir, boot_cmd, chroot_dir,
                          boot_dir, boot_script, boot_device_or_file):
-        make_uImage(cls.load_addr, uboot_parts_dir, cls.sub_arch, boot_dir)
-        make_uInitrd(uboot_parts_dir, cls.sub_arch, boot_dir)
+        make_uImage(
+            cls.load_addr, uboot_parts_dir, cls.kernel_suffix, boot_dir)
+        make_uInitrd(uboot_parts_dir, cls.kernel_suffix, boot_dir)
         make_boot_script(boot_cmd, boot_script)
 
 
@@ -176,7 +179,7 @@
     kernel_addr = '0x90000000'
     initrd_addr = '0x90800000'
     load_addr = '0x90008000'
-    sub_arch = 'linaro-mx51'
+    kernel_suffix = 'linaro-mx51'
     boot_script = 'boot.scr'
     mmc_part_offset = 1
     mmc_option = '0:2'
@@ -187,8 +190,9 @@
         uboot_file = os.path.join(
             chroot_dir, 'usr', 'lib', 'u-boot', 'mx51evk', 'u-boot.imx')
         install_mx51evk_boot_loader(uboot_file, boot_device_or_file)
-        make_uImage(cls.load_addr, uboot_parts_dir, cls.sub_arch, boot_dir)
-        make_uInitrd(uboot_parts_dir, cls.sub_arch, boot_dir)
+        make_uImage(
+            cls.load_addr, uboot_parts_dir, cls.kernel_suffix, boot_dir)
+        make_uInitrd(uboot_parts_dir, cls.kernel_suffix, boot_dir)
         make_boot_script(boot_cmd, boot_script)
 
 
@@ -199,7 +203,7 @@
     kernel_addr = '0x60008000'
     initrd_addr = '0x81000000'
     load_addr = kernel_addr
-    sub_arch = 'linaro-vexpress'
+    kernel_suffix = 'linaro-vexpress'
     boot_script = None
     # ARM Boot Monitor is used to load u-boot, uImage etc. into flash and
     # only allows for FAT16
@@ -208,8 +212,9 @@
     @classmethod
     def _make_boot_files(cls, uboot_parts_dir, boot_cmd, chroot_dir,
                          boot_dir, boot_script):
-        make_uImage(cls.load_addr, uboot_parts_dir, cls.sub_arch, boot_dir)
-        make_uInitrd(uboot_parts_dir, cls.sub_arch, boot_dir)
+        make_uImage(
+            cls.load_addr, uboot_parts_dir, cls.kernel_suffix, boot_dir)
+        make_uInitrd(uboot_parts_dir, cls.kernel_suffix, boot_dir)
 
 
 board_configs = {
@@ -256,17 +261,17 @@
         raise ValueError("Too many files matching '%s' found." % regex)
 
 
-def make_uImage(load_addr, uboot_parts_dir, sub_arch, boot_disk):
+def make_uImage(load_addr, uboot_parts_dir, suffix, boot_disk):
     img_data = _get_file_matching(
-        '%s/vmlinuz-*-%s' % (uboot_parts_dir, sub_arch))
+        '%s/vmlinuz-*-%s' % (uboot_parts_dir, suffix))
     img = '%s/uImage' % boot_disk
     return _run_mkimage(
         'kernel', load_addr, load_addr, 'Linux', img_data, img)
 
 
-def make_uInitrd(uboot_parts_dir, sub_arch, boot_disk):
+def make_uInitrd(uboot_parts_dir, suffix, boot_disk):
     img_data = _get_file_matching(
-        '%s/initrd.img-*-%s' % (uboot_parts_dir, sub_arch))
+        '%s/initrd.img-*-%s' % (uboot_parts_dir, suffix))
     img = '%s/uInitrd' % boot_disk
     return _run_mkimage('ramdisk', '0', '0', 'initramfs', img_data, img)