config: Clean up the qemu configurations.

5 files changed, 72 insertions, 15 deletions

diff --git a/tester/rtems/testing/bsps/realview_pbx_a9_qemu.mc b/tester/rtems/testing/bsps/realview_pbx_a9_qemu.mc
index 5a748c7..acc107c 100644
--- a/tester/rtems/testing/bsps/realview_pbx_a9_qemu.mc
+++ b/tester/rtems/testing/bsps/realview_pbx_a9_qemu.mc
@@ -45,9 +45,9 @@
 # The Realview PBX A9 BSP.
 #
 [global]
-bsp:                   none,    none,     'realview_pbx_a9_qemu'
+bsp:                       none,    none,  'realview_pbx_a9_qemu'
 
 [realview_pbx_a9_qemu]
-realview_pbx_a9_qemu:      none,    none,     '%{_rtscripts}/qemu.cfg'
-realview_pbx_a9_qemu_arch: none,    none,     'arm'
-realview_pbx_a9_qemu_opts: none,    none,     '-no-reboot -serial /dev/null -serial mon:stdio -net none -nographic -M xilinx-zynq-a9 -m 256M'
+realview_pbx_a9_qemu:      none,    none,  '%{_rtscripts}/qemu.cfg'
+realview_pbx_a9_qemu_arch: none,    none,  'arm'
+realview_pbx_a9_qemu_opts: none,    none,  '%{qemu_opts_base} %{qemu_opts_no_net} -M realview-pbx-a9 -m 256M'
diff --git a/tester/rtems/testing/bsps/xilinx_zynq_a9_qemu.mc b/tester/rtems/testing/bsps/xilinx_zynq_a9_qemu.mc
index 22c2a88..98b9b87 100644
--- a/tester/rtems/testing/bsps/xilinx_zynq_a9_qemu.mc
+++ b/tester/rtems/testing/bsps/xilinx_zynq_a9_qemu.mc
@@ -45,10 +45,9 @@
 # The Xilinx Zynq A9 QEMU BSP
 #
 [global]
-bsp:                none,    none,     'xilinx_zynq_a9_qemu'
+bsp:                      none,    none,     'xilinx_zynq_a9_qemu'
 
 [xilinx_zynq_a9_qemu]
-xilinx_zynq_a9_qemu:       none,    none,     '%{_rtscripts}/run.cfg'
-xilinx_zynq_a9_qemu_arch:  none,    none,     'arm'
-bsp_run_cmd:               none,    none,     'qemu-system-arm'
-bsp_run_opts:              none,    none,     '-no-reboot -serial null -serial mon:stdio -nographic -net none -M xilinx-zynq-a9 -m 256M -kernel'
+realview_pbx_a9_qemu:     none,    none,  '%{_rtscripts}/qemu.cfg'
+xilinx_zynq_a9_qemu_arch: none,    none,  'arm'
+xilinx_zynq_a9_qemu_opts: none,    none,  '%{qemu_opts_base} %{qemu_opts_no_net} -M xilinx-zynq-a9 -m 256M'
diff --git a/tester/rtems/testing/bsps/xilinx_zynq_a9_qemu_smp.mc b/tester/rtems/testing/bsps/xilinx_zynq_a9_qemu_smp.mc
index bdd2ce7..c7a96b0 100644
--- a/tester/rtems/testing/bsps/xilinx_zynq_a9_qemu_smp.mc
+++ b/tester/rtems/testing/bsps/xilinx_zynq_a9_qemu_smp.mc
@@ -45,11 +45,10 @@
 # The Xilinx Zynq A9 QEMU BSP
 #
 [global]
-bsp:                none,    none,     'xilinx_zynq_a9_qemu'
+bsp:                      none,    none,  'xilinx_zynq_a9_qemu'
+jobs:                     none,    none,  'half'
 
 [xilinx_zynq_a9_qemu]
-xilinx_zynq_a9_qemu:       none,    none,     '%{_rtscripts}/run.cfg'
-xilinx_zynq_a9_qemu_arch:  none,    none,     'arm'
-bsp_run_cmd:               none,    none,     'qemu-system-arm'
-bsp_run_opts:              none,    none,     '-no-reboot -serial null -serial mon:stdio -nographic -net none -M xilinx-zynq-a9 -m 256M -smp cpus=2 -kernel'
-jobs:                      none,    none,     'half'
+realview_pbx_a9_qemu:     none,    none,  '%{_rtscripts}/qemu.cfg'
+xilinx_zynq_a9_qemu_arch: none,    none,  'arm'
+xilinx_zynq_a9_qemu_opts: none,    none,  '%{qemu_opts_base} %{qemu_opts_no_net} -M xilinx-zynq-a9 -m 256M -smp cpus=2'
diff --git a/tester/rtems/testing/bsps/xilinx_zynq_zc706_qemu.mc b/tester/rtems/testing/bsps/xilinx_zynq_zc706_qemu.mc
new file mode 100644
index 0000000..d5acc57
--- /dev/null
+++ b/tester/rtems/testing/bsps/xilinx_zynq_zc706_qemu.mc
@@ -0,0 +1,54 @@
+#
+# 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.
+#
+
+#
+# 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 Xilinx Zync ZC706 board connected via OpenOCD and a JTAG pod. The console
+# is connected to a tty device.
+#
+[global]
+bsp:                    none,    none,   'xilinx_zynq_zc706'
+
+[xilinx_zynq_zc706]
+xilinx_zynq_zc706:      none,    none,  '%{_rtscripts}/qemu.cfg'
+xilinx_zynq_zc706_arch: none,    none,  'arm'
+xilinx_zynq_zc706_opts: none,    none,  '%{qemu_opts_base} %{qemu_opts_no_net} -M xilinx-zynq-a9 -m 1024M'
diff --git a/tester/rtems/testing/qemu.cfg b/tester/rtems/testing/qemu.cfg
index e15f058..a3310bc 100644
--- a/tester/rtems/testing/qemu.cfg
+++ b/tester/rtems/testing/qemu.cfg
@@ -49,6 +49,11 @@
 %include %{_rtdir}/rtems/version.cfg
 
 #
+# Qemu common option patterns.
+#
+%define qemu_opts_base   -no-reboot -monitor none -serial stdio -nographic
+%define qemu_opts_no_net -net none
+#
 # Qemu executable
 #
 %define qemu_cmd  qemu-system-%{bsp_arch}