Skip to content

Commit 40f5ca0

Browse files
gmarullcarlescufi
gmarull
authored and
carlescufi
committed
modules: hal_nordic: add support for nRF54H20 EngB
Add support for nRF54H20 EngB in the Nordic HAL glue code. Signed-off-by: Gerard Marull-Paretas <[email protected]>
1 parent a9d0eac commit 40f5ca0

File tree

6 files changed

+72
-40
lines changed

6 files changed

+72
-40
lines changed

‎modules/hal_nordic/nrfx/CMakeLists.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,14 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_CPUPPR NRF54H20_XXAA
4444
NRF_PPR)
4545
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_CPUFLPR NRF54H20_XXAA
4646
NRF_FLPR)
47+
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUAPP NRF54H20_ENGB_XXAA
48+
NRF_APPLICATION)
49+
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPURAD NRF54H20_ENGB_XXAA
50+
NRF_RADIOCORE)
51+
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUPPR NRF54H20_ENGB_XXAA
52+
NRF_PPR)
53+
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUFLPR NRF54H20_ENGB_XXAA
54+
NRF_FLPR)
4755
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_ENGA NRF54L15_ENGA_XXAA)
4856
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_ENGA_CPUAPP NRF_APPLICATION)
4957
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_ENGA_CPUFLPR NRF_FLPR)
@@ -221,6 +229,10 @@ mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPUAPP nrf54h20_application.svd)
221229
mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPUPPR nrf54h20_ppr.svd)
222230
mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPUFLPR nrf54h20_flpr.svd)
223231
mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPURAD nrf54h20_radiocore.svd)
232+
mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUAPP nrf54h20_engb_application.svd)
233+
mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUPPR nrf54h20_engb_ppr.svd)
234+
mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUFLPR nrf54h20_engb_flpr.svd)
235+
mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPURAD nrf54h20_engb_radiocore.svd)
224236
mdk_svd_ifdef(CONFIG_SOC_NRF54L15_ENGA_CPUAPP nrf54l15_enga_application.svd)
225237
mdk_svd_ifdef(CONFIG_SOC_NRF54L15_ENGA_CPUFLPR nrf54l15_enga_flpr.svd)
226238
mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUAPP nrf54l15_application.svd)

‎modules/hal_nordic/nrfx/nrfx_config.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1042,13 +1042,13 @@
10421042
#include <nrfx_config_nrf5340_application.h>
10431043
#elif defined(NRF5340_XXAA_NETWORK)
10441044
#include <nrfx_config_nrf5340_network.h>
1045-
#elif defined(NRF54H20_XXAA) && defined(NRF_APPLICATION)
1045+
#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_APPLICATION)
10461046
#include <nrfx_config_nrf54h20_application.h>
1047-
#elif defined(NRF54H20_XXAA) && defined(NRF_RADIOCORE)
1047+
#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_RADIOCORE)
10481048
#include <nrfx_config_nrf54h20_radiocore.h>
1049-
#elif defined(NRF54H20_XXAA) && defined(NRF_PPR)
1049+
#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_PPR)
10501050
#include <nrfx_config_nrf54h20_ppr.h>
1051-
#elif defined(NRF54H20_XXAA) && defined(NRF_FLPR)
1051+
#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_FLPR)
10521052
#include <nrfx_config_nrf54h20_flpr.h>
10531053
#elif (defined(NRF54L15_XXAA) || defined(NRF54L15_ENGA_XXAA)) && defined(NRF_APPLICATION)
10541054
#include <nrfx_config_nrf54l15_enga_application.h>

‎modules/hal_nordic/nrfx/nrfx_config_nrf54h20_application.h

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#error "This file should not be included directly. Include nrfx_config.h instead."
1212
#endif
1313

