From a735d42b3784af88994eb52b982a509c106cb2d4 Mon Sep 17 00:00:00 2001 From: Hesham Almatary Date: Sun, 18 Dec 2022 13:24:14 +0000 Subject: RISC-V Default rv64* BSPs to medany and 0x80000000 start address To run on both QEMU and Spike Updates #4775 --- .../rtems/testing/bsps/rv64imac_medany_spike.ini | 38 ---------------------- tester/rtems/testing/bsps/rv64imac_spike.ini | 2 +- tester/rtems/testing/bsps/rv64imafd.ini | 36 ++++++++++++++++++++ tester/rtems/testing/bsps/rv64imafd_medany.ini | 36 -------------------- .../rtems/testing/bsps/rv64imafd_medany_spike.ini | 38 ---------------------- tester/rtems/testing/bsps/rv64imafd_spike.ini | 2 +- tester/rtems/testing/bsps/rv64imafdc.ini | 37 +++++++++++++++++++++ tester/rtems/testing/bsps/rv64imafdc_medany.ini | 37 --------------------- .../rtems/testing/bsps/rv64imafdc_medany_spike.ini | 38 ---------------------- tester/rtems/testing/bsps/rv64imafdc_spike.ini | 2 +- 10 files changed, 76 insertions(+), 190 deletions(-) delete mode 100644 tester/rtems/testing/bsps/rv64imac_medany_spike.ini create mode 100644 tester/rtems/testing/bsps/rv64imafd.ini delete mode 100644 tester/rtems/testing/bsps/rv64imafd_medany.ini delete mode 100644 tester/rtems/testing/bsps/rv64imafd_medany_spike.ini create mode 100644 tester/rtems/testing/bsps/rv64imafdc.ini delete mode 100644 tester/rtems/testing/bsps/rv64imafdc_medany.ini delete mode 100644 tester/rtems/testing/bsps/rv64imafdc_medany_spike.ini (limited to 'tester') 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 (chrisj@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.ini b/tester/rtems/testing/bsps/rv64imafd.ini new file mode 100644 index 0000000..bbb4ee3 --- /dev/null +++ b/tester/rtems/testing/bsps/rv64imafd.ini @@ -0,0 +1,36 @@ +# +# RTEMS Tools Project (http://www.rtems.org/) +# Copyright 2018 embedded brains GmbH +# 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. +# + +[rv64imafd] +bsp = rv64imafd +arch = riscv64 +tester = %{_rtscripts}/qemu.cfg +bsp_qemu_image_type = -bios +bsp_qemu_opts = -no-reboot -nographic %{qemu_opts_no_net} -machine virt -m 128M diff --git a/tester/rtems/testing/bsps/rv64imafd_medany.ini b/tester/rtems/testing/bsps/rv64imafd_medany.ini deleted file mode 100644 index 9a09518..0000000 --- a/tester/rtems/testing/bsps/rv64imafd_medany.ini +++ /dev/null @@ -1,36 +0,0 @@ -# -# RTEMS Tools Project (http://www.rtems.org/) -# Copyright 2018 embedded brains GmbH -# 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. -# - -[rv64imafd_medany] -bsp = rv64imafd_medany -arch = riscv64 -tester = %{_rtscripts}/qemu.cfg -bsp_qemu_image_type = -bios -bsp_qemu_opts = -no-reboot -nographic %{qemu_opts_no_net} -machine virt -m 128M 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 (chrisj@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.ini b/tester/rtems/testing/bsps/rv64imafdc.ini new file mode 100644 index 0000000..d42680b --- /dev/null +++ b/tester/rtems/testing/bsps/rv64imafdc.ini @@ -0,0 +1,37 @@ +# +# RTEMS Tools Project (http://www.rtems.org/) +# Copyright 2020 Hesham Almatary +# Copyright 2018 embedded brains GmbH +# 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. +# + +[rv64imafdc] +bsp = rv64imafdc +arch = riscv64 +tester = %{_rtscripts}/qemu.cfg +bsp_qemu_image_type = -bios +bsp_qemu_opts = -no-reboot -nographic %{qemu_opts_no_net} -machine virt -m 128M diff --git a/tester/rtems/testing/bsps/rv64imafdc_medany.ini b/tester/rtems/testing/bsps/rv64imafdc_medany.ini deleted file mode 100644 index cd4fe47..0000000 --- a/tester/rtems/testing/bsps/rv64imafdc_medany.ini +++ /dev/null @@ -1,37 +0,0 @@ -# -# RTEMS Tools Project (http://www.rtems.org/) -# Copyright 2020 Hesham Almatary -# Copyright 2018 embedded brains GmbH -# 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. -# - -[rv64imafdc_medany] -bsp = rv64imafdc_medany -arch = riscv64 -tester = %{_rtscripts}/qemu.cfg -bsp_qemu_image_type = -bios -bsp_qemu_opts = -no-reboot -nographic %{qemu_opts_no_net} -machine virt -m 128M 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 (chrisj@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 -- cgit v1.2.3