tester: Add a BSP field to each BSP INI configuration section.

The INI section in a BSP configuration is the name of the INI file so
each BSP configuration section needs a BSP.

Updates #3204.

67 files changed, 168 insertions, 104 deletions

diff --git a/tester/rt/test.py b/tester/rt/test.py
index 575c2a1..e036561 100644
--- a/tester/rt/test.py
+++ b/tester/rt/test.py
@@ -199,7 +199,7 @@ def report_finished(reports, report_mode, reporting, finished, job_trace):
     return reporting
 
 def load_configuration(bsp, opts):
-    mandatory = ['tester', 'arch']
+    mandatory = ['bsp', 'arch', 'tester']
     cfg = configuration.configuration()
     path_ = opts.defaults.expand('%%{_configdir}/bsps/%s.ini' % (bsp))
     ini_name = path.basename(path_)
@@ -215,7 +215,6 @@ def load_configuration(bsp, opts):
             opts.defaults.set_write_map(bsp, add = True)
             for i in cfg.get_items(bsp, flatten = False):
                 opts.defaults[i[0]] = i[1]
-            opts.defaults['bsp'] = bsp
             if not opts.defaults.set_read_map(bsp):
                 raise error.general('cannot set BSP read map: %s' % (bsp))
             # Get a copy of the required fields we need
@@ -241,7 +240,7 @@ def load_configuration(bsp, opts):
                             if opts.defaults.get(r) is None:
                                 raise error.general('user value missing, BSP %s requires: %s' % \
                                                     (bsp, ', '.join(requires)))
-            return
+            return opts.defaults['bsp']
     raise error.general('cannot find bsp configuration file: %s.ini' % (bsp))
 
 def _job_trace(tst, msg, total, exe, active, reporting):
@@ -319,8 +318,7 @@ def run(command_path = None):
         bsp = opts.find_arg('--rtems-bsp')
         if bsp is None or len(bsp) != 2:
             raise error.general('RTEMS BSP not provided or an invalid option')
-        bsp = bsp[1]
-        load_configuration(bsp, opts)
+        bsp = load_configuration(bsp[1], opts)
         bsp_config = opts.defaults.expand(opts.defaults['tester'])
         report_mode = opts.find_arg('--report-mode')
         if report_mode:
diff --git a/tester/rtems/testing/bsps/arm1136jfs-run.ini b/tester/rtems/testing/bsps/arm1136jfs-run.ini
index 276ca6f..1066088 100644
--- a/tester/rtems/testing/bsps/arm1136jfs-run.ini
+++ b/tester/rtems/testing/bsps/arm1136jfs-run.ini
@@ -31,8 +31,9 @@
 #
 # The arm1136jfs BSP
 #
-[arm1136jfs]
-tester       = %{_rtscripts}/run.cfg
+[arm1136jfs-run]
+bsp          = arm1136jfs
 arch         = arm
+tester       = %{_rtscripts}/run.cfg
 bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
 bsp_run_opts = -a -nouartrx
diff --git a/tester/rtems/testing/bsps/arm1136jfs.ini b/tester/rtems/testing/bsps/arm1136jfs.ini
index cb8c0c2..ea8d9f1 100644
--- a/tester/rtems/testing/bsps/arm1136jfs.ini
+++ b/tester/rtems/testing/bsps/arm1136jfs.ini
@@ -32,8 +32,9 @@
 # The arm1136jfs BSP
 #
 [arm1136jfs]
-tester         = %{_rtscripts}/gdb.cfg
+bsp            = arm1136jfs
 arch           = arm
+tester         = %{_rtscripts}/gdb.cfg
 gdb_script     = bsp_gdb_script
 bsp_gdb_script = target sim
                  load
diff --git a/tester/rtems/testing/bsps/arm1136js-run.ini b/tester/rtems/testing/bsps/arm1136js-run.ini
index af889d4..995d71d 100644
--- a/tester/rtems/testing/bsps/arm1136js-run.ini
+++ b/tester/rtems/testing/bsps/arm1136js-run.ini
@@ -31,8 +31,9 @@
 #
 # The arm1136js BSP
 #
-[arm1136js]
-tester       = %{_rtscripts}/run.cfg
+[arm1136js-run]
+bsp          = arm1136js
 arch         = arm
+tester       = %{_rtscripts}/run.cfg
 bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
 bsp_run_opts = -a -nouartrx
diff --git a/tester/rtems/testing/bsps/arm1136js.ini b/tester/rtems/testing/bsps/arm1136js.ini
index 68d787a..2f86ca2 100644
--- a/tester/rtems/testing/bsps/arm1136js.ini
+++ b/tester/rtems/testing/bsps/arm1136js.ini
@@ -32,8 +32,9 @@
 # The arm1136js BSP
 #
 [arm1136js]
-arm1136js      = %{_rtscripts}/gdb.cfg
+bsp            = arm1136js
 arch           = arm
+arm1136js      = %{_rtscripts}/gdb.cfg
 gdb_script     = bsp_gdb_script
 bsp_gdb_script = target sim
                  load
diff --git a/tester/rtems/testing/bsps/arm7tdmi-run.ini b/tester/rtems/testing/bsps/arm7tdmi-run.ini
index efb30ab..7f98465 100644
--- a/tester/rtems/testing/bsps/arm7tdmi-run.ini
+++ b/tester/rtems/testing/bsps/arm7tdmi-run.ini
@@ -31,8 +31,9 @@
 #
 # The arm7tdmi BSP
 #
-[arm7tdmi]
-tester       = %{_rtscripts}/run.cfg
+[arm7tdmi-run]
+bsp          = arm7tdmi
 arch         = arm
+tester       = %{_rtscripts}/run.cfg
 bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
 bsp_run_opts = -a -nouartrx
diff --git a/tester/rtems/testing/bsps/arm7tdmi.ini b/tester/rtems/testing/bsps/arm7tdmi.ini
index 2835bee..e9b1261 100644
--- a/tester/rtems/testing/bsps/arm7tdmi.ini
+++ b/tester/rtems/testing/bsps/arm7tdmi.ini
@@ -32,8 +32,9 @@
 # The arm7tdmi BSP
 #
 [arm7tdmi]
