config: Remove RTEMS version

- Buildset scripts automatically move RTEMS versions

- Some configs will not work on 5 and will be removed once branched

27 files changed, 95 insertions, 142 deletions

diff --git a/builds.py b/builds.py
index 213fe38..385d204 100644
--- a/builds.py
+++ b/builds.py
@@ -28,35 +28,30 @@ RSB Deployment Builds
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-rtems_version_default = 6
-
-configs = {
-    5: [],
-    6: [
-        {
-            'buildset': '6/test/aarch64-bsps-bad-opts',
-            'good': False,
-            'dry-run': True
-        },
-        {
-            'buildset': '6/test/aarch64-bsps',
-            'good': True,
-            'dry-run': True
-        },
-        {
-            'buildset': '6/test/aarch64-bsps-opts',
-            'good': True,
-            'dry-run': True
-        },
-        {
-            'buildset': '6/test/aarch64-config',
-            'good': True,
-            'dry-run': True
-        },
-        {
-            'buildset': '6/test/aarch64-powerpc-config',
-            'good': True,
-            'dry-run': True
-        },
-    ],
-}
+configs = [
+    {
+        'buildset': 'test/arm-bsps-bad-opts',
+        'good': False,
+        'dry-run': True
+    },
+    {
+        'buildset': 'test/sparc-bsps',
+        'good': True,
+        'dry-run': True
+    },
+    {
+        'buildset': 'test/arm-bsps-opts',
+        'good': True,
+        'dry-run': True
+    },
+    {
+        'buildset': 'test/aarch64-config',
+        'good': True,
+        'dry-run': True
+    },
+    {
+        'buildset': 'test/aarch64-powerpc-config',
+        'good': True,
+        'dry-run': True
+    },
+]
diff --git a/config/5/project-tools-bsp.bset b/config/5/project-tools-bsp.bset
deleted file mode 100644
index cce74ce..0000000
--- a/config/5/project-tools-bsp.bset
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Project Tools and BSP
-#
-%define with_rtems_bsp     powerpc/mvme2307
-5/rtems-powerpc
-5/rtems-kernel
diff --git a/config/5/project-tools.bset b/config/5/project-tools.bset
deleted file mode 100644
index ecd55e7..0000000
--- a/config/5/project-tools.bset
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Project Tools
-#
-5/rtems-powerpc
diff --git a/config/6/polarfire-icicle-bsp.bset b/config/6/polarfire-icicle-bsp.bset
deleted file mode 100644
index 7da5bc7..0000000
--- a/config/6/polarfire-icicle-bsp.bset
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Microchip PolarFire Icicle Kit
-#
-%define with_rtems_bsp_config config/6/polarfire-icicle-bsp-smp.ini
-6/rtems-riscv
-6/rtems-kernel
diff --git a/config/6/project/aarch64-tools-bsp-libbsd-config.bset b/config/6/project/aarch64-tools-bsp-libbsd-config.bset
deleted file mode 100644
index 3102808..0000000
--- a/config/6/project/aarch64-tools-bsp-libbsd-config.bset
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Project Tools and BSPs
-#
-%define with_rtems_bsp_config config/6/project/aarch64-bsp.ini
-6/rtems-aarch64
-6/rtems-kernel
-6/rtems-libbsd
diff --git a/config/6/project/tools-bsp-config.bset b/config/6/project/tools-bsp-config.bset
deleted file mode 100644
index 8bd6233..0000000
--- a/config/6/project/tools-bsp-config.bset
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Project 1 Tools and BSPs
-#
-%define with_rtems_bsp_config config/6/project/bsps.ini
-6/rtems-aarch64
-6/rtems-arm
-6/rtems-kernel
diff --git a/config/6/project/tools.bset b/config/6/project/tools.bset
deleted file mode 100644
index aa2120b..0000000
--- a/config/6/project/tools.bset
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Project 1 Tools
-#
-6/rtems-aarch64
diff --git a/config/6/test/aarch64-bsps-bad-opts.bset b/config/6/test/aarch64-bsps-bad-opts.bset
deleted file mode 100644
index 81c55b8..0000000
--- a/config/6/test/aarch64-bsps-bad-opts.bset
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Gemini BSPs
-#
-# Build into the prefix path:
-#
-#  - PowerPC tools
-#  - RTEMS Kernel and BSP
-#
-
-%define mail_single_report 1
-
-%define with_rtems_bsp     aarch64/xilinx_versal_aiedge aarch64/xilinx_zynqmp_lp64_zu3eg
-%define with_rtems_bspopts A=B C=d
-%define rtems_target       aarch64-rtems%{rtems_version}
-%define rtems_host         %{rtems_target}
-
-6/rtems-aarch64
-6/rtems-kernel
diff --git a/config/6/test/aarch64-bsps-opts.bset b/config/6/test/aarch64-bsps-opts.bset
deleted file mode 100644
index 36408ae..0000000
--- a/config/6/test/aarch64-bsps-opts.bset
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Gemini BSPs
-#
-# Build into the prefix path:
-#
-#  - PowerPC tools
-#  - RTEMS Kernel and BSP
-#
-
-%define mail_single_report 1
-
-%define with_rtems_bsp     aarch64/xilinx_versal_aiedge
-%define with_rtems_bspopts BSP_XILINX_VERSAL_NOCACHE_LENGTH=0x4000000 BSP_XILINX_VERSAL_RAM_LENGTH=0x200000000
-%define rtems_target       aarch64-rtems%{rtems_version}
-%define rtems_host         %{rtems_target}
-
-6/rtems-aarch64
-6/rtems-kernel
diff --git a/config/6/test/aarch64-bsps.bset b/config/6/test/aarch64-bsps.bset
deleted file mode 100644
index dc335cf..0000000
--- a/config/6/test/aarch64-bsps.bset
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Gemini BSPs
-#
-# Build into the prefix path:
-#
-#  - PowerPC tools
-#  - RTEMS Kernel and BSP
-#
-
-%define with_rtems_bsp aarch64/xilinx_versal_aiedge aarch64/xilinx_zynqmp_lp64_zu3eg
-%define rtems_target   aarch64-rtems%{rtems_version}
-%define rtems_host     %{rtems_target}
-
-6/rtems-aarch64
-6/rtems-kernel
diff --git a/config/6/polarfire-icicle-bsp-smp.ini b/config/microchip/polarfire-icicle-bsp-smp.ini
index 254b1ff..254b1ff 100644
--- a/config/6/polarfire-icicle-bsp-smp.ini
+++ b/config/microchip/polarfire-icicle-bsp-smp.ini
diff --git a/config/microchip/polarfire-icicle-bsp.bset b/config/microchip/polarfire-icicle-bsp.bset
new file mode 100644
index 0000000..38e2ce6
--- /dev/null
+++ b/config/microchip/polarfire-icicle-bsp.bset
@@ -0,0 +1,6 @@
+#
+# Microchip PolarFire Icicle Kit
+#
+%define with_rtems_bsp_config config/microchip/polarfire-icicle-bsp-smp.ini
+%{rtems_version}/rtems-riscv
+%{rtems_version}/rtems-kernel
diff --git a/config/6/project/aarch64-bsp.ini b/config/project/aarch64-bsp.ini
index 230f3d7..b2199e7 100644
--- a/config/6/project/aarch64-bsp.ini
+++ b/config/project/aarch64-bsp.ini
@@ -1,5 +1,5 @@
 #
