Merge lp:~lool/linaro-image-tools/mx53-loco into lp:~linaro-landing-team-freescale/linaro-image-tools/mx53-loco

[Loïc Minier]

Misc cleanups and simplifications; biggest change is to require u-boot.imx, this makes the implementation much simpler.

=== modified file 'linaro_media_create/boards.py'
--- linaro_media_create/boards.py	2011-03-05 14:33:21 +0000
+++ linaro_media_create/boards.py	2011-03-05 22:07:55 +0000
@@ -418,22 +418,6 @@
     load_addr = '0x70008000'
     kernel_suffix = 'linaro-imx5'
 
-    @classmethod
-    def _make_boot_files(cls, uboot_parts_dir, boot_cmd, chroot_dir,
-		    boot_dir, boot_script, boot_device_or_file):
-        uboot_imx_file = os.path.join(chroot_dir, 'usr', 'lib', 'u-boot', 'mx53_loco', 'u-boot.imx')
-	uboot_bin_file = os.path.join(chroot_dir, 'usr', 'lib', 'u-boot', 'mx53_loco', 'u-boot.bin')
-	if os.path.exists(uboot_imx_file):
-	    uboot_file = uboot_imx_file
-	    uboot_padded = 0
-        else:
-	    uboot_file = uboot_bin_file
-	    uboot_padded = 1
-	install_mx5_uboot(uboot_file, uboot_padded, boot_device_or_file)
-	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)
-
 
 class VexpressConfig(BoardConfig):
     uboot_flavor = 'ca9x4_ct_vxp'
@@ -542,18 +526,6 @@
     proc.wait()
 
 
-def install_mx5_uboot(uboot_file, padded, boot_device_or_file):
-    proc = cmd_runner.run([
-	"dd",
-	"if=%s" % uboot_file,
-	"of=%s" % boot_device_or_file,
-	"bs=1024",
-	"seek=1",
-	"skip=%d" % padded,
-	"conv=notrunc"], as_root=True)
-    proc.wait()
-
-
 def _get_mlo_file(chroot_dir):
     # XXX bug=702645: This is a temporary solution to make sure l-m-c works
     # with any version of x-loader-omap. The proper solution is to have