-tester         = %{_rtscripts}/gdb.cfg
+bsp            = arm7tdmi
 arch           = arm
+tester         = %{_rtscripts}/gdb.cfg
 gdb_script     = bsp_gdb_script
 bsp_gdb_script = target sim
                  load
diff --git a/tester/rtems/testing/bsps/arm920-run.ini b/tester/rtems/testing/bsps/arm920-run.ini
index a904aae..c3652c7 100644
--- a/tester/rtems/testing/bsps/arm920-run.ini
+++ b/tester/rtems/testing/bsps/arm920-run.ini
@@ -31,8 +31,9 @@
 #
 # The arm920 BSP
 #
-[arm920]
-tester       = %{_rtscripts}/run.cfg
+[arm920-run]
+bsp          = arm920
 arch         = arm
+tester       = %{_rtscripts}/run.cfg
 bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
 bsp_run_opts = -a -nouartrx
diff --git a/tester/rtems/testing/bsps/arm920.ini b/tester/rtems/testing/bsps/arm920.ini
index 2f2dba3..0e376c4 100644
--- a/tester/rtems/testing/bsps/arm920.ini
+++ b/tester/rtems/testing/bsps/arm920.ini
@@ -32,8 +32,9 @@
 # The arm920 BSP
 #
 [arm920]
-tester         = %{_rtscripts}/gdb.cfg
+bsp            = arm920
 arch           = arm
+tester         = %{_rtscripts}/gdb.cfg
 gdb_script     = bsp_gdb_script
 bsp_gdb_script = target sim
                  load
diff --git a/tester/rtems/testing/bsps/armcortexa9-run.ini b/tester/rtems/testing/bsps/armcortexa9-run.ini
index c0964ab..aa9c07f 100644
--- a/tester/rtems/testing/bsps/armcortexa9-run.ini
+++ b/tester/rtems/testing/bsps/armcortexa9-run.ini
@@ -31,8 +31,9 @@
 #
 # The armcortexa9 BSP
 #
-[armcortexa9]
-tester       = %{_rtscripts}/run.cfg
+[armcortexa9-run]
+bsp          = armcortexa9
 arch         = arm
+tester       = %{_rtscripts}/run.cfg
 bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
 bsp_run_opts = -a -nouartrx
diff --git a/tester/rtems/testing/bsps/armcortexa9.ini b/tester/rtems/testing/bsps/armcortexa9.ini
index 6eb2321..1a21ea6 100644
--- a/tester/rtems/testing/bsps/armcortexa9.ini
+++ b/tester/rtems/testing/bsps/armcortexa9.ini
@@ -32,8 +32,9 @@
 # The armcortexa9 BSP
 #
 [armcortexa9]
-tester         = %{_rtscripts}/gdb.cfg
+bsp            = armcortexa9
 arch           = arm
+tester         = %{_rtscripts}/gdb.cfg
 gdb_script     = bsp_gdb_script
 bsp_gdb_script = target sim
                  load
diff --git a/tester/rtems/testing/bsps/beagleboardxm.ini b/tester/rtems/testing/bsps/beagleboardxm.ini
index 1d5b590..e8a79a6 100644
--- a/tester/rtems/testing/bsps/beagleboardxm.ini
+++ b/tester/rtems/testing/bsps/beagleboardxm.ini
@@ -34,8 +34,9 @@
 # configuration file called bbxm.cfg you need to start OpenOCD with.
 #
 [beagleboardxm]
+bsp        = beagleboardxm
+arch       = arm
 jobs       = 1
 tester     = %{_rtscripts}/gdb.cfg
-arch       = arm
 gdb_script = bsp_gdb_script
 requires   = bsp_tty_dev, bsp_gdb_script
diff --git a/tester/rtems/testing/bsps/beagleboneblack.ini b/tester/rtems/testing/bsps/beagleboneblack.ini
index 5b3932d..4bf850f 100644
--- a/tester/rtems/testing/bsps/beagleboneblack.ini
+++ b/tester/rtems/testing/bsps/beagleboneblack.ini
@@ -33,9 +33,10 @@
 # telnet tty device.
 #
 [beagleboneblack]
+bsp                = beagleboneblack
+arch               = arm
 jobs               = 1
 tester             = %{_rtscripts}/tftp.cfg
-arch               = arm
 test_restarts      = 3
 target_reset_regex = ^No ethernet found.*|BOOTP broadcast 6.*|^ERROR: can.t get kernel image
 target_start_regex = ^U-Boot SPL .*
diff --git a/tester/rtems/testing/bsps/bf537Stamp-run.ini b/tester/rtems/testing/bsps/bf537Stamp-run.ini
index b9ab03b..ab29eb0 100644
--- a/tester/rtems/testing/bsps/bf537Stamp-run.ini
+++ b/tester/rtems/testing/bsps/bf537Stamp-run.ini
@@ -31,8 +31,9 @@
 #
 # The bf537Stamp BSP
 #
-[bf537Stamp]
-tester       = %{_rtscripts}/run.cfg
+[bf537Stamp-run]
+bsp          = bf537Stamp
 arch         = bfin
+tester       = %{_rtscripts}/run.cfg
 bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
 bsp_run_opts = --env operating --model bf537
diff --git a/tester/rtems/testing/bsps/bf537Stamp.ini b/tester/rtems/testing/bsps/bf537Stamp.ini
index ae687a5..9912288 100644
--- a/tester/rtems/testing/bsps/bf537Stamp.ini
+++ b/tester/rtems/testing/bsps/bf537Stamp.ini
@@ -32,8 +32,9 @@
 # The bf537Stamp BSP
 #
 [bf537Stamp]
-tester         = %{_rtscripts}/gdb.cfg
+bsp            = bf537Stamp
 arch           = bfin
+tester         = %{_rtscripts}/gdb.cfg
 gdb_script     = bsp_gdb_script
 bsp_gdb_script = target sim --env operating --model bf537
                  load
