Skip to content

Commit 7f48f2e

Browse files
sihyung-maximEddie
authored andcommitted
[MSDK-976] Removed PUF references from ME18. (#318)
* MSDK-976: Removed PUF references from ME18. * ME18: Added owm_reva_me18.svd to reflect correct CTRL_STAT.presence_detect (bit 5) position. * ME18: Removed PUF keys from AESKEYS. * Verify_Register_SVD: Updated the action to pass if an unsupported file was deleted. --------- Co-authored-by: Eddie <[email protected]> MSDK-Commit: e7b885bd75e2c0425fb00578889d31a4e582a811
1 parent dda27fb commit 7f48f2e

File tree

6 files changed

+239
-213
lines changed

6 files changed

+239
-213
lines changed

MAX/Libraries/CMSIS/Device/Maxim/MAX32690/Include/aeskeys_regs.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,6 @@ extern "C" {
8888
typedef struct {
8989
__IO uint128_t key0; /**< <tt>\b 0x000:</tt> AESKEYS KEY0 Register */
9090
__IO uint128_t key1; /**< <tt>\b 0x010:</tt> AESKEYS KEY1 Register */
91-
__IO uint256_t puf_key1; /**< <tt>\b 0x020:</tt> AESKEYS PUF_KEY1 Register */
92-
__IO uint256_t puf_key2; /**< <tt>\b 0x040:</tt> AESKEYS PUF_KEY2 Register */
9391
} mxc_aeskeys_regs_t;
9492

9593
/* Register offsets for module AESKEYS */
@@ -101,8 +99,6 @@ typedef struct {
10199
*/
102100
#define MXC_R_AESKEYS_KEY0 ((uint32_t)0x00000000UL) /**< Offset from AESKEYS Base Address: <tt> 0x0000</tt> */
103101
#define MXC_R_AESKEYS_KEY1 ((uint32_t)0x00000010UL) /**< Offset from AESKEYS Base Address: <tt> 0x0010</tt> */
104-
#define MXC_R_AESKEYS_PUF_KEY1 ((uint32_t)0x00000020UL) /**< Offset from AESKEYS Base Address: <tt> 0x0020</tt> */
105-
#define MXC_R_AESKEYS_PUF_KEY2 ((uint32_t)0x00000040UL) /**< Offset from AESKEYS Base Address: <tt> 0x0040</tt> */
106102
/**@} end of group aeskeys_registers */
107103

108104
#ifdef __cplusplus

MAX/Libraries/CMSIS/Device/Maxim/MAX32690/Include/max32690.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ typedef enum {
174174
RSV92_IRQn, /* 0x6C 0x01B0 108: Reserved */
175175
RSV93_IRQn, /* 0x6D 0x01B4 109: Reserved */
176176
RSV94_IRQn, /* 0x6E 0x01B8 110: Reserved */
177-
PUF_IRQn, /* 0x6F 0x01BC 111: Physically Uncloneable Function */
177+
RSV95_IRQn, /* 0x6F 0x01BC 111: Reserved */
178178
RSV96_IRQn, /* 0x70 0x01C0 112: Reserved */
179179
RSV97_IRQn, /* 0x71 0x01C4 113: Reserved */
180180
RSV98_IRQn, /* 0x72 0x01C8 114: Reserved */
@@ -394,11 +394,6 @@ typedef enum {
394394
#define MXC_BASE_MCR ((uint32_t)0x40006C00UL)
395395
#define MXC_MCR ((mxc_mcr_regs_t *)MXC_BASE_MCR)
396396

397-
/******************************************************************************/
398-
/* PUF Secure Controller */
399-
#define MXC_BASE_PUF ((uint32_t)0x40007000UL)
400-
#define MXC_PUF ((mxc_puf_regs_t *)MXC_BASE_PUF)
401-
402397
/******************************************************************************/
403398
/* GPIO */
404399
#define MXC_CFG_GPIO_INSTANCES (5)

MAX/Libraries/CMSIS/Device/Maxim/MAX32690/Include/max32690.svd

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -888,18 +888,6 @@
888888
<addressOffset>0x010</addressOffset>
889889
<size>128</size>
890890
</register>
891-
<register>
892-
<name>PUF_KEY1</name>
893-
<description>PUF Key 1.</description>
894-
<addressOffset>0x020</addressOffset>
895-
<size>256</size>
896-
</register>
897-
<register>
898-
<name>PUF_KEY2</name>
899-
<description>PUF Key 2.</description>
900-
<addressOffset>0x040</addressOffset>
901-
<size>256</size>
902-
</register>
903891
</registers>
904892
</peripheral>
905893
<!--AESKEYS AES Key Registers.-->
@@ -10980,7 +10968,7 @@ memory.
1098010968
<field>
1098110969
<name>presence_detect</name>
1098210970
<description>Presence Pulse Detected.</description>
10983-
<bitRange>[7:7]</bitRange>
10971+
<bitRange>[5:5]</bitRange>
1098410972
<access>read-only</access>
1098510973
</field>
1098610974
</fields>

MAX/Libraries/CMSIS/Device/Maxim/MAX32690/Include/puf_regs.h

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

MAX/Libraries/PeriphDrivers/Source/AES/AESKEYS/aeskeys_me18.svd

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,6 @@
2323
<addressOffset>0x010</addressOffset>
2424
<size>128</size>
2525
</register>
26-
<register>
27-
<name>PUF_KEY1</name>
28-
<description>PUF Key 1.</description>
29-
<addressOffset>0x020</addressOffset>
30-
<size>256</size>
31-
</register>
32-
<register>
33-
<name>PUF_KEY2</name>
34-
<description>PUF Key 2.</description>
35-
<addressOffset>0x040</addressOffset>
36-
<size>256</size>
37-
</register>
3826
</registers>
3927
</peripheral>
4028
<!-- AESKEYS-->

0 commit comments

Comments
 (0)