-# Project Aarch64 BSP
+# Deployment Example Project Aarch64 BSP
 #
 [DEFAULT]
 RTEMS_POSIX_API = True
diff --git a/config/project/aarch64-tools-bsp-libbsd-config.bset b/config/project/aarch64-tools-bsp-libbsd-config.bset
new file mode 100644
index 0000000..aac0256
--- /dev/null
+++ b/config/project/aarch64-tools-bsp-libbsd-config.bset
@@ -0,0 +1,7 @@
+#
+# Deployment Example Project Tools and BSPs
+#
+%define with_rtems_bsp_config config/project/aarch64-bsp.ini
+%{rtems_version}/rtems-aarch64
+%{rtems_version}/rtems-kernel
+%{rtems_version}/rtems-libbsd
diff --git a/config/6/project/aarch64-tools-bsp-libbsd.bset b/config/project/aarch64-tools-bsp-libbsd.bset
index 5c6233a..a4ecb14 100644
--- a/config/6/project/aarch64-tools-bsp-libbsd.bset
+++ b/config/project/aarch64-tools-bsp-libbsd.bset
@@ -1,9 +1,9 @@
 #
-# Project Tools, BSP and LibBSD
+# Deployment Example Project Tools, BSP and LibBSD
 #
 %define with_rtems_bsp     aarch64/xilinx_versal_aiedge
 %define with_rtems_bspopts BSP_XILINX_VERSAL_NOCACHE_LENGTH=0x4000000 \
                            BSP_XILINX_VERSAL_RAM_LENGTH=0x200000000
