diff --git a/samples/boards/nrf/mesh/onoff-app/prj.conf b/samples/boards/nrf/mesh/onoff-app/prj.conf index 8c74fc50e39..e6f744fb95a 100644 --- a/samples/boards/nrf/mesh/onoff-app/prj.conf +++ b/samples/boards/nrf/mesh/onoff-app/prj.conf @@ -22,7 +22,6 @@ CONFIG_BT_DATA_LEN_UPDATE=n CONFIG_BT_PHY_UPDATE=n CONFIG_BT_CTLR_CHAN_SEL_2=n CONFIG_BT_CTLR_MIN_USED_CHAN=n -CONFIG_BT_CTLR_ADV_EXT=n CONFIG_BT_CTLR_PRIVACY=n CONFIG_BT_PERIPHERAL=y diff --git a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/prj.conf b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/prj.conf index b5a01e39e56..f23b4dc2a30 100644 --- a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/prj.conf +++ b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/prj.conf @@ -17,7 +17,6 @@ CONFIG_BT_DATA_LEN_UPDATE=n CONFIG_BT_PHY_UPDATE=n CONFIG_BT_CTLR_CHAN_SEL_2=n CONFIG_BT_CTLR_MIN_USED_CHAN=n -CONFIG_BT_CTLR_ADV_EXT=n CONFIG_BT_CTLR_PRIVACY=n CONFIG_BT_CTLR_TX_PWR_PLUS_8=y diff --git a/tests/bluetooth/mesh/basic/dbg.conf b/tests/bluetooth/mesh/basic/dbg.conf index 6a7af563828..73cd1b361b6 100644 --- a/tests/bluetooth/mesh/basic/dbg.conf +++ b/tests/bluetooth/mesh/basic/dbg.conf @@ -5,7 +5,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 CONFIG_BT_OBSERVER=y CONFIG_BT_BROADCASTER=y -CONFIG_BT_EXT_ADV=n CONFIG_BT_CTLR_DUP_FILTER_LEN=0 CONFIG_BT_CTLR_LE_ENC=n CONFIG_BT_CTLR_LE_PING=n diff --git a/tests/bluetooth/mesh/basic/ext_adv.conf b/tests/bluetooth/mesh/basic/ext_adv.conf deleted file mode 100644 index db03b444608..00000000000 --- a/tests/bluetooth/mesh/basic/ext_adv.conf +++ /dev/null @@ -1,59 +0,0 @@ -CONFIG_TEST=y -CONFIG_INIT_STACKS=y -CONFIG_MAIN_STACK_SIZE=512 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 - -CONFIG_BT_OBSERVER=y -CONFIG_BT_BROADCASTER=y -CONFIG_BT_CTLR_DUP_FILTER_LEN=0 -CONFIG_BT_CTLR_LE_ENC=n -CONFIG_BT_CTLR_LE_PING=n -CONFIG_BT_DATA_LEN_UPDATE=n -CONFIG_BT_PHY_UPDATE=n -CONFIG_BT_CTLR_MIN_USED_CHAN=n -CONFIG_BT_CTLR_PRIVACY=n - -CONFIG_BT_PERIPHERAL=y - -CONFIG_BT=y -CONFIG_BT_TINYCRYPT_ECC=y - -CONFIG_BT_MESH=y -CONFIG_BT_MESH_RELAY=y -CONFIG_BT_MESH_RELAY_ENABLED=n -CONFIG_BT_MESH_BEACON_ENABLED=n -CONFIG_BT_MESH_LOW_POWER=n -CONFIG_BT_MESH_FRIEND=n - -CONFIG_BT_MESH_PB_GATT=y -CONFIG_BT_MESH_PB_ADV=n -CONFIG_BT_MESH_GATT_PROXY=y - -CONFIG_BT_MESH_LPN_SCAN_LATENCY=30 -CONFIG_BT_MESH_LPN_RECV_DELAY=40 -#CONFIG_BT_MESH_LPN_POLL_TIMEOUT=300 - -CONFIG_BT_MESH_SUBNET_COUNT=2 -CONFIG_BT_MESH_APP_KEY_COUNT=2 -CONFIG_BT_MESH_MODEL_GROUP_COUNT=2 -CONFIG_BT_MESH_LABEL_COUNT=3 - -CONFIG_BT_MESH_IV_UPDATE_TEST=y - -#CONFIG_UART_CONSOLE=n -#CONFIG_BT_DEBUG_MONITOR_UART=y -CONFIG_LOG=y - -CONFIG_BT_MESH_LOG_LEVEL_DBG=y -CONFIG_BT_MESH_PROV_LOG_LEVEL_DBG=y -CONFIG_BT_MESH_PROXY_LOG_LEVEL_DBG=y -#CONFIG_BT_MESH_BEACON_LOG_LEVEL_DBG=y -CONFIG_BT_MESH_NET_LOG_LEVEL_DBG=y -#CONFIG_BT_MESH_TRANS_LOG_LEVEL_DBG=y -#CONFIG_BT_MESH_LOW_POWER_LOG_LEVEL_DBG=y -#CONFIG_BT_MESH_FRIEND_LOG_LEVEL_DBG=y -#CONFIG_BT_MESH_MODEL_LOG_LEVEL_DBG=y -CONFIG_BT_MESH_ACCESS_LOG_LEVEL_DBG=y -CONFIG_BT_MESH_CRYPTO_LOG_LEVEL_DBG=y -CONFIG_BT_MESH_ADV_LOG_LEVEL_DBG=y -#CONFIG_BT_MESH_SELF_TEST=y diff --git a/tests/bluetooth/mesh/basic/friend.conf b/tests/bluetooth/mesh/basic/friend.conf index f69ea194469..136bced37db 100644 --- a/tests/bluetooth/mesh/basic/friend.conf +++ b/tests/bluetooth/mesh/basic/friend.conf @@ -5,7 +5,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 CONFIG_BT_OBSERVER=y CONFIG_BT_BROADCASTER=y -CONFIG_BT_EXT_ADV=n CONFIG_BT_CTLR_DUP_FILTER_LEN=0 CONFIG_BT_CTLR_LE_ENC=n CONFIG_BT_CTLR_LE_PING=n diff --git a/tests/bluetooth/mesh/basic/gatt.conf b/tests/bluetooth/mesh/basic/gatt.conf index b7d96e122f4..75b6a424a4a 100644 --- a/tests/bluetooth/mesh/basic/gatt.conf +++ b/tests/bluetooth/mesh/basic/gatt.conf @@ -5,7 +5,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 CONFIG_BT_OBSERVER=y CONFIG_BT_BROADCASTER=y -CONFIG_BT_EXT_ADV=n CONFIG_BT_CTLR_DUP_FILTER_LEN=0 CONFIG_BT_CTLR_LE_ENC=n CONFIG_BT_CTLR_LE_PING=n diff --git a/tests/bluetooth/mesh/basic/lpn.conf b/tests/bluetooth/mesh/basic/lpn.conf index cb40ce34513..441516fbe6e 100644 --- a/tests/bluetooth/mesh/basic/lpn.conf +++ b/tests/bluetooth/mesh/basic/lpn.conf @@ -5,7 +5,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 CONFIG_BT_OBSERVER=y CONFIG_BT_BROADCASTER=y -CONFIG_BT_EXT_ADV=n CONFIG_BT_CTLR_DUP_FILTER_LEN=0 CONFIG_BT_CTLR_LE_ENC=n CONFIG_BT_CTLR_LE_PING=n diff --git a/tests/bluetooth/mesh/basic/multi_ext_adv.conf b/tests/bluetooth/mesh/basic/multi_ext_adv.conf index 610318f847b..aa93628401b 100644 --- a/tests/bluetooth/mesh/basic/multi_ext_adv.conf +++ b/tests/bluetooth/mesh/basic/multi_ext_adv.conf @@ -52,4 +52,3 @@ CONFIG_BT_MESH_ADV_LOG_LEVEL_DBG=y CONFIG_BT_EXT_ADV_MAX_ADV_SET=3 CONFIG_BT_MESH_RELAY_ADV_SETS=1 -CONFIG_BT_MESH_ADV_EXT=y diff --git a/tests/bluetooth/mesh/basic/pb_gatt.conf b/tests/bluetooth/mesh/basic/pb_gatt.conf index d47aa598058..28ade412c08 100644 --- a/tests/bluetooth/mesh/basic/pb_gatt.conf +++ b/tests/bluetooth/mesh/basic/pb_gatt.conf @@ -5,7 +5,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 CONFIG_BT_OBSERVER=y CONFIG_BT_BROADCASTER=y -CONFIG_BT_EXT_ADV=n CONFIG_BT_CTLR_DUP_FILTER_LEN=0 CONFIG_BT_CTLR_LE_ENC=n CONFIG_BT_CTLR_LE_PING=n diff --git a/tests/bluetooth/mesh/basic/prj.conf b/tests/bluetooth/mesh/basic/prj.conf index 93b99d2f373..126907a8837 100644 --- a/tests/bluetooth/mesh/basic/prj.conf +++ b/tests/bluetooth/mesh/basic/prj.conf @@ -5,7 +5,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 CONFIG_BT_OBSERVER=y CONFIG_BT_BROADCASTER=y -CONFIG_BT_EXT_ADV=n CONFIG_BT_CTLR_DUP_FILTER_LEN=0 CONFIG_BT_CTLR_LE_ENC=n CONFIG_BT_CTLR_LE_PING=n diff --git a/tests/bluetooth/mesh/basic/proxy.conf b/tests/bluetooth/mesh/basic/proxy.conf index 478d7257802..18d22ae8b97 100644 --- a/tests/bluetooth/mesh/basic/proxy.conf +++ b/tests/bluetooth/mesh/basic/proxy.conf @@ -5,7 +5,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 CONFIG_BT_CENTRAL=y CONFIG_BT_BROADCASTER=y -CONFIG_BT_EXT_ADV=n CONFIG_BT_CTLR_DUP_FILTER_LEN=0 CONFIG_BT_CTLR_LE_ENC=n CONFIG_BT_CTLR_LE_PING=n diff --git a/tests/bluetooth/mesh/basic/testcase.yaml b/tests/bluetooth/mesh/basic/testcase.yaml index b299442f8ac..24486e4d75f 100644 --- a/tests/bluetooth/mesh/basic/testcase.yaml +++ b/tests/bluetooth/mesh/basic/testcase.yaml @@ -75,17 +75,6 @@ tests: tags: - bluetooth - mesh - bluetooth.mesh.ext_adv: - build_only: true - extra_args: CONF_FILE=ext_adv.conf - platform_allow: - - qemu_x86 - - nrf52840dk/nrf52840 - integration_platforms: - - qemu_x86 - tags: - - bluetooth - - mesh bluetooth.mesh.multi_ext_adv: build_only: true extra_args: CONF_FILE=multi_ext_adv.conf