diff --git a/tester/rtems/testing/bsps/erc32-run.ini b/tester/rtems/testing/bsps/erc32-run.ini
index 83800eb..3dc5f60 100644
--- a/tester/rtems/testing/bsps/erc32-run.ini
+++ b/tester/rtems/testing/bsps/erc32-run.ini
@@ -31,7 +31,8 @@
 #
 # The erc32 BSP
 #
-[erc32]
-tester       = %{_rtscripts}/run.cfg
+[erc32-run]
+bsp          = erc32
 arch         = sparc
+tester       = %{_rtscripts}/run.cfg
 bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
diff --git a/tester/rtems/testing/bsps/erc32-sis.ini b/tester/rtems/testing/bsps/erc32-sis.ini
index 63047c6..fca2122 100644
--- a/tester/rtems/testing/bsps/erc32-sis.ini
+++ b/tester/rtems/testing/bsps/erc32-sis.ini
@@ -31,8 +31,9 @@
 #
 # The erc32 BSP
 #
-[erc32]
-tester       = %{_rtscripts}/run.cfg
+[erc32-sis]
+bsp          = erc32
 arch         = sparc
+tester       = %{_rtscripts}/run.cfg
 bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-sis
 bsp_run_opts = -nouartrx -r -tlim 600 s
diff --git a/tester/rtems/testing/bsps/erc32.ini b/tester/rtems/testing/bsps/erc32.ini
index 021dbd8..7911a2f 100644
--- a/tester/rtems/testing/bsps/erc32.ini
+++ b/tester/rtems/testing/bsps/erc32.ini
@@ -32,8 +32,9 @@
 # The erc32 BSP
 #
 [erc32]
-tester         = %{_rtscripts}/gdb.cfg
+bsp            = erc32
 arch           = sparc
+tester         = %{_rtscripts}/gdb.cfg
 gdb_script     = bsp_gdb_script
 bsp_gdb_script = target sim
                  load
diff --git a/tester/rtems/testing/bsps/generic_or1k.ini b/tester/rtems/testing/bsps/generic_or1k.ini
index f17c66e..153d167 100644
--- a/tester/rtems/testing/bsps/generic_or1k.ini
+++ b/tester/rtems/testing/bsps/generic_or1k.ini
@@ -32,6 +32,7 @@
 # The generic_or1k BSP
 #
 [generic_or1k]
-tester        = %{_rtscripts}/qemu.cfg
+bsp           = generic_or1k
 arch          = or32
+tester        = %{_rtscripts}/qemu.cfg
 bsp_qemu_opts = %{qemu_opts_base} %{qemu_opts_no_net} -m 32M
diff --git a/tester/rtems/testing/bsps/h8sxsim-run.ini b/tester/rtems/testing/bsps/h8sxsim-run.ini
index 8a351d5..afac53f 100644
--- a/tester/rtems/testing/bsps/h8sxsim-run.ini
+++ b/tester/rtems/testing/bsps/h8sxsim-run.ini
@@ -31,8 +31,9 @@
 #
 # The h8sxsim BSP
 #
-[h8sxsim]
-tester       = %{_rtscripts}/run.cfg
+[h8sxsim-run]
+bsp          = h8sxsim
 arch         = h8300
+tester       = %{_rtscripts}/run.cfg
 bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
 bsp_run_opts = -a -nouartrx
diff --git a/tester/rtems/testing/bsps/h8sxsim.ini b/tester/rtems/testing/bsps/h8sxsim.ini
index 85fe9ce..d67f68e 100644
--- a/tester/rtems/testing/bsps/h8sxsim.ini
+++ b/tester/rtems/testing/bsps/h8sxsim.ini
@@ -32,8 +32,9 @@
 # The h8sxsim BSP
 #
 [h8sxsim]
-tester         = %{_rtscripts}/gdb.cfg
+bsp            = h8sxsim
 arch           = h8300
+tester         = %{_rtscripts}/gdb.cfg
 gdb_script     = bsp_gdb_script
 bsp_gdb_script = target sim
                  load
diff --git a/tester/rtems/testing/bsps/jmr3904-run.ini b/tester/rtems/testing/bsps/jmr3904-run.ini
index 0591697..c3dbb13 100644
--- a/tester/rtems/testing/bsps/jmr3904-run.ini
+++ b/tester/rtems/testing/bsps/jmr3904-run.ini
@@ -31,8 +31,9 @@
 #
 # The JMR3904 BSP
 #
-[jmr3904]
-tester       = %{_rtscripts}/run.cfg
+[jmr3904-run]
+bsp          = jmr3904
 arch         = mipstx39
+tester       = %{_rtscripts}/run.cfg
 bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
 bsp_run_opts = --board=jmr3904
diff --git a/tester/rtems/testing/bsps/jmr3904.ini b/tester/rtems/testing/bsps/jmr3904.ini
index 7588df6..6690a7c 100644
--- a/tester/rtems/testing/bsps/jmr3904.ini
+++ b/tester/rtems/testing/bsps/jmr3904.ini
@@ -32,8 +32,9 @@
 # The JMR3904 BSP
 #
 [jmr3904]
-tester         = %{_rtscripts}/gdb.cfg
+bsp            = jmr3904
 arch           = mipstx39
+tester         = %{_rtscripts}/gdb.cfg
 gdb_script     = bsp_gdb_script
 bsp_gdb_script = target sim --board=jmr3904
                  load
diff --git a/tester/rtems/testing/bsps/leon2-run.ini b/tester/rtems/testing/bsps/leon2-run.ini
index 2ff5b20..0e54579 100644
--- a/tester/rtems/testing/bsps/leon2-run.ini
+++ b/tester/rtems/testing/bsps/leon2-run.ini
@@ -31,8 +31,9 @@
 #
 # The leon2 BSP
 #
-[leon2]
-tester       = %{_rtscripts}/run.cfg
+[leon2-run]
+bsp          = leon2
 arch         = sparc
+tester       = %{_rtscripts}/run.cfg
 bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-sis
 bsp_run_opts = -leon2
