Merge lp:~mwaddel/linaro-image-tools/vexpress-copy-u-boot into lp:linaro-image-tools/11.11

[Matt Waddel]

Pull vexpress u-boot.bin from /usr/lib/u-boot/ca9x4_ct_vxp/ directory and put it in the boot partition.

[Loïc Minier (lool)]

review: Approve

[Loïc Minier (lool)]

It was ok, but I fixed misc issues in the code in this spot: stopped creating an intermediate unpacked u-boot (and renamed the installed u-boot.bin as a result), fixed the tar call to not specify gzip, fixed the uImage.vxp to be simply uImage, fixed extraneous/useless vmlinuz on the boot partition

=== modified file 'linaro-media-create'
--- linaro-media-create	2010-08-29 19:29:48 +0000
+++ linaro-media-create	2010-08-30 16:52:55 +0000
@@ -206,8 +206,8 @@
      sudo cp -v ${DIR}/disk/boot.scr ${DIR}/disk/boot.ini
      ;;
    vexpress)
-     sudo cp -v ${DIR}/binary/${parts_dir}/u-boot-ca9x4_ct_vxp.bin \
-          ${DIR}/disk/ubootca9.bin
+     sudo tar -x --gzip  -f $BINARY_TARBALL binary/usr/lib/u-boot/
+     sudo cp -v ${DIR}/binary/usr/lib/u-boot/ca9x4_ct_vxp/u-boot.bin ${DIR}/disk/ubootca9.bin
      sudo cp -f ${DIR}/binary/${parts_dir}/vmlinuz*-vexpress ${DIR}/disk/vmlinuz
      mkimage -A arm -O linux -T kernel -C none -a 0x60008000 -e 0x60008000 \
           -n "Linux" -d  ${DIR}/disk/vmlinuz  ${DIR}/disk/uImage.vxp