diff --git a/src/platforms/common/blackpill-f4/meson.build b/src/platforms/common/blackpill-f4/meson.build
index 399ae8ea584..71206e54ba0 100644
--- a/src/platforms/common/blackpill-f4/meson.build
+++ b/src/platforms/common/blackpill-f4/meson.build
@@ -53,6 +53,7 @@ probe_blackpill_load_address = bmd_bootloader ? '0x08004000' : '0x08000000'
 probe_blackpill_args = [
 	f'-DDFU_SERIAL_LENGTH=@probe_blackpill_dfu_serial_length@',
 	f'-DAPP_START=@probe_blackpill_load_address@',
+	'-DTRACESWO_PROTOCOL=2',
 ]
 
 blackpill_alternative_pinout = get_option('alternative_pinout')
diff --git a/src/platforms/stlink/meson.build b/src/platforms/stlink/meson.build
index a0c0a455c82..a5bb3422ccc 100644
--- a/src/platforms/stlink/meson.build
+++ b/src/platforms/stlink/meson.build
@@ -71,8 +71,11 @@ stlink_swim_nrst_as_uart = get_option('stlink_swim_nrst_as_uart')
 
 if probe == 'stlink' and stlink_swim_nrst_as_uart
 	probe_stlink_args += ['-DSWIM_NRST_AS_UART=1']
+	probe_stlink_dependencies += fixme_platform_stm32_traceswo
+	probe_stlink_args += ['-DTRACESWO_PROTOCOL=1']
 else
 	probe_stlink_dependencies += fixme_platform_stm32_traceswoasync
+	probe_stlink_args += ['-DTRACESWO_PROTOCOL=2']
 endif
 
 probe_host = declare_dependency(
diff --git a/src/platforms/swlink/meson.build b/src/platforms/swlink/meson.build
index 9b862b98a96..d0471cc1703 100644
--- a/src/platforms/swlink/meson.build
+++ b/src/platforms/swlink/meson.build
@@ -42,6 +42,7 @@ probe_swlink_dfu_sources = files(
 
 probe_swlink_args = [
 	'-DDFU_SERIAL_LENGTH=9',
+	'-DTRACESWO_PROTOCOL=2',
 ]
 
 probe_swlink_common_link_args = [