Merge branch 'main' into adi

blackmagic-debug · Nov 18, 2024 · 6f9cd3e · 6f9cd3e
2 parents 1a49d86 + 9ac66f5
commit 6f9cd3e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/cross-file/stlink.ini b/cross-file/stlink.ini
@@ -23,3 +23,4 @@ targets = 'cortexm,lpc,nrf,nxp,renesas,sam,stm,ti'
 rtt_support = false
 stlink_swim_nrst_as_uart = false
 bmd_bootloader = false
+stlink_v2_isol = false
diff --git a/meson_options.txt b/meson_options.txt
@@ -86,6 +86,12 @@ option(
 	value: true,
 	description: 'Use the BMD bootloader (not always applicable)'
 )
+option(
+	'stlink_v2_isol',
+	type: 'boolean',
+	value: false,
+	description: 'Build for the ISOL variant of ST-Link v2'
+)
 option(
 	'stlink_swim_nrst_as_uart',
 	type: 'boolean',

diff --git a/src/platforms/stlink/meson.build b/src/platforms/stlink/meson.build
@@ -40,6 +40,8 @@ probe_stlink_dfu_sources = files(
 	'usbdfu.c',
 )
 
+stlink_v2_isol = get_option('stlink_v2_isol')
+
 bmd_bootloader = get_option('bmd_bootloader')
 
 probe_stlink_dfu_serial_length = bmd_bootloader ? '9' : '25'
@@ -48,6 +50,9 @@ probe_stlink_load_address = bmd_bootloader ? '0x8002000' : '0x8004000'
 probe_stlink_args = [
 	f'-DDFU_SERIAL_LENGTH=@probe_stlink_dfu_serial_length@',
 ]
+if stlink_v2_isol
+	probe_stlink_args += ['-DSTLINK_V2_ISOL']
+endif
 if not bmd_bootloader
 	probe_stlink_args += ['-DST_BOOTLOADER']
 endif