[rtems-testing commit] lm32_evr: Fix

[Joel Sherril]

Module:    rtems-testing
Branch:    master
Commit:    1f4e73802e2d1dd77c69ad32b4c4f5f80dcf0232
Changeset: http://git.rtems.org/rtems-testing/commit/?id=1f4e73802e2d1dd77c69ad32b4c4f5f80dcf0232

Author:    Joel Sherrill <joel.sherrill at oarcorp.com>
Date:      Sun Apr  5 10:12:14 2015 -0500

lm32_evr: Fix

---

 sim-scripts/Makefile    |  4 ++--
 sim-scripts/lm32_evr.in | 40 +++++++++++++++++++++++++---------------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/sim-scripts/Makefile b/sim-scripts/Makefile
index 4b5ef40..da47201 100644
--- a/sim-scripts/Makefile
+++ b/sim-scripts/Makefile
@@ -99,8 +99,8 @@ leon2-skyeye: gdb-sim-run.in gdb-sim.in leon2-skyeye.in
 	./mkrun yes SPARC sparc leon2-skyeye
 
 ### TSIM Simulator BSPs
-erc32: gdb-sim-run.in gdb-sim.in erc32.in tsim-support
-	./mkrun yes SPARC sparc erc32
+erc32-tsim: gdb-sim-run.in gdb-sim.in erc32-tsim.in tsim-support
+	./mkrun yes SPARC sparc erc32-tsim
 
 leon2-tsim: gdb-sim-run.in gdb-sim.in leon2-tsim.in tsim-support
 	./mkrun yes SPARC sparc leon2-tsim
diff --git a/sim-scripts/lm32_evr.in b/sim-scripts/lm32_evr.in
index 788320a..82bd44d 100644
--- a/sim-scripts/lm32_evr.in
+++ b/sim-scripts/lm32_evr.in
@@ -2,6 +2,21 @@
 #  lm32/lm32_evr Support Using Simulator in GDB
 #
 
+generate_lm32_evr_conf()
+{
+cat >lm32_evr.conf <<EOF
+/lm32cpu
+/lm32uart/reg 0x80006000 0x100
+/lm32uart > int int0 /lm32cpu
+/lm32timer/reg 0x80002000 0x80
+/lm32timer > int int1 /lm32cpu
+EOF
+
+# GDB does not support attaching a second instance
+# /lm32timer/reg 0x8000a000 0x80
+# /lm32timer > int int3 /lm32cpu
+}
+
 runARGS()
 {
 #  echo '--hw-device lm32cpu
@@ -10,28 +25,23 @@ runARGS()
 #       --hw-device "lm32timer/reg 0x80002000 0x80"
 #       --hw-device "/lm32timer > int int1 /lm32cpu"
 #       --memory-region 0x08000000,0x4000000' ${1}
-cat >lm32_evr.conf <<EOF
-lm32cpu
-lm32uart/reg 0x80006000 0x100
-/lm32uart > int int0 /lm32cpu
-lm32timer/reg 0x80002000 0x80
-/lm32timer > int int1 /lm32cpu
---memory-region  0x08000000,0x4000000
-EOF
-  echo "--hw-file lm32_evr.conf ${1}"
+  generate_lm32_evr_conf
+  echo "--hw-file lm32_evr.conf --memory-region  0x08000000,0x4000000 ${1}"
 }
 
 bspGeneratesGDBCommands="yes"
 
 bspGenerateGDBCommands()
 {
+# tar sim --hw-device lm32cpu \\
+#   --hw-device "lm32uart/reg 0x80006000 0x100" \\
+#   --hw-device "/lm32uart > int int0 /lm32cpu" \\
+#   --hw-device "lm32timer/reg 0x80002000 0x80" \\
+#   --hw-device "/lm32timer > int int1 /lm32cpu" \\
+#   --memory-region 0x08000000,0x4000000
+generate_lm32_evr_conf
 cat <<EOF
-tar sim --hw-device lm32cpu \\
-  --hw-device "lm32uart/reg 0x80006000 0x100" \\
-  --hw-device "/lm32uart > int int0 /lm32cpu" \\
-  --hw-device "lm32timer/reg 0x80002000 0x80" \\
-  --hw-device "/lm32timer > int int1 /lm32cpu" \\
-  --memory-region 0x08000000,0x4000000
+tar sim --hw-file lm32_evr.conf --memory-region  0x08000000,0x4000000
 load
 EOF
 }