From 88fd1e0e00e5b0a30f177ae08c1fd1fde234df59 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 31 May 2013 15:27:00 +0200 Subject: sim-scripts: Add realview_pbx_a9_qemu_smp --- rtems/bit_rtems | 4 ++-- sim-scripts/.gitignore | 1 + sim-scripts/Makefile | 6 +++++- sim-scripts/gdb-sim-run.in | 8 ++++--- sim-scripts/pc386.in | 2 +- sim-scripts/realview_pbx_a9_qemu_smp.in | 38 +++++++++++++++++++++++++++++++++ 6 files changed, 52 insertions(+), 7 deletions(-) create mode 100644 sim-scripts/realview_pbx_a9_qemu_smp.in diff --git a/rtems/bit_rtems b/rtems/bit_rtems index 430f5b5..61459bb 100755 --- a/rtems/bit_rtems +++ b/rtems/bit_rtems @@ -492,7 +492,7 @@ if [ ${ENABLE_RTEMS_TESTS} = "samples" -o \ if [ ${RUN_RTEMS_TESTS} = yes ] ; then case ${BSP_TO_TEST} in - realview_pbx_a9_qemu) testable=yes ;; # arm/realview_pbx_a9_qemu + realview_pbx_a9_qemu*) testable=yes ;; # arm/realview_pbx_a9_qemu* xilinx_zynq_a9_qemu) testable=yes ;; # arm/xilinx_zynq_a9_qemu edb7312) testable=yes ;; # arm/edb7312 rtl22xx) testable=yes ;; # arm/rtl22xx @@ -536,7 +536,7 @@ if [ ${ENABLE_RTEMS_TESTS} = "samples" -o \ # ARM edb7312) runner=edb7312 ;; gumstix) runner=gumstix ;; - realview_pbx_a9_qemu) runner=realview_pbx_a9_qemu ;; + realview_pbx_a9_qemu) runner=${BSP_TO_TEST} ;; xilinx_zynq_a9_qemu) runner=xilinx_zynq_a9_qemu ;; rtl22xx) runner=rtl22xx ;; # SPARC diff --git a/sim-scripts/.gitignore b/sim-scripts/.gitignore index 756c66d..813143b 100644 --- a/sim-scripts/.gitignore +++ b/sim-scripts/.gitignore @@ -48,6 +48,7 @@ qemu-leon2 qemu-lm32_evr qemuppc realview_pbx_a9_qemu +realview_pbx_a9_qemu_smp rtl22xx rtl22xx-gdb simsh diff --git a/sim-scripts/Makefile b/sim-scripts/Makefile index 58595c2..9d9baaf 100644 --- a/sim-scripts/Makefile +++ b/sim-scripts/Makefile @@ -6,7 +6,8 @@ SKYEYE_SCRIPTS=ant5206 bf537Stamp-skyeye csb337 csb350 csb360 edb7312 \ TSIM_SCRIPTS=erc32 leon2 leon3 QEMU_SCRIPTS=pc386 qemuppc qemu-gumstix qemu-leon2 qemu-lm32_evr uC5282 \ - lm3s6965 realview_pbx_a9_qemu xilinx_zynq_a9_qemu + lm3s6965 realview_pbx_a9_qemu realview_pbx_a9_qemu_smp \ + xilinx_zynq_a9_qemu OTHER_SCRIPTS=avrtest GENERATED_SCRIPTS=\ @@ -54,6 +55,9 @@ lm3s6965: gdb-sim-run.in lm3s6965.in realview_pbx_a9_qemu: gdb-sim-run.in realview_pbx_a9_qemu.in ./mkrun no ARM arm realview_pbx_a9_qemu +realview_pbx_a9_qemu_smp: gdb-sim-run.in realview_pbx_a9_qemu_smp.in + ./mkrun no ARM arm realview_pbx_a9_qemu_smp + xilinx_zynq_a9_qemu: gdb-sim-run.in xilinx_zynq_a9_qemu.in ./mkrun no ARM arm xilinx_zynq_a9_qemu diff --git a/sim-scripts/gdb-sim-run.in b/sim-scripts/gdb-sim-run.in index 1870b0a..e48338a 100755 --- a/sim-scripts/gdb-sim-run.in +++ b/sim-scripts/gdb-sim-run.in @@ -29,7 +29,7 @@ USAGE=\ -N -- enable use of network adapter (default=no) -G -- put simulator in GDB server mode (default=no) -i -- interactive (default=no time limit) - -p cores -- number of cores for SMP (default=1) + -p cores -- number of cores for SMP -s -- force System V IPC support (default=no) -S -- skip Interrupt Critical Section Tests (default=no) -l limit -- specify time limit (default is 'BSP dependent') @@ -88,7 +88,7 @@ doTrace="no" enable_display_adapter="no" enable_network="no" skip_interrupt_critical_section_tests="no" -number_of_cores=1 +number_of_cores= while getopts "vcCgGil:L:p:DsNT" OPT do @@ -117,7 +117,9 @@ shift $shiftcount args=$* case ${number_of_cores} in + "");; [1-9]) ;; + [1-9][0-9]) ;; 0) echo "Zero cores does not make sense" exit 1 @@ -189,7 +191,7 @@ if [ ${bspSupportsDisplayAdapter} = "no" -a \ exit 1 fi -if [ ${bspSupportsSMP} = "no" -a ${number_of_cores} != 1 ] ; then +if [ ${bspSupportsSMP} = "no" -a ${number_of_cores:-1} != 1 ] ; then echo "Simulator does not support multiple cores." exit 1 fi diff --git a/sim-scripts/pc386.in b/sim-scripts/pc386.in index d0c4472..c4e15da 100644 --- a/sim-scripts/pc386.in +++ b/sim-scripts/pc386.in @@ -79,7 +79,7 @@ runARGS() # core2duo with newer qemu for SMP support # 486 or pentium for non-SMP - if [ ${number_of_cores} = 1 ] ; then + if [ ${number_of_cores:-1} = 1 ] ; then CPUARGS="-cpu 486" else CPUARGS="-cpu core2duo -smp ${number_of_cores}" diff --git a/sim-scripts/realview_pbx_a9_qemu_smp.in b/sim-scripts/realview_pbx_a9_qemu_smp.in new file mode 100644 index 0000000..0aecf68 --- /dev/null +++ b/sim-scripts/realview_pbx_a9_qemu_smp.in @@ -0,0 +1,38 @@ +# +# arm/realview_pbx_a9_qemu_smp Qemu Support +# + +bspUsesGDBSimulator="no" +bspSupportsSMP="yes" +# bspGeneratesGDBCommands="yes" +# bspSupportsGDBServerMode="yes" +runBSP=NOT_OVERRIDDEN +if [ ! -r ${runBSP} ] ; then + runBSP=qemu-system-arm +fi +bspNeedsDos2Unix="yes" + +runARGS() +{ + if [ ${coverage} = yes ] ; then + COVERAGE_ARG="-trace ${1}.cov" + fi + + echo "-no-reboot -net none -nographic -M realview-pbx-a9 -m 256M -smp ${number_of_cores:-2} -icount 8 ${COVERAGE_ARG} -kernel ${1}" +} + +checkBSPFaults() +{ + return 0 +} + +bspLimit() +{ + testname=$1 + case ${testname} in + *) limit=180 ;; + esac + echo ${limit} +} + +bspGeneratesDeviceTree="no" -- cgit v1.2.3