Skip to content

Commit cda95b7

Browse files
actions-useractions-user
committed
Update Zephyr MSDK Hal based on MSDK PR: analogdevicesinc/msdk#1303 
1 parent 934fb9a commit cda95b7

File tree

4 files changed

+1
-76
lines changed

4 files changed

+1
-76
lines changed

‎MAX/Libraries/CMSIS/Device/Maxim/MAX32657/Include/max32657.svd

-30
Original file line numberDiff line numberDiff line change
@@ -10317,24 +10317,6 @@
1031710317
<bitOffset>2</bitOffset>
1031810318
<bitWidth>1</bitWidth>
1031910319
</field>
10320-
<field>
10321-
<name>AESKG_MEU</name>
10322-
<description>Generate and transfer 256 bit MEU key to AES Key storage.</description>
10323-
<bitOffset>3</bitOffset>
10324-
<bitWidth>1</bitWidth>
10325-
</field>
10326-
<field>
10327-
<name>AESKG_MEMPROT_XIP</name>
10328-
<description>Generate and transfer 128 bit MEMPROT_XIP key to AES key storage.</description>
10329-
<bitOffset>4</bitOffset>
10330-
<bitWidth>1</bitWidth>
10331-
</field>
10332-
<field>
10333-
<name>AESKG_MEMPROT_DIP</name>
10334-
<description>Generate and transfer 128 bit MEMPROT_DIP key to AES key storage.</description>
10335-
<bitOffset>5</bitOffset>
10336-
<bitWidth>1</bitWidth>
10337-
</field>
1033810320
<field>
1033910321
<name>OD_ROMON</name>
1034010322
<description>Start ring oscillator monitor on demand test.</description>
@@ -10365,12 +10347,6 @@
1036510347
<bitOffset>10</bitOffset>
1036610348
<bitWidth>1</bitWidth>
1036710349
</field>
10368-
<field>
10369-
<name>KEYWIPE</name>
10370-
<description>To wipe the Battery Backed key.</description>
10371-
<bitOffset>15</bitOffset>
10372-
<bitWidth>1</bitWidth>
10373-
</field>
1037410350
<field>
1037510351
<name>GET_TERO_CNT</name>
1037610352
<description>Get Tero Count.</description>
@@ -10472,12 +10448,6 @@
1047210448
<bitOffset>3</bitOffset>
1047310449
<bitWidth>1</bitWidth>
1047410450
</field>
10475-
<field>
10476-
<name>AES_KEYGEN</name>
10477-
<description>AESKGD.</description>
10478-
<bitOffset>4</bitOffset>
10479-
<bitWidth>1</bitWidth>
10480-
</field>
1048110451
<field>
1048210452
<name>OD_ROMON</name>
1048310453
<description>On demand ring oscillator test status.</description>

‎MAX/Libraries/CMSIS/Device/Maxim/MAX32657/Include/trng_regs.h

