Merge branch 'main' into pass-baudrate-in-manchester-mode

Author: Misaka0x2730

.github/workflows/build-and-upload.yml

@@ -14,6 +14,10 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.job }}-${{ github.ref }}
   cancel-in-progress: true
 
+permissions:
+  contents: read
+  actions: write
+
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   # This workflow contains a job for each supported OS in the form `build-<os>`
@@ -98,6 +102,12 @@ jobs:
           meson setup build --cross-file cross-file/${{ matrix.probe }}.ini
           meson compile -C build
           mkdir src/artefacts
+          case "${{ matrix.probe }}" in
+            native-*)
+              mv build/blackmagic_native_firmware.elf build/blackmagic_${{ matrix.probe }}_firmware.elf
+              mv build/blackmagic_native_firmware.bin build/blackmagic_${{ matrix.probe }}_firmware.bin
+              ;;
+          esac
           mv build/blackmagic_*_firmware.{elf,bin} src/artefacts
 
       # Package up the artefacts and upload them

.github/workflows/build-pr.yml

@@ -14,6 +14,10 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.job }}-${{ github.ref }}
   cancel-in-progress: true
 
+permissions:
+  contents: read
+  pull-requests: read
+
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   # This workflow contains a job for each supported OS in the form `build-<os>`
@@ -29,9 +33,9 @@ jobs:
     strategy:
       matrix:
         os:
-          - {id: ubuntu-22.04, name: jammy}
+          - {id: ubuntu-24.04, name: noble}
         arm-compiler:
-          - '12.2.Rel1'
+          - '14.2.Rel1'
         probe:
           - '96b_carbon'
           - 'blackpill-f401cc'
@@ -74,13 +78,15 @@ jobs:
       # Install and setup a suitable Meson + Ninja
       - name: Setup Meson + Ninja
         run: |
-          sudo python3 -m pip install --upgrade pip setuptools wheel
+          sudo apt install -y python3-pip python3-setuptools python3-wheel
           sudo python3 -m pip install meson ninja
         working-directory: ${{ runner.temp }}
 
       # Install BMDA's deps (libftdi1, hidapi-hidraw)
       - name: Install BMDA dependencies
-        run: sudo apt-get -y install libftdi1-dev libhidapi-dev libudev-dev
+        run: |
+          sudo apt update
+          sudo apt-get -y install libftdi1-dev libhidapi-dev libudev-dev
 
       # Record the versions of all the tools used in the build
       - name: Version tools
@@ -119,7 +125,7 @@ jobs:
     strategy:
       matrix:
         os:
-          - windows-2022
+          - windows-2025
       fail-fast: false
 
     # Steps represent a sequence of tasks that will be executed as part of the job
@@ -178,7 +184,7 @@ jobs:
     strategy:
       matrix:
         os:
-          - windows-2022
+          - windows-2025
         sys:
           - {abi: mingw64, env: x86_64, compiler: gcc}
           - {abi: ucrt64, env: ucrt-x86_64, compiler: gcc}
@@ -265,6 +271,7 @@ jobs:
         os:
           - macos-13
           - macos-14
+          - macos-15
           - macos-latest
       fail-fast: false
 
@@ -319,13 +326,14 @@ jobs:
     strategy:
       matrix:
         os:
-          - macos-13
           - macos-14
+          - macos-15
         compiler:
           - gcc@11
           - gcc@12
           - gcc@13
-          - gcc@14 # Don't use 'gcc', the symlink is versioned -- see below
+          - gcc@14
+          - gcc@15 # Don't use 'gcc', the symlink is versioned -- see below
       fail-fast: false
 
     # Steps represent a sequence of tasks that will be executed as part of the job
@@ -378,7 +386,7 @@ jobs:
           meson compile -C build
 
   size-diff:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       # Build a suitable runtime environment
@@ -394,12 +402,12 @@ jobs:
       - name: Setup ARM GCC
         uses: carlosperate/arm-none-eabi-gcc-action@v1
         with:
-          release: '12.2.Rel1'
+          release: '14.2.Rel1'
 
       # Install and setup a suitable Meson + Ninja
       - name: Setup Meson + Ninja
         run: |
-          sudo python3 -m pip install --upgrade pip setuptools wheel
+          sudo apt install -y python3-pip python3-setuptools python3-wheel
           sudo python3 -m pip install meson ninja
         working-directory: ${{ runner.temp }}
 

.github/workflows/lint.yml

@@ -9,6 +9,10 @@ on:
 
   workflow_dispatch:
 
+permissions:
+  contents: read
+  pull-requests: read
+
 jobs:
   pre-commit:
     runs-on: ubuntu-latest

.gitignore