diff --git a/tester/rtems/testing/bsps/leon2-sis.ini b/tester/rtems/testing/bsps/leon2-sis.ini
index b1c8b1f..61205ad 100644
--- a/tester/rtems/testing/bsps/leon2-sis.ini
+++ b/tester/rtems/testing/bsps/leon2-sis.ini
@@ -31,8 +31,9 @@
 #
 # The leon2 BSP
 #
-[leon2]
-tester       = %{_rtscripts}/run.cfg
+[leon2-sis]
+bsp          = leon2
 arch         = sparc
+tester       = %{_rtscripts}/run.cfg
 bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-sis
 bsp_run_opts = -leon2 -nouartrx -r -tlim 200 s
diff --git a/tester/rtems/testing/bsps/leon2.ini b/tester/rtems/testing/bsps/leon2.ini
index a4186ba..d385012 100644
--- a/tester/rtems/testing/bsps/leon2.ini
+++ b/tester/rtems/testing/bsps/leon2.ini
@@ -32,8 +32,9 @@
 # The leon2 BSP
 #
 [leon2]
-tester         = %{_rtscripts}/gdb.cfg
+bsp            = leon2
 arch           = sparc
+tester         = %{_rtscripts}/gdb.cfg
 gdb_script     = leon2_gdb_script
 bsp_gdb_script = target sim -leon2
                  load
diff --git a/tester/rtems/testing/bsps/leon3-run.ini b/tester/rtems/testing/bsps/leon3-run.ini
index 6d844c7..7e37e5f 100644
--- a/tester/rtems/testing/bsps/leon3-run.ini
+++ b/tester/rtems/testing/bsps/leon3-run.ini
@@ -31,8 +31,9 @@
 #
 # The leon3 BSP
 #
-[leon3]
-tester       = %{_rtscripts}/run.cfg
+[leon3-run]
+bsp          = leon3
 arch         = sparc
+tester       = %{_rtscripts}/run.cfg
 bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-sis
 bsp_run_opts = -leon3
diff --git a/tester/rtems/testing/bsps/leon3-sis.ini b/tester/rtems/testing/bsps/leon3-sis.ini
index e31a181..d2a9e05 100644
--- a/tester/rtems/testing/bsps/leon3-sis.ini
+++ b/tester/rtems/testing/bsps/leon3-sis.ini
@@ -31,8 +31,9 @@
 #
 # The leon3 BSP
 #
-[leon3]
-tester       = %{_rtscripts}/run.cfg
+[leon3-sis]
+bsp          = leon3
 arch         = sparc
+tester       = %{_rtscripts}/run.cfg
 bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-sis
 bsp_run_opts = -leon3 -nouartrx -r -tlim 200 s
diff --git a/tester/rtems/testing/bsps/leon3.ini b/tester/rtems/testing/bsps/leon3.ini
index 874129b..74eafb7 100644
--- a/tester/rtems/testing/bsps/leon3.ini
+++ b/tester/rtems/testing/bsps/leon3.ini
@@ -32,8 +32,9 @@
 # The leon3 BSP
 #
 [leon3]
-tester         = %{_rtscripts}/gdb.cfg
+bsp            = leon3
 arch           = sparc
+tester         = %{_rtscripts}/gdb.cfg
 gdb_script     = bsp_gdb_script
 bsp_gdb_script = target sim -leon3
                  load
diff --git a/tester/rtems/testing/bsps/leon3_tsim-run.ini b/tester/rtems/testing/bsps/leon3_tsim-run.ini
index bbff25b..7da7014 100644
--- a/tester/rtems/testing/bsps/leon3_tsim-run.ini
+++ b/tester/rtems/testing/bsps/leon3_tsim-run.ini
@@ -32,8 +32,9 @@
 # The LEON3 BSP on TSIM
 #
 #
-[tsim_leon3]
-tester       = %{_rtscripts}/run.cfg
+[leon3_tsim-run]
+bsp          = leon3
 arch         = sparc
+tester       = %{_rtscripts}/run.cfg
 bsp_run_cmd  = tsim-leon3
 bsp_run_opts = -c %{_rtscripts}/bsps/leon3-tsim-cmds
diff --git a/tester/rtems/testing/bsps/leon3_tsim.ini b/tester/rtems/testing/bsps/leon3_tsim.ini
index 8d69f96..753ecbb 100644
--- a/tester/rtems/testing/bsps/leon3_tsim.ini
+++ b/tester/rtems/testing/bsps/leon3_tsim.ini
@@ -32,8 +32,9 @@
 # The LEON3 BSP running on TSIM
 #
 [leon3_tsim]
-tester         = %{_rtscripts}/gdb.cfg
+bsp            = leon3
 arch           = sparc
+tester         = %{_rtscripts}/gdb.cfg
 gdb_script     = bsp_gdb_script
 bsp_gdb_script = target remote :1234
                  load
diff --git a/tester/rtems/testing/bsps/lm32_evr_gdbsim-run.ini b/tester/rtems/testing/bsps/lm32_evr_gdbsim-run.ini
index 03b6570..613e12b 100644
--- a/tester/rtems/testing/bsps/lm32_evr_gdbsim-run.ini
+++ b/tester/rtems/testing/bsps/lm32_evr_gdbsim-run.ini
@@ -31,8 +31,9 @@
 #
 # The lm32_evr_gdbsim BSP
 #
-[lm32_evr_gdbsim]
-tester       = %{_rtscripts}/run.cfg
+[lm32_evr_gdbsim-run]
+bsp          = lm32_evr_gdbsim
 arch         = lm32
+tester       = %{_rtscripts}/run.cfg
 bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
 bsp_run_opts = --hw-file %{_rtscripts}/bsps/lm32_evr_gdbsim-device-tree --memory-region 0x08000000,0x4000000
diff --git a/tester/rtems/testing/bsps/lm32_evr_gdbsim.ini b/tester/rtems/testing/bsps/lm32_evr_gdbsim.ini
index e8319a2..1e16544 100644
--- a/tester/rtems/testing/bsps/lm32_evr_gdbsim.ini
+++ b/tester/rtems/testing/bsps/lm32_evr_gdbsim.ini
@@ -32,8 +32,9 @@
 # The lm32_evr_gdbsim BSP
 #
 [lm32_evr_gdbsim]