14+
1415
/**
1516
* @brief NRFX_DEFAULT_IRQ_PRIORITY
1617
*
@@ -358,30 +359,30 @@
358359
#endif
359360

360361
/**
361-
* @brief NRFX_GRTC_CONFIG_SLEEP_ALLOWED
362+
* @brief NRFX_GRTC_CONFIG_AUTOEN
362363
*
363364
* Boolean. Accepted values: 0 and 1.
364365
*/
365-
#ifndef NRFX_GRTC_CONFIG_SLEEP_ALLOWED
366-
#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 0
366+
#ifndef NRFX_GRTC_CONFIG_AUTOEN
367+
#define NRFX_GRTC_CONFIG_AUTOEN 1
367368
#endif
368369

369370
/**
370-
* @brief NRFX_GRTC_CONFIG_AUTOEN
371+
* @brief NRFX_GRTC_CONFIG_AUTOSTART
371372
*
372373
* Boolean. Accepted values: 0 and 1.
373374
*/
374-
#ifndef NRFX_GRTC_CONFIG_AUTOEN
375-
#define NRFX_GRTC_CONFIG_AUTOEN 0
375+
#ifndef NRFX_GRTC_CONFIG_AUTOSTART
376+
#define NRFX_GRTC_CONFIG_AUTOSTART 0
376377
#endif
377378

378379
/**
379-
* @brief NRFX_GRTC_CONFIG_AUTOSTART
380+
* @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
380381
*
381382
* Boolean. Accepted values: 0 and 1.
382383
*/
383-
#ifndef NRFX_GRTC_CONFIG_AUTOSTART
384-
#define NRFX_GRTC_CONFIG_AUTOSTART 0
384+
#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
385+
#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
385386
#endif
386387

387388
/**

‎modules/hal_nordic/nrfx/nrfx_config_nrf54h20_flpr.h

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -254,30 +254,30 @@
254254
#endif
255255

256256
/**
257-
* @brief NRFX_GRTC_CONFIG_SLEEP_ALLOWED
257+
* @brief NRFX_GRTC_CONFIG_AUTOEN
258258
*
259259
* Boolean. Accepted values: 0 and 1.
260260
*/
261-
#ifndef NRFX_GRTC_CONFIG_SLEEP_ALLOWED
262-
#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 0
261+
#ifndef NRFX_GRTC_CONFIG_AUTOEN
262+
#define NRFX_GRTC_CONFIG_AUTOEN 1
263263
#endif
264264

265265
/**
266-
* @brief NRFX_GRTC_CONFIG_AUTOEN
266+
* @brief NRFX_GRTC_CONFIG_AUTOSTART
267267
*
268268
* Boolean. Accepted values: 0 and 1.
269269
*/
270-
#ifndef NRFX_GRTC_CONFIG_AUTOEN
271-
#define NRFX_GRTC_CONFIG_AUTOEN 0
270+
#ifndef NRFX_GRTC_CONFIG_AUTOSTART
271+
#define NRFX_GRTC_CONFIG_AUTOSTART 0
272272
#endif
273273

274274
/**
275-
* @brief NRFX_GRTC_CONFIG_AUTOSTART
275+
* @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
276276
*
277277
* Boolean. Accepted values: 0 and 1.
278278
*/
279-
#ifndef NRFX_GRTC_CONFIG_AUTOSTART
280-
#define NRFX_GRTC_CONFIG_AUTOSTART 0
279+
#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
280+
#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
281281
#endif
282282

