[PATCH] [sim-scripts] renanme or1ksim BSP to generic_or1k

Hesham ALMatary heshamelmatary at gmail.com
Sun Apr 19 16:20:55 UTC 2015


---
 sim-scripts/.gitignore      |   4 +-
 sim-scripts/Makefile        |   6 +-
 sim-scripts/generic_or1k.in | 156 ++++++++++++++++++++++++++++++++++++++++++++
 sim-scripts/or1ksim.in      | 156 --------------------------------------------
 sim-scripts/qemu-or1k.in    |   4 +-
 5 files changed, 163 insertions(+), 163 deletions(-)
 create mode 100644 sim-scripts/generic_or1k.in
 delete mode 100644 sim-scripts/or1ksim.in

diff --git a/sim-scripts/.gitignore b/sim-scripts/.gitignore
index 30df64f..8d481e9 100644
--- a/sim-scripts/.gitignore
+++ b/sim-scripts/.gitignore
@@ -44,8 +44,8 @@ m32csim
 m32csim-gdb
 m32rsim
 m32rsim-gdb
-or1ksim
-or1ksim-gdb
+generic_or1k
+generic_or1k-gdb
 pc386
 psim
 psim-gdb
diff --git a/sim-scripts/Makefile b/sim-scripts/Makefile
index 4b5ef40..14a5286 100644
--- a/sim-scripts/Makefile
+++ b/sim-scripts/Makefile
@@ -1,6 +1,6 @@
 INSTALL_DIR=../bin
 GDBSIM_SCRIPTS=bf537Stamp ezkit533 gdbarmsim h8sim jmr3904 lm32_evr \
-  m32csim m32rsim or1ksim psim sis erc32 leon2 leon3 simsh v850sim
+  m32csim m32rsim generic_or1k psim sis erc32 leon2 leon3 simsh v850sim
 SKYEYE_SCRIPTS=ant5206 bf537Stamp-skyeye csb337 csb350 csb360 edb7312 \
   ezkit533-skyeye gumstix rtl22xx smdk2410 leon2-skyeye
 
@@ -133,8 +133,8 @@ m32csim m32csim-gdb: gdb-sim-run.in gdb-sim.in m32csim.in
 m32rsim m32rsim-gdb: gdb-sim-run.in gdb-sim.in m32rsim.in
 	./mkrun yes M32R m32r m32rsim
 
-or1ksim or1ksim-gdb: or1ksim.in
-	./mkrun yes OR1K or1k or1ksim
+generic_or1k generic_or1k-gdb: generic_or1k.in
+	./mkrun yes OR1K or1k generic_or1k
 
 psim psim-gdb: gdb-sim-run.in gdb-sim.in psim.in
 	./mkrun yes PowerPC powerpc psim
