2009-08-21 Joel Sherrill <joel.sherrill@OARcorp.com>

	* ant5206.in, avrtest.in, bf537Stamp.in, csb337.in, csb350.in,
	csb360.in, ezkit533.in, gdb-sim-run.in, gumstix.in, h8sim.in,
	jmr3904.in, m32csim.in, m32rsim.in, psim.in, qemu-rtems.in,
	rtl22xx.in, simsh.in, sis.in, skyeye-support, smdk2410.in,
	tsim-support: echo rather than return time limit since the return
	code is only 0-255 and we need limits longer than 255 seconds.

22 files changed, 49 insertions, 32 deletions

diff --git a/sim-scripts/ChangeLog b/sim-scripts/ChangeLog
index a30fe51..17ac036 100644
--- a/sim-scripts/ChangeLog
+++ b/sim-scripts/ChangeLog
@@ -1,3 +1,12 @@
+2009-08-21	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* ant5206.in, avrtest.in, bf537Stamp.in, csb337.in, csb350.in,
+	csb360.in, ezkit533.in, gdb-sim-run.in, gumstix.in, h8sim.in,
+	jmr3904.in, m32csim.in, m32rsim.in, psim.in, qemu-rtems.in,
+	rtl22xx.in, simsh.in, sis.in, skyeye-support, smdk2410.in,
+	tsim-support: echo rather than return time limit since the return
+	code is only 0-255 and we need limits longer than 255 seconds.
+
 2009-08-15	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* gdb-sim-run.in: Fix typo.
diff --git a/sim-scripts/ant5206.in b/sim-scripts/ant5206.in
index 6978bc6..f2b1fcd 100644
--- a/sim-scripts/ant5206.in
+++ b/sim-scripts/ant5206.in
@@ -15,13 +15,13 @@ checkBSPFaults()
 bspLimit()
 {
   testname=$1
-  case ${tname} in
+  case ${testname} in
     *stackchk*)limit=5 ;;
     *fatal*)   limit=1 ;;
     *psxtime*) limit=180 ;;
     *)         limit=60 ;;
   esac
-  return ${limit}
+  echo ${limit}
 }
 
 bspGeneratesDeviceTree="yes"
diff --git a/sim-scripts/avrtest.in b/sim-scripts/avrtest.in
index 89753ef..1715306 100644
--- a/sim-scripts/avrtest.in
+++ b/sim-scripts/avrtest.in
@@ -26,5 +26,5 @@ bspLimit()
     *psxtime*) limit=180 ;;

     *)         limit=60 ;;

   esac

-  return ${limit}

+  echo ${limit}

 }

diff --git a/sim-scripts/bf537Stamp.in b/sim-scripts/bf537Stamp.in
index 58a2889..e64f741 100644
--- a/sim-scripts/bf537Stamp.in
+++ b/sim-scripts/bf537Stamp.in
@@ -15,13 +15,13 @@ checkBSPFaults()
 bspLimit()
 {
   testname=$1
-  case ${tname} in
+  case ${testname} in
     *stackchk*)limit=5 ;;
     *fatal*)   limit=1 ;;
     *psxtime*) limit=180 ;;
     *)         limit=60 ;;
   esac
-  return ${limit}
+  echo ${limit}
 }
 
 bspGeneratesDeviceTree="yes"
diff --git a/sim-scripts/csb337.in b/sim-scripts/csb337.in
index 2d41c21..89cace7 100644
--- a/sim-scripts/csb337.in
+++ b/sim-scripts/csb337.in
@@ -17,13 +17,13 @@ checkBSPFaults()
 bspLimit()
 {
   testname=$1
-  case ${tname} in
+  case ${testname} in
     *stackchk*)limit=5 ;;
     *fatal*)   limit=1 ;;
     *psxtime*) limit=180 ;;
     *)         limit=60 ;;
   esac
-  return ${limit}
+  echo ${limit}
 }
 
 bspGeneratesDeviceTree="yes"
diff --git a/sim-scripts/csb350.in b/sim-scripts/csb350.in
index e19047e..4ee451b 100644
--- a/sim-scripts/csb350.in
+++ b/sim-scripts/csb350.in
@@ -15,13 +15,13 @@ checkBSPFaults()
 bspLimit()
 {
   testname=$1
-  case ${tname} in
+  case ${testname} in
     *stackchk*)limit=5 ;;
     *fatal*)   limit=1 ;;
     *psxtime*) limit=180 ;;
     *)         limit=60 ;;
   esac
-  return ${limit}
+  echo ${limit}
 }
 
 bspGeneratesDeviceTree="yes"
