Revise the ARM kernel installer scripts.

5 files changed, 163 insertions, 132 deletions

diff --git a/arm-installer-common.sh b/arm-installer-common.sh
new file mode 100644
index 0000000..32fb69c
--- /dev/null
+++ b/arm-installer-common.sh
@@ -0,0 +1,124 @@
+#!/bin/bash
+
+set -e
+set -u
+
+# Build host for ARM.
+HOST="pound.cs.unc.edu"
+
+# Not installed on the U-Boot partition.
+ZIMAGE_FILE="zImage"
+
+# Name of the installed files on the U-Boot partition.
+UIMAGE_FILE="uImage-litmus"
+INITRD_FILE="uInitrd-litmus"
+SCRIPT_FILE="boot-litmus.scr"
+
+# Assumes the globals:
+#     - KVERSION
+#     - CONFIG_FILE - kernel configuration file name (not path)
+#     - LOAD_ADDR
+#     - ENTRY_PIONT
+#
+# Assumes UBOOT_PATH is set by the calling script.
+
+TMP_DIR=$(mktemp -d)
+
+# initramfs state directory (Debian/Ubuntu)
+INITRAMFS_STATEDIR="/var/lib/initramfs-tools"
+
+error() {
+        echo "$@" >&2
+        exit 1
+}
+
+if [ $# -ne 2 ] ; then
+        error "Usage: `basename $0` <REMOTE-KDIR> <BOOT-SCRIPT>"
+fi
+
+KERN_DIR=$1
+SCRIPT_NAME=$2
+
+if [ ! -f "$SCRIPT_NAME" ] ; then
+        error "Boot script not a file: $SCRIPT_NAME"
+fi
+
+getversion() {
+        # This function also sets the CONFIG_FILE global.
+
+        local version
+        set +e
+        version=$(ssh $HOST cat $KERN_DIR/include/config/kernel.release)
+        set -e
+        if [ "x" = "x$version" ] ; then
+                error "Could not determine version"
+        fi
+        CONFIG_FILE="config-$version"
+        return $version
+}
+
+fetchfiles() {
+        echo "Fetching files from $HOST ..." >&2
+        rsync -P $USER@$HOST:$KERN_DIR/arch/arm/boot/zImage $TMP_DIR/$ZIMAGE_FILE
+        rsync -P $USER@$HOST:$KERN_DIR/.config $TMP_DIR/$CONFIG_FILE
+        echo "done." >&2
+}
+
+mkuboot() {
+        echo "Generating kernel u-boot image..." >&2
+        mkimage -A arm -O linux -T kernel -C none \
+                -a $LOAD_ADDR -e $ENTRY_POINT \
+                -d $TMP_DIR/$ZIMAGE_FILE $TMP_DIR/$UIMAGE_FILE >&2
+        echo "done." >&2
+}
+
+mkscript() {
+        echo "Generating u-boot configuration ... " >&2
+        mkimage -A arm -T script -C none -d "$SCRIPT_FILE" $TMP_DIR/$SCRIPT_FILE >&2
+        echo "done." >&2
+}
+
+moveconfig() {
+        echo "Moving config file to /boot ..." >&2
+        sudo cp $TMP_DIR/$CONFIG_FILE /boot/
+        echo "done." >&2
+}
+
+doinitramfs() {
+        local initrdimage
+        initrdimage="/boot/initrd.img-$KVERSION"
+
+        if [ -e "$INITRAMFS_STATEDIR/$KVERSION" -o -e "$initrdimage" ] ; then
+                echo "Removing old initramfs ... " >&2
+                sudo update-initramfs -k $KVERSION -d
+                echo "done." >&2
+        fi
+
+        echo "Creating initramfs (ignore module errors) ... " >&2
+        sudo update-initramfs -k $KVERSION -c
+        echo "done." >&2
+}
+
+mkuinitrd() {
+        local initrdimage
+        initrdimage="/boot/initrd.img-$KVERSION"
+
+        echo "Making u-boot initrd image ... " >&2
+        mkimage -A arm -O linux -T ramdisk -C none \
+                -d $initrdimage $TMP_DIR/$INITRD_NAME >&2
+        echo "done." >&2
+}
+
+copy_to_uboot() {
+        echo "Copying files to u-boot partition ..." >&2
+        sudo cp $TMP_DIR/$UIMAGE_FILE $UBOOT_PATH/
+        sudo cp $TMP_DIR/$SCRIPT_FILE $UBOOT_PATH/
+        sudo cp $TMP_DIR/$INITRD_FILE $UBOOT_PATH/
+        echo "done." >&2
+}
+
+rm_tmp_files() {
+        echo "Removing temporary files ..." >&2
+        rm -rf $TMP_DIR
+        echo "done." >&2
+}
diff --git a/odroid-boot-sample.txt b/odroid-boot-sample.txt
new file mode 100644
index 0000000..1b20c3f
--- /dev/null
+++ b/odroid-boot-sample.txt
@@ -0,0 +1,5 @@
+setenv initrd_high "0xffffffff"
+setenv fdt_high "0xffffffff"
+setenv bootcmd "fatload mmc 0:2 0x40007000 uImage-litmus; fatload mmc 0:2 0x42000000 uInitrd-litmus; fatload mmc 0:2 0x41f00000 board.dtb; bootm 0x40007000 0x42000000"
+setenv bootargs "console=tty1 console=ttySAC1,115200n8  root=UUID=c21f1426-e878-4f05-a063-0a9c5e4234d0 rootwait ro"
+boot
diff --git a/odroid-install-kernel.sh b/odroid-install-kernel.sh
index 8748e60..fc6da32 100755
--- a/odroid-install-kernel.sh
+++ b/odroid-install-kernel.sh
@@ -1,93 +1,37 @@
 #!/bin/sh
 
-set -e
-
-error() {
-        echo "$@" >&2
-        exit 1
-}
-
-# The FAT u-boot bootloader partition.
-UBOOT_PART=/dev/mmcblk0p2
-
-# Build host for ARM.
-HOST="pound.cs.unc.edu"
-
-if [ $# -ne 2 ] ; then
-        error "Usage: `basename $0` <REMOTE KDIR> <BOOT-SCRIPT>"
-fi
-
-SRC_ROOT=$1
-SCRIPT_NAME=$2
+LOAD_ADDR=0x4000800
+ENTRY_POINT=0x4000800
 
+# Where the U-Boot partition is mounted.
+UBOOT_PATH="/media/boot"
 set +e
-VERSION=$(ssh cjk@$HOST cat $SRC_ROOT/include/config/kernel.release)
-set -e
-if [ "x" = "x$VERSION" ] ; then
-        error "Could not determine version"
-fi
-
-if [ ! -f "$SCRIPT_NAME" ] ; then
-        error "Boot script not a file: $SCRIPT_NAME"
+grep "$UBOOT_PATH" /etc/mtab > /dev/null
+if [ 0 -ne $? ] ; then
+        error "U-Boot partition not mounted."
 fi
+set -e
 
-TMP_DIR=$(mktemp -d)
-TMP_MOUNT=$(mktemp -d)
-
-ZIMAGE_NAME="zImage-litmus"
-UIMAGE_NAME="uImage-litmus"
-CONFIG_NAME="config-$VERSION"
-INITRD_NAME="uInitrd-litmus"
-SCR_NAME="boot-litmus.scr"
-
-echo "Fetching files from $HOST ..." >&2
-rsync -P cjk@$HOST:$SRC_ROOT/arch/arm/boot/zImage $TMP_DIR/$ZIMAGE_NAME
-rsync -P cjk@$HOST:$SRC_ROOT/.config $TMP_DIR/$CONFIG_NAME
-echo "done." >&2
+getversion
 
-echo "Generating kernel u-boot image..." >&2
-mkimage -A arm -O linux -T kernel -C none -a 0x80008000 \
-        -e 0x80008000 -d $TMP_DIR/$ZIMAGE_NAME $TMP_DIR/$UIMAGE_NAME >&2
-echo "done." >&2
+fetchfiles
 
-echo "Generating u-boot configuration ... " >&2
-mkimage -A arm -T script -C none -d "$SCRIPT_NAME" $TMP_DIR/$SCR_NAME >&2
-echo "done." >&2
+mkuboot
 
-echo "Moving vmlinuz and config fils to /boot ..." >&2
-sudo cp $TMP_DIR/$ZIMAGE_NAME /boot/vmlinuz-$VERSION
-sudo cp $TMP_DIR/$CONFIG_NAME /boot/
-echo "done." >&2
+mkscript
 
-echo "Creating initramfs (ignore module errors) ... " >&2
-sudo update-initramfs -k $VERSION -c
-echo "done." >&2
+moveconfig
 
-echo "Making u-boot initrd image ... " >&2
-mkimage -A arm -T ramdisk -C none \
-        -d /boot/initrd.img-$VERSION $TMP_DIR/$INITRD_NAME >&2
-echo "done." >&2
+doinitramfs
 
-echo "Mounting u-boot partition ..." >&2
-sudo mount $UBOOT_PART $TMP_MOUNT
-echo "done." >&2
+mkunitrd
 
-echo "Copying files to u-boot partition ..." >&2
-sudo cp $TMP_DIR/$UIMAGE_NAME $TMP_MOUNT/
-sudo cp $TMP_DIR/$SCR_NAME $TMP_MOUNT/
-sudo cp $TMP_DIR/$INITRD_NAME $TMP_MOUNT/
-echo "done." >&2
+copy_to_uboot
 
 echo "Making LITMUS the default ..." >&2
-mv $TMP_MOUNT/$SCR_NAME $TMP_MOUNT/boot.scr
+mv $TMP_MOUNT/$SCRIPT_NAME $TMP_MOUNT/boot.scr
 echo "done." >&2
 
-echo "Unmounting u-boot partition ..." >&2
-sudo umount $TMP_MOUNT
-echo "done." >&2
-
-echo "Removing temporary files ..." >&2
-rm -rf $TMP_DIR $TMP_MOUNT
-echo "done." >&2
+rm_tmp_files
 
 echo "All done!" >&2
diff --git a/panda-boot-sample.script b/panda-boot-sample.txt
index d017085..d017085 100644
--- a/panda-boot-sample.script
+++ b/panda-boot-sample.txt
diff --git a/panda-install-kernel.sh b/panda-install-kernel.sh
index 2ed5aab..9a22d8c 100755
--- a/panda-install-kernel.sh
+++ b/panda-install-kernel.sh
@@ -7,83 +7,41 @@ error() {
         exit 1
 }
 
+TMP_MOUNT=$(mktemp -d)
+
 # The FAT u-boot bootloader partition.
 UBOOT_PART=/dev/mmcblk0p1
 
-# Build host for ARM.
-HOST="pound.cs.unc.edu"
+# This is machine specific, AFAIK.
+LOAD_ADDR=0x80008000
+ENTRY_POINT=0x80008000
 
-if [ $# -ne 2 ] ; then
-        error "Usage: `basename $0` <REMOTE KDIR> <BOOT-SCRIPT>"
-fi
+getversion
 
-SRC_ROOT=$1
-SCRIPT_NAME=$2
+fetchfiles
 
-set +e
-VERSION=$(ssh $HOST cat $SRC_ROOT/include/config/kernel.release)
-set -e
-if [ "x" = "x$VERSION" ] ; then
-        error "Could not determine version"
-fi
+mkuboot
 
-if [ ! -f "$SCRIPT_NAME" ] ; then
-        error "Boot script not a file: $SCRIPT_NAME"
-fi
+mkscript
 
-TMP_DIR=$(mktemp -d)
-TMP_MOUNT=$(mktemp -d)
+moveconfig
 
-ZIMAGE_NAME="zImage-litmus"
-UIMAGE_NAME="uImage-litmus"
-CONFIG_NAME="config-$VERSION"
-INITRD_NAME="uInitrd-litmus"
-SCR_NAME="boot-litmus.scr"
+doinitramfs
 
-echo "Fetching files from $HOST ..." >&2
-rsync -P cjk@$HOST:$SRC_ROOT/arch/arm/boot/zImage $TMP_DIR/$ZIMAGE_NAME
-rsync -P cjk@$HOST:$SRC_ROOT/.config $TMP_DIR/$CONFIG_NAME
-echo "done." >&2
-
-echo "Generating kernel u-boot image..." >&2
-mkimage -A arm -O linux -T kernel -C none -a 0x80008000 \
-        -e 0x80008000 -d $TMP_DIR/$ZIMAGE_NAME $TMP_DIR/$UIMAGE_NAME >&2
-echo "done." >&2
-
-echo "Generating u-boot configuration ... " >&2
-mkimage -A arm -T script -C none -d "$SCRIPT_NAME" $TMP_DIR/$SCR_NAME >&2
-echo "done." >&2
-
-echo "Moving vmlinuz and config fils to /boot ..." >&2
-sudo cp $TMP_DIR/$ZIMAGE_NAME /boot/vmlinuz-$VERSION
-sudo cp $TMP_DIR/$CONFIG_NAME /boot/
-echo "done." >&2
-
-echo "Creating initramfs (ignore module errors) ... " >&2
-sudo update-initramfs -k $VERSION -c
-echo "done." >&2
-
-echo "Making u-boot initrd image ... " >&2
-mkimage -A arm -O linux -T ramdisk -C none -a 0x0 -e 0x0 \
-        -d /boot/initrd.img-$VERSION $TMP_DIR/$INITRD_NAME >&2
-echo "done." >&2
+mkuinitrd
 
 echo "Mounting u-boot partition ..." >&2
 sudo mount $UBOOT_PART $TMP_MOUNT
 echo "done." >&2
 
-echo "Copying files to u-boot partition ..." >&2
-sudo cp $TMP_DIR/$UIMAGE_NAME $TMP_MOUNT/
-sudo cp $TMP_DIR/$SCR_NAME $TMP_MOUNT/
-sudo cp $TMP_DIR/$INITRD_NAME $TMP_MOUNT/
-echo "done." >&2
+UBOOT_PATH=$TMP_MOUNT
+copy_to_uboot
 
 echo "Unmounting u-boot partition ..." >&2
 sudo umount $TMP_MOUNT
 echo "done." >&2
 
-echo "Removing temporary files ..." >&2
-rm -rf $TMP_DIR $TMP_MOUNT
-echo "done." >&2
+rm_tmp_files
+rm -rf $TMP_MOUNT
 
 echo "All done!" >&2