Skip to content

Feature/misc meson improvements #1992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Feature/misc meson improvements #1992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
579c5e2
meson: default to no targets unless a probe cross-file is given
perigoso Oct 23, 2024
a06bf2f
meson: integrate debug target descriptive name into the target declar…
perigoso Oct 23, 2024
7ff7b9e
meson: automatically build dependency list for libbmd
perigoso Oct 23, 2024
5ab9a39
meson: decouple enable_riscv_accel from the debug target configuration
perigoso Oct 29, 2024
3852d8e
meson: streamline target declaration
perigoso Nov 4, 2024
73a4cb1
cross-file: update default target list
perigoso Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cross-file/bluepill.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ endian = 'little'

[project options]
probe = 'bluepill'
targets = 'cortexm,efm,hc32,lpc,nrf,nxp,renesas,rp,sam,stm,ti'
targets = 'cortexm,efm,hc32,lpc,nrf,nxp,renesas_ra,rp,sam,stm,ti'
rtt_support = false
bmd_bootloader = true
2 changes: 1 addition & 1 deletion cross-file/f072.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ endian = 'little'

[project options]
probe = 'f072'
targets = 'cortexm,riscv32,riscv64,lpc,nrf,nxp,renesas,rp,sam,stm,ti'
targets = 'cortexm,riscv32,riscv64,lpc,nrf,nxp,renesas_ra,rp,sam,stm,ti'
rtt_support = false
bmd_bootloader = false
2 changes: 1 addition & 1 deletion cross-file/native.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ endian = 'little'

[project options]
probe = 'native'
targets = 'cortexm,lpc,nrf,nxp,renesas,rp,sam,stm,ti'
targets = 'cortexm,lpc,nrf,nxp,renesas_ra,rp,sam,stm,ti'
rtt_support = false
bmd_bootloader = true
2 changes: 1 addition & 1 deletion cross-file/stlink.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ endian = 'little'

[project options]
probe = 'stlink'
targets = 'cortexm,lpc,nrf,nxp,renesas,sam,stm,ti'
targets = 'cortexm,lpc,nrf,nxp,renesas_ra,sam,stm,ti'
rtt_support = false
stlink_swim_nrst_as_uart = false
bmd_bootloader = false
2 changes: 1 addition & 1 deletion cross-file/swlink.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ endian = 'little'

[project options]
probe = 'swlink'
targets = 'cortexm,efm,hc32,lpc,nrf,nxp,renesas,rp,sam,stm,ti'
targets = 'cortexm,efm,hc32,lpc,nrf,nxp,renesas_ra,rp,sam,stm,ti'
rtt_support = false
bmd_bootloader = false
6 changes: 6 additions & 0 deletions meson_options.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,25 @@ option(
'ch579',
'efm',
'gd32',
'gd32_rv',
'hc32',
'lpc',
'mm32',
'nrf',
'nxp',
'puya',
'renesas_ra',
'renesas_rz',
'renesas',
'rp',
'sam',
'stm32f1',
'stm32f4',
'stm',
'ti',
'xilinx'
],
value: [],
description: 'Enabled debug targets'
)
option(
Expand Down
7 changes: 7 additions & 0 deletions src/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,12 @@ if advertise_noackmode
libbmd_core_args += ['-DADVERTISE_NOACKMODE=1']
endif

# Check if we should enable the RISC-V Debug remote protocol acceleration and do so if required
enable_riscv_accel = get_option('enable_riscv_accel')
if enable_riscv_accel
bmd_core_args += ['-DCONFIG_RISCV_ACCEL=1']
endif

# Get BMD targets dependency
subdir('target')

Expand Down Expand Up @@ -118,6 +124,7 @@ summary(
'Debug output': debug_output,
'RTT support': rtt_support,
'Advertise QStartNoAckMode': advertise_noackmode,
'RISC-V acceleration': enable_riscv_accel,
},
bool_yn: true,
section: 'Black Magic Debug',
Expand Down
Loading
Loading