Re: [PATCH] Rename or1ksim BSP to generic_or1k
On Sun, Apr 19, 2015 at 1:49 AM, Joel Sherrill wrote: > On 04/18/2015 04:57 PM, Gedare Bloom wrote: >> >> Looks straightforward to me. Any doc need updating? >> > Maybe the wiki. But the other pieces are sim-scripts > and rtems-tools for the simulator scripts. > > I don't know of much else unless Hesham wants to > update his blog about this. Yeah once this patch got merged I'll send patches for sim-scripts, tester, and update my blog. >> >> On Sat, Apr 18, 2015 at 12:25 PM, Hesham ALMatary >> wrote: >>> >>> or1ksim BSP was initially named after or1ksim simulator, and it was >>> intented to only run there. But now it can also run on QEMU, jor1k and >>> real FPGA boards without modifications. It makes more sense to give >>> it a new generic name like generic_or1k. >>> --- >>> c/src/lib/libbsp/or1k/acinclude.m4 | 4 +- >>> c/src/lib/libbsp/or1k/configure.ac | 2 +- >>> c/src/lib/libbsp/or1k/generic_or1k/Makefile.am | 110 + >>> c/src/lib/libbsp/or1k/generic_or1k/README | 34 >>> c/src/lib/libbsp/or1k/generic_or1k/bsp_specs | 11 ++ >>> .../lib/libbsp/or1k/generic_or1k/clock/clockdrv.c | 152 >>> + >>> c/src/lib/libbsp/or1k/generic_or1k/configure.ac| 30 >>> .../or1k/generic_or1k/console/console-config.c | 58 +++ >>> c/src/lib/libbsp/or1k/generic_or1k/console/uart.c | 152 >>> + >>> c/src/lib/libbsp/or1k/generic_or1k/include/bsp.h | 47 ++ >>> .../or1k/generic_or1k/include/generic_or1k.h | 118 + >>> c/src/lib/libbsp/or1k/generic_or1k/include/irq.h | 45 + >>> c/src/lib/libbsp/or1k/generic_or1k/include/uart.h | 42 + >>> c/src/lib/libbsp/or1k/generic_or1k/irq/irq.c | 42 + >>> .../make/custom/generic_or1k-testsuite.tcfg| 5 + >>> .../or1k/generic_or1k/make/custom/generic_or1k.cfg | 7 + >>> c/src/lib/libbsp/or1k/generic_or1k/preinstall.am | 120 ++ >>> c/src/lib/libbsp/or1k/generic_or1k/sim.cfg | 105 >>> c/src/lib/libbsp/or1k/generic_or1k/start/start.S | 182 >>> + >>> .../libbsp/or1k/generic_or1k/startup/bspstart.c| 25 +++ >>> .../lib/libbsp/or1k/generic_or1k/startup/linkcmds | 41 + >>> c/src/lib/libbsp/or1k/generic_or1k/timer/timer.c | 64 >>> c/src/lib/libbsp/or1k/or1ksim/Makefile.am | 110 - >>> c/src/lib/libbsp/or1k/or1ksim/README | 37 - >>> c/src/lib/libbsp/or1k/or1ksim/bsp_specs| 11 -- >>> c/src/lib/libbsp/or1k/or1ksim/clock/clockdrv.c | 149 >>> - >>> c/src/lib/libbsp/or1k/or1ksim/configure.ac | 30 >>> .../libbsp/or1k/or1ksim/console/console-config.c | 58 --- >>> c/src/lib/libbsp/or1k/or1ksim/console/uart.c | 152 >>> - >>> c/src/lib/libbsp/or1k/or1ksim/include/bsp.h| 47 -- >>> c/src/lib/libbsp/or1k/or1ksim/include/irq.h| 45 - >>> c/src/lib/libbsp/or1k/or1ksim/include/or1ksim.h| 118 - >>> c/src/lib/libbsp/or1k/or1ksim/include/uart.h | 42 - >>> c/src/lib/libbsp/or1k/or1ksim/irq/irq.c| 42 - >>> .../or1ksim/make/custom/or1ksim-testsuite.tcfg | 5 - >>> .../libbsp/or1k/or1ksim/make/custom/or1ksim.cfg| 7 - >>> c/src/lib/libbsp/or1k/or1ksim/preinstall.am| 120 -- >>> c/src/lib/libbsp/or1k/or1ksim/sim.cfg | 105 >>> c/src/lib/libbsp/or1k/or1ksim/start/start.S| 182 >>> - >>> c/src/lib/libbsp/or1k/or1ksim/startup/bspstart.c | 25 --- >>> c/src/lib/libbsp/or1k/or1ksim/startup/linkcmds | 41 - >>> c/src/lib/libbsp/or1k/or1ksim/timer/timer.c| 64 >>> 42 files changed, 1393 insertions(+), 1393 deletions(-) >>> create mode 100644 c/src/lib/libbsp/or1k/generic_or1k/Makefile.am >>> create mode 100644 c/src/lib/libbsp/or1k/generic_or1k/README >>> create mode 100644 c/src/lib/libbsp/or1k/generic_or1k/bsp_specs >>> create mode 100644 c/src/lib/libbsp/or1k/generic_or1k/clock/clockdrv.c >>> create mode 100644 c/src/lib/libbsp/or1k/generic_or1k/configure.ac >>> create mode 100644 >>> c/src/lib/libbsp/or1k/generic_or1k/console/console-config.c >>> create mode 100644 c/src/lib/libbsp/or1k/generic_or1k/console/uart.c >>> create mode 100644 c/src/lib/libbsp/or1k/generic_or1k/include/bsp.h >>> create mode 100644 >>> c/src/lib/libbsp/or1k/generic_or1k/include/generic_or1k.h >>> create mode 100644 c/src/lib/libbsp/or1k/generic_or1k/include/irq.h >>> create mode 100644 c/src/lib/libbsp/or1k/generic_or1k/include/uart.h >>> create mode 100644 c/src/lib/libbsp/or1k/generic_or1k/irq/irq.c >>> create mode 100644 >>> c/src/lib/libbsp/or1k/generic_or1k/make/custom/generic_or1k-testsuite.tcfg >>> create mode 100644 >>> c/src/lib/libbsp/or1k/generic_or1k/make/custom/generic_or1k.cfg >>> crea
Re: [PATCH] Rename or1ksim BSP to generic_or1k
On Sun, Apr 19, 2015 at 6:24 AM, Hesham ALMatary wrote: > On Sun, Apr 19, 2015 at 1:49 AM, Joel Sherrill > wrote: >> On 04/18/2015 04:57 PM, Gedare Bloom wrote: >>> >>> Looks straightforward to me. Any doc need updating? >>> >> Maybe the wiki. But the other pieces are sim-scripts >> and rtems-tools for the simulator scripts. >> >> I don't know of much else unless Hesham wants to >> update his blog about this. > Yeah once this patch got merged I'll send patches for sim-scripts, > tester, and update my blog. Done. ___ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
[PATCH] [RTEMS Tester] Rename or1ksim BSP to generic_or1k
---
tester/rtems/testing/bsps/generic_or1k.mc | 53 +++
tester/rtems/testing/bsps/or1ksim.mc | 53 ---
2 files changed, 53 insertions(+), 53 deletions(-)
create mode 100644 tester/rtems/testing/bsps/generic_or1k.mc
delete mode 100644 tester/rtems/testing/bsps/or1ksim.mc
diff --git a/tester/rtems/testing/bsps/generic_or1k.mc
b/tester/rtems/testing/bsps/generic_or1k.mc
new file mode 100644
index 000..c5feffd
--- /dev/null
+++ b/tester/rtems/testing/bsps/generic_or1k.mc
@@ -0,0 +1,53 @@
+#
+# 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.
+#
+
+#
+# All paths in defaults must be Unix format. Do not store any Windows format
+# paths in the defaults.
+#
+# Every entry must describe the type of checking a host must pass.
+#
+# Records:
+# key: type, attribute, value
+# type : none, dir, exe, triplet
+# attribute: none, required, optional
+# value: 'single line', '''multi line'''
+#
+
+#
+# The generic_or1k BSP
+#
+[global]
+bsp: none,none, 'generic_or1k'
+
+[generic_or1k]
+generic_or1k: none,none, '%{_rtscripts}/qemu.cfg'
+generic_or1k_arch: none,none, 'or32'
+generic_or1k_opts: none,none, '%{qemu_opts_base} %{qemu_opts_no_net} -m
32M'
diff --git a/tester/rtems/testing/bsps/or1ksim.mc
b/tester/rtems/testing/bsps/or1ksim.mc
deleted file mode 100644
index 7222a7f..000
--- a/tester/rtems/testing/bsps/or1ksim.mc
+++ /dev/null
@@ -1,53 +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.
-#
-
-#
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-# key: type, attribute, value
-# type : none, dir, exe, triplet
-# attribute: none, required, optional
-# value: 'single line', '''multi line'''
-#
-
-#
-# The or1ksim BSP
-#
-[global]
-bsp: none,none, 'or1ksim'
-
-[or1ksim]
-or1ksim: none,none, '%{_rtscripts}/qemu.cfg'
-or1ksim_arch: none,none, 'or32'
-or
[PATCH] [sim-scripts] renanme or1ksim BSP to generic_or1k
---
sim-scripts/qemu-or1k.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
Re: [PATCH] [sim-scripts] renanme or1ksim BSP to generic_or1k
This patch does not renamed or1ksim in sim-scripts.
Don't forget .gitignore.
On 04/19/2015 06:20 AM, Hesham ALMatary wrote:
---
sim-scripts/qemu-or1k.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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()
--
-- Joel Sherrill
Ask me about RTEMS: a free RTOS
Support and Training Available
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
Re: [PATCH] [sim-scripts] renanme or1ksim BSP to generic_or1k
On Sun, Apr 19, 2015 at 4:42 PM, Joel Sherrill
wrote:
>
> This patch does not renamed or1ksim in sim-scripts.
>
or1ksim in sim-scripts refers to the simulator not the BSP, like qemu-or1k.
> Don't forget .gitignore.
>
>
> On 04/19/2015 06:20 AM, Hesham ALMatary wrote:
>>
>> ---
>> sim-scripts/qemu-or1k.in | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> 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()
>
>
>
> --
> -- Joel Sherrill
> Ask me about RTEMS: a free RTOS
> Support and Training Available
>
--
Hesham
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
Re: [PATCH] [sim-scripts] renanme or1ksim BSP to generic_or1k
On 04/19/2015 10:48 AM, Hesham ALMatary wrote:
On Sun, Apr 19, 2015 at 4:42 PM, Joel Sherrill
wrote:
This patch does not renamed or1ksim in sim-scripts.
or1ksim in sim-scripts refers to the simulator not the BSP, like qemu-or1k.
The sim-scripts use the name of the BSP as the name of the
script for consistency. Otherwise there is code/memory to
remember the mapping. This makes it easier to script testing.
Don't forget .gitignore.
On 04/19/2015 06:20 AM, Hesham ALMatary wrote:
---
sim-scripts/qemu-or1k.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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()
--
-- Joel Sherrill
Ask me about RTEMS: a free RTOS
Support and Training Available
--
-- Joel Sherrill
Ask me about RTEMS: a free RTOS
Support and Training Available
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
Re: [PATCH] [sim-scripts] renanme or1ksim BSP to generic_or1k
On Sun, Apr 19, 2015 at 4:50 PM, Joel Sherrill
wrote:
> On 04/19/2015 10:48 AM, Hesham ALMatary wrote:
>>
>> On Sun, Apr 19, 2015 at 4:42 PM, Joel Sherrill
>> wrote:
>>>
>>> This patch does not renamed or1ksim in sim-scripts.
>>>
>> or1ksim in sim-scripts refers to the simulator not the BSP, like
>> qemu-or1k.
>
> The sim-scripts use the name of the BSP as the name of the
> script for consistency. Otherwise there is code/memory to
> remember the mapping. This makes it easier to script testing.
>
Yeah I see. What if there are different simulators that can run the
same BSP? I think we can make qemu-or1k the default (i.e. renaming it
to generic_or1k) this way.
>>> Don't forget .gitignore.
>>>
>>>
>>> On 04/19/2015 06:20 AM, Hesham ALMatary wrote:
---
sim-scripts/qemu-or1k.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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()
>>>
>>>
>>>
>>> --
>>> -- Joel Sherrill
>>> Ask me about RTEMS: a free RTOS
>>> Support and Training Available
>>>
>>
>>
>
>
> --
> -- Joel Sherrill
> Ask me about RTEMS: a free RTOS
> Support and Training Available
>
--
Hesham
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
Re: [PATCH] [sim-scripts] renanme or1ksim BSP to generic_or1k
On 04/19/2015 11:00 AM, Hesham ALMatary wrote:
On Sun, Apr 19, 2015 at 4:50 PM, Joel Sherrill
wrote:
On 04/19/2015 10:48 AM, Hesham ALMatary wrote:
On Sun, Apr 19, 2015 at 4:42 PM, Joel Sherrill
wrote:
This patch does not renamed or1ksim in sim-scripts.
or1ksim in sim-scripts refers to the simulator not the BSP, like
qemu-or1k.
The sim-scripts use the name of the BSP as the name of the
script for consistency. Otherwise there is code/memory to
remember the mapping. This makes it easier to script testing.
Yeah I see. What if there are different simulators that can run the
same BSP? I think we can make qemu-or1k the default (i.e. renaming it
to generic_or1k) this way.
The script gets the simulator name appended like
leon3, leon3-qemu, and leon3-tsim.
Don't forget .gitignore.
On 04/19/2015 06:20 AM, Hesham ALMatary wrote:
---
sim-scripts/qemu-or1k.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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()
--
-- Joel Sherrill
Ask me about RTEMS: a free RTOS
Support and Training Available
--
-- Joel Sherrill
Ask me about RTEMS: a free RTOS
Support and Training Available
--
-- Joel Sherrill
Ask me about RTEMS: a free RTOS
Support and Training Available
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
[PATCH] [sim-scripts] renanme or1ksim BSP to generic_or1k
---
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 000..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
Re: [PATCH] [RPI BSP] mailbox
Here is a modified patch for mailbox. If there's still anything against the convention, please point it out and I'll correct it immediately. The mailbox implementation might also be needed by other rpi bsp developpers.--diff --git a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am b/c/src/lib/libbsp/arm/raspberrypi/Makefile.amindex c6133df..70bc01d 100644--- a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am+++ b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am@@ -43,6 +43,7 @@ include_bsp_HEADERS += ../shared/include/arm-release-id.h include_bsp_HEADERS += include/irq.h include_bsp_HEADERS += include/mmu.h include_bsp_HEADERS += include/usart.h+include_bsp_HEADERS += include/mailbox.h include_bsp_HEADERS += include/raspberrypi.h include_libcpu_HEADERS = ../../../libcpu/arm/shared/include/cache_.h \@@ -123,6 +124,9 @@ libbsp_a_SOURCES += misc/timer.c # I2C +# Mailbox+libbsp_a_SOURCES += misc/mailbox.c+ # Cache libbsp_a_SOURCES += ../../../libcpu/shared/src/cache_manager.c libbsp_a_SOURCES += ../../../libcpu/arm/shared/include/cache_.hdiff --git a/c/src/lib/libbsp/arm/raspberrypi/include/mailbox.h b/c/src/lib/libbsp/arm/raspberrypi/include/mailbox.hnew file mode 100644index 000..fa6a0c2--- /dev/null+++ b/c/src/lib/libbsp/arm/raspberrypi/include/mailbox.h@@ -0,0 +1,33 @@+/**+ * @file+ *+ * @ingroup raspberrypi+ *+ * @brief mailbox support.+ */++/*+ * Copyright (c) 2015 Yang Qiao+ *+ * The license and distribution terms for this file may be+ * found in the file LICENSE in this distribution or at+ *+ * http://www.rtems.org/license/LICENSE+ *+ */++#ifndef LIBBSP_ARM_RASPBERRYPI_MAILBOX_H+#define LIBBSP_ARM_RASPBERRYPI_MAILBOX_H++#ifdef __cplusplus+extern "C" {+#endif /* __cplusplus */++extern unsigned int raspberrypi_mailbox_read(unsigned int channel);+extern void raspberrypi_mailbox_write(unsigned int channel, unsigned int data);++#ifdef __cplusplus+}+#endif /* __cplusplus */++#endif /* LIBBSP_ARM_RASPBERRYPI_MAILBOX_H */diff --git a/c/src/lib/libbsp/arm/raspberrypi/include/raspberrypi.h b/c/src/lib/libbsp/arm/raspberrypi/include/raspberrypi.hindex c33e22a..3240404 100644--- a/c/src/lib/libbsp/arm/raspberrypi/include/raspberrypi.h+++ b/c/src/lib/libbsp/arm/raspberrypi/include/raspberrypi.h@@ -208,6 +208,55 @@ /** @} */ + /**+ * @name Mailbox Registers+ *+ * @{+ */++#define BCM2835_MBOX_BASE (RPI_PERIPHERAL_BASE+0xB880)++#define BCM2835_MBOX_PEEK (BCM2835_MBOX_BASE+0x10)+#define BCM2835_MBOX_READ (BCM2835_MBOX_BASE+0x00)+#define BCM2835_MBOX_WRITE (BCM2835_MBOX_BASE+0x20)+#define BCM2835_MBOX_STATUS (BCM2835_MBOX_BASE+0x18)+#define BCM2835_MBOX_SENDER (BCM2835_MBOX_BASE+0x14)+#define BCM2835_MBOX_CONFIG (BCM2835_MBOX_BASE+0x1C)++#define BCM2835_MBOX_SUCCESS (BCM2835_MBOX_BASE+0x8000)+#define BCM2835_MBOX_FULL (BCM2835_MBOX_BASE+0x8000)+#define BCM2835_MBOX_EMPTY (BCM2835_MBOX_BASE+0x4000)++/**+* @name Mailbox Channels+*+* @{+*/++/* Power Manager channel */+#define BCM2835_MBOX_CHANNEL_PM 0+/* Framebuffer channel */+#define BCM2835_MBOX_CHANNEL_FB 1+ /* Virtual UART channel */+#define BCM2835_MBOX_CHANNEL_VUART 2+ /* VCHIQ channel */+#define BCM2835_MBOX_CHANNEL_VCHIQ 3+ /* LEDs channel */+#define BCM2835_MBOX_CHANNEL_LED 4+ /* Button channel */+#define BCM2835_MBOX_CHANNEL_BUTTON 5+ /* Touch screen channel */+#define BCM2835_MBOX_CHANNEL_TOUCHS 6+/* Property tags (ARM <-> VC) channel */+#define BCM2835_MBOX_CHANNEL_PROP_AVC 8+ /* Property tags (VC <-> ARM) channel */+#define BCM2835_MBOX_CHANNEL_PROP_VCA 9++/** @} */+++/** @} */+ /** @} */ diff --git a/c/src/lib/libbsp/arm/raspberrypi/misc/mailbox.c b/c/src/lib/libbsp/arm/raspberrypi/misc/mailbox.cnew file mode 100644index 000..2a63a41--- /dev/null+++ b/c/src/lib/libbsp/arm/raspberrypi/misc/mailbox.c@@ -0,0 +1,44 @@+/**+ * @file+ *+ * @ingroup raspberrypi+ *+ * @brief mailbox support.+ */++/*+ * Copyright (c) 2015 Yang Qiao+ *+ * The license and distribution terms for this file may be+ * found in the file LICENSE in this distribution or at+ *+ * http://www.rtems.org/license/LICENSE+ *+ */++#include +#include +#include ++unsigned int raspberrypi_mailbox_read (unsigned int channel)+{+ unsigned int data;+ unsigned int read_channel;++ while ( 1 )+ {+ while (BCM2835_REG (BCM2835_MBOX_STATUS ) & BCM2835_MBOX_EMPTY);+ data = "" (BCM2835_MBOX_READ );+ read_channel = (unsigned int) (data & 0xF );+ if (read_channel == channel)+ return (data & 0xFFF0);+ }+}++void raspberrypi_mailbox_write(unsigned int channel, unsigned int data)+{+ while (BCM2835_REG(BCM2835_MBOX_STATUS) & BCM2835_MBOX_FULL);+ BCM2835_REG(BCM2835_MBOX_WRITE) = + (data & 0xFFF0) | + (unsigned int) (channel & 0xF);+}diff --git a/c/src/lib/libbsp/arm/raspberrypi/preinstall.am b/c/src/lib/libbsp/arm/raspberrypi/preinstall.amindex 70259e2..4cb7ed6 100644--- a/c/src/lib/libbsp/arm/raspberrypi/preinstall.am+++ b/c/src/lib/libbsp/arm/raspberrypi/preinstall.am@@ -126,6 +126,10 @@ $(PROJECT_IN
Re: 4.11 branch point
On 18/04/2015 12:06 am, Joel Sherrill wrote: > > > On 4/17/2015 5:11 AM, Sebastian Huber wrote: >> Hello, >> >> I think everything for the 4.11 release is now in the tree. It would be >> good to do the branch soon, since the watchdog changes and the FreeBSD >> timecounters should probably be not in the release. We can test and >> polish for the release in the branch. >> > Agreed. Nothing is really outstanding AFAIK from a patch perspective. > I still need to run coverage and post reports. We haven't looked at that > in a while and the changes could have negatively impacted that. That > can be post-branching. > > Are you including the new timer server implementation you just > posted as a post-branching merge? > > I would like to do a build and test sweep before we branch. Daniel's > patch was quite large and I just want to make sure all is OK still. > But nothing really blocking except a sanity check. All built OK overnight > and the test runs have been acceptable. > > This is the point at which feedback from real hardware from user's would be > appreciated but I won't hold a release waiting for any. I will be doing > a sweep > on simulators. Anything additional is a plus. > > I would really like for Chris to be back from holidays before we push > the button. Just in case. :) > I think the master branch is ready. I think we need to review the wiki to get a single clear Getting Starting guide. Chris ___ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
Re: 4.11 branch point
On April 19, 2015 7:39:22 PM CDT, Chris Johns wrote: >On 18/04/2015 12:06 am, Joel Sherrill wrote: >> >> >> On 4/17/2015 5:11 AM, Sebastian Huber wrote: >>> Hello, >>> >>> I think everything for the 4.11 release is now in the tree. It would >be >>> good to do the branch soon, since the watchdog changes and the >FreeBSD >>> timecounters should probably be not in the release. We can test and >>> polish for the release in the branch. >>> >> Agreed. Nothing is really outstanding AFAIK from a patch >perspective. >> I still need to run coverage and post reports. We haven't looked at >that >> in a while and the changes could have negatively impacted that. That >> can be post-branching. >> >> Are you including the new timer server implementation you just >> posted as a post-branching merge? >> >> I would like to do a build and test sweep before we branch. Daniel's >> patch was quite large and I just want to make sure all is OK still. >> But nothing really blocking except a sanity check. All built OK >overnight >> and the test runs have been acceptable. >> >> This is the point at which feedback from real hardware from user's >would be >> appreciated but I won't hold a release waiting for any. I will be >doing >> a sweep >> on simulators. Anything additional is a plus. >> >> I would really like for Chris to be back from holidays before we push >> the button. Just in case. :) >> > >I think the master branch is ready. I think we need to review the wiki >to get a single clear Getting Starting guide. Agreed. I have a handful of small patches from building over the weekend. Nios C++ support is going to require a gcc patch. I am currently running tests on every bsp that we have a simulator for. My tasks are to finish the run and review results. Fix Nios C++. And push those patches. If someone can review the getting started that would be appreciated. >Chris --joel ___ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
Re: crypt01 execution time
On 15/04/2015 7:37 am, Joel Sherrill wrote:
>
>
> On 11/26/2014 1:12 AM, Sebastian Huber wrote:
>> On 25/11/14 23:25, Joel Sherrill wrote:
>>> How long is this test supposed to run?
>>>
>>> It takes 4:42 using sis on my computer which is a 2.9 Ghz i7 .
>> SIS is a slow simulator. On Qemu it runs much faster.
> To repeat a statement by Jiri, SIS is an accurate simulator. Just
> a different goal.
>>> Is there anything to do? Split it?
>> Splitting it up doesn't reduce the overall test time. The test cases in
>> this test are standard test cases. I am not so fond of removing them,
>> but in case the test time is too long for you then you can drop the ones
>> with the many rounds.
>>
> I took the statement "doesn't reduce overall test time" earlier at face
> value
> and didn't push back. It is a true statement to the extent that splitting
> it results in N tests which run for the same combined time. But what
> was missed is that the run-time of this test is much longer than any
> other test. This results in having to set a timeout value that accommodates
> this test while others could be timed out in the equivalent of 180
> seconds of CPU time.
I wonder if the test framework is a little weak in this area and we need
to improve it. The core issue is the ability to determine the
performance of a simulator and then the effect of running in parallel
assuming one instance per core. The type of host being used is a factor
we need to estimate and adjust for.
One possible way I have considered is to have a "benchmark" type
executable that is run by itself before the test run (which can have
parallel tests running) and the results are used to scale the host to
match the simulated CPU time. There needs to be some integer and
floating point code run to get a balanced result.
>
> Thus it isn't the test time itself that is the problem. It is the impact
> it has on setting the overall timeout value since this single test
> runs for 309.51s of simulated CPU time according to sis. Every test
> which times out is bound by the maximum allowed execution time
> of the slowest tests.
>
I think we should add support for some new test annotations. Along with
the test begin and end we current support we add "timeout reset" and
"timeout scalar". The first resets the timeout value so a collection of
tests can be in a single executable (which has some advantages in some
cases), and scalar allows a test to adjust the default timeout by a factor.
> RTEMS suffers from having many unwritten rules. Originally, all the
> sptests generally did not run much longer than ticker. That test takes
> 35 seconds of target time plus boot. Of course, this was never a hard
> rule and many exceptions crept in.
Yes and this is understandable. The purpose of the rtems-test command is
to collect and manage these issues and to provide a consistent user
interface.
> sis (and tsim) can be programmed to timeout after N seconds of simulated
> CPU time. Based on sim-scripts, 180 seconds is sufficient as a general
> timeout if you ignore crypt01. Splitting the test into multiple tests
> would
> bring it back in line with the maximum execution time of any other test.
Does this change the meaning of the time out value ? In the rtems-test
command the time out is the host's real-time because we cannot support
this in a common way across all simulators and it does not mean anything
with real hardware. The idea behind the "bench mark" executable was to
get some form of scaling factor between the CPU time and the host's
clock time.
>
> When testing with a simulator, we can run multiple instances in parallel.
> It is just a matter of managing the maximum run-time of any test so
> they cluster rather than having a single outlier driving the selection.
>
> This test should be easy to split. The code looks like this:
>
> static void Init(rtems_task_argument arg)
> {
> TEST_BEGIN();
>
> test_formats();
> test_md5();
> test_sha256();
> test_sha512();
> test_generic();
>
> TEST_END();
> rtems_test_exit(0);
> }
>
> The test has five sub-parts and it is just a matter of dividing the test
> into those subparts. The simplest way would be conditional compilation
> driven from the Makefile.am to build part 1, 2, 3, ... as needed.
>
> FWIW it took 24.61 seconds to run on a 2.4 Ghz older CPU. I added a
> print of uptime to get a feel of how it would need to be split.
>
> *** BEGIN OF TEST CRYPT 1 ***
> UPTIME: 0: 2479000
> UPTIME: 0: 3537000
What about adding:
*** TIMEOUT: RESET ***
> test crypt_md5_r()
> UPTIME: 0: 404662000
> test crypt_sha256_r()
> UPTIME: 196: 135394000
> test crypt_sha512_r()
> UPTIME: 644: 629217000
> test crypt_r()
> UPTIME: 663: 426214000
> *** END OF TEST CRYPT 1 ***
>
> Unfortunately, it looks like the big "chunks" are sha256 and
> sha512 which are both over 180 seconds. So the list of
> test input/output list fo
