Skip to content

Commit

Permalink
zephyr: boards: make 5340_hci_ipc_* generic config
Browse files Browse the repository at this point in the history
rename hci_ipc configuration for generic multicore usage.

related change in tester:
zephyrproject-rtos/zephyr#81755

Signed-off-by: Aytürk Düzen <[email protected]>
  • Loading branch information
AyturkDuzen authored and sjanc committed Nov 27, 2024
1 parent 8c0e82a commit f6b7006
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions autopts/ptsprojects/boards/nrf53.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def build_and_flash(zephyr_wd, board, debugger_snr, conf_file=None, *args):
check_call('rm -rf build/'.split(), cwd=tester_dir)
check_call('rm -rf build/'.split(), cwd=controller_dir)

bttester_overlay = 'nrf5340_hci_ipc.conf'
bttester_overlay = 'hci_ipc.conf'

if conf_file and conf_file != 'default' and conf_file != 'prj.conf':
bttester_overlay += f';{conf_file}'
Expand All @@ -46,6 +46,6 @@ def build_and_flash(zephyr_wd, board, debugger_snr, conf_file=None, *args):

cmd = ['west', 'build', '--no-sysbuild', '-b', 'nrf5340dk/nrf5340/cpunet', '--',
f'-DEXTRA_CONF_FILE=\'nrf5340_cpunet_iso-bt_ll_sw_split.conf;'
f'../../../tests/bluetooth/tester/nrf5340_hci_ipc_cpunet.conf\'']
f'../../../tests/bluetooth/tester/hci_ipc_cpunet.conf\'']
check_call(cmd, cwd=controller_dir)
check_call(['west', 'flash', '--skip-rebuild', '-i', debugger_snr], cwd=controller_dir)
2 changes: 1 addition & 1 deletion autopts/ptsprojects/boards/nrf53_appcore.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def build_and_flash(zephyr_wd, board, debugger_snr, conf_file=None, *args):

check_call('rm -rf build/'.split(), cwd=tester_dir)

bttester_overlay = 'nrf5340_hci_ipc.conf'
bttester_overlay = 'hci_ipc.conf'

if conf_file and conf_file != 'default' and conf_file != 'prj.conf':
bttester_overlay += f';{conf_file}'
Expand Down
2 changes: 1 addition & 1 deletion autopts/ptsprojects/boards/nrf53_audio.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def build_and_flash(zephyr_wd, board, debugger_snr, conf_file=None, *args):
config_dir_net = os.getenv("AUTOPTS_SOURCE_DIR_NET")
if config_dir_net is None:
net_core_configs = [f'EXTRA_CONF_FILE=\'nrf5340_cpunet_iso-bt_ll_sw_split.conf;'
f'../../../tests/bluetooth/tester/nrf5340_hci_ipc_cpunet.conf\'']
f'../../../tests/bluetooth/tester/hci_ipc_cpunet.conf\'']
else:
conf_path = os.path.join(zephyr_wd, config_dir_net, 'hci_ipc.conf')
net_core_configs = [f'EXTRA_CONF_FILE=\'{conf_path}\'']
Expand Down

0 comments on commit f6b7006

Please sign in to comment.