Skip to content

Commit 96a3108

Browse files
mbrossardmathias-arm
mbrossard
authored and
mathias-arm
committed
nrf52820_hic: update to nrfx v2.5.0 (1/3)
From https://github.com/NordicSemiconductor/nrfx at tag 'v2.5.0'
1 parent b3daa08 commit 96a3108

32 files changed

+1646
-902
lines changed

‎records/board/nrf52820_if.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ common:
77
board:
88
- source/board/nrf52820_if.c
99
target:
10-
- source/family/nordic/nrf5x/target.c
10+
- source/family/nordic/nrf52/target.c
1111
- source/family/nordic/target_reset_nrf52.c

‎source/board/nrf52820_if.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@ const char * const board_id_nrf52 = "1101";
2626
const char * const board_id_nrf52_64 = "9903";
2727
const char * const board_id_nrf52840 = "1102";
2828

29-
extern target_cfg_t target_device_nrf52;
29+
extern target_cfg_t target_device_nrf51822_32;
3030
extern target_cfg_t target_device_nrf52_64;
3131
extern target_cfg_t target_device_nrf52840;
32+
target_cfg_t target_device;
3233

3334
static void nrf_prerun_board_config(void) {
3435
#if defined(TARGET_NRF52)

‎source/hic_hal/nordic/nrf52820/cmsis/compiler_abstraction.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
33
Copyright (c) 2010 - 2021, Nordic Semiconductor ASA All rights reserved.
44
5+
SPDX-License-Identifier: BSD-3-Clause
6+
57
Redistribution and use in source and binary forms, with or without
68
modification, are permitted provided that the following conditions are met:
79

‎source/hic_hal/nordic/nrf52820/cmsis/nrf.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
33
Copyright (c) 2010 - 2021, Nordic Semiconductor ASA All rights reserved.
44
5+
SPDX-License-Identifier: BSD-3-Clause
6+
57
Redistribution and use in source and binary forms, with or without
68
modification, are permitted provided that the following conditions are met:
79
@@ -35,8 +37,8 @@ POSSIBILITY OF SUCH DAMAGE.
3537

3638
/* MDK version */
3739
#define MDK_MAJOR_VERSION 8
38-
#define MDK_MINOR_VERSION 38
39-
#define MDK_MICRO_VERSION 0
40+
#define MDK_MINOR_VERSION 40
41+
#define MDK_MICRO_VERSION 2
4042

4143

4244
/* Define coprocessor domains */

‎source/hic_hal/nordic/nrf52820/cmsis/nrf51_erratas.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
66
Copyright (c) 2010 - 2021, Nordic Semiconductor ASA All rights reserved.
77
8+
SPDX-License-Identifier: BSD-3-Clause
9+
810
Redistribution and use in source and binary forms, with or without
911
modification, are permitted provided that the following conditions are met:
1012

‎source/hic_hal/nordic/nrf52820/cmsis/nrf51_to_nrf52.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
33
Copyright (c) 2010 - 2021, Nordic Semiconductor ASA All rights reserved.
44
5+
SPDX-License-Identifier: BSD-3-Clause
6+
57
Redistribution and use in source and binary forms, with or without
68
modification, are permitted provided that the following conditions are met:
79

‎source/hic_hal/nordic/nrf52820/cmsis/nrf52.h‎

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/*
22
* Copyright (c) 2010 - 2021, Nordic Semiconductor ASA All rights reserved.
33
*
4+
* SPDX-License-Identifier: BSD-3-Clause
5+
*
46
* Redistribution and use in source and binary forms, with or without
57
* modification, are permitted provided that the following conditions are met:
68
*
@@ -30,10 +32,10 @@
3032
* @file nrf52.h
3133
* @brief CMSIS HeaderFile
3234
* @version 1
33-
* @date 15. January 2021
34-
* @note Generated by SVDConv V3.3.35 on Friday, 15.01.2021 17:02:05
35+
* @date 29. April 2021
36+
* @note Generated by SVDConv V3.3.35 on Thursday, 29.04.2021 12:43:45
3537
* from File 'nrf52.svd',
36-
* last modified on Friday, 15.01.2021 16:02:00
38+
* last modified on Thursday, 29.04.2021 10:43:40
3739
*/
3840

3941

@@ -752,13 +754,33 @@ typedef struct { /*!< (@ 0x10001000) UICR Structu
752754
__IM uint32_t RESERVED1[64];
753755
__IOM uint32_t PSELRESET[2]; /*!< (@ 0x00000200) Description collection[0]: Mapping of the nRESET
754756
function (see POWER chapter for details) */
755-
__IOM uint32_t APPROTECT; /*!< (@ 0x00000208) Access Port protection */
757+
__IOM uint32_t APPROTECT; /*!< (@ 0x00000208) Access port protection */
756758
__IOM uint32_t NFCPINS; /*!< (@ 0x0000020C) Setting of pins dedicated to NFC functionality:
757759
NFC antenna or GPIO */
758760
} NRF_UICR_Type; /*!< Size = 528 (0x210) */
759761

760762

761763

764+
/* =========================================================================================================================== */
765+
/* ================ APPROTECT ================ */
766+
/* =========================================================================================================================== */
767+
768+
769+
/**
770+
* @brief Access Port Protection (APPROTECT)
771+
*/
772+
773+
typedef struct { /*!< (@ 0x40000000) APPROTECT Structure */
774+
__IM uint32_t RESERVED[340];
775+
__IOM uint32_t FORCEPROTECT; /*!< (@ 0x00000550) Software force enable APPROTECT mechanism until
776+
next reset. This register can only be written
777+
once. */
778+
__IM uint32_t RESERVED1;
779+
__IOM uint32_t DISABLE; /*!< (@ 0x00000558) Software disable APPROTECT mechanism */
780+
} NRF_APPROTECT_Type; /*!< Size = 1372 (0x55c) */
781+
782+
783+
762784
/* =========================================================================================================================== */
763785
/* ================ BPROT ================ */
764786
/* =========================================================================================================================== */
@@ -2268,6 +2290,7 @@ typedef struct { /*!< (@ 0x50000000) P0 Structure
22682290

22692291
#define NRF_FICR_BASE 0x10000000UL
22702292
#define NRF_UICR_BASE 0x10001000UL
2293+
#define NRF_APPROTECT_BASE 0x40000000UL
22712294
#define NRF_BPROT_BASE 0x40000000UL
22722295
#define NRF_POWER_BASE 0x40000000UL
22732296
#define NRF_CLOCK_BASE 0x40000000UL
@@ -2346,6 +2369,7 @@ typedef struct { /*!< (@ 0x50000000) P0 Structure
23462369

23472370
#define NRF_FICR ((NRF_FICR_Type*) NRF_FICR_BASE)
23482371
#define NRF_UICR ((NRF_UICR_Type*) NRF_UICR_BASE)
2372+
#define NRF_APPROTECT ((NRF_APPROTECT_Type*) NRF_APPROTECT_BASE)
23492373
#define NRF_BPROT ((NRF_BPROT_Type*) NRF_BPROT_BASE)
23502374
#define NRF_POWER ((NRF_POWER_Type*) NRF_POWER_BASE)
23512375
#define NRF_CLOCK ((NRF_CLOCK_Type*) NRF_CLOCK_BASE)

0 commit comments

Comments
 (0)