Skip to content

Commit b03bced

Browse files
committed
Revert "modules: Move nrfx glue code to main Zephyr repository"
This reverts commit 251648a. Signed-off-by: Peter Bigot <[email protected]>
1 parent eb0ceed commit b03bced

21 files changed

+185
-21159
lines changed

modules/Kconfig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ source "modules/Kconfig.loramac-node"
2121
source "modules/Kconfig.mbedtls"
2222
source "modules/Kconfig.mcux"
2323
source "modules/Kconfig.microchip"
24+
source "modules/Kconfig.nordic"
2425
source "modules/Kconfig.nuvoton"
2526
source "modules/Kconfig.open-amp"
2627
source "modules/Kconfig.silabs"
@@ -49,9 +50,6 @@ comment "Unavailable modules, please install those via the project manifest."
4950
# config ZEPHYR_<MODULE_NAME_UPPER>_MODULE
5051
# bool
5152

52-
comment "hal_nordic module not available."
53-
depends on !ZEPHYR_HAL_NORDIC_MODULE
54-
5553
# This ensures that symbols are available in Kconfig for dependency checking
5654
# and referencing, while keeping the settings themselves unavailable when the
5755
# modules are not present in the workspace

modules/hal_nordic/nrfx/Kconfig renamed to modules/Kconfig.nordic

Lines changed: 183 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,189 @@
11
# Copyright (c) 2016 Nordic Semiconductor ASA
22
# SPDX-License-Identifier: Apache-2.0
33