diff --git a/sim-scripts/csb360.in b/sim-scripts/csb360.in
index f32be85..b31b45c 100644
--- a/sim-scripts/csb360.in
+++ b/sim-scripts/csb360.in
@@ -15,13 +15,13 @@ checkBSPFaults()
 bspLimit()
 {
   testname=$1
-  case ${tname} in
+  case ${testname} in
     *stackchk*)limit=5 ;;
     *fatal*)   limit=1 ;;
     *psxtime*) limit=180 ;;
     *)         limit=60 ;;
   esac
-  return ${limit}
+  echo ${limit}
 }
 
 bspGeneratesDeviceTree="yes"
diff --git a/sim-scripts/ezkit533.in b/sim-scripts/ezkit533.in
index a076b1d..eaeee7d 100644
--- a/sim-scripts/ezkit533.in
+++ b/sim-scripts/ezkit533.in
@@ -21,7 +21,7 @@ bspLimit()
     *psxtime*) limit=180 ;;
     *)         limit=60 ;;
   esac
-  return ${limit}
+  echo ${limit}
 }
 
 bspGeneratesDeviceTree="yes"
diff --git a/sim-scripts/gdb-sim-run.in b/sim-scripts/gdb-sim-run.in
index 801a5f6..f08a246 100755
--- a/sim-scripts/gdb-sim-run.in
+++ b/sim-scripts/gdb-sim-run.in
@@ -328,8 +328,7 @@ do
   esac
   # calculate the limit in case it is used by the simulator script
   if [ ${defaultLimit} = "not_set" ] ; then
-    bspLimit ${toRun}
-    limit=$?
+    limit=`bspLimit ${toRun}`
   else
     limit=${defaultLimit}
   fi
diff --git a/sim-scripts/gumstix.in b/sim-scripts/gumstix.in
index eb067f4..f77bffd 100644
--- a/sim-scripts/gumstix.in
+++ b/sim-scripts/gumstix.in
@@ -25,7 +25,7 @@ bspLimit()
     *sp20*)    limit=180 ;;
     *)         limit=60 ;;
   esac
-  return ${limit}
+  echo ${limit}
 }
 
 bspGeneratesDeviceTree="yes"
@@ -41,7 +41,8 @@ mem_bank: map=M, type=RW, addr=0x5c000000, size=0x100000
 mem_bank: map=M, type=RW, addr=0xA0000000, size=0x4000000
 mem_bank: map=I, type=RW, addr=0xB0000000, size=0x100000
 mem_bank: map=I, type=RW, addr=0x40000000, size=0x4C000000
-shutdown_device: addr=0xb0000000, max_ins=${limit}0000000
+#shutdown_device: addr=0xb0000000, max_ins=${limit}0000000
+shutdown_device: addr=0xb0000000, max_ins=0
 lcd:state=on,type=pxa,mod=gtk
 EOF
 if [ ${coverage} = yes ] ; then
diff --git a/sim-scripts/h8sim.in b/sim-scripts/h8sim.in
index 2dfa506..28cfdc7 100644
--- a/sim-scripts/h8sim.in
+++ b/sim-scripts/h8sim.in
@@ -23,5 +23,5 @@ bspLimit()
     *psxtime*) limit=180 ;;
     *)         limit=60 ;;
   esac
-  return ${limit}
+  echo ${limit}
 }
diff --git a/sim-scripts/jmr3904.in b/sim-scripts/jmr3904.in
index b89cf33..bca0423 100644
--- a/sim-scripts/jmr3904.in
+++ b/sim-scripts/jmr3904.in
@@ -31,7 +31,7 @@ bspLimit()
     *psxtime*) limit=180 ;;
     *)         limit=60 ;;
   esac
-  return ${limit}
+  echo ${limit}
 }
 
 bspGeneratesGDBCommands="yes"
diff --git a/sim-scripts/m32csim.in b/sim-scripts/m32csim.in
index 6560dfd..0a8236d 100644
--- a/sim-scripts/m32csim.in
+++ b/sim-scripts/m32csim.in
@@ -23,5 +23,5 @@ bspLimit()
     *psxtime*) limit=180 ;;
     *)         limit=60 ;;
   esac
-  return ${limit}
+  echo ${limit}
 }
diff --git a/sim-scripts/m32rsim.in b/sim-scripts/m32rsim.in
index ae5e469..c53dafd 100644
--- a/sim-scripts/m32rsim.in
+++ b/sim-scripts/m32rsim.in
@@ -22,5 +22,5 @@ bspLimit()
     *psxtime*) limit=180 ;;
     *)         limit=60 ;;
   esac
-  return ${limit}
+  echo ${limit}
 }
