Merge lp:~mwaddel/linaro-image-tools/vexpress-additions-v3 into lp:linaro-image-tools/11.11

[Matt Waddel]

1) Refactored boot/rootfs creation for adding new platforms.
2) Added the Versatile Express platform.

[Loïc Minier (lool)]

Matt, overall it looked good, there is only one small issue in r31, you have a reference to omap in the vexpress case statement:
    sudo cp -f ${DIR}/binary/${parts_dir}/uInitrd.omap ${DIR}/disk/uInitrd

feel free to fix this in an additional commit on top

You didn't mention whether you tested that, did you manage to create a working image with this?

Thanks!

review: Needs Fixing

[Matt Waddel (mwaddel)]

The current vexpress doesn't use the uInitrd. So this is a benign problem and doesn't affect the booting vexpress image. I'll fix it when we get a specific uInitrd.vexpress file (if that's ok with you).

[Loïc Minier (lool)]

Well you should fix it before I merge since we caught that issue in review, but you can comment out this line locally until there's an uInitrd in the daily builds

[Matt Waddel (mwaddel)]

Fixed in:

https://code.launchpad.net/~mwaddel/linaro-image-tools/remove-vexpress-uinitrd-cp

=== modified file 'linaro-media-create'
--- linaro-media-create	2010-08-05 15:10:31 +0000
+++ linaro-media-create	2010-08-23 20:22:38 +0000
@@ -169,7 +169,7 @@
  echo ""
 
  echo ""
- echo "Installing OMAP Boot Loader"
+ echo "Installing Boot Loader"
  echo ""
 
  if [ "$IS_LIVE" ]; then
@@ -180,19 +180,36 @@
 
  mkdir -p ${DIR}/disk || true
  sudo mount ${MMC1} ${DIR}/disk
- if test -e binary/${parts_dir}/${MLO_FILE} -a -e binary/${parts_dir}/${UBOOT_FILE}; then
-   sudo cp -v binary/${parts_dir}/${MLO_FILE} ${DIR}/disk/MLO
-   sudo cp -v binary/${parts_dir}/${UBOOT_FILE} ${DIR}/disk/u-boot.bin
- fi
- sync
- cd ${DIR}
- echo "done"
-
- sudo cp -f ${DIR}/binary/${parts_dir}/uImage.omap ${DIR}/disk/uImage
- sudo cp -f ${DIR}/binary/${parts_dir}/uInitrd.omap ${DIR}/disk/uInitrd
-
- sudo mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "$CODENAME 10.05" -d ${DIR}/binary/boot.cmd ${DIR}/disk/boot.scr
- sudo cp -v ${DIR}/disk/boot.scr ${DIR}/disk/boot.ini
+ case "$DEVIMAGE" in
+   beagle)
+     if test -e binary/${parts_dir}/${MLO_FILE} -a -e binary/${parts_dir}/${UBOOT_FILE}; then
+       sudo cp -v binary/${parts_dir}/${MLO_FILE} ${DIR}/disk/MLO
+       sudo cp -v binary/${parts_dir}/${UBOOT_FILE} ${DIR}/disk/u-boot.bin
+     fi
+     sync
+     cd ${DIR}
+     echo "done"
+
+     sudo cp -f ${DIR}/binary/${parts_dir}/uImage.omap ${DIR}/disk/uImage
+     sudo cp -f ${DIR}/binary/${parts_dir}/uInitrd.omap ${DIR}/disk/uInitrd
+
+     sudo mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "$CODENAME 10.05" -d ${DIR}/binary/boot.cmd ${DIR}/disk/boot.scr
+     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 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
+     sudo cp -f ${DIR}/binary/${parts_dir}/uInitrd.omap ${DIR}/disk/uInitrd
+     ;;
+   *)
+     echo "Set --dev parameter: --dev <beagle|vexpress>" 1>&2
+     cleanup_workdir
+     exit
+     ;;
+ esac
 
  echo "#!/bin/sh" > /tmp/rebuild_uinitrd.sh
  echo "" >> /tmp/rebuild_uinitrd.sh
@@ -362,6 +379,12 @@
 --image_file <xxx>
     specify name of image file
 
+--dev <board>
+    use development boot options; this includes setting up serial ttys as well
+    as enabling normal debug options for the target board. Current board values:
+    * beagle
+    * vexpress
+
 Additional/Optional options:
 -h --help
     this help
@@ -390,11 +413,6 @@
     Create boot command for casper/live images; adds only-ubiquity option
     to allow use of live installer on boards with 256M memory - like beagle
 
---dev <board>
-    use development boot options; this includes setting up serial ttys as well
-    as enabling normal debug options for the target board. Current board values:
-    * beagle
-
 --console <ttyXY>
     add a console to kernel boot parameter; this parameter can be defined
     multiple times.
@@ -508,6 +526,12 @@
         serial_opts="$serial_opts serialtty=ttyS2"
       fi
       ;;
+    vexpress)
+      serial_opts="$serial_opts console=tty0 console=ttyAMA0,38400n8"
+      if [ "$IS_LIVE" ]; then
+        serial_opts="$serial_opts serialtty=ttyAMA0"
+      fi
+      ;;
     *)
       echo "unknown --dev paramater: $DEVIMAGE" 1>&2
       ;;