r4804 - developers/werner/myroot

[werner at docs.openmoko.org]

Author: werner
Date: 2008-11-20 01:16:49 +0100 (Thu, 20 Nov 2008)
New Revision: 4804

Modified:
   developers/werner/myroot/README
   developers/werner/myroot/mkjffs2
   developers/werner/myroot/mksd
Log:
- mkjffs2: added option -m <machine> and GTA01 support (untested)
- mksd: added option -m <machine> and GTA01 support (untested)
- mksd: brought do_iq to a state where it may actually work (untested)
- README: described how to use things with GTA01 and Qi



Modified: developers/werner/myroot/README
===================================================================
--- developers/werner/myroot/README	2008-11-19 23:41:20 UTC (rev 4803)
+++ developers/werner/myroot/README	2008-11-20 00:16:49 UTC (rev 4804)
@@ -120,6 +120,24 @@
 % ssh neo blockdev --rereadpt /dev/mmcblk0
 
 
+Using Qi
+--------
+
+*** UNTESTED !!! ***
+
+To use the bootable SD card with Qi instead of u-boot, omit the
+option -u when invoking mksd.
+
+
+Using GTA01
+-----------
+
+*** UNTESTED !!! ***
+
+For GTA01 instead of GTA02, use the option  -m gta01  with mkjffs2
+and mksd.
+
+
 Bugs and future improvements
 ============================
 

Modified: developers/werner/myroot/mkjffs2
===================================================================
--- developers/werner/myroot/mkjffs2	2008-11-19 23:41:20 UTC (rev 4803)
+++ developers/werner/myroot/mkjffs2	2008-11-20 00:16:49 UTC (rev 4804)
@@ -1,8 +1,28 @@
 #!/bin/sh
-#
-# GTA02 !
-#
 
+
+usage()
+{
+    echo "usage: $0 [-m gta01|gta02] [dirname]" 1>&2
+    exit 1
+}
+
+
+mach=gta02
+
+while true; do
+    case "$1" in
+        -m)
+	    shift
+	    mach="$1";;
+	-*)
+	    usage;;
+	*)
+	    break;;
+    esac
+    shift
+done
+
 dir=${1:-root}
 name="`basename $dir`"
 
@@ -11,8 +31,18 @@
     exit 1
 fi
 
-mkfs.jffs2 --eraseblock=0x20000 --pagesize=0x800 --no-cleanmarkers \
+case $mach in
+    gta01)
+	eb=0x4000;;
+    gta02)
+	eb=0x20000
+	ps_opt="--pagesize=0x800";;
+    *)
+	usage;;
+esac
+
+mkfs.jffs2 --eraseblock=$eb $ps_opt --no-cleanmarkers \
   --little-endian --pad -o _tmp -d $dir
-sumtool --eraseblock=0x20000 --no-cleanmarkers \
+sumtool --eraseblock=$eb --no-cleanmarkers \
   --littleendian --pad -i _tmp -o $name.jffs2
 rm -f _tmp

Modified: developers/werner/myroot/mksd
===================================================================
--- developers/werner/myroot/mksd	2008-11-19 23:41:20 UTC (rev 4803)
+++ developers/werner/myroot/mksd	2008-11-20 00:16:49 UTC (rev 4804)
@@ -38,14 +38,22 @@
     # untested
     # @@@ shouldn't we rather do this in mkext2 ?
 
-    mkdir -p _mount
+    mkdir -p _mnt
     mount -o loop "$fs" _mnt
+
     mkdir -p _mnt/boot
-    cp "$kernel" _mnt/boot/uImage-GTA02.bin
-    umont _mnt
-    rm -f _mnt
+    rm -f _mnt/boot/uImage-GTA01.bin
+    rm -f _mnt/boot/uImage-GTA02.bin
+    cp "$kernel" _mnt/boot/uImage-$mach_uc.bin
 
     sd_image "$fs"
+
+    rm -f _mnt/boot/uImage-GTA01.bin
+    rm -f _mnt/boot/uImage-GTA02.bin
+    rmdir --ignore-fail-on-non-empty _mnt/boot
+
+    umount _mnt
+    rmdir _mnt
 }
 
 
@@ -78,29 +86,43 @@
 
 usage()
 {
-    echo "usage: $0 [-u] [-o sd_image] kernel [ext2_image]" 1>&2
+    echo \
+      "usage: $0 [-u] [-m gta01|gta02] [-o sd_image] kernel [ext2_image]" 1>&2
     exit 1
 }
 
 
 qi=true
 sd=sd_image
+mach=gta02
 
 while true; do
     case "$1" in
-    -u)
-	qi=false;;
-    -o)
-	shift
-	sd="$1";;
-    -*)
-	usage;;
-    *)
-	break;;
+	-m)
+	    shift
+	    mach="$1";;
+	-o)
+	    shift
+	    sd="$1";;
+	-u)
+	    qi=false;;
+	-*)
+	    usage;;
+	*)
+	    break;;
     esac
     shift
 done
 
+case "$mach" in
+    gta01)
+	mach_uc=GTA01;;
+    gta02)
+	mach_uc=GTA02;;
+    *)
+	usage;;
+esac
+
 kernel=$1
 [ ! -z "$kernel" ] || usage
 fs=${2:-root.ext2}
@@ -117,7 +139,7 @@
 [ ! -d _mnt ] || umount _mnt
 
 if $qi; then
-    do_iq
+    do_qi
 else
     do_uboot
 fi