diff --git a/sim-scripts/psim.in b/sim-scripts/psim.in
index 954cd95..e85c8c4 100644
--- a/sim-scripts/psim.in
+++ b/sim-scripts/psim.in
@@ -23,7 +23,7 @@ bspLimit()
     *psxtime*) limit=180 ;;
     *)         limit=60 ;;
   esac
-  return ${limit}
+  echo ${limit}
 }
 
 bspGeneratesGDBCommands="yes"
diff --git a/sim-scripts/qemu-rtems.in b/sim-scripts/qemu-rtems.in
index 332143d..71f1d36 100644
--- a/sim-scripts/qemu-rtems.in
+++ b/sim-scripts/qemu-rtems.in
@@ -74,7 +74,7 @@ bspLimit()
     *psxtime*) limit=180 ;;
     *)         limit=60 ;;
   esac
-  return ${limit}
+  echo ${limit}
 }
 
 bspGeneratesDeviceTree="no"
diff --git a/sim-scripts/rtl22xx.in b/sim-scripts/rtl22xx.in
index 7b40555..7cc9ae8 100644
--- a/sim-scripts/rtl22xx.in
+++ b/sim-scripts/rtl22xx.in
@@ -15,13 +15,13 @@ checkBSPFaults()
 bspLimit()
 {
   testname=$1
-  case ${tname} in
+  case ${testname} in
     *stackchk*)limit=5 ;;
     *fatal*)   limit=1 ;;
     *psxtime*) limit=180 ;;
     *)         limit=60 ;;
   esac
-  return ${limit}
+  echo ${limit}
 }
 
 bspGeneratesDeviceTree="yes"
diff --git a/sim-scripts/simsh.in b/sim-scripts/simsh.in
index 12886b1..9f8a5f5 100644
--- a/sim-scripts/simsh.in
+++ b/sim-scripts/simsh.in
@@ -23,5 +23,5 @@ bspLimit()
     *psxtime*) limit=180 ;;
     *)         limit=60 ;;
   esac
-  return ${limit}
+  echo ${limit}
 }
diff --git a/sim-scripts/sis.in b/sim-scripts/sis.in
index 89ebe88..992d7bd 100644
--- a/sim-scripts/sis.in
+++ b/sim-scripts/sis.in
@@ -23,5 +23,5 @@ bspLimit()
     *psxtime*) limit=180 ;;
     *)         limit=60 ;;
   esac
-  return ${limit}
+  echo ${limit}
 }
diff --git a/sim-scripts/skyeye-support b/sim-scripts/skyeye-support
index 1596f4e..7e771e6 100644
--- a/sim-scripts/skyeye-support
+++ b/sim-scripts/skyeye-support
@@ -41,7 +41,7 @@ bspLimit()
     *psxtime*) limit=180 ;;
     *)         limit=60 ;;
   esac
-  return ${limit}
+  echo ${limit}
 }
 
 bspExited_ARM()
diff --git a/sim-scripts/smdk2410.in b/sim-scripts/smdk2410.in
index 0c60421..4642341 100644
--- a/sim-scripts/smdk2410.in
+++ b/sim-scripts/smdk2410.in
@@ -15,13 +15,21 @@ checkBSPFaults()
 bspLimit()
 {
   testname=$1
-  case ${tname} in
+  case ${testname} in
     *stackchk*)limit=5 ;;
     *fatal*)   limit=1 ;;
-    *psxtime*) limit=180 ;;
+    *intrcrit*) limit=120 ;;
+    *psxfile01*) limit=90 ;;
+    *psxsignal02*) limit=240 ;;
+    *psxstat*) limit=120 ;;
+    *psxtime*) limit=600 ;;
+    *sp01*)    limit=180 ;;
+    *sp12*)    limit=180 ;;
+    *sp24*)    limit=150 ;;
+    *sp39*)    limit=330 ;;  # run was 4m45s
     *)         limit=60 ;;
   esac
-  return ${limit}
+  echo ${limit}
 }
 
 bspGeneratesDeviceTree="yes"
diff --git a/sim-scripts/tsim-support b/sim-scripts/tsim-support
index 9c67fe4..6ca1d0b 100644
--- a/sim-scripts/tsim-support
+++ b/sim-scripts/tsim-support
@@ -53,14 +53,14 @@ bspLimit()
     *fatal*)   limit=1 ;;
     *psxtime*) 
        case ${tsimName} in
-         leon) limit=240 ;;  # ran in 200 seconds on idle england
+         leon)  limit=240 ;;  # ran in 200 seconds on idle england
          leon3) limit=240 ;;  # ran in 200 seconds on idle england
          *)     limit=180 ;;
        esac
        ;;
     *)         limit=60 ;;
   esac
-  return ${limit}
+  echo ${limit}
 }
 
 bspSimTrustedToExit="yes"