From: Hesham Almatary <hesham.almat...@cl.cam.ac.uk>
To run on both QEMU and Spike
Updates #4775
---
.../testing/bsps/rv64imac_medany_spike.ini | 38 -------------------
tester/rtems/testing/bsps/rv64imac_spike.ini | 2 +-
.../{rv64imafd_medany.ini => rv64imafd.ini} | 4 +-
.../testing/bsps/rv64imafd_medany_spike.ini | 38 -------------------
tester/rtems/testing/bsps/rv64imafd_spike.ini | 2 +-
.../{rv64imafdc_medany.ini => rv64imafdc.ini} | 4 +-
.../testing/bsps/rv64imafdc_medany_spike.ini | 38 -------------------
.../rtems/testing/bsps/rv64imafdc_spike.ini | 2 +-
8 files changed, 7 insertions(+), 121 deletions(-)
delete mode 100644 tester/rtems/testing/bsps/rv64imac_medany_spike.ini
rename tester/rtems/testing/bsps/{rv64imafd_medany.ini => rv64imafd.ini} (96%)
delete mode 100644 tester/rtems/testing/bsps/rv64imafd_medany_spike.ini
rename tester/rtems/testing/bsps/{rv64imafdc_medany.ini => rv64imafdc.ini}
(96%)
delete mode 100644 tester/rtems/testing/bsps/rv64imafdc_medany_spike.ini
diff --git a/tester/rtems/testing/bsps/rv64imac_medany_spike.ini
b/tester/rtems/testing/bsps/rv64imac_medany_spike.ini
deleted file mode 100644
index 1d9a522..0000000
--- a/tester/rtems/testing/bsps/rv64imac_medany_spike.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2010-2014 Chris Johns (chr...@rtems.org)
-# All rights reserved.
-#
-# This file is part of the RTEMS Tools package in 'rtems-tools'.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# The Generic RISC-V BSP
-#
-[rv64imac_medany_spike]
-bsp = rv64imac
-arch = riscv64
-tester = %{_rtscripts}/spike.cfg
-bsp_spike_opts = --isa=RV64IMAC
diff --git a/tester/rtems/testing/bsps/rv64imac_spike.ini
b/tester/rtems/testing/bsps/rv64imac_spike.ini
index b2a35fd..10900d8 100644
--- a/tester/rtems/testing/bsps/rv64imac_spike.ini
+++ b/tester/rtems/testing/bsps/rv64imac_spike.ini
@@ -35,4 +35,4 @@
bsp = rv64imac
arch = riscv64
tester = %{_rtscripts}/spike.cfg
-bsp_spike_opts = --isa=RV64IMAC -m0x70000000:0x10000000
+bsp_spike_opts = --isa=RV64IMAC
diff --git a/tester/rtems/testing/bsps/rv64imafd_medany.ini
b/tester/rtems/testing/bsps/rv64imafd.ini
similarity index 96%
rename from tester/rtems/testing/bsps/rv64imafd_medany.ini
rename to tester/rtems/testing/bsps/rv64imafd.ini
index 9a09518..bbb4ee3 100644
--- a/tester/rtems/testing/bsps/rv64imafd_medany.ini
+++ b/tester/rtems/testing/bsps/rv64imafd.ini
@@ -28,8 +28,8 @@
# POSSIBILITY OF SUCH DAMAGE.
#
-[rv64imafd_medany]
-bsp = rv64imafd_medany
+[rv64imafd]
+bsp = rv64imafd
arch = riscv64
tester = %{_rtscripts}/qemu.cfg
bsp_qemu_image_type = -bios
diff --git a/tester/rtems/testing/bsps/rv64imafd_medany_spike.ini
b/tester/rtems/testing/bsps/rv64imafd_medany_spike.ini
deleted file mode 100644
index 9348131..0000000
--- a/tester/rtems/testing/bsps/rv64imafd_medany_spike.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2010-2014 Chris Johns (chr...@rtems.org)
-# All rights reserved.
-#
-# This file is part of the RTEMS Tools package in 'rtems-tools'.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# The Generic RISC-V BSP
-#
-[rv64imafd_medany_spike]
-bsp = rv64imafd
-arch = riscv64
-tester = %{_rtscripts}/spike.cfg
-bsp_spike_opts = --isa=RV64IMAFD
diff --git a/tester/rtems/testing/bsps/rv64imafd_spike.ini
b/tester/rtems/testing/bsps/rv64imafd_spike.ini
index 74336aa..8e975f7 100644
--- a/tester/rtems/testing/bsps/rv64imafd_spike.ini
+++ b/tester/rtems/testing/bsps/rv64imafd_spike.ini
@@ -35,4 +35,4 @@
bsp = rv64imafd
arch = riscv64
tester = %{_rtscripts}/spike.cfg
-bsp_spike_opts = --isa=RV64IMAFD -m0x70000000:0x10000000
+bsp_spike_opts = --isa=RV64IMAFD
diff --git a/tester/rtems/testing/bsps/rv64imafdc_medany.ini
b/tester/rtems/testing/bsps/rv64imafdc.ini
similarity index 96%
rename from tester/rtems/testing/bsps/rv64imafdc_medany.ini
rename to tester/rtems/testing/bsps/rv64imafdc.ini
index cd4fe47..d42680b 100644
--- a/tester/rtems/testing/bsps/rv64imafdc_medany.ini
+++ b/tester/rtems/testing/bsps/rv64imafdc.ini
@@ -29,8 +29,8 @@
# POSSIBILITY OF SUCH DAMAGE.
#
-[rv64imafdc_medany]
-bsp = rv64imafdc_medany
+[rv64imafdc]
+bsp = rv64imafdc
arch = riscv64
tester = %{_rtscripts}/qemu.cfg
bsp_qemu_image_type = -bios
diff --git a/tester/rtems/testing/bsps/rv64imafdc_medany_spike.ini
b/tester/rtems/testing/bsps/rv64imafdc_medany_spike.ini
deleted file mode 100644
index b691a60..0000000
--- a/tester/rtems/testing/bsps/rv64imafdc_medany_spike.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2010-2014 Chris Johns (chr...@rtems.org)
-# All rights reserved.
-#
-# This file is part of the RTEMS Tools package in 'rtems-tools'.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# The Generic RISC-V BSP
-#
-[rv64imafdc_medany_spike]
-bsp = rv64imafdc_medany
-arch = riscv64
-tester = %{_rtscripts}/spike.cfg
-bsp_spike_opts = --isa=RV64IMAFDC
diff --git a/tester/rtems/testing/bsps/rv64imafdc_spike.ini
b/tester/rtems/testing/bsps/rv64imafdc_spike.ini
index b72b471..c95a840 100644
--- a/tester/rtems/testing/bsps/rv64imafdc_spike.ini
+++ b/tester/rtems/testing/bsps/rv64imafdc_spike.ini
@@ -35,4 +35,4 @@
bsp = rv64imafdc
arch = riscv64
tester = %{_rtscripts}/spike.cfg
-bsp_spike_opts = --isa=RV64IMAFDC -m0x70000000:0x10000000
+bsp_spike_opts = --isa=RV64IMAFDC
--
2.25.1
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
