You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by an...@apache.org on 2022/03/17 12:35:43 UTC
[mynewt-core] 01/04: hw/bsp: Update syscfg for new HCI transport
This is an automated email from the ASF dual-hosted git repository.
andk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit aea783267704392c55da60ffeab3915faea5317c
Author: Andrzej Kaczmarek <an...@codecoup.pl>
AuthorDate: Tue Mar 8 07:34:35 2022 +0100
hw/bsp: Update syscfg for new HCI transport
---
hw/bsp/dialog_cmac/syscfg.yml | 8 ++++++--
hw/bsp/dialog_da14695-dk-usb/syscfg.yml | 3 ++-
hw/bsp/dialog_da1469x-dk-pro/syscfg.yml | 3 ++-
hw/bsp/nordic_pca10095/syscfg.yml | 6 +++---
hw/bsp/nordic_pca10095_net/syscfg.yml | 5 +++--
5 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/hw/bsp/dialog_cmac/syscfg.yml b/hw/bsp/dialog_cmac/syscfg.yml
index 91c0408..01c10bb 100644
--- a/hw/bsp/dialog_cmac/syscfg.yml
+++ b/hw/bsp/dialog_cmac/syscfg.yml
@@ -20,7 +20,11 @@
syscfg.vals:
MSYS_1_BLOCK_SIZE: 308
OS_CPUTIME_FREQ: 31250
- BLE_HCI_TRANSPORT: dialog_cmac
+ BLE_TRANSPORT_HS: dialog_cmac
+ BLE_TRANSPORT_LL: native
+# CMAC can only run NimBLE controller
syscfg.restrictions:
- - BLE_HCI_TRANSPORT == "dialog_cmac"
+ - BLE_TRANSPORT
+ - BLE_TRANSPORT_HS == "dialog_cmac"
+ - BLE_TRANSPORT_LL == "native"
diff --git a/hw/bsp/dialog_da14695-dk-usb/syscfg.yml b/hw/bsp/dialog_da14695-dk-usb/syscfg.yml
index 9b3e7b4..8179775 100644
--- a/hw/bsp/dialog_da14695-dk-usb/syscfg.yml
+++ b/hw/bsp/dialog_da14695-dk-usb/syscfg.yml
@@ -76,5 +76,6 @@ syscfg.vals:
NFFS_FLASH_AREA: FLASH_AREA_NFFS
COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
-syscfg.vals.'BLE_HCI_TRANSPORT == "dialog_cmac"':
+syscfg.vals.BLE_TRANSPORT:
+ BLE_TRANSPORT_LL: dialog_cmac
TRNG: 1
diff --git a/hw/bsp/dialog_da1469x-dk-pro/syscfg.yml b/hw/bsp/dialog_da1469x-dk-pro/syscfg.yml
index 4ce112f..42d3046 100644
--- a/hw/bsp/dialog_da1469x-dk-pro/syscfg.yml
+++ b/hw/bsp/dialog_da1469x-dk-pro/syscfg.yml
@@ -86,5 +86,6 @@ syscfg.vals:
NFFS_FLASH_AREA: FLASH_AREA_NFFS
COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
-syscfg.vals.'BLE_HCI_TRANSPORT == "dialog_cmac"':
+syscfg.vals.BLE_TRANSPORT:
+ BLE_TRANSPORT_LL: dialog_cmac
TRNG: 1
diff --git a/hw/bsp/nordic_pca10095/syscfg.yml b/hw/bsp/nordic_pca10095/syscfg.yml
index 6a7776f..d0b2876 100644
--- a/hw/bsp/nordic_pca10095/syscfg.yml
+++ b/hw/bsp/nordic_pca10095/syscfg.yml
@@ -70,8 +70,6 @@ syscfg.vals:
# Always use non-blocking API
SPI_HAL_USE_NOBLOCK: 1
- BLE_HCI_TRANSPORT: nrf5340
-
QSPI_FLASH_SECTOR_SIZE: 4096
QSPI_FLASH_SECTOR_COUNT: 2048
QSPI_PIN_CS: 18
@@ -98,9 +96,11 @@ syscfg.vals.!BOOT_LOADER:
MCU_LFCLK_XO_INTCAP: c9pf
syscfg.vals.BLE_HOST:
- BLE_HCI_TRANSPORT: nrf5340
BLE_HS_FLOW_CTRL: 1
+syscfg.vals.BLE_TRANSPORT:
+ BLE_TRANSPORT_LL: nrf5340
+
syscfg.vals.BSP_NRF5340_NET_ENABLE:
BSP_NRF5340_NET_FLASH_ENABLE: 1
BLE_HCI_VS: 1
diff --git a/hw/bsp/nordic_pca10095_net/syscfg.yml b/hw/bsp/nordic_pca10095_net/syscfg.yml
index cf19e16..b2abdc3 100644
--- a/hw/bsp/nordic_pca10095_net/syscfg.yml
+++ b/hw/bsp/nordic_pca10095_net/syscfg.yml
@@ -67,6 +67,7 @@ syscfg.vals.BLE_CONTROLLER:
OS_CPUTIME_FREQ: 32768
OS_CPUTIME_TIMER_NUM: 3
BLE_LL_RFMGMT_ENABLE_TIME: 1500
-
- BLE_HCI_TRANSPORT: nrf5340
BLE_LL_CFG_FEAT_CTRL_TO_HOST_FLOW_CONTROL: 1
+
+syscfg.vals.BLE_TRANSPORT:
+ BLE_TRANSPORT_HS: nrf5340