zephyr: boards: fix nrf53 downstream

Pass '-DSNIPPET=bt-ll-sw-split' for building zll downstream.

Signed-off-by: Aytürk Düzen <ayturk.duzen@nordicsemi.no>

Author: AyturkDuzen

autopts/ptsprojects/boards/nrf53.py

@@ -45,7 +45,8 @@ def build_and_flash(zephyr_wd, board, debugger_snr, conf_file=None, *args):
     check_call(['west', 'flash', '--skip-rebuild', '--recover', '-i', debugger_snr], cwd=tester_dir)
 
     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/hci_ipc_cpunet.conf\'']
+           f'-DEXTRA_CONF_FILE=\'nrf5340_cpunet_iso-bt_ll_sw_split.conf;',
+           f'../../../tests/bluetooth/tester/hci_ipc_cpunet.conf\'',
+           '-DSNIPPET=bt-ll-sw-split']
     check_call(cmd, cwd=controller_dir)
     check_call(['west', 'flash', '--skip-rebuild', '-i', debugger_snr], cwd=controller_dir)

autopts/wid/csip.py

@@ -177,7 +177,10 @@ def hdl_wid_20100(params: WIDParams):
 
     btp.gap_conn(addr, addr_type)
     stack.gap.wait_for_connection(timeout=10, addr=addr)
-    stack.gap.gap_wait_for_sec_lvl_change(level=2, timeout=30, addr=addr)
+    sec_lvl = stack.gap.gap_wait_for_sec_lvl_change(level=2, timeout=10, addr=addr)
+    if sec_lvl != 2:
+        btp.gap_pair(addr, addr_type)
+        sec_lvl = stack.gap.gap_wait_for_sec_lvl_change(level=2, timeout=30, addr=addr)
 
     #CSIP/CL/SP/BV-07-C will receive the WID 20101. Hence, no need to perform discovery here.