@@ -29,3 +29,5 @@ scripts/swolisten
 
 /deps/*
 !/deps/*.wrap
+
+/.cache/

.pre-commit-config.yaml

@@ -1,8 +1,8 @@
 exclude: '^upgrade/|^scripts/'  # don't run hooks on scripts/ and upgrade/
 
 repos:
-- repo: https://github.com/ssciwr/clang-format-hook
-  rev: v16.0.2
+- repo: https://github.com/pre-commit/mirrors-clang-format
+  rev: v18.1.8
   hooks:
   - id: clang-format
     # entries here override, not extend, upstream's configuration

Makefile

@@ -1,5 +1,5 @@
 all:
-	@echo "Makefile build system is depricated."
+	@echo "Makefile build system is deprecated."
 	@echo ""
 	@echo "Please use Meson build system instead."
 	@echo ""

README.md

@@ -227,6 +227,15 @@ You should now see the resulting binaries in `build`, in this case:
 
 These are the binary files you will use to flash to your probe.
 
+#### Building the bootloader
+
+If your probe hardware does not already have a bootloader on it, after building firmware as described above
+you can build the appropriate bootloader with the following command:
+
+```sh
+meson compile -C build boot-bin
+```
+
 ##### region `rom' overflowed
 
 It may happen, while working with non default configurations or the project's latest version from Git,

SECURITY.md

@@ -4,8 +4,10 @@
 
 | Version |     Supported      |
 |---------|--------------------|
+|   2.0.x | :white_check_mark: |
+|  1.10.x | :white_check_mark: |
 |   1.9.x | :white_check_mark: |
-|   1.8.x | :white_check_mark: |
+|   1.8.x | :x:                |
 |<= 1.7.x | :x:                |
 
 Any older version not listed in the above table is also not supported

cross-file/stlink.ini

@@ -19,7 +19,7 @@ endian = 'little'
 
 [project options]
 probe = 'stlink'
-targets = 'cortexm,lpc,nrf,nxp,renesas,sam,stm,ti'
+targets = 'cortexm,lpc,nrf,nxp,sam,stm,ti'
 rtt_support = false
 stlink_swim_nrst_as_uart = false
 bmd_bootloader = false

meson.build

@@ -1,7 +1,8 @@
 # This file is part of the Black Magic Debug project.
 #
-# Copyright (C) 2023 1BitSquared <info@1bitsquared.com>
+# Copyright (C) 2023-2025 1BitSquared <info@1bitsquared.com>
 # Written by Rafael Silva <perigoso@riseup.net>
+# Modified by Rachel Mant <git@dragonmux.network>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -31,7 +32,7 @@
 project(
 	'Black Magic Debug',
 	'c',
-	version: '1.10.0',
+	version: '2.0.0',
 	license: 'GPL-3.0-or-later OR BSD-3-Clause OR MIT',
 	# license_files: ['COPYING', 'COPYING-BSD', 'COPYING-MIT'], # Only available in meson 1.1.0
 	default_options: [
@@ -112,6 +113,7 @@ extended_warnings = [
 	'-w24703', # Potentially uninitialized local pointer variable 'name' used
 	'-Wmissing-attributes',
 	'-Wmissing-braces',
+	'-Wnewline-eof',
 	'-Wno-char-subscripts',
 	'-Wnull-dereference',
 	# '-Wpacked',
@@ -126,6 +128,7 @@ extended_warnings = [
 	# '-Wstack-protector',
 	'-Wstrict-aliasing',
 	'-Wstrict-overflow=3',
+	'-Wstrict-prototypes',
 	'-Wstring-compare',
 	'-Wstringop-overflow',
 	'-Wunknown-pragmas', # MSVC's C4081 and it's a level 1 warning
@@ -258,17 +261,31 @@ If you did not touch the build system this is not your fault, please report it
 	## Utility targets
 	## _______________
 
-	# Black Magic Probe Firmware Manager
-	bmputil = find_program('bmputil', required: false)
+	# Black Magic Probe companion utility
+	bmputil = find_program('bmputil-cli', required: false)
 	if bmputil.found()
 		message('Adding target for firmware update')
 
 		# Firmware update target
 		run_target(
 			'flash',
-			command: [bmputil, 'flash', bmf_elf.full_path()],
+			command: [bmputil, 'probe', 'update', bmf_elf.full_path()],
 			depends: bmf_elf,
 		)
+	# If we couldn't find the utility, look for the older pre-v1.0 version of it
+	else
+		# Black Magic Probe Firmware Manager
+		bmputil = find_program('bmputil', required: false)
+		if bmputil.found()
+			message('Adding target for firmware update')
+
+			# Firmware update target
+			run_target(
+				'flash',
+				command: [bmputil, 'flash', bmf_elf.full_path()],
+				depends: bmf_elf,
+			)
+		endif
 	endif
 endif