-tester         = %{_rtscripts}/gdb.cfg
+bsp            = lm32_evr_gdbsim
 arch           = lm32
+tester         = %{_rtscripts}/gdb.cfg
 gdb_script     = bdp_gdb_script
 bsp_gdb_script = tar sim --hw-file %{_rtscripts}/bsps/lm32_evr_gdbsim-device-tree --memory-region 0x08000000,0x4000000
                  load
diff --git a/tester/rtems/testing/bsps/m32csim-run.ini b/tester/rtems/testing/bsps/m32csim-run.ini
index a584660..e9189d0 100644
--- a/tester/rtems/testing/bsps/m32csim-run.ini
+++ b/tester/rtems/testing/bsps/m32csim-run.ini
@@ -31,8 +31,9 @@
 #
 # The m32csim BSP
 #
-[m32csim]
-tester       = %{_rtscripts}/run.cfg
+[m32csim-run]
+bsp          = m32csim
 arch         = m32c
+tester       = %{_rtscripts}/run.cfg
 bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
 bsp_run_opts = -a -nouartrx
diff --git a/tester/rtems/testing/bsps/m32csim.ini b/tester/rtems/testing/bsps/m32csim.ini
index b472efb..e091086 100644
--- a/tester/rtems/testing/bsps/m32csim.ini
+++ b/tester/rtems/testing/bsps/m32csim.ini
@@ -32,8 +32,9 @@
 # The m32csim BSP
 #
 [m32csim]
-tester         = %{_rtscripts}/gdb.cfg
+bsp            = m32csim
 arch           = m32c
+tester         = %{_rtscripts}/gdb.cfg
 gdb_script     = bsp_gdb_script
 bsp_gdb_script = target sim
                  load
diff --git a/tester/rtems/testing/bsps/mcf5235.ini b/tester/rtems/testing/bsps/mcf5235.ini
index 01ddce6..00f6a26 100644
--- a/tester/rtems/testing/bsps/mcf5235.ini
+++ b/tester/rtems/testing/bsps/mcf5235.ini
@@ -32,7 +32,8 @@
 # The Coldfire Axiom MCF5235 connected via BDM.
 #
 [mcf5235]
+bsp      = mcf5235
+arch     = m68k
 jobs     = 1
 tester   = %{_rtscripts}/gdb.cfg
-arch     = m68k
 requires = bsp_tty_dev, gdb_script
diff --git a/tester/rtems/testing/bsps/pc.ini b/tester/rtems/testing/bsps/pc.ini
index 1762f16..93a5dae 100644
--- a/tester/rtems/testing/bsps/pc.ini
+++ b/tester/rtems/testing/bsps/pc.ini
@@ -29,8 +29,9 @@
 #
 
 [pc]
+bsp           = pc686
+arch          = i386
 jobs          = 1
 tester        = %{_rtscripts}/tftp.cfg
-arch          = i386
 test_restarts = 3
 requires      = bsp_tty_dev, target_on_command, target_off_command, target_reset_command
diff --git a/tester/rtems/testing/bsps/psim-run.ini b/tester/rtems/testing/bsps/psim-run.ini
index b9abebe..854269a 100644
--- a/tester/rtems/testing/bsps/psim-run.ini
+++ b/tester/rtems/testing/bsps/psim-run.ini
@@ -33,8 +33,9 @@
 #
 # Warning: This is not working cleanly on MacOS. I am not sure why. The gdb version does work.
 #
-[psim]
-tester       = %{_rtscripts}/run.cfg
+[psim-run]
+bsp          = psim
 arch         = powerpc
+tester       = %{_rtscripts}/run.cfg
 bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
 bsp_run_opts = -f %{_rtscripts}/bsps/psim-device-tree
diff --git a/tester/rtems/testing/bsps/psim.ini b/tester/rtems/testing/bsps/psim.ini
index 2eb3d8b..e537622 100644
--- a/tester/rtems/testing/bsps/psim.ini
+++ b/tester/rtems/testing/bsps/psim.ini
@@ -32,8 +32,9 @@
 # The PSIM BSP
 #
 [psim]
-tester         = %{_rtscripts}/gdb.cfg
+bsp            = psim
 arch           = powerpc
+tester         = %{_rtscripts}/gdb.cfg
 gdb_script     = bsp_gdb_script
 bsp_gdb_script = target sim -f %{_rtscripts}/bsps/psim-device-tree
                  load
diff --git a/tester/rtems/testing/bsps/realview_pbx_a9_qemu.ini b/tester/rtems/testing/bsps/realview_pbx_a9_qemu.ini
index 49d758e..68e7f31 100644
--- a/tester/rtems/testing/bsps/realview_pbx_a9_qemu.ini
+++ b/tester/rtems/testing/bsps/realview_pbx_a9_qemu.ini
@@ -32,6 +32,7 @@
 # The Realview PBX A9 BSP.
 #
 [realview_pbx_a9_qemu]
-tester        = %{_rtscripts}/qemu.cfg
+bsp           = realview_pbx_a9_qemu
 arch          = arm
+tester        = %{_rtscripts}/qemu.cfg
 bsp_qemu_opts = %{qemu_opts_base} %{qemu_opts_no_net} -M realview-pbx-a9 -m 256M
diff --git a/tester/rtems/testing/bsps/simsh1-run.ini b/tester/rtems/testing/bsps/simsh1-run.ini
index 1244cb3..7f21712 100644
--- a/tester/rtems/testing/bsps/simsh1-run.ini
+++ b/tester/rtems/testing/bsps/simsh1-run.ini
@@ -31,8 +31,9 @@
 #
 # The simsh1 BSP
 #
-[simsh1]
-tester       = %{_rtscripts}/run.cfg
+[simsh1-run]
+bsp          = simsh1
 arch         = sh
+tester       = %{_rtscripts}/run.cfg
 bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
 bsp_run_opts = -a -nouartrx
