Add netconsole and auto-version to PandaBoard install script.

2 files changed, 12 insertions, 6 deletions

diff --git a/panda-boot-sample.script b/panda-boot-sample.script
index 4f822ab..d017085 100644
--- a/panda-boot-sample.script
+++ b/panda-boot-sample.script
@@ -1,4 +1,4 @@
         fatload mmc 0:1 0x80000000 uImage-litmus
         fatload mmc 0:1 0x81600000 uInitrd-litmus
-        setenv bootargs ro elevator=noop vram=40M mem=456M@0x80000000 mem=512M@0xA0000000 root=UUID=1c7e7b13-56b8-430a-aed1-50ee431e84c2 fixrtc console=ttyO2,115200n8
+        setenv bootargs ro elevator=noop vram=40M mem=456M@0x80000000 mem=512M@0xA0000000 root=UUID=1c7e7b13-56b8-430a-aed1-50ee431e84c2 fixrtc console=ttyO2,115200n8 netconsole=4444@152.2.130.212/eth0,2345@152.2.142.84/00:21:9b:1b:85:7e
         bootm 0x80000000 0x81600000
diff --git a/panda-install-kernel.sh b/panda-install-kernel.sh
index 2f20990..2ed5aab 100755
--- a/panda-install-kernel.sh
+++ b/panda-install-kernel.sh
@@ -13,13 +13,19 @@ UBOOT_PART=/dev/mmcblk0p1
 # Build host for ARM.
 HOST="pound.cs.unc.edu"
 
-if [ $# -ne 3 ] ; then
-        error "Usage: `basename $0` <VERSION> <REMOTE KDIR> <BOOT-SCRIPT>"
+if [ $# -ne 2 ] ; then
+        error "Usage: `basename $0` <REMOTE KDIR> <BOOT-SCRIPT>"
 fi
 
-VERSION=$1
-SRC_ROOT=$2
-SCRIPT_NAME=$3
+SRC_ROOT=$1
+SCRIPT_NAME=$2
+
+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
 
 if [ ! -f "$SCRIPT_NAME" ] ; then
         error "Boot script not a file: $SCRIPT_NAME"