Skip to content

bsp/pca10121: Add support for IPC ICBMsg transport #3464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

bsp/pca10121: Add support for IPC ICBMsg transport #3464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions hw/bsp/nordic_pca10121/boot-nrf5340.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ MEMORY
{
FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x8000
RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x80000
sram_ipc0_tx (rw) : ORIGIN = 0x20070000, LENGTH = 0x4000
sram_ipc0_rx (rw) : ORIGIN = 0x20074000, LENGTH = 0x4000
}

/* The bootloader does not contain an image header */
Expand Down
2 changes: 2 additions & 0 deletions hw/bsp/nordic_pca10121/net/boot-nrf5340_net.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ MEMORY
FLASH (rx) : ORIGIN = 0x01000000, LENGTH = 0x4000
RAM (rwx) : ORIGIN = 0x21000000, LENGTH = 0x10000
IPC (rw) : ORIGIN = 0x20000400, LENGTH = 0x400
sram_ipc0_tx (rw) : ORIGIN = 0x20070000, LENGTH = 0x4000
sram_ipc0_rx (rw) : ORIGIN = 0x20074000, LENGTH = 0x4000
}

/* The bootloader does not contain an image header */
Expand Down
2 changes: 2 additions & 0 deletions hw/bsp/nordic_pca10121/net/nrf5340_net.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ MEMORY
FLASH (rx) : ORIGIN = 0x01008000, LENGTH = 0x30000
RAM (rwx) : ORIGIN = 0x21000000, LENGTH = 0x10000
IPC (rw) : ORIGIN = 0x20000400, LENGTH = 0x400
sram_ipc0_tx (rw) : ORIGIN = 0x20070000, LENGTH = 0x4000
sram_ipc0_rx (rw) : ORIGIN = 0x20074000, LENGTH = 0x4000
}

/* This linker script is used for images and thus contains an image header */
Expand Down
2 changes: 2 additions & 0 deletions hw/bsp/nordic_pca10121/net/pkg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,7 @@ pkg.deps:
- "@apache-mynewt-core/hw/scripts"
- "@apache-mynewt-core/hw/mcu/nordic/nrf5340_net"
- "@apache-mynewt-core/libc"

pkg.deps.'BLE_TRANSPORT == 1 && BLE_TRANSPORT_HS != "ipc"':
- "@apache-mynewt-core/sys/flash_map"
- "@apache-mynewt-core/hw/drivers/flash/ipc_nrf5340_flash"
13 changes: 13 additions & 0 deletions hw/bsp/nordic_pca10121/net/syscfg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,16 @@ syscfg.vals.BLE_CONTROLLER:

syscfg.vals.BLE_TRANSPORT:
BLE_TRANSPORT_HS: nrf5340

syscfg.vals.'BLE_TRANSPORT_HS=="ipc" || BLE_TRANSPORT_IPC_BACKEND=="icbmsg"':
# The APP core have the same values but switched directions
BLE_TRANSPORT_IPC_TX_CHANNEL: 1
BLE_TRANSPORT_IPC_RX_CHANNEL: 0
IPC_SYNC_TX_CHANNEL: 1
IPC_SYNC_RX_CHANNEL: 0
IPC_ICBMSG_TX_REGION_NAME: "\".ipc0_rx\""
IPC_ICBMSG_RX_REGION_NAME: "\".ipc0_tx\""
IPC_ICBMSG_NUM_TX_BLOCKS: 24
IPC_ICBMSG_NUM_RX_BLOCKS: 16
IPC_ICBMSG_TX_REGION_SIZE: 0x4000
IPC_ICBMSG_RX_REGION_SIZE: 0x4000
2 changes: 2 additions & 0 deletions hw/bsp/nordic_pca10121/nrf5340.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ MEMORY
{
FLASH (rx) : ORIGIN = 0x0000c000, LENGTH = 0x76000
RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x80000
sram_ipc0_tx (rw) : ORIGIN = 0x20070000, LENGTH = 0x4000
sram_ipc0_rx (rw) : ORIGIN = 0x20074000, LENGTH = 0x4000
}

/* This linker script is used for images and thus contains an image header */
Expand Down
20 changes: 19 additions & 1 deletion hw/bsp/nordic_pca10121/syscfg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,30 @@ syscfg.vals.BLE_TRANSPORT:
BLE_TRANSPORT_LL: nrf5340

syscfg.vals.BSP_NRF5340_NET_ENABLE:
BSP_NRF5340_NET_FLASH_ENABLE: 1
BLE_HCI_VS: 1

syscfg.vals.'BSP_NRF5340_NET_ENABLE && BLE_TRANSPORT_LL != "ipc"':
BSP_NRF5340_NET_FLASH_ENABLE: 1

syscfg.vals.BSP_NRF5340_NET_FLASH_ENABLE:
IPC_NRF5340_CHANNELS: 4

syscfg.vals.IPC_NRF5340_FLASH_CLIENT:
HAL_FLASH_MAX_DEVICE_COUNT: 3

syscfg.vals.'BLE_TRANSPORT_LL=="ipc" || BLE_TRANSPORT_IPC_BACKEND=="icbmsg"':
# The APP core have the same values but switched directions
BLE_TRANSPORT_IPC_TX_CHANNEL: 0
BLE_TRANSPORT_IPC_RX_CHANNEL: 1
IPC_SYNC_TX_CHANNEL: 0
IPC_SYNC_RX_CHANNEL: 1
IPC_ICBMSG_TX_REGION_NAME: "\".ipc0_tx\""
IPC_ICBMSG_RX_REGION_NAME: "\".ipc0_rx\""
IPC_ICBMSG_NUM_TX_BLOCKS: 16
IPC_ICBMSG_NUM_RX_BLOCKS: 24
IPC_ICBMSG_TX_REGION_SIZE: 0x4000
IPC_ICBMSG_RX_REGION_SIZE: 0x4000

syscfg.restrictions.BSP_NRF5340_NET_FLASH_ENABLE:
- 'IPC_NRF5340_CHANNELS >= 4'

Expand Down
Loading