diff --git a/tester/rtems/testing/bsps/simsh1.ini b/tester/rtems/testing/bsps/simsh1.ini
index 66da1bb..8c82c46 100644
--- a/tester/rtems/testing/bsps/simsh1.ini
+++ b/tester/rtems/testing/bsps/simsh1.ini
@@ -32,8 +32,9 @@
 # The simsh1 BSP
 #
 [simsh1]
-tester         = %{_rtscripts}/gdb.cfg
+bsp            = simsh1
 arch           = sh
+tester         = %{_rtscripts}/gdb.cfg
 gdb_script     = bsp_gdb_script
 bsp_gdb_script = target sim
                  load
diff --git a/tester/rtems/testing/bsps/simsh2-run.ini b/tester/rtems/testing/bsps/simsh2-run.ini
index fa604b9..d269dad 100644
--- a/tester/rtems/testing/bsps/simsh2-run.ini
+++ b/tester/rtems/testing/bsps/simsh2-run.ini
@@ -31,8 +31,9 @@
 #
 # The simsh2 BSP
 #
-[simsh2]
-tester       = %{_rtscripts}/run.cfg
+[simsh2-run]
+bsp          = simsh2
 arch         = sh
+tester       = %{_rtscripts}/run.cfg
 bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
 bsp_run_opts = -a -nouartrx
diff --git a/tester/rtems/testing/bsps/simsh2.ini b/tester/rtems/testing/bsps/simsh2.ini
index 5158e0f..269dd76 100644
--- a/tester/rtems/testing/bsps/simsh2.ini
+++ b/tester/rtems/testing/bsps/simsh2.ini
@@ -32,8 +32,9 @@
 # The simsh2 BSP
 #
 [simsh2]
-tester         = %{_rtscripts}/gdb.cfg
+bsp            = simsh2
 arch           = sh
+tester         = %{_rtscripts}/gdb.cfg
 gdb_script     = bsp_gdb_script
 bsp_gdb_script = target sim
                  load
diff --git a/tester/rtems/testing/bsps/simsh2e-run.ini b/tester/rtems/testing/bsps/simsh2e-run.ini
index 112d95e..b1356db 100644
--- a/tester/rtems/testing/bsps/simsh2e-run.ini
+++ b/tester/rtems/testing/bsps/simsh2e-run.ini
@@ -31,8 +31,9 @@
 #
 # The simsh2e BSP
 #
-[simsh2e]
-tester       = %{_rtscripts}/run.cfg
+[simsh2e-run]
+bsp          = simsh2e
 arch         = sh
+tester       = %{_rtscripts}/run.cfg
 bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
 bsp_run_opts = -a -nouartrx
diff --git a/tester/rtems/testing/bsps/simsh2e.ini b/tester/rtems/testing/bsps/simsh2e.ini
index f54515b..3185c8c 100644
--- a/tester/rtems/testing/bsps/simsh2e.ini
+++ b/tester/rtems/testing/bsps/simsh2e.ini
@@ -32,8 +32,9 @@
 # The simsh2e BSP
 #
 [simsh2e]
-tester         = %{_rtscripts}/gdb.cfg
+bsp            = simsh2e
 arch           = sh
+tester         = %{_rtscripts}/gdb.cfg
 gdb_script     = simsh2e_gdb_script
 bsp_gdb_script = target sim
                  load
diff --git a/tester/rtems/testing/bsps/simsh4-run.ini b/tester/rtems/testing/bsps/simsh4-run.ini
index e175126..648dbdc 100644
--- a/tester/rtems/testing/bsps/simsh4-run.ini
+++ b/tester/rtems/testing/bsps/simsh4-run.ini
@@ -31,8 +31,9 @@
 #
 # The simsh4 BSP
 #
-[simsh4]
-tester       = %{_rtscripts}/run.cfg
+[simsh4-run]
+bsp          = simsh4
 arch         = sh
+tester       = %{_rtscripts}/run.cfg
 bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
 bsp_run_opts = -a -nouartrx
diff --git a/tester/rtems/testing/bsps/simsh4.ini b/tester/rtems/testing/bsps/simsh4.ini
index 1e80553..047483f 100644
--- a/tester/rtems/testing/bsps/simsh4.ini
+++ b/tester/rtems/testing/bsps/simsh4.ini
@@ -32,8 +32,9 @@
 # The simsh4 BSP
 #
 [simsh4]
-tester         = %{_rtscripts}/gdb.cfg
+bsp            = simsh4
 arch           = sh
+tester         = %{_rtscripts}/gdb.cfg
 gdb_script     = bsp_gdb_script
 bsp_gdb_script = target sim
                  load
diff --git a/tester/rtems/testing/bsps/sis-run.ini b/tester/rtems/testing/bsps/sis-run.ini
index 0e037a1..55c30ac 100644
--- a/tester/rtems/testing/bsps/sis-run.ini
+++ b/tester/rtems/testing/bsps/sis-run.ini
@@ -31,8 +31,9 @@
 #
 # The SIS BSP
 #
-[sis]
-tester       = %{_rtscripts}/run.cfg
+[sis-run]
+bsp          = sis
 arch         = sparc
+tester       = %{_rtscripts}/run.cfg
 bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
 bsp_run_opts = -a -nouartrx
diff --git a/tester/rtems/testing/bsps/sis.ini b/tester/rtems/testing/bsps/sis.ini
index e76b10a..b5d700f 100644
--- a/tester/rtems/testing/bsps/sis.ini
+++ b/tester/rtems/testing/bsps/sis.ini
@@ -32,8 +32,9 @@
 # The SIS BSP
 #
 [sis]
-tester         = %{_rtscripts}/gdb.cfg
+bsp            = sis
 arch           = sparc
+tester         = %{_rtscripts}/gdb.cfg
 gdb_script     = bsp_gdb_script
 bsp_gdb_script = target sim -a -nouartrx
                  load
