# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: shawn.gsc@gmail.com-20100930003630-xnq48xycx6rd4ct3
# target_branch: http://bazaar.launchpad.net/~linaro-\
#   maintainers/linaro-image-tools/linaro-image-tools/
# testament_sha1: 45b2c5edaf7c0b0c53c3bd0b811ae405fdc1cc40
# timestamp: 2010-09-29 20:38:27 -0400
# base_revision_id: lool@dooz.org-20100928185319-ry7yw3ft8wceytl9
# 
# Begin patch
=== modified file 'linaro-media-create'
--- linaro-media-create	2010-09-28 18:53:19 +0000
+++ linaro-media-create	2010-09-30 00:36:30 +0000
@@ -62,6 +62,7 @@
     * beagle
     * igep
     * vexpress
+    * imx51
 
 Additional/Optional options:
 -h --help
@@ -274,7 +275,16 @@
 }
 
 install_hwpack() {
-  ensure_command qemu-arm-static qemu-arm-static
+  # Check host architecture
+  arch_is_arm=false
+  arch_str=`uname -m`
+  if [[ "$arch_str" == arm* ]]; then
+    arch_is_arm=true
+  fi
+
+  if [ ! $arch_is_arm ]; then
+    ensure_command qemu-arm-static qemu-arm-static
+  fi
 
   chroot=${DIR}/binary
   # Make sure we unmount /proc in the chroot or else it can't be moved to the
@@ -291,7 +301,9 @@
   sudo mv -f ${chroot}/etc/hosts ${TMP_DIR}/hosts.orig
   sudo cp /etc/hosts ${chroot}/etc/hosts
 
-  sudo cp /usr/bin/qemu-arm-static ${chroot}/usr/bin
+  if [ ! $arch_is_arm ]; then
+    sudo cp /usr/bin/qemu-arm-static ${chroot}/usr/bin
+  fi
   sudo cp $LINARO_HWPACK_INSTALL ${chroot}/usr/bin
   sudo cp "$HWPACK_FILE" "$chroot"
 
@@ -304,7 +316,9 @@
   sudo umount ${chroot}/proc
   sudo mv -f ${TMP_DIR}/resolv.conf.orig ${chroot}/etc/resolv.conf
   sudo mv -f ${TMP_DIR}/hosts.orig ${chroot}/etc/hosts
-  sudo rm -f ${chroot}/usr/bin/qemu-arm-static
+  if [ ! $arch_is_arm ]; then
+    sudo rm -f ${chroot}/usr/bin/qemu-arm-static
+  fi
   sudo rm -f ${chroot}/usr/bin/linaro-hwpack-install
   sudo rm -f ${chroot}/$(basename "$HWPACK_FILE")
 }
@@ -371,10 +385,17 @@
 
   # Create a VFAT or FAT16 partition of 9 cylinders which is about 64M
   # and a linux partition of the rest
+  if [ "$DEVIMAGE" = imx51 ]; then
+  sudo sfdisk -D -H $HEADS -S $SECTORS $CYLINDER_ARG $partdev << THEEND
+1,9,$PARTITION_TYPE,*
+10,,,-
+THEEND
+  else
   sudo sfdisk -D -H $HEADS -S $SECTORS $CYLINDER_ARG $partdev << THEEND
 ,9,$PARTITION_TYPE,*
 ,,,-
 THEEND
+  fi
 
   if [ "${IMAGE_FILE}" ]; then
   VFATOFFSET=$(($(fdisk -l -u $IMAGE_FILE | grep FAT | awk '{print $3}')*512))
@@ -458,6 +479,24 @@
            "${BOOT_DISK}/uInitrd"
       ;;
 
+    imx51)
+      sudo dd if=binary/usr/lib/u-boot/mx51evk/u-boot.imx of=/dev/mmcblk0 bs=512 seek=2
+      sync
+      sudo mkimage -A arm -O linux -T kernel -C none -a 0x90008000 -e 0x90008000 \
+           -n Linux -d "${DIR}/binary/${parts_dir}"/vmlinuz*-mx51 "${BOOT_DISK}/uImage"
+      sudo mkimage -A arm -O linux -T ramdisk -C none -a 0 \
+           -e 0 -n initramfs \
+           -d "${DIR}/binary/${parts_dir}"/initrd.img-*-linaro-mx51 \
+           "${BOOT_DISK}/uInitrd"
+      cat > ${TMP_DIR}/boot.cmd << BOOTCMD
+setenv bootcmd 'fatload mmc 0:1 0x90000000 uImage; fatload mmc 0:1 0x90800000 uInitrd; bootm 0x90000000 0x90800000'
+setenv bootargs '${serial_opts} ${splash_opts} ${lowmem_opt} ${boot_snippet} rootwait ro'
+boot
+BOOTCMD
+      sudo mkimage -A arm -O linux -T script -C none -a 0 \
+           -e 0 -n "$CODENAME 10.05" -d "${TMP_DIR}/boot.cmd" \
+           "${BOOT_DISK}/boot.scr"
+      ;;
     *)
       echo "Internal error; missing support for $DEVIMAGE" >&2
       exit 1
@@ -561,7 +600,7 @@
 fi
 
 case "$DEVIMAGE" in
-  beagle|igep|vexpress)
+  beagle|igep|vexpress|imx51)
     :
   ;;
   "")
@@ -591,6 +630,12 @@
       # only allows for FAT16
       FAT_SIZE=16
       ;;
+    imx51)
+      serial_opts="$serial_opts console=tty0 console=ttymxc0,115200n8"
+      if [ "$IS_LIVE" ]; then
+        serial_opts="$serial_opts serialtty=ttymxc0"
+      fi
+      ;;
     *)
       echo "Internal error; missing support for $DEVIMAGE" >&2
       exit 1

# Begin bundle
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
u1xrz1B71A/8XckU4UJAWB186A==