Changeset 47a728e1 in mainline for contrib/conf/mips32-gx.sh

Timestamp:

2012-08-01T21:59:40Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

cb4a66d2

Parents:

23db8aa (diff), 9bcdbc5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• contrib/conf/mips32-gx.sh (modified) (1 diff)

contrib/conf/mips32-gx.sh

@@ -8 +8 @@
 fi
 
-gxemul $@ -E oldtestmips -C R4000 -X image.boot -d d0:"$DISK_IMG"
+if [ "$1" == "-E" ] && [ -n "$2" ]; then
+        MACHINE="$2"
+        shift 2
+else
+        MACHINE="oldtestmips"
+fi
+
+gxemul $@ -E "$MACHINE" -C R4000 -X image.boot -d d0:"$DISK_IMG"