4+
config HAS_NORDIC_DRIVERS
5+
bool
6+
7+
menu "Nordic drivers"
8+
depends on HAS_NORDIC_DRIVERS
9+
10+
menuconfig NRF_802154_RADIO_DRIVER
11+
bool "Enable nRF IEEE 802.15.4 radio driver"
12+
depends on HAS_HW_NRF_RADIO_IEEE802154
13+
select DYNAMIC_INTERRUPTS
14+
select ENTROPY_GENERATOR
15+
select NRF_HW_TIMER1_RESERVED
16+
help
17+
This option enables nRF IEEE 802.15.4 radio driver in Zephyr. Note,
18+
that beside the radio peripheral itself, this drivers occupies several
19+
other peripherals. A complete list can be found in the hal_nordic
20+
repository, within drivers/nrf_radio_802154/nrf_802154_peripherals.h
21+
file. As the nRF IEEE 802.15.4 radio driver defines IRQ configuration
22+
abstraction layer API and its Zephyr-specific implementation uses dynamic
23+
interrupts, the DYNAMIC_INTERRUPTS switch is selected unconditionally.
24+
25+
if NRF_802154_RADIO_DRIVER
26+
27+
config NRF_802154_MULTIPROTOCOL_SUPPORT
28+
bool
29+
help
30+
In dynamic multiprotocol applications, access to the radio peripheral
31+
must be distributed by an arbiter. To support this arbitration
32+
in the driver, this option must be enabled. Otherwise, the driver
33+
assumes that access to the radio peripheral is granted indefinitely.
34+
35+
choice NRF_802154_CCA_MODE
36+
prompt "nRF IEEE 802.15.4 CCA mode"
37+
default NRF_802154_CCA_MODE_ED
38+
help
39+
CCA mode
40+
41+
config NRF_802154_CCA_MODE_ED
42+
bool "Energy Above Threshold"
43+
44+
config NRF_802154_CCA_MODE_CARRIER
45+
bool "Carrier Seen"
46+
47+
config NRF_802154_CCA_MODE_CARRIER_AND_ED
48+
bool "Energy Above Threshold AND Carrier Seen"
49+
50+
config NRF_802154_CCA_MODE_CARRIER_OR_ED
51+
bool "Energy Above Threshold OR Carrier Seen"
52+
53+
endchoice
54+
55+
choice NRF_802154_SL_TYPE
56+
prompt "nRF IEEE 802.15.4 Service Layer Type"
57+
default NRF_802154_SL_OPENSOURCE
58+
59+
config NRF_802154_SL_OPENSOURCE
60+
bool "nRF IEEE 802.15.4 Open source Service Layer"
61+
62+
endchoice
63+
64+
config NRF_802154_CCA_ED_THRESHOLD
65+
int "nRF IEEE 802.15.4 CCA Energy Detection threshold"
66+
default 45
67+
help
68+
If energy detected in a given channel is above the value then the
69+
channel is deemed busy. The unit is defined as per 802.15.4-2006 spec.
70+
71+
config NRF_802154_CCA_CORR_THRESHOLD
72+
int "nRF IEEE 802.15.4 CCA Correlator threshold"
73+
default 45
74+
75+
config NRF_802154_CCA_CORR_LIMIT
76+
int "nRF IEEE 802.15.4 CCA Correlator limit"
77+
default 2
78+
help
79+
Limit for occurrences above correlator threshold. When not equal to
80+
zero the correlator based signal detect is enabled.
81+
82+
config NRF_802154_PENDING_SHORT_ADDRESSES
83+
int "nRF 802.15.4 pending short addresses"
84+
default 16
85+
help
86+
Number of slots containing short addresses of nodes for which pending data is stored
87+
88+
config NRF_802154_PENDING_EXTENDED_ADDRESSES
89+
int "nRF 802.15.4 pending extended addresses"
90+
default 16
91+
help
92+
Number of slots containing extended addresses of nodes for which pending data is stored
93+
94+
config NRF_802154_RX_BUFFERS
95+
int "nRF 802.15.4 receive buffers"
96+
default 16
97+
help
98+
Number of buffers in nRF 802.15.4 driver receive queue. If this value is modified,
99+
its serialization host counterpart must be set to the exact same value.
100+
101+
endif # NRF_802154_RADIO_DRIVER
102+
103+
config NRF_802154_SER_HOST
104+
bool "nRF IEEE 802.15.4 Driver serialization host"
105+
depends on !NRF_802154_RADIO_DRIVER
106+
depends on !HAS_HW_NRF_RADIO_IEEE802154
107+
select IPM
108+
select IPM_NRFX
109+
select IPM_MSG_CH_0_ENABLE
110+
select IPM_MSG_CH_1_ENABLE
111+
select IPM_MSG_CH_0_TX
112+
select IPM_MSG_CH_1_RX
113+
select OPENAMP
114+
select IEEE802154_NRF5_EXT_IRQ_MGMT if IEEE802154_NRF5
115+
help
116+
Enable serialization of nRF IEEE 802.15.4 Driver. This option is to be
117+
used if radio is not available in the core, but radio services are
118+
provided by a serialization backend.
119+
120+
menuconfig NRF_802154_SER_RADIO
121+
bool "nRF IEEE 802.15.4 Driver serialization radio"
122+
depends on HAS_HW_NRF_RADIO_IEEE802154
123+
depends on !IEEE802154_NRF5
124+
select IPM
125+
select IPM_NRFX
126+
select IPM_MSG_CH_0_ENABLE
127+
select IPM_MSG_CH_1_ENABLE
128+
select IPM_MSG_CH_0_RX
129+
select IPM_MSG_CH_1_TX
130+
select OPENAMP
131+
select NRF_802154_RADIO_DRIVER
132+
help
133+
Enable serialization of nRF IEEE 802.15.4 Driver. This option is to be
134+
used if radio is available in the core to provide radio services over
135+
a serialization backend.
136+
137+
if NRF_802154_SER_RADIO
138+
139+
config NRF_802154_SER_RADIO_INIT_PRIO
140+
int "nRF52 IEEE 802.15.4 serialization initialization priority"
141+
default 81
142+
help
143+
Set the initialization priority number. Do not mess with it unless
144+
you know what you are doing.
145+
146+
endif
147+
148+
menu "nRF 802.15.4 serialization"
149+
depends on NRF_802154_SER_HOST || NRF_802154_SER_RADIO
150+
151+
config NRF_802154_SER_LOG
152+
bool "802.15.4 serialization logs"
153+
default n
154+
help
155+
This option enable debug logs of 802.15.4 serialization module.
156+
157+
config NRF_802154_SER_BUFFER_ALLOCATOR_THREAD_SAFE
158+
bool
159+
# Hidden option
160+
default y
161+
help
162+
This option specifies if buffers for 802.15.4 serialization are allocated
163+
in a thread-safe manner.
164+
165+
config NRF_802154_SER_DEFAULT_RESPONSE_TIMEOUT
166+
int "Default Spinel serialization response timeout in milliseconds"
167+
default 500
168+
help
169+
This option specifies default timeout of spinel status response
170+
in milliseconds.
171+
172+
if NRF_802154_SER_HOST
173+
174+
config NRF_802154_RX_BUFFERS
175+
int "nRF 802.15.4 receive buffers"
176+
default 16
177+
help
178+
Number of buffers in nRF 802.15.4 driver serialization host's receive queue.
179+
If this value is modified, its remote counterpart must be set to the exact same value.
180+
181+
endif
182+
183+
endmenu # NRF_802154_SER_HOST || NRF_802154_SER_RADIO
184+
185+
endmenu # HAS_NORDIC_DRIVERS
186+
4187
config HAS_NRFX
5188
bool
6189

modules/hal_nordic/CMakeLists.txt

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)