diff --git a/sim-scripts/generic_or1k.in b/sim-scripts/generic_or1k.in
new file mode 100644
index 0000000..6e773f1
--- /dev/null
+++ b/sim-scripts/generic_or1k.in
@@ -0,0 +1,156 @@
+#
+#  or1k/or1ksim Support
+#
+bspUsesGDBSimulator="no"
+bspSupportsGDBServerMode="yes"
+runBSP=or1k-elf-sim
+bspTreeFile=sim.cfg
+
+runARGS()
+{
+  echo "-f ${bspTreeFile} ${1}"
+}
+
+checkBSPFaults()
+{
+  return 0
+}
+
+bspLimit()
+{
+  testname=$1
+  case ${testname} in
+    *stackchk*)limit=5 ;;
+    *fatal*)   limit=1 ;;
+    *minimum*) limit=1 ;;
+    *psxtime*) limit=180 ;;
+    *)         limit=60 ;;
+  esac
+  echo ${limit}
+}
+
+bspGeneratesGDBCommands="yes"
+
+gdbServerARGS()
+{
+  echo "-c ${bspTreeFile}"
+}
+
+bspGenerateGDBCommands()
+{
+cat <<EOF
+tar remote :50001
+EOF
+}
+
+### Generate the or1ksim device tree based upon the type of application being run
+bspGenerateDeviceTree()
+{
+cat <<EOF
+section memory
+  name     =      "RAM"
+  random_seed = 12345
+  type        = random
+  ce       =          0
+  mc       =          0
+  baseaddr = 0x00000000
+  size     = 0x08000000
+  delayr   =          1
+  delayw   =          2
+end
+
+section immu
+  enabled = 0
+  nsets = 64
+  nways = 1
+  pagesize = 8192
+  hitdelay = 0
+  missdelay = 0
+end
+
+section dmmu
+  enabled = 0
+  nsets = 64
+  nways = 1
+  pagesize = 8192
+  hitdelay = 0
+  missdelay = 0
+end
+section mc
+  enabled = 0
+  baseaddr = 0x90000000
+  POC = 0x0000000a                 /* 32 bit SSRAM */
+  index = 0
+end
+
+section ic
+  enabled   =   0
+  nsets     = 256
+  nways     =   1
+  blocksize =  16
+  hitdelay  =  20
+  missdelay =  20
+end
+
+section dc
+  enabled = 0
+  nsets = 256
+  nways = 1
+  blocksize = 16
+  load_hitdelay = 0
+  load_missdelay = 0
+  store_hitdelay = 0
+  store_missdelay = 0
+end
+
+section pic
+  enabled = 1
+  edge_trigger = 1
+end
+
+section sim
+  verbose  =  1
+  debug    =  0
+  profile  =  0
+  history  =  0
+  clkcycle = 10ns		/* 100MHz clock */
+end
+
+section VAPI
+  enabled = 0 
+  server_port = 50000
+  log_enabled = 1
+  vapi_log_file = "vapi.log"
+end
+
+section cpu
+  ver = 0x12
+  cfg = 0x00
+  rev = 0x0001
+  superscalar = 0
+  hazards = 0
+  dependstats = 0
+  sbuf_len = 100
+end
+
+section debug
+ enabled = 0
+ rsp_enabled = 0 
+ rsp_port = 50001
+end
+
+section uart
+  enabled  = 1
+  baseaddr = 0x90000000
+  #channel = "xterm"
+  channel = "file:uart0.rx,uart0.tx"
+  irq = 2
+  16550    = 1
+end
+
+section pm
+  enabled = 1
+end
+EOF
+}
+bspGeneratesDeviceTree="yes"
diff --git a/sim-scripts/or1ksim.in b/sim-scripts/or1ksim.in
deleted file mode 100644
index 6e773f1..0000000
--- a/sim-scripts/or1ksim.in
+++ /dev/null
@@ -1,156 +0,0 @@
-#
-#  or1k/or1ksim Support
-#
-bspUsesGDBSimulator="no"
-bspSupportsGDBServerMode="yes"
-runBSP=or1k-elf-sim
-bspTreeFile=sim.cfg
-
-runARGS()
-{
-  echo "-f ${bspTreeFile} ${1}"
-}
-
-checkBSPFaults()
-{
-  return 0
-}
-
-bspLimit()
-{
-  testname=$1
-  case ${testname} in
-    *stackchk*)limit=5 ;;
-    *fatal*)   limit=1 ;;
-    *minimum*) limit=1 ;;
-    *psxtime*) limit=180 ;;
-    *)         limit=60 ;;
-  esac
-  echo ${limit}
-}
-
-bspGeneratesGDBCommands="yes"
-
-gdbServerARGS()
-{
-  echo "-c ${bspTreeFile}"
-}
-
-bspGenerateGDBCommands()
-{
-cat <<EOF
-tar remote :50001
-EOF
-}
-
-### Generate the or1ksim device tree based upon the type of application being run
-bspGenerateDeviceTree()
-{
-cat <<EOF
-section memory
-  name     =      "RAM"
-  random_seed = 12345
-  type        = random
-  ce       =          0
-  mc       =          0
-  baseaddr = 0x00000000
-  size     = 0x08000000
-  delayr   =          1
-  delayw   =          2
-end
-
-section immu
-  enabled = 0
-  nsets = 64
-  nways = 1
-  pagesize = 8192
-  hitdelay = 0
-  missdelay = 0
-end
-
-section dmmu
-  enabled = 0
-  nsets = 64
-  nways = 1
-  pagesize = 8192
-  hitdelay = 0
-  missdelay = 0
-end
-section mc
-  enabled = 0
-  baseaddr = 0x90000000
-  POC = 0x0000000a                 /* 32 bit SSRAM */
-  index = 0
-end
-
-section ic
-  enabled   =   0
-  nsets     = 256
-  nways     =   1
-  blocksize =  16
-  hitdelay  =  20
-  missdelay =  20
-end
-
-section dc
-  enabled = 0
-  nsets = 256
-  nways = 1
-  blocksize = 16
-  load_hitdelay = 0
-  load_missdelay = 0
-  store_hitdelay = 0
-  store_missdelay = 0
-end
-
-section pic
-  enabled = 1
-  edge_trigger = 1
-end
-
-section sim
-  verbose  =  1
-  debug    =  0
-  profile  =  0
-  history  =  0
-  clkcycle = 10ns		/* 100MHz clock */
-end
-
-section VAPI
-  enabled = 0 
-  server_port = 50000
-  log_enabled = 1
-  vapi_log_file = "vapi.log"
-end
-
-section cpu
-  ver = 0x12
-  cfg = 0x00
-  rev = 0x0001
-  superscalar = 0
-  hazards = 0
-  dependstats = 0
-  sbuf_len = 100
-end
-
-section debug
- enabled = 0
- rsp_enabled = 0 
- rsp_port = 50001
-end
-
-section uart
-  enabled  = 1
-  baseaddr = 0x90000000
-  #channel = "xterm"
-  channel = "file:uart0.rx,uart0.tx"
-  irq = 2
-  16550    = 1
-end
-
-section pm
-  enabled = 1
-end
-EOF
-}
-bspGeneratesDeviceTree="yes"
diff --git a/sim-scripts/qemu-or1k.in b/sim-scripts/qemu-or1k.in
index a9c2974..fbeb826 100644
--- a/sim-scripts/qemu-or1k.in
+++ b/sim-scripts/qemu-or1k.in
@@ -1,5 +1,5 @@
 #
-#  or1ksim/QEMU BSP Qemu Support
+#  generic_or1k BSP QEMU Support
 #
 
 bspUsesGDBSimulator="no"
@@ -17,7 +17,7 @@ runARGS()
     COVERAGE_ARG="--exec-trace ${1}.cov"
   fi
 
-  echo "-serial mon:stdio -serial /dev/null -net none -nographic -m 128M -kernel ${1}"
+  echo "-serial mon:stdio -serial /dev/null -net none -nographic -m 32M -kernel ${1}"
 }
 
 checkBSPFaults()
-- 
2.1.0




More information about the devel mailing list