diff --git a/tester/rtems/testing/bsps/v850e1sim-run.ini b/tester/rtems/testing/bsps/v850e1sim-run.ini
index 97371d5..1329a48 100644
--- a/tester/rtems/testing/bsps/v850e1sim-run.ini
+++ b/tester/rtems/testing/bsps/v850e1sim-run.ini
@@ -31,8 +31,9 @@
 #
 # The v850e1sim BSP
 #
-[v850e1sim]
-tester       = %{_rtscripts}/run.cfg
+[v850e1sim-run]
+bsp          = v850e1sim
 arch         = v850
+tester       = %{_rtscripts}/run.cfg
 bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
 bsp_run_opts = -a -nouartrx
diff --git a/tester/rtems/testing/bsps/v850e1sim.ini b/tester/rtems/testing/bsps/v850e1sim.ini
index 7800834..5b484ea 100644
--- a/tester/rtems/testing/bsps/v850e1sim.ini
+++ b/tester/rtems/testing/bsps/v850e1sim.ini
@@ -32,8 +32,9 @@
 # The v850e1sim BSP
 #
 [v850e1sim]
-tester         = %{_rtscripts}/gdb.cfg
+bsp            = v850e1sim
 arch           = v850
+tester         = %{_rtscripts}/gdb.cfg
 gdb_script     = gdb_gdb_script
 bsp_gdb_script = target sim
                  load
diff --git a/tester/rtems/testing/bsps/v850e2sim-run.ini b/tester/rtems/testing/bsps/v850e2sim-run.ini
index e3fd0d0..f905eee 100644
--- a/tester/rtems/testing/bsps/v850e2sim-run.ini
+++ b/tester/rtems/testing/bsps/v850e2sim-run.ini
@@ -31,8 +31,9 @@
 #
 # The v850e2sim BSP
 #
-[v850e2sim]
-tester       = %{_rtscripts}/run.cfg
+[v850e2sim-run]
+bsp          = v850e2sim
 arch         = v850
+tester       = %{_rtscripts}/run.cfg
 bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
 bsp_run_opts = -a -nouartrx
diff --git a/tester/rtems/testing/bsps/v850e2sim.ini b/tester/rtems/testing/bsps/v850e2sim.ini
index 486c4f1..9aa45c4 100644
--- a/tester/rtems/testing/bsps/v850e2sim.ini
+++ b/tester/rtems/testing/bsps/v850e2sim.ini
@@ -32,8 +32,9 @@
 # The v850e2sim BSP
 #
 [v850e2sim]
-tester         = %{_rtscripts}/gdb.cfg
+bsp            = v850e2sim
 arch           = v850
+tester         = %{_rtscripts}/gdb.cfg
 gdb_script     = bsp_gdb_script
 bsp_gdb_script = target sim
                  load
diff --git a/tester/rtems/testing/bsps/v850e2v3sim-run.ini b/tester/rtems/testing/bsps/v850e2v3sim-run.ini
index a1d9c73..0aae81a 100644
--- a/tester/rtems/testing/bsps/v850e2v3sim-run.ini
+++ b/tester/rtems/testing/bsps/v850e2v3sim-run.ini
@@ -31,8 +31,9 @@
 #
 # The v850e2v3sim BSP
 #
-[v850e2v3sim]
-tester       = %{_rtscripts}/run.cfg
+[v850e2v3sim-run]
+bsp          = v850e2v3sim
 arch         = v850
+tester       = %{_rtscripts}/run.cfg
 bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
 bsp_run_opts = -a -nouartrx
diff --git a/tester/rtems/testing/bsps/v850e2v3sim.ini b/tester/rtems/testing/bsps/v850e2v3sim.ini
index 0d95eec..650f559 100644
--- a/tester/rtems/testing/bsps/v850e2v3sim.ini
+++ b/tester/rtems/testing/bsps/v850e2v3sim.ini
@@ -32,8 +32,9 @@
 # The v850e2v3sim BSP
 #
 [v850e2v3sim]
-tester         = %{_rtscripts}/gdb.cfg
+bsp            = v850e2v3sim
 arch           = v850
+tester         = %{_rtscripts}/gdb.cfg
 gdb_script     = v850e2v3sim_gdb_script
 bsp_gdb_script = target sim
                  load
diff --git a/tester/rtems/testing/bsps/v850esim-run.ini b/tester/rtems/testing/bsps/v850esim-run.ini
index b652bdf..61cf5a3 100644
--- a/tester/rtems/testing/bsps/v850esim-run.ini
+++ b/tester/rtems/testing/bsps/v850esim-run.ini
@@ -31,8 +31,9 @@
 #
 # The v850esim BSP
 #
-[v850esim]
-tester       = %{_rtscripts}/run.cfg
+[v850esim-run]
+bsp          = v850esim
 arch         = v850
+tester       = %{_rtscripts}/run.cfg
 bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
 bsp_run_opts = -a -nouartrx
diff --git a/tester/rtems/testing/bsps/v850esim.ini b/tester/rtems/testing/bsps/v850esim.ini
index 46b8380..29f0aef 100644
--- a/tester/rtems/testing/bsps/v850esim.ini
+++ b/tester/rtems/testing/bsps/v850esim.ini
@@ -32,8 +32,9 @@
 # The v850esim BSP
 #
 [v850esim]
-tester         = %{_rtscripts}/gdb.cfg
+bsp            = v850esim
 arch           = v850
+tester         = %{_rtscripts}/gdb.cfg
 gdb_script     = bsp_gdb_script
 bsp_gdb_script = target sim
                  load
diff --git a/tester/rtems/testing/bsps/v850essim-run.ini b/tester/rtems/testing/bsps/v850essim-run.ini
index 5f56dc7..e49911a 100644
--- a/tester/rtems/testing/bsps/v850essim-run.ini
+++ b/tester/rtems/testing/bsps/v850essim-run.ini
@@ -31,8 +31,9 @@
 #
 # The v850essim BSP
 #
-[v850essim]
-tester       = %{_rtscripts}/run.cfg
+[v850essim-run]
+bsp          = v850essim
 arch         = v850
+tester       = %{_rtscripts}/run.cfg
 bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
 bsp_run_opts = -a -nouartrx