-15
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,6 @@ typedef struct {
111111
#define MXC_F_TRNG_CTRL_HEALTH_IE_POS 2 /**< CTRL_HEALTH_IE Position */
112112
#define MXC_F_TRNG_CTRL_HEALTH_IE ((uint32_t)(0x1UL << MXC_F_TRNG_CTRL_HEALTH_IE_POS)) /**< CTRL_HEALTH_IE Mask */
113113

114-
#define MXC_F_TRNG_CTRL_AESKG_MEU_POS 3 /**< CTRL_AESKG_MEU Position */
115-
#define MXC_F_TRNG_CTRL_AESKG_MEU ((uint32_t)(0x1UL << MXC_F_TRNG_CTRL_AESKG_MEU_POS)) /**< CTRL_AESKG_MEU Mask */
116-
117-
#define MXC_F_TRNG_CTRL_AESKG_MEMPROT_XIP_POS 4 /**< CTRL_AESKG_MEMPROT_XIP Position */
118-
#define MXC_F_TRNG_CTRL_AESKG_MEMPROT_XIP ((uint32_t)(0x1UL << MXC_F_TRNG_CTRL_AESKG_MEMPROT_XIP_POS)) /**< CTRL_AESKG_MEMPROT_XIP Mask */
119-
120-
#define MXC_F_TRNG_CTRL_AESKG_MEMPROT_DIP_POS 5 /**< CTRL_AESKG_MEMPROT_DIP Position */
121-
#define MXC_F_TRNG_CTRL_AESKG_MEMPROT_DIP ((uint32_t)(0x1UL << MXC_F_TRNG_CTRL_AESKG_MEMPROT_DIP_POS)) /**< CTRL_AESKG_MEMPROT_DIP Mask */
122-
123114
#define MXC_F_TRNG_CTRL_OD_ROMON_POS 6 /**< CTRL_OD_ROMON Position */
124115
#define MXC_F_TRNG_CTRL_OD_ROMON ((uint32_t)(0x1UL << MXC_F_TRNG_CTRL_OD_ROMON_POS)) /**< CTRL_OD_ROMON Mask */
125116

@@ -135,9 +126,6 @@ typedef struct {
135126
#define MXC_F_TRNG_CTRL_EBLS_POS 10 /**< CTRL_EBLS Position */
136127
#define MXC_F_TRNG_CTRL_EBLS ((uint32_t)(0x1UL << MXC_F_TRNG_CTRL_EBLS_POS)) /**< CTRL_EBLS Mask */
137128

138-
#define MXC_F_TRNG_CTRL_KEYWIPE_POS 15 /**< CTRL_KEYWIPE Position */
139-
#define MXC_F_TRNG_CTRL_KEYWIPE ((uint32_t)(0x1UL << MXC_F_TRNG_CTRL_KEYWIPE_POS)) /**< CTRL_KEYWIPE Mask */
140-
141129
#define MXC_F_TRNG_CTRL_GET_TERO_CNT_POS 16 /**< CTRL_GET_TERO_CNT Position */
142130
#define MXC_F_TRNG_CTRL_GET_TERO_CNT ((uint32_t)(0x1UL << MXC_F_TRNG_CTRL_GET_TERO_CNT_POS)) /**< CTRL_GET_TERO_CNT Mask */
143131

@@ -183,9 +171,6 @@ typedef struct {
183171
#define MXC_F_TRNG_STATUS_SRCFAIL_POS 3 /**< STATUS_SRCFAIL Position */
184172
#define MXC_F_TRNG_STATUS_SRCFAIL ((uint32_t)(0x1UL << MXC_F_TRNG_STATUS_SRCFAIL_POS)) /**< STATUS_SRCFAIL Mask */
185173

186-
#define MXC_F_TRNG_STATUS_AES_KEYGEN_POS 4 /**< STATUS_AES_KEYGEN Position */
187-
#define MXC_F_TRNG_STATUS_AES_KEYGEN ((uint32_t)(0x1UL << MXC_F_TRNG_STATUS_AES_KEYGEN_POS)) /**< STATUS_AES_KEYGEN Mask */
188-
189174
#define MXC_F_TRNG_STATUS_OD_ROMON_POS 6 /**< STATUS_OD_ROMON Position */
190175
#define MXC_F_TRNG_STATUS_OD_ROMON ((uint32_t)(0x1UL << MXC_F_TRNG_STATUS_OD_ROMON_POS)) /**< STATUS_OD_ROMON Mask */
191176

‎MAX/Libraries/PeriphDrivers/Source/TRNG/trng_revc_me30.svd

-30
Original file line numberDiff line numberDiff line change
@@ -51,24 +51,6 @@
5151
<bitOffset>2</bitOffset>
5252
<bitWidth>1</bitWidth>
5353
</field>
54-
<field>
55-
<name>AESKG_MEU</name>
56-
<description>Generate and transfer 256 bit MEU key to AES Key storage.</description>
57-
<bitOffset>3</bitOffset>
58-
<bitWidth>1</bitWidth>
59-
</field>
60-
<field>
61-
<name>AESKG_MEMPROT_XIP</name>
62-
<description>Generate and transfer 128 bit MEMPROT_XIP key to AES key storage.</description>
63-
<bitOffset>4</bitOffset>
64-
<bitWidth>1</bitWidth>
65-
</field>
66-
<field>
67-
<name>AESKG_MEMPROT_DIP</name>
68-
<description>Generate and transfer 128 bit MEMPROT_DIP key to AES key storage.</description>
69-
<bitOffset>5</bitOffset>
70-
<bitWidth>1</bitWidth>
71-
</field>
7254
<field>
7355
<name>OD_ROMON</name>
7456
<description>Start ring oscillator monitor on demand test.</description>
@@ -99,12 +81,6 @@
9981
<bitOffset>10</bitOffset>
10082
<bitWidth>1</bitWidth>
10183
</field>
102-
<field>
103-
<name>KEYWIPE</name>
104-
<description>To wipe the Battery Backed key.</description>
105-
<bitOffset>15</bitOffset>
106-
<bitWidth>1</bitWidth>
107-
</field>
10884
<field>
10985
<name>GET_TERO_CNT</name>
11086
<description>Get Tero Count.</description>
@@ -206,12 +182,6 @@
206182
<bitOffset>3</bitOffset>
207183
<bitWidth>1</bitWidth>
208184
</field>
209-
<field>
210-
<name>AES_KEYGEN</name>
211-
<description>AESKGD.</description>
212-
<bitOffset>4</bitOffset>
213-
<bitWidth>1</bitWidth>
214-
</field>
215185
<field>
216186
<name>OD_ROMON</name>
217187
<description>On demand ring oscillator test status.</description>

‎MAX/msdk_sha

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6e61aa32b0dc0b7ef6e8476c039e2aacb792fc1c
1+
e2ee5899f60b059591d1ffe74db6c40f4d97a5c8

0 commit comments

Comments
 (0)