283283
/**
@@ -1619,6 +1619,15 @@
16191619
#define NRFX_UARTE_CONFIG_RX_CACHE_ENABLED 1
16201620
#endif
16211621

1622+
/**
1623+
* @brief NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
1624+
*
1625+
* Integer value. Minimum: 0. Maximum: 255.
1626+
*/
1627+
#ifndef NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
1628+
#define NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE 171
1629+
#endif
1630+
16221631
/**
16231632
* @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
16241633
*

‎modules/hal_nordic/nrfx/nrfx_config_nrf54h20_ppr.h

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#error "This file should not be included directly. Include nrfx_config.h instead."
1212
#endif
1313

14+
1415
/**
1516
* @brief NRFX_DEFAULT_IRQ_PRIORITY
1617
*
@@ -62,6 +63,15 @@
6263
#define NRFX_COMP_CONFIG_LOG_LEVEL 3
6364
#endif
6465

66+
/**
67+
* @brief NRFX_COREDEP_VPR_LEGACY
68+
*
69+
* Boolean. Accepted values: 0 and 1.
70+
*/
71+
#ifndef NRFX_COREDEP_VPR_LEGACY
72+
#define NRFX_COREDEP_VPR_LEGACY 0
73+
#endif
74+
6575
/**
6676
* @brief NRFX_DPPI_ENABLED
6777
*
@@ -304,30 +314,30 @@
304314
#endif
305315

306316
/**
307-
* @brief NRFX_GRTC_CONFIG_SLEEP_ALLOWED
317+
* @brief NRFX_GRTC_CONFIG_AUTOEN
308318
*
309319
* Boolean. Accepted values: 0 and 1.
310320
*/
311-
#ifndef NRFX_GRTC_CONFIG_SLEEP_ALLOWED
312-
#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 0
321+
#ifndef NRFX_GRTC_CONFIG_AUTOEN
322+
#define NRFX_GRTC_CONFIG_AUTOEN 1
313323
#endif
314324

315325
/**
316-
* @brief NRFX_GRTC_CONFIG_AUTOEN
326+
* @brief NRFX_GRTC_CONFIG_AUTOSTART
317327
*
318328
* Boolean. Accepted values: 0 and 1.
319329
*/
320-
#ifndef NRFX_GRTC_CONFIG_AUTOEN
321-
#define NRFX_GRTC_CONFIG_AUTOEN 0
330+
#ifndef NRFX_GRTC_CONFIG_AUTOSTART
331+
#define NRFX_GRTC_CONFIG_AUTOSTART 0
322332
#endif
323333

324334
/**
325-
* @brief NRFX_GRTC_CONFIG_AUTOSTART
335+
* @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
326336
*
327337
* Boolean. Accepted values: 0 and 1.
328338
*/
329-
#ifndef NRFX_GRTC_CONFIG_AUTOSTART
330-
#define NRFX_GRTC_CONFIG_AUTOSTART 0
339+
#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
340+
#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
331341
#endif
332342

333343
/**

‎modules/hal_nordic/nrfx/nrfx_config_nrf54h20_radiocore.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -395,30 +395,30 @@
395395
#endif
396396

397397
/**
398-
* @brief NRFX_GRTC_CONFIG_SLEEP_ALLOWED
398+
* @brief NRFX_GRTC_CONFIG_AUTOEN
399399
*
400400
* Boolean. Accepted values: 0 and 1.
401401
*/
402-
#ifndef NRFX_GRTC_CONFIG_SLEEP_ALLOWED
403-
#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 0
402+
#ifndef NRFX_GRTC_CONFIG_AUTOEN
403+
#define NRFX_GRTC_CONFIG_AUTOEN 1
404404
#endif
405405

406406
/**
407-
* @brief NRFX_GRTC_CONFIG_AUTOEN
407+
* @brief NRFX_GRTC_CONFIG_AUTOSTART
408408
*
409409
* Boolean. Accepted values: 0 and 1.
410410
*/
411-
#ifndef NRFX_GRTC_CONFIG_AUTOEN
412-
#define NRFX_GRTC_CONFIG_AUTOEN 0
411+
#ifndef NRFX_GRTC_CONFIG_AUTOSTART
412+
#define NRFX_GRTC_CONFIG_AUTOSTART 0
413413
#endif
414414

415415
/**
416-
* @brief NRFX_GRTC_CONFIG_AUTOSTART
416+
* @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
417417
*
418418
* Boolean. Accepted values: 0 and 1.
419419
*/
420-
#ifndef NRFX_GRTC_CONFIG_AUTOSTART
421-
#define NRFX_GRTC_CONFIG_AUTOSTART 0
420+
#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
421+
#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
422422
#endif
423423

424424
/**

0 commit comments

Comments
 (0)