wip

contrib/u-boot/get_args.sh

@@ -40,11 +40,17 @@ export build_dir=
 # limit the number of active buildman processors
 export process_limit=2
 
+# debug flag for labgrid
+export debug=
+
 while getopts "${allowed_args}" opt; do
 	case $opt in
 	d )
 	  build_dir="$OPTARG"
 	  ;;
+	D )
+	  debug=-d
+	  ;;
 	c )
 	  clean=1
 	  ;;

contrib/u-boot/ub-cli

@@ -12,6 +12,8 @@ usage() {
 	echo "Usage: ub-cli [-csv] <target>"
 	echo " -B  Don't build U-Boot"
 	echo " -c  Run 'make mrproper' before building"
+	echo " -d  Set build directory"
+	echo " -D  Enable debugging"
 	echo " -h  Help"
 	echo " -s  Send over USB (instead of writing to boot media)"
 	echo " -T  Don't bootstrap U-Boot"
@@ -23,11 +25,11 @@ mydir=$(dirname $0)
 
 . ${mydir}/lg-env
 
-allowed_args="BchsTv"
+allowed_args="BcDhsTv"
 . ${mydir}/get_args.sh
 
 ret=0
-labgrid-client ${V} ${vars} -r ${target} -s uboot -a console || ret=$?
+labgrid-client ${V} ${debug} ${vars} -r ${target} -s uboot -a console || ret=$?
 
 labgrid-client ${V} -r "${target}" release -a
 

contrib/u-boot/ub-int

@@ -13,6 +13,7 @@ usage() {
 	echo " -B  Don't build U-Boot"
 	echo " -c  Run 'make mrproper' before building"
 	echo " -d  Set build directory"
+	echo " -D  Enable debugging"
 	echo " -h  Help"
 	echo " -R  Don't reset the board, just connect as is"
 	echo " -s  Send over USB (instead of writing to boot media)"
@@ -25,11 +26,11 @@ mydir=$(dirname $0)
 
 . ${mydir}/lg-env
 
-allowed_args="d:cBhRsTv"
+allowed_args="d:cBDhRsTv"
 . ${mydir}/get_args.sh
 
 ret=0
-labgrid-client ${V} ${vars} -r ${target} ${strategy} -a console || ret=$?
+labgrid-client ${V} ${debug} ${vars} -r ${target} ${strategy} -a console || ret=$?
 
 labgrid-client ${V} -r "${target}" release -a
 

labgrid/util/term.py

@@ -4,6 +4,7 @@
 import os
 import sys
 from pexpect import TIMEOUT
+from serial.serialutil import SerialException
 import termios
 import time
 
@@ -65,6 +66,9 @@ async def run(serial):
         except TIMEOUT:
             pass
 
+        except SerialException:
+            break
+
         data = os.read(sys.stdin.fileno(), BUF_SIZE)
         if data:
             activity = True