-6/rtems-aarch64
-6/rtems-kernel
-6/rtems-libbsd
+%{rtems_version}/rtems-aarch64
+%{rtems_version}/rtems-kernel
+%{rtems_version}/rtems-libbsd
diff --git a/config/6/project/bsps.ini b/config/project/bsps.ini
index 61f5cbe..38ae142 100644
--- a/config/6/project/bsps.ini
+++ b/config/project/bsps.ini
@@ -1,5 +1,5 @@
 #
-# Project BSPs
+# Deployment Example Project BSPs
 #
 [DEFAULT]
 RTEMS_POSIX_API = True
diff --git a/config/project/tools-bsp-config.bset b/config/project/tools-bsp-config.bset
new file mode 100644
index 0000000..fca1632
--- /dev/null
+++ b/config/project/tools-bsp-config.bset
@@ -0,0 +1,7 @@
+#
+# Deployment Example Project Tools and BSPs
+#
+%define with_rtems_bsp_config config/project/bsps.ini
+%{rtems_version}/rtems-aarch64
+%{rtems_version}/rtems-arm
+%{rtems_version}/rtems-kernel
diff --git a/config/6/project/tools-bsp.bset b/config/project/tools-bsp.bset
index 867ae77..2c0c0e7 100644
--- a/config/6/project/tools-bsp.bset
+++ b/config/project/tools-bsp.bset
@@ -1,8 +1,8 @@
 #
-# Project Tools and BSP
+# Deployment Example Project Tools and BSP
 #
 %define with_rtems_bsp     aarch64/xilinx_versal_aiedge
 %define with_rtems_bspopts BSP_XILINX_VERSAL_NOCACHE_LENGTH=0x4000000 \
                            BSP_XILINX_VERSAL_RAM_LENGTH=0x200000000
-6/rtems-aarch64
-6/rtems-kernel
+%{rtems_version}/rtems-aarch64
+%{rtems_version}/rtems-kernel
diff --git a/config/project/tools.bset b/config/project/tools.bset
new file mode 100644
index 0000000..b9705d1
--- /dev/null
+++ b/config/project/tools.bset
@@ -0,0 +1,4 @@
+#
+# Deployment Example Project Tools
+#
+%{rtems_version}/rtems-aarch64
diff --git a/config/6/test/aarch64-config.bset b/config/test/aarch64-config.bset
index a0c5fb9..a0c5fb9 100644
--- a/config/6/test/aarch64-config.bset
+++ b/config/test/aarch64-config.bset
diff --git a/config/6/test/aarch64-powerpc-config.bset b/config/test/aarch64-powerpc-config.bset
index 20140fe..20140fe 100644
--- a/config/6/test/aarch64-powerpc-config.bset
+++ b/config/test/aarch64-powerpc-config.bset
diff --git a/config/6/test/aarch64-powerpc.ini b/config/test/aarch64-powerpc.ini
index 478e4eb..478e4eb 100644
--- a/config/6/test/aarch64-powerpc.ini
+++ b/config/test/aarch64-powerpc.ini
diff --git a/config/test/arm-bsps-bad-opts.bset b/config/test/arm-bsps-bad-opts.bset
new file mode 100644
index 0000000..9674751
--- /dev/null
+++ b/config/test/arm-bsps-bad-opts.bset
@@ -0,0 +1,11 @@
+#
+# This test fails with bad options
+#
+
+%define mail_single_report 1
+
+%define with_rtems_bsp     arm/xilinx_zynq_zedboard arm/xilinx_zynq_a9_qemu
+%define with_rtems_bspopts A=B C=d
+
+%{rtems_version}/rtems-arm
+%{rtems_version}/rtems-kernel
diff --git a/config/test/arm-bsps-opts.bset b/config/test/arm-bsps-opts.bset
new file mode 100644
index 0000000..ff58e64
--- /dev/null
+++ b/config/test/arm-bsps-opts.bset
@@ -0,0 +1,12 @@
+#
+# Test options
+#
+
+%define mail_single_report 1
+
+%define with_rtems_bsp     arm/xilinx_zynq_zc706
+%define with_rtems_smp     1
+%define with_rtems_bspopts ZYNQ_RAM_LENGTH=0x10000000 ZYNQ_CLOCK_CPU_1X=100000000 BSP_ARM_A9MPCORE_PERIPHCLK=375000000
+
+%{rtems_version}/rtems-arm
+%{rtems_version}/rtems-kernel
diff --git a/config/6/test/bsps.ini b/config/test/bsps.ini
index eb35e27..eb35e27 100644
--- a/config/6/test/bsps.ini
+++ b/config/test/bsps.ini
diff --git a/config/test/sparc-bsps.bset b/config/test/sparc-bsps.bset
new file mode 100644
index 0000000..b931306
--- /dev/null
+++ b/config/test/sparc-bsps.bset
@@ -0,0 +1,8 @@
+#
+# BSPs test
+#
+
+%define with_rtems_bsp sparc/erc32 sparc/leon3
+
+%{rtems_version}/rtems-sparc
+%{rtems_target}/rtems-kernel
diff --git a/wscript b/wscript
index c5dfd12..363cb18 100644
--- a/wscript
+++ b/wscript
@@ -39,7 +39,7 @@ import os.path
 import shutil
 
 #