diff --git a/tester/rtems/testing/bsps/v850essim.ini b/tester/rtems/testing/bsps/v850essim.ini
index 9047d8f..3689d8f 100644
--- a/tester/rtems/testing/bsps/v850essim.ini
+++ b/tester/rtems/testing/bsps/v850essim.ini
@@ -32,8 +32,9 @@
 # The v850essim BSP
 #
 [v850essim]
-tester         = %{_rtscripts}/gdb.cfg
+bsp            = v850essim
 arch           = v850
+tester         = %{_rtscripts}/gdb.cfg
 gdb_script     = bsp_gdb_script
 bsp_gdb_script = target sim
                  load
diff --git a/tester/rtems/testing/bsps/v850sim-run.ini b/tester/rtems/testing/bsps/v850sim-run.ini
index e71f28c..2ebe9a0 100644
--- a/tester/rtems/testing/bsps/v850sim-run.ini
+++ b/tester/rtems/testing/bsps/v850sim-run.ini
@@ -31,8 +31,9 @@
 #
 # The v850sim BSP
 #
-[v850sim]
-tester       = %{_rtscripts}/run.cfg
+[v850sim-run]
+bsp          = v850sim
 arch         = v850
+tester       = %{_rtscripts}/run.cfg
 bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
 bsp_run_opts = -a -nouartrx
diff --git a/tester/rtems/testing/bsps/v850sim.ini b/tester/rtems/testing/bsps/v850sim.ini
index 211b859..f83dd0f 100644
--- a/tester/rtems/testing/bsps/v850sim.ini
+++ b/tester/rtems/testing/bsps/v850sim.ini
@@ -32,9 +32,10 @@
 # The v850sim BSP
 #
 [v850sim]
-tester        = %{_rtscripts}/gdb.cfg
-arch          = v850
-gdb_script    = bsp_gdb_script
+bsp            = v850sim
+arch           = v850
+tester         = %{_rtscripts}/gdb.cfg
+gdb_script     = bsp_gdb_script
 bsp_gdb_script = target sim
                  load
                  run
diff --git a/tester/rtems/testing/bsps/xilinx_zynq_a9_qemu.ini b/tester/rtems/testing/bsps/xilinx_zynq_a9_qemu.ini
index 843e3fa..6fba113 100644
--- a/tester/rtems/testing/bsps/xilinx_zynq_a9_qemu.ini
+++ b/tester/rtems/testing/bsps/xilinx_zynq_a9_qemu.ini
@@ -32,6 +32,7 @@
 # The Xilinx Zynq A9 QEMU BSP
 #
 [xilinx_zynq_a9_qemu]
-tester        = %{_rtscripts}/qemu.cfg
+bsp           = xilinx_zynq_a9_qemu
 arch          = arm
+tester        = %{_rtscripts}/qemu.cfg
 bsp_qemu_opts = %{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.ini b/tester/rtems/testing/bsps/xilinx_zynq_a9_qemu_smp.ini
index a1e3323..f49d381 100644
--- a/tester/rtems/testing/bsps/xilinx_zynq_a9_qemu_smp.ini
+++ b/tester/rtems/testing/bsps/xilinx_zynq_a9_qemu_smp.ini
@@ -31,8 +31,9 @@
 #
 # The Xilinx Zynq A9 QEMU BSP
 #
-[xilinx_zynq_a9_qemu]
+[xilinx_zynq_a9_qemu_smp]
+bsp           = xilinx_zynq_a9_qemu
+arch          = arm
 jobs          = half
 tester        = %{_rtscripts}/qemu.cfg
-arch          = arm
 bsp_qemu_opts = %{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.ini b/tester/rtems/testing/bsps/xilinx_zynq_zc706.ini
index 34e1cff..e543022 100644
--- a/tester/rtems/testing/bsps/xilinx_zynq_zc706.ini
+++ b/tester/rtems/testing/bsps/xilinx_zynq_zc706.ini
@@ -33,8 +33,9 @@
 # is connected to a tty device.
 #
 [xilinx_zynq_zc706]
+bsp        = xilinx_zynq_zc706
+arch       = arm
 jobs       = 1
 tester     = %{_rtscripts}/gdb.cfg
-arch       = arm
 gdb_script = bsp_gdb_script
 requires   = bsp_tty_dev, bsp_gdb_script
diff --git a/tester/rtems/testing/bsps/xilinx_zynq_zc706_qemu.ini b/tester/rtems/testing/bsps/xilinx_zynq_zc706_qemu.ini
index 6f0f02b..7abc34e 100644
--- a/tester/rtems/testing/bsps/xilinx_zynq_zc706_qemu.ini
+++ b/tester/rtems/testing/bsps/xilinx_zynq_zc706_qemu.ini
@@ -31,7 +31,8 @@
 #
 # The Xilinx Zync ZC706 running QEMU
 #
-[xilinx_zynq_zc706]
-tester        = %{_rtscripts}/qemu.cfg
+[xilinx_zynq_zc706_qemu]
+bsp           = xilinx_zynq_zc706
 arch          = arm
+tester        = %{_rtscripts}/qemu.cfg
 bsp_qemu_opts = %{qemu_opts_base} %{qemu_opts_no_net} -M xilinx-zynq-a9 -m 1024M
diff --git a/tester/rtems/testing/bsps/xilinx_zynq_zedboard.ini b/tester/rtems/testing/bsps/xilinx_zynq_zedboard.ini
index e8fa563..4404a67 100644
--- a/tester/rtems/testing/bsps/xilinx_zynq_zedboard.ini
+++ b/tester/rtems/testing/bsps/xilinx_zynq_zedboard.ini
@@ -33,9 +33,10 @@
 # is connected to a telnet tty device.
 #
 [xilinx_zynq_zedboard]
+bsp                = xilinx_zynq_zedboard
+arch               = arm
 jobs               = 1
 tester             = %{_rtscripts}/tftp.cfg
-arch               = arm
 test_restarts      = 3
 target_reset_regex = ^No ethernet found.*|^BOOTP broadcast 6.*|^.+complete\.+ TIMEOUT.*
 target_start_regex = ^U-Boot SPL .*