From f6b7006d9d57df388a91447618b74b44dd401e1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ayt=C3=BCrk=20D=C3=BCzen?= Date: Fri, 22 Nov 2024 10:58:19 +0100 Subject: [PATCH] zephyr: boards: make 5340_hci_ipc_* generic config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit rename hci_ipc configuration for generic multicore usage. related change in tester: https://github.com/zephyrproject-rtos/zephyr/pull/81755 Signed-off-by: Aytürk Düzen --- autopts/ptsprojects/boards/nrf53.py | 4 ++-- autopts/ptsprojects/boards/nrf53_appcore.py | 2 +- autopts/ptsprojects/boards/nrf53_audio.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/autopts/ptsprojects/boards/nrf53.py b/autopts/ptsprojects/boards/nrf53.py index c5c14ee2d5..a200111260 100644 --- a/autopts/ptsprojects/boards/nrf53.py +++ b/autopts/ptsprojects/boards/nrf53.py @@ -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}' @@ -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) diff --git a/autopts/ptsprojects/boards/nrf53_appcore.py b/autopts/ptsprojects/boards/nrf53_appcore.py index e4282d7dfb..e26e8fa1da 100644 --- a/autopts/ptsprojects/boards/nrf53_appcore.py +++ b/autopts/ptsprojects/boards/nrf53_appcore.py @@ -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}' diff --git a/autopts/ptsprojects/boards/nrf53_audio.py b/autopts/ptsprojects/boards/nrf53_audio.py index 989df2a6da..9e1d0cf194 100644 --- a/autopts/ptsprojects/boards/nrf53_audio.py +++ b/autopts/ptsprojects/boards/nrf53_audio.py @@ -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}\'']