-# Provide a set of builds and the RTEMS version
+# Provide a set of builds with special settings
 #
 import builds
 
@@ -148,7 +148,7 @@ def set_builder_build(bld, build, dry_run=False, show=False):
 
 
 def find_buildsets(version):
-    path = os.path.join('config', str(version))
+    path = 'config'
     discovered = []
     for root, dirs, files in os.walk(path):
         base = root[len('config') + 1:]
@@ -156,8 +156,8 @@ def find_buildsets(version):
             r, e = os.path.splitext(f)
             if e == '.bset':
                 discovered += [os.path.join(base, r)]
-    bs_default = [bs['buildset'] for bs in builds.configs[version]]
-    bs = builds.configs[version] + [{
+    bs_default = [bs['buildset'] for bs in builds.configs]
+    bs = builds.configs + [{
         'buildset': b,
         'good': True,
         'dry-run': False
@@ -170,10 +170,6 @@ def options(opt):
                    default=None,
                    dest='rsb_path',
                    help='Path to the RTEMS Source Builder (RSB)')
-    opt.add_option('--rtems-version',
-                   default=builds.rtems_version_default,
-                   dest='rtems_version',
-                   help='Version of RTEMS')
     opt.add_option('--prefix',
                    default='/opt/rtems/deploy',
                    dest='prefix',
@@ -190,13 +186,6 @@ def configure(conf):
         conf.fatal('RSB path not provided as configure option')
     if not os.path.exists(conf.options.rsb_path):
         conf.fatal('RSB path not found: ' + conf.options.rsb_path)
-    try:
-        rtems_version = int(conf.options.rtems_version)
-    except:
-        conf.fatal('invalid RTEMS version: ' + conf.options.rtems_version)
-    if rtems_version not in builds.configs:
-        conf.fatal('unsupported RTEMS version: ' + conf.options.rtems_version)
-    conf.msg('RTEMS Version', rtems_version, 'GREEN')
     rsb_path = os.path.abspath(conf.options.rsb_path)
     rsb_set_builder = os.path.join(rsb_path, 'source-builder',
                                    'sb-set-builder')
@@ -211,7 +200,6 @@ def configure(conf):
     conf.msg('RSB Install mode', install, 'GREEN')
     conf.env.RSB_PATH = rsb_path
     conf.env.RSB_SET_BUILDER = rsb_set_builder
-    conf.env.RTEMS_VERSION = rtems_version
     conf.env.PREFIX = conf.options.prefix
     conf.env.NO_INSTALL = not conf.options.install