Merge lp:~vorlon/linaro-image-tools/uboot-refactoring into lp:linaro-image-tools/11.11

[Steve Langasek]

refactor of u-boot handling in linaro-media-create so that we're sharing code across boards instead of reinventing the wheel for each one. Tested on beagle, but this also affects VE which I can't entirely test, so looking for some more eyeballs on this before pushing.

[James Westby (james-w)]

On Thu, 16 Sep 2010 00:19:50 -0000, Steve Langasek <email address hidden> wrote:
> +
> + if [ -n "$UBOOT_FILE" ] && [ -e "binary/$UBOOT_FILE" ]; then
> + sudo cp -v binary/${UBOOT_FILE} ${DIR}/disk/u-boot.bin
> + fi
> +

Is there a use case for $UBOOT_FILE existing, but not wanted to be copied?

Otherwise this looks ok to me.

Thanks,

James

[Steve Langasek (vorlon)]

On Thu, Sep 16, 2010 at 12:49:08AM -0000, James Westby wrote:
> On Thu, 16 Sep 2010 00:19:50 -0000, Steve Langasek <email address hidden> wrote:
> > +
> > + if [ -n "$UBOOT_FILE" ] && [ -e "binary/$UBOOT_FILE" ]; then
> > + sudo cp -v binary/${UBOOT_FILE} ${DIR}/disk/u-boot.bin
> > + fi
> > +

> Is there a use case for $UBOOT_FILE existing, but not wanted to be copied?

I don't think so; if you don't want u-boot.bin copied in on that subarch,
don't define it for that subarch?

--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer http://www.debian.org/
<email address hidden> <email address hidden>

[James Westby (james-w)]

On Thu, 16 Sep 2010 04:58:43 -0000, Steve Langasek <email address hidden> wrote:
> On Thu, Sep 16, 2010 at 12:49:08AM -0000, James Westby wrote:
> > On Thu, 16 Sep 2010 00:19:50 -0000, Steve Langasek <email address hidden> wrote:
> > > +
> > > + if [ -n "$UBOOT_FILE" ] && [ -e "binary/$UBOOT_FILE" ]; then
> > > + sudo cp -v binary/${UBOOT_FILE} ${DIR}/disk/u-boot.bin
> > > + fi
> > > +
>
> > Is there a use case for $UBOOT_FILE existing, but not wanted to be copied?
>
> I don't think so; if you don't want u-boot.bin copied in on that subarch,
> don't define it for that subarch?

Sounds sensible to me.

The current way just means that we may create images without u-boot if
the file isn't found for some reason. I would expect it to fail instead.

Thanks,

James

=== modified file 'linaro-media-create'
--- linaro-media-create	2010-09-15 23:44:53 +0000
+++ linaro-media-create	2010-09-16 00:19:49 +0000
@@ -20,7 +20,6 @@
 set -e
 
 MLO_FILE=usr/lib/x-loader-omap/MLO
-UBOOT_FILE=usr/lib/u-boot/omap3_beagle/u-boot.bin
 
 unset MMC MMC1 MMC2 MMC3 IMAGE_FILE
 
@@ -242,6 +241,7 @@
 ensure_command wget wget
 ensure_command md5sum coreutils
 ensure_command realpath realpath
+
 case $RFS in
   ext3)
     ensure_command mkfs.ext3 e2fsprogs
@@ -253,12 +253,25 @@
     ensure_command mkfs.btrfs btrfs-tools
     ;;
 esac
-case $DEVNAME in
-  beagle|igep|vexpress)
+
+case $DEVIMAGE in
+  beagle)
+    UBOOT_FLAVOR=omap3_beagle
+    ensure_command mkimage uboot-mkimage
+    ;;
+  igep)
+    ensure_command mkimage uboot-mkimage
+    ;;
+  vexpress)
+    UBOOT_FLAVOR=ca9x4_ct_vxp
     ensure_command mkimage uboot-mkimage
     ;;
 esac
 
+if [ -n "$UBOOT_FLAVOR" ]; then
+  UBOOT_FILE="usr/lib/u-boot/$UBOOT_FLAVOR/u-boot.bin"
+fi
+
 RFS_UUID=`uuidgen -r`
 
 get_mmcs_by_id() {
@@ -302,8 +315,11 @@
   rm -rf binary/vmlinuz-* || true
 
   extras=
+  if [ -n "$UBOOT_FILE" ]; then
+    extras="binary/$UBOOT_FILE"
+  fi
   if [ "$DEVIMAGE" = beagle ]; then
-    extras="binary/${MLO_FILE} binary/${UBOOT_FILE}"
+    extras="$extras binary/${MLO_FILE}"
   fi
   tar -xf $BINARY_TARBALL binary/${parts_dir} $extras
 
@@ -405,12 +421,16 @@
  
   mkdir -p ${DIR}/disk || true
   sudo mount ${MMC1} ${DIR}/disk
+
+  if [ -n "$UBOOT_FILE" ] && [ -e "binary/$UBOOT_FILE" ]; then
+    sudo cp -v binary/${UBOOT_FILE} ${DIR}/disk/u-boot.bin
+  fi
+
   case "$DEVIMAGE" in
     beagle|igep)
       if [ "$DEVIMAGE" = "beagle" ]; then
-        if [ -e binary/${MLO_FILE} ] && [ -e binary/${UBOOT_FILE} ]; then
+        if [ -e binary/${MLO_FILE} ]; then
           sudo cp -v binary/${MLO_FILE}   ${DIR}/disk/MLO
-          sudo cp -v binary/${UBOOT_FILE} ${DIR}/disk/u-boot.bin
         fi
       fi
       sync
@@ -431,7 +451,6 @@
       sudo cp -v ${DIR}/disk/boot.scr ${DIR}/disk/boot.ini
       ;;
     vexpress)
-      sudo tar --strip-components=5 -C ${DIR}/disk/ -xf $BINARY_TARBALL binary/usr/lib/u-boot/ca9x4_ct_vxp/u-boot.bin
       sudo mkimage -A arm -O linux -T kernel -C none -a 0x60008000 -e 0x60008000 \
            -n "Linux" -d ${DIR}/binary/${parts_dir}/vmlinuz*-vexpress ${DIR}/disk/uImage
       sudo mkimage -A arm -O linux -T ramdisk -C none -a 0x81000000 \