More fixes for new novaboot

diff --git a/rtems/gw/boot b/rtems/gw/boot
index 0fb4875a99ed081dfb7f4b594742af090b3af17f..1d12af7ced7067fe0fd3c79cbd27281e7a8354f6 100755 (executable)
--- a/rtems/gw/boot
+++ b/rtems/gw/boot
@@ -4,4 +4,4 @@
 # Use this file with https://github.com/wentasah/novaboot
 BUILDDIR=_compiled/icecube
 
-uImage-rtems-gw < $SRCDIR/mkimg-ppc-cangw; cat bin/cangw.img
+load uImage-rtems-gw < $SRCDIR/mkimg-ppc-cangw; cat bin/cangw.img

diff --git a/ugw/data/bench-all.sh b/ugw/data/bench-all.sh
index 3048da73c5063c6c53796c4be86df16d1f752103..4ead5e6f79575a3784cfb07d8131944d310ef52e 100755 (executable)
--- a/ugw/data/bench-all.sh
+++ b/ugw/data/bench-all.sh
@@ -31,7 +31,7 @@ methods=${@:-rtems kernel read-write readnb-write mmap-write mmap-mmap mmapbusy-
 for method in $methods; do
     set -x
     case $method in
-       rtems) ../../rtems/gw/boot --expect '"]", sub { shift->send_slow(0.1, "startGW\n"); }' --exiton 'tasks started';;
+       rtems) ../../rtems/gw/boot --expect-raw '"]", sub { shift->send_slow(0.1, "startGW\n"); }' --exiton 'tasks started';;
        kernel)         ../ppc/boot -a kernelgw --exiton "Kernel GW started";;
        read-write)     ../ppc/boot             --exiton "UGW started";;
        readnb-write)   ../ppc/boot -a "ugw=|-n|" --exiton "UGW started";;