# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: shawn.gsc@gmail.com-20100930173353-mzn4chqns7mhzeio
# target_branch: http://bazaar.launchpad.net/~linaro-\
#   maintainers/linaro-image-tools/linaro-image-tools/
# testament_sha1: 3ea5974d2b6ae0a3cefa0bf86fff67ae084598ec
# timestamp: 2010-09-30 13:41:07 -0400
# base_revision_id: steve.langasek@canonical.com-20100929152856-\
#   2axwv0sktwxn9i1q
# 
# Begin patch
=== modified file 'linaro-media-create'
--- linaro-media-create	2010-09-29 15:28:56 +0000
+++ linaro-media-create	2010-09-30 17:33:53 +0000
@@ -62,6 +62,7 @@
     * beagle
     * igep
     * vexpress
+    * mx51evk
 
 Additional/Optional options:
 -h --help
@@ -274,8 +275,6 @@
 }
 
 install_hwpack() {
-  ensure_command qemu-arm-static qemu-arm-static
-
   chroot=${DIR}/binary
   # Make sure we unmount /proc in the chroot or else it can't be moved to the
   # rootfs.
@@ -291,7 +290,16 @@
   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
+  local arch_is_arm=no
+  case `uname -m` in
+    arm*)
+      arch_is_arm=yes
+      ;;
+    *)
+      ensure_command qemu-arm-static qemu-arm-static
+      sudo cp /usr/bin/qemu-arm-static ${chroot}/usr/bin
+      ;;
+  esac
   sudo cp $LINARO_HWPACK_INSTALL ${chroot}/usr/bin
   sudo cp "$HWPACK_FILE" "$chroot"
 
@@ -304,7 +312,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" = no ]; 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")
 }
@@ -324,19 +334,31 @@
     boot_snippet='root=UUID='${RFS_UUID}
   fi
 
-  if [ "${IMAGE_FILE}" ]; then
-    cat > ${TMP_DIR}/boot.cmd << BOOTCMD
+  case "$DEVIMAGE" in
+    beagle|igep)
+      if [ "${IMAGE_FILE}" ]; then
+        cat > ${TMP_DIR}/boot.cmd << BOOTCMD
 setenv bootcmd 'mmc init; fatload mmc 0:1 0x80000000 uImage; bootm 0x80000000'
 setenv bootargs '${serial_opts} ${splash_opts} earlyprintk fixrtc nocompcache ${lowmem_opt} root=/dev/mmcblk0p2 rootwait rw vram=12M omapfb.debug=y omapfb.mode=dvi:1280x720MR-16@60'
 boot
 BOOTCMD
-  else
-    cat > ${TMP_DIR}/boot.cmd << BOOTCMD
+      else
+        cat > ${TMP_DIR}/boot.cmd << BOOTCMD
 setenv bootcmd 'mmc init; fatload mmc 0:1 0x80000000 uImage; fatload mmc 0:1 0x81600000 uInitrd; bootm 0x80000000 0x81600000'
 setenv bootargs '${serial_opts} ${splash_opts} earlyprintk fixrtc nocompcache ${lowmem_opt} ${boot_snippet} rootwait ro vram=12M omapfb.debug=y omapfb.mode=dvi:1280x720MR-16@60'
 boot
 BOOTCMD
-  fi
+      fi
+      ;;
+
+    mx51evk)
+      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
+      ;;
+  esac
 }
 
 cleanup_sd() {
@@ -371,10 +393,17 @@
 
   # Create a VFAT or FAT16 partition of 9 cylinders which is about 64M
   # and a linux partition of the rest
+  if [ "$DEVIMAGE" = mx51evk ]; 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 +487,21 @@
            "${BOOT_DISK}/uInitrd"
       ;;
 
+    mx51evk)
+      sudo dd if=binary/usr/lib/u-boot/mx51evk/u-boot.imx of=/dev/mmcblk0 \
+	   bs=1024 seek=1
+      sudo mkimage -A arm -O linux -T kernel -C none -a 0x90008000 \
+	   -e 0x90008000 -n Linux \
+	   -d "${DIR}/binary/${parts_dir}"/vmlinuz*-linaro-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"
+      sudo mkimage -A arm -O linux -T script -C none -a 0 \
+           -e 0 -n "boot script" -d "${TMP_DIR}/boot.cmd" \
+           "${BOOT_DISK}/boot.scr"
+      ;;
     *)
       echo "Internal error; missing support for $DEVIMAGE" >&2
       exit 1
@@ -561,7 +605,7 @@
 fi
 
 case "$DEVIMAGE" in
-  beagle|igep|vexpress)
+  beagle|igep|vexpress|mx51evk)
     :
   ;;
   "")
@@ -591,6 +635,12 @@
       # only allows for FAT16
       FAT_SIZE=16
       ;;
+    mx51evk)
+      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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
nW1rBT1Zp0oH0Byf+LuSKcKEh0ocGBA=