Hcarter/38 update softwaremap to handle new spec format

cheribsd.yaml

@@ -17,7 +17,7 @@ project_contribution:
 
     Portions of CheriBSD are being posted for upstreaming in a fork of [FreeBSD hosted at the CHERI Alliance](https://github.com/CHERI-Alliance/freebsd-src). This primarily exists for staging purposes and is not currently capable of producing a usable CHERI system, but can be used to examine patches in progress and validate them on non-CHERI targets.  The cheri branch is a rebased branch and may be unstable at times.  Snapshot are posted occasionally.  The latest snaphost is [2025.03.02](https://github.com/CHERI-Alliance/freebsd-src/releases/tag/cheri-2026.03.02).
   mailing_lists: |-
-    The following lists should be used: 
+    The following lists should be used:
       - [CheriBSD announcement mailing list (low volume)](https://lists.cam.ac.uk/sympa/info/cl-cheribsd-announce)
       - [CheriBSD general discussion](https://lists.cam.ac.uk/sympa/info/cl-cheribsd-discuss)
       - [CheriBSD ports and packages discussion](https://lists.cam.ac.uk/sympa/info/cl-cheribsd-ports)
@@ -33,7 +33,7 @@ project_contribution:
 buildingFromSource: "Please keep an eye out for our [blog](/blog/) as we will soon share instructions for building from source."
 
 software:
-  - arch: "aarch64c"
+  - arch: "riscv64c, aarch64c"
     releases:
      - version: "25.03"
        version_date: 2025-03-28
@@ -42,6 +42,11 @@ software:
        upstream_version: "15-CURRENT (1500026)"
        upstream_date: 2024-10-26
        upstream_url: "https://github.com/freebsd/freebsd-src/commit/87c2aab0a0b3db2a4690773b869e8cfc8b3ac6c2"
+       cheri_spec:
+        - name: UoC RISC-V ISAv9
+          version: "9"
+        - name: "ARM Morello"
+          version: A.k
        images:
          - label: "Installer Image"
            link: "https://download.cheribsd.org/releases/arm64/aarch64c/25.03/cheribsd-memstick-arm64-aarch64c-25.03.img.xz"
@@ -50,13 +55,18 @@ software:
            link: "https://www.cheribsd.org/release-notes/25.03/index.html"
          - label: "Installation Guide"
            link: "https://ctsrd-cheri.github.io/cheribsd-getting-started/morello-install/index.html"
-     - arch: "aarch64c"
+     - arch: "riscv64c, aarch64c"
        version: "24.05"
        version_date: 2024-07-19
        version_url: "https://github.com/CTSRD-CHERI/cheribsd/releases/tag/release%2F24.05"
        upstream_version: "15-CURRENT (1500011)"
        upstream_date: 2024-01-20
        upstream_url: "https://github.com/freebsd/freebsd-src/commit/4b3ffc5918b9968ea6ddee6f6cdf3538072e5ef4"
+       cheri_spec:
+        - name: UoC RISC-V ISAv9
+          version: "9"
+        - name: "ARM Morello"
+          version: A.k
        images:
          - label: "Installer Image"
            link: "https://download.cheribsd.org/releases/arm64/aarch64c/25.03/cheribsd-memstick-arm64-aarch64c-24.05.img.xz"
@@ -65,13 +75,18 @@ software:
            link: "https://www.cheribsd.org/release-notes/24.05/index.html"
          - label: "Installation Guide"
            link: "https://ctsrd-cheri.github.io/cheribsd-getting-started/morello-install/index.html"
-     - arch: "aarch64c"
+     - arch: "riscv64c, aarch64c"
        version: "23.11"
        version_date: 2023-12-12
        version_url: "https://github.com/CTSRD-CHERI/cheribsd/releases/tag/release%2F23.11"
        upstream_version: "14-CURRENT (1400094)"
        upstream_date: 2023-08-18
        upstream_url: "https://github.com/freebsd/freebsd-src/commit/d8bb58586d90a27852cc79f37aa890ac6397cc03"
+       cheri_spec:
+        - name: UoC RISC-V ISAv9
+          version: "9"
+        - name: "ARM Morello"
+          version: A.k
        images:
          - label: "Installer Image"
            link: "https://download.cheribsd.org/releases/arm64/aarch64c/25.03/cheribsd-memstick-arm64-aarch64c-23.11.img.xz"
@@ -80,13 +95,18 @@ software:
            link: "https://www.cheribsd.org/release-notes/23.11/index.html"
          - label: "Installation Guide"
            link: "https://ctsrd-cheri.github.io/cheribsd-getting-started/morello-install/index.html"
-     - arch: "aarch64c"
+     - arch: "riscv64c, aarch64c"
        version: "22.12"
        version_date: 2022-12-14
        version_url: "https://github.com/CTSRD-CHERI/cheribsd/releases/tag/release%2F22.12"
        upstream_version: "14-CURRENT (1400064)"
        upstream_date: 2022-07-29
        upstream_url: "https://github.com/freebsd/freebsd-src/commit/43eebd036447f5399dd4bfa9b9d3e4e6f6596f48"
+       cheri_spec:
+        - name: UoC RISC-V ISAv9
+          version: "9"
+        - name: "ARM Morello"
+          version: A.k
        images:
          - label: "Installer Image"
            link: "https://download.cheribsd.org/releases/arm64/aarch64c/25.03/cheribsd-memstick-arm64-aarch64c-22.12.img.xz"
@@ -95,13 +115,18 @@ software:
            link: "https://www.cheribsd.org/release-notes/22.12/index.html"
          - label: "Installation Guide"
            link: "https://ctsrd-cheri.github.io/cheribsd-getting-started/morello-install/index.html"
-     - arch: "aarch64c"
+     - arch: "riscv64c, aarch64c"
        version: "22.05p1"
        version_date: 2022-07-05
        version_url: "https://github.com/CTSRD-CHERI/cheribsd/releases/tag/release%2F22.05p1"
        upstream_version: "14-CURRENT (1400053)"
        upstream_date: 2022-03-04
        upstream_url: "https://github.com/freebsd/freebsd-src/commit/25375b1415f8a0b0290b56c00c31d20e218ffab9"
+       cheri_spec:
+        - name: UoC RISC-V ISAv9
+          version: "9"
+        - name: "ARM Morello"
+          version: A.k
        images:
          - label: "Installer Image"
            link: "https://download.cheribsd.org/releases/arm64/aarch64c/25.03/cheribsd-memstick-arm64-aarch64c-22.05p1.img.xz"
@@ -110,13 +135,18 @@ software:
            link: "https://www.cheribsd.org/release-notes/22.05p1/index.html"
          - label: "Installation Guide"
            link: "https://ctsrd-cheri.github.io/cheribsd-getting-started/morello-install/index.html"
-     - arch: "aarch64c"
+     - arch: "riscv64c, aarch64c"
        version: "22.05"
        version_date: 2022-05-23
        version_url: "https://github.com/CTSRD-CHERI/cheribsd/releases/tag/release%2F22.05"
        upstream_version: "14-CURRENT (1400053)"
        upstream_date: 2022-03-04
        upstream_url: "https://github.com/freebsd/freebsd-src/commit/25375b1415f8a0b0290b56c00c31d20e218ffab9"
+       cheri_spec:
+        - name: UoC RISC-V ISAv9
+          version: "9"
+        - name: "ARM Morello"
+          version: A.k
        images:
          - label: "Installer Image"
            link: "https://download.cheribsd.org/releases/arm64/aarch64c/25.03/cheribsd-memstick-arm64-aarch64c-22.05.img.xz"

cheriot.yaml

@@ -1,7 +1,7 @@
 project_summary:
   category: "rtos"
   home_url: "https://cheriot.org/"
-  # home_text: 
+  # home_text:
   short_description: "The core RTOS for the CHERIoT platform"
   description: |-
     [CHERIoT-RTOS](https://github.com/CHERIoT-Platform/cheriot-rtos) is a real-time operating system implementation, designed to make full use of CHERIoT ISA architecture.
@@ -12,13 +12,13 @@ project_summary:
     MMUs also typically need page tables, which are very large on resource-constrained systems.
     Embedded systems often have a memory-protection unit (MPU) instead, which provides access control to a fixed number of regions.
     CHERIoT was designed assuming CHERI from the ground up and so does not require either: it can use CHERI for object-granularity protection and safe sharing, without needing additional look-aside structures.
-    
+
     The full CHERIoT platform consists of three major components:
     - [The CHERIoT ISA](https://github.com/CHERIoT-Platform/cheriot-sail) - Extends the RISC-V ISA with a core CHERI implementation suitable for small-scale embedded devices.
       This has two open-source implementations:
       - [CHERIoT Ibex](https://github.com/microsoft/cheriot-ibex) is a mature production-quality (area-optimised) reference implementation.
       - [CHERIoT Kudu](https://github.com/microsoft/cheriot-kudu) is a newer higher-performance dual-issue implementation.
-      
+
       The first CHERIoT devices are expected to be available in quantity in 2026.
     - [CHERIoT-LLVM](https://github.com/CHERIoT-Platform/llvm-project) - Compiler toolchain targeting CHERIoT.
     - [CHERIoT-RTOS](https://github.com/CHERIoT-Platform/cheriot-rtos) - The core of the system.
@@ -30,10 +30,10 @@ project_summary:
     Track the current progress towards a 1.0 release on their [GitHub](https://github.com/orgs/CHERIoT-Platform/projects/2).
 
     You can keep up to date the with latest news for CHERIoT Platform via the project [website](https://cheriot.org/news.html) and via their [public Signal chat](https://signal.group/#CjQKIElxAs3t3MUEMOEmQEuMHRK4rErUk2xVeFzjAjFXAShzEhCK9qQwEMFKGLGZnCjrQ7zm).
-       
+
   #vulnerability_contact: N/A There is no coordinated vulnerability disclosure for this project.
   #download_notes: N/A - No extra notes needed there is the devcontainer that is an equivalent to a pre-built binary really
-  last_update: "29th January 2026" 
+  last_update: "29th January 2026"
 
 project_contribution:
   src_tree: |-
@@ -53,21 +53,23 @@ project_contribution:
 
 buildingFromSource: |-
   CHERIoT-RTOS provides a development environment container which includes all of the necessary dependencies pre-built to allow you to quickly begin development of CHERIoT-RTOS applications, without the need to build LLVM and the Sail-based emulator first.
-  
-  If you're looking to quickly get started developing with CHERIoT-RTOS, we recommend using the devcontainer. 
-  
+
+  If you're looking to quickly get started developing with CHERIoT-RTOS, we recommend using the devcontainer.
+
   Their [Getting Started guide](https://github.com/CHERIoT-Platform/cheriot-rtos/blob/main/docs/GettingStarted.md) covers setting this up, as well as building dependencies from source.
 
 software:
 
-  - arch: "CHERIoT"
+  - arch: "riscv32cheriot"
     releases:
       - version: "HEAD"
         version_date: 2026-01-06
         version_url: "https://github.com/CHERIoT-Platform/cheriot-rtos/"
         latest: true
-        cheri_spec: CHERIoT ISA v1.0
-        images: 
+        cheri_spec:
+          - name: CHERIoT
+            version: ISA v1.0
+        images:
           - label: "Source (incl devcontainer)"
             link: "https://github.com/CHERIoT-Platform/cheriot-rtos/"
         docs:

cheriyocto.yaml

@@ -18,10 +18,10 @@ project_contribution:
 
     The layer can be used with its sister distro layer [meta-morello-distro](https://github.com/The-Capable-Hub/meta-morello-distro) that provides CHERIfied user space applications.
   mailing_lists: |-
-    The following lists should be used: 
+    The following lists should be used:
       - [Original ARM Morello mailing list](https://op-lists.linaro.org/mailman3/lists/linux-morello-distros.op-lists.linaro.org)
   slack: |-
-    Support for meta-morello is provided via the [CHERI CPU Slack](https://www.cl.cam.ac.uk/research/security/ctsrd/cheri/cheri-slack.html), please post your questions under the #cheri-linux channel. 
+    Support for meta-morello is provided via the [CHERI CPU Slack](https://www.cl.cam.ac.uk/research/security/ctsrd/cheri/cheri-slack.html), please post your questions under the #cheri-linux channel.
   meetings: |-
     There are no public meetings for this project.
 
@@ -37,6 +37,9 @@ software:
        upstream_version: "5.0.16 Scarthgap LTS"
        upstream_date: 2026-02-16
        upstream_url: "https://downloads.yoctoproject.org/releases/yocto/yocto-5.0.16/poky-1d54d1c4736a114e1cecbe85a0306e3814d5ce70.tar.bz2"
+       cheri_spec:
+        - name: "ARM Morello"
+          version: A.k
        images:
          - label: "Board firmware"
            link: "https://yocto-morello.dl.thecapablehub.org/morello-release-2.0/board-firmware-sd-image.img"
@@ -48,6 +51,9 @@ software:
        upstream_version: "4.0.32 Kikrstone LTS"
        upstream_date: 2025-12-24
        upstream_url: "https://downloads.yoctoproject.org/releases/yocto/yocto-4.0.32/poky-2c05660b21c7cc1082aeac8b75d8a2d82e249f63.tar.bz2"
+       cheri_spec:
+        - name: "ARM Morello"
+          version: A.k
        images:
          - label: "Board firmware"
            link: "https://yocto-morello.dl.thecapablehub.org/morello-release-1.9/board-firmware-sd-image.img"

cherizephyr.yaml

@@ -30,6 +30,9 @@ software:
        upstream_version: "4.1.0"
        upstream_date: 2025-05-20
        upstream_url: "https://github.com/CHERI-Alliance/CHERI-zephyr/commit/90a48e814b9699d34d41e42038bef0132427a5c3"
+       cheri_spec:
+        - name: CHERI RISC-V (RVY)
+          version: 0.9.3
        images:
          - label: "Source"
            link: "https://github.com/CHERI-Alliance/CHERI-zephyr/tree/v0.3.0-cheri-branch"
@@ -46,6 +49,9 @@ software:
        upstream_version: "4.1.0"
        upstream_date: 2025-05-20
        upstream_url: "https://github.com/CHERI-Alliance/CHERI-zephyr/commit/90a48e814b9699d34d41e42038bef0132427a5c3"
+       cheri_spec:
+        - name: CHERI RISC-V (RVY)
+          version: 0.9.3
        images:
          - label: "Source"
            link: "https://github.com/CHERI-Alliance/CHERI-zephyr/tree/CHERI-Zephyr-v0.2.0"
@@ -59,6 +65,9 @@ software:
        upstream_version: "3.5.0"
        upstream_date: 2023-11-07
        upstream_url: "https://github.com/CHERI-Alliance/CHERI-zephyr/commit/ec031029f4cab3c0fbb116f5cd63afcf59205a84"
+       cheri_spec:
+        - name: CHERI RISC-V (RVY)
+          version: 0.9.3
        images:
          - label: "Source"
            link: "https://github.com/CHERI-Alliance/CHERI-zephyr/tree/CHERI-Zephyr-v0.1.0"

gcc.yaml

@@ -5,17 +5,17 @@ project_summary:
   description: |-
     GCC is a open-source compiler collection used to compile a vast amount of existing software for different processor architectures.
     For CHERI, this enables legacy applications to be recompiled to utilise hardware capabilities, enforcing memory safety and pointer validity at the instruction level.
-    
+
   status: |-
     There have been no releases of Morello GNU toolchain in a long time. It is currently unmaintained and lagging considerably behind upstream.
-    
+
   #vulnerability_contact: "support@thecapablehub.org"
   download_notes: "There are no pre-built binaries or versioned releases yet, users must build from source."
   last_update: "30th January 2026"
 
 project_contribution:
   src_tree: |-
-    - [morello/gnu-toolchain/gcc](https://git.morello-project.org/morello/gnu-toolchain/gcc) 
+    - [morello/gnu-toolchain/gcc](https://git.morello-project.org/morello/gnu-toolchain/gcc)
   chat: |-
     Use the [Morello forum](https://community.arm.com/support-forums/f/morello-forum) for general support.
   mailing_lists: |-
@@ -34,11 +34,13 @@ software:
         version_date: 2022-11-30
         version_url: "https://developer.arm.com/Tools%20and%20Software/Morello%20Development%20Tools#Downloads"
         latest: true
-        cheri_spec: Morello
         upstream_version: "10.1.0"
         upstream_date: 2020-05-07
         upstream_url: "https://gcc.gnu.org/git/?p=gcc.git;a=tag;h=refs/tags/releases/gcc-10.1.0"
-        images: 
+        cheri_spec:
+          - name: ARM Morello
+            version: A.k
+        images:
           - label: "bare-metal (aarch64 host)"
             link: "https://developer.arm.com/-/cdn-downloads/permalink/Arm-GNU-Toolchain-Morello/10.1.Morello-Alp2_Linux/arm-gnu-toolchain-10.1.morello-alp2-aarch64-aarch64-none-elf.tar.xz"
           - label: "linux (aarch64 host)"
@@ -50,17 +52,19 @@ software:
         docs:
           - label: "Release Notes"
             link: "https://developer.arm.com/documentation/109399/10-1-Morello-Alp2-2022_11/"
-  - arch: "bare-metal/aarch64c"  
-    releases:  
+  - arch: "bare-metal/aarch64c"
+    releases:
       - version: "10.1.Morello-Alp1_Linux"
         version_date: 2022-06-13
         version_url: "https://developer.arm.com/Tools%20and%20Software/Morello%20Development%20Tools#Downloads"
         latest: false
-        cheri_spec: Morello
         upstream_version: "10.1.0"
         upstream_date: 2020-05-07
         upstream_url: "https://gcc.gnu.org/git/?p=gcc.git;a=tag;h=refs/tags/releases/gcc-10.1.0"
-        images: 
+        cheri_spec:
+          - name: ARM Morello
+            version: A.k
+        images:
           - label: "bare-metal (aarch64 host)"
             link: "https://developer.arm.com/-/cdn-downloads/permalink/Arm-GNU-Toolchain-Morello/10.1.Morello-Alp1_Linux/arm-gnu-toolchain-10.1.Morello-Alp1-aarch64-aarch64-none-elf.tar.xz"
           - label: "bare-metal (x86_64 host)"