This is an automated email from the ASF dual-hosted git repository. janc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit a1e03722aee25f7756badc22a47091b04baeb68e Author: Szymon Janc <[email protected]> AuthorDate: Wed Feb 9 08:46:12 2022 +0100 nimble/porting: Fix ports targets Those are used to generate configurations for port so make sure all MYNEWT_VAL are properly included. --- nimble/transport/socket/syscfg.yml | 4 ++++ porting/targets/linux/pkg.yml | 2 +- porting/targets/linux/syscfg.yml | 1 + porting/targets/linux_blemesh/pkg.yml | 2 +- porting/targets/linux_blemesh/syscfg.yml | 1 + porting/targets/nuttx/pkg.yml | 2 +- porting/targets/nuttx/syscfg.yml | 2 +- porting/targets/porting_default/pkg.yml | 2 +- porting/targets/porting_default/syscfg.yml | 1 + porting/targets/riot/pkg.yml | 2 +- porting/targets/riot/syscfg.yml | 3 ++- 11 files changed, 15 insertions(+), 7 deletions(-) diff --git a/nimble/transport/socket/syscfg.yml b/nimble/transport/socket/syscfg.yml index 9c8fa58..63b9cdd 100644 --- a/nimble/transport/socket/syscfg.yml +++ b/nimble/transport/socket/syscfg.yml @@ -43,6 +43,10 @@ syscfg.defs: description: 'linux kernel device' value: 0 + BLE_SOCK_USE_NUTTX: + description: 'Use NuttX socket' + value: 0 + BLE_SOCK_TASK_PRIO: description: 'Priority of the HCI socket task.' type: task_priority diff --git a/porting/targets/linux/pkg.yml b/porting/targets/linux/pkg.yml index c819a83..72018c8 100644 --- a/porting/targets/linux/pkg.yml +++ b/porting/targets/linux/pkg.yml @@ -28,7 +28,7 @@ pkg.deps: - "@apache-mynewt-core/sys/log/stub" - "@apache-mynewt-core/sys/stats/stub" - "@apache-mynewt-nimble/nimble/host" - - "@apache-mynewt-nimble/nimble/transport/socket" + - "@apache-mynewt-nimble/nimble/transport" - "@apache-mynewt-nimble/nimble/host/services/ans" - "@apache-mynewt-nimble/nimble/host/services/bas" - "@apache-mynewt-nimble/nimble/host/services/dis" diff --git a/porting/targets/linux/syscfg.yml b/porting/targets/linux/syscfg.yml index 603e586..5778ee7 100644 --- a/porting/targets/linux/syscfg.yml +++ b/porting/targets/linux/syscfg.yml @@ -17,6 +17,7 @@ # syscfg.vals: + BLE_HCI_TRANSPORT: socket BLE_SOCK_USE_TCP: 0 BLE_SOCK_USE_LINUX_BLUE: 1 BLE_SOCK_TASK_PRIO: 3 diff --git a/porting/targets/linux_blemesh/pkg.yml b/porting/targets/linux_blemesh/pkg.yml index 3cbe09a..14cb2d9 100644 --- a/porting/targets/linux_blemesh/pkg.yml +++ b/porting/targets/linux_blemesh/pkg.yml @@ -28,7 +28,7 @@ pkg.deps: - "@apache-mynewt-core/sys/log/stub" - "@apache-mynewt-core/sys/stats/stub" - "@apache-mynewt-nimble/nimble/host" - - "@apache-mynewt-nimble/nimble/transport/socket" + - "@apache-mynewt-nimble/nimble/transport" - "@apache-mynewt-nimble/nimble/host/services/ans" - "@apache-mynewt-nimble/nimble/host/services/bas" - "@apache-mynewt-nimble/nimble/host/services/dis" diff --git a/porting/targets/linux_blemesh/syscfg.yml b/porting/targets/linux_blemesh/syscfg.yml index 8ef7972..5e644d4 100644 --- a/porting/targets/linux_blemesh/syscfg.yml +++ b/porting/targets/linux_blemesh/syscfg.yml @@ -43,6 +43,7 @@ syscfg.vals: BLE_MESH_SETTINGS: 0 CONFIG_NFFS: 0 + BLE_HCI_TRANSPORT: socket BLE_SOCK_USE_TCP: 0 BLE_SOCK_USE_LINUX_BLUE: 1 BLE_SOCK_TASK_PRIO: 3 diff --git a/porting/targets/nuttx/pkg.yml b/porting/targets/nuttx/pkg.yml index e105cd6..fb6c014 100644 --- a/porting/targets/nuttx/pkg.yml +++ b/porting/targets/nuttx/pkg.yml @@ -28,7 +28,7 @@ pkg.deps: - "@apache-mynewt-core/sys/log/stub" - "@apache-mynewt-core/sys/stats/stub" - "@apache-mynewt-nimble/nimble/host" -- "@apache-mynewt-nimble/nimble/transport/socket" +- "@apache-mynewt-nimble/nimble/transport" - "@apache-mynewt-nimble/nimble/host/services/ans" - "@apache-mynewt-nimble/nimble/host/services/bas" - "@apache-mynewt-nimble/nimble/host/services/dis" diff --git a/porting/targets/nuttx/syscfg.yml b/porting/targets/nuttx/syscfg.yml index fdfa7b5..d2c6de7 100644 --- a/porting/targets/nuttx/syscfg.yml +++ b/porting/targets/nuttx/syscfg.yml @@ -17,6 +17,7 @@ # syscfg.vals: + BLE_HCI_TRANSPORT: socket BLE_SOCK_USE_TCP: 0 BLE_SOCK_USE_NUTTX: 1 BLE_SOCK_TASK_PRIO: 3 @@ -25,4 +26,3 @@ syscfg.vals: LOG_LEVEL: 2 BLE_SM_LEGACY: 1 BLE_SM_SC: 1 - diff --git a/porting/targets/porting_default/pkg.yml b/porting/targets/porting_default/pkg.yml index 44a34ba..8b7aab0 100644 --- a/porting/targets/porting_default/pkg.yml +++ b/porting/targets/porting_default/pkg.yml @@ -28,7 +28,7 @@ pkg.deps: - "@apache-mynewt-core/sys/log/stub" - "@apache-mynewt-core/sys/stats/stub" - "@apache-mynewt-nimble/nimble/host" - - "@apache-mynewt-nimble/nimble/transport/socket" + - "@apache-mynewt-nimble/nimble/transport" - "@apache-mynewt-nimble/nimble/host/services/ans" - "@apache-mynewt-nimble/nimble/host/services/bas" - "@apache-mynewt-nimble/nimble/host/services/dis" diff --git a/porting/targets/porting_default/syscfg.yml b/porting/targets/porting_default/syscfg.yml index d0aff80..3ffd4c2 100644 --- a/porting/targets/porting_default/syscfg.yml +++ b/porting/targets/porting_default/syscfg.yml @@ -1,3 +1,4 @@ syscfg.vals: + BLE_HCI_TRANSPORT: socket BLE_SOCK_USE_TCP: 0 BLE_SOCK_USE_LINUX_BLUE: 1 diff --git a/porting/targets/riot/pkg.yml b/porting/targets/riot/pkg.yml index 7d1a324..e57c47c 100644 --- a/porting/targets/riot/pkg.yml +++ b/porting/targets/riot/pkg.yml @@ -28,7 +28,7 @@ pkg.deps: - "@apache-mynewt-core/sys/log/stub" - "@apache-mynewt-core/sys/stats/stub" - "@apache-mynewt-nimble/nimble/host" + - "@apache-mynewt-nimble/nimble/transport" - "@apache-mynewt-nimble/nimble/controller" - - "@apache-mynewt-nimble/nimble/transport/ram" - "@apache-mynewt-nimble/nimble/host/services/gap" - "@apache-mynewt-nimble/nimble/host/services/gatt" diff --git a/porting/targets/riot/syscfg.yml b/porting/targets/riot/syscfg.yml index 8359eaa..1d6939c 100644 --- a/porting/targets/riot/syscfg.yml +++ b/porting/targets/riot/syscfg.yml @@ -31,6 +31,7 @@ syscfg.vals: BLE_SM_LEGACY: 0 BLE_SM_SC: 0 BLE_MAX_PERIODIC_SYNCS: 0 + BLE_HCI_TRANSPORT: ram MSYS_1_BLOCK_COUNT: 5 MSYS_1_BLOCK_SIZE: 88 - XTAL_32768: 1 + MCU_LFCLK_SOURCE: LFXO
