Skip to content

Commit b897f54

Browse files
FRASTMerwango
authored andcommitted
stm32cube: update stm32mp2 to cube version V1.2.0
Update Cube version for STM32MP2xx series on https://github.com/STMicroelectronics from version v1.1.0 to version v1.2.0 Signed-off-by: F. Ramu <[email protected]>
1 parent a2ccb68 commit b897f54

File tree

152 files changed

+639293
-662990
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+639293
-662990
lines changed

stm32cube/stm32mp2xx/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Copyright (C) 2025 Savoir-faire Linux, Inc.
2+
# Copyright (c) 2025 STMicroelectronics
23
#
34
# SPDX-License-Identifier: Apache-2.0
45

@@ -107,4 +108,3 @@ zephyr_library_sources_ifdef(CONFIG_USE_STM32_LL_USB drivers/src/stm32mp2xx_ll_u
107108
zephyr_library_sources_ifdef(CONFIG_USE_STM32_LL_USB_DRD drivers/src/stm32mp2xx_ll_usb_drd.c)
108109
zephyr_library_sources_ifdef(CONFIG_USE_STM32_LL_USB_OTG drivers/src/stm32mp2xx_ll_usb_otg.c)
109110
zephyr_library_sources_ifdef(CONFIG_USE_STM32_UTIL_I3C drivers/src/stm32mp2xx_util_i3c.c)
110-

stm32cube/stm32mp2xx/README

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Origin:
66
https://github.com/STMicroelectronics/STM32CubeMP2
77

88
Status:
9-
version 1.1.0
9+
version v1.2.0
1010

1111
Purpose:
1212
ST Microelectronics official MCU package for STM32MP2 series.
@@ -23,7 +23,7 @@ URL:
2323
https://github.com/STMicroelectronics/STM32CubeMP2
2424

2525
Commit:
26-
1b1ff6b48df3c9b7417ac411dbd8dfd097f0bb04
26+
474a04c8907e466c28fae407236a8f81ea1d9e13
2727

2828
Maintained-by:
2929
External

stm32cube/stm32mp2xx/drivers/include/stm32mp2xx_hal_bsec.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,10 +155,10 @@ typedef struct
155155
/** @defgroup BSEC_State BSEC Device lifecycle state
156156
* @{
157157
*/
158-
#define HAL_BSEC_OPEN_STATE (0x16U << BSEC_SR_NVSTATE_Pos) /*!< BSEC is in open state */
159-
#define HAL_BSEC_CLOSED_STATE (0x0DU << BSEC_SR_NVSTATE_Pos) /*!< BSEC is in closed state */
160-
#define HAL_BSEC_INVALID_STATE (0x07U << BSEC_SR_NVSTATE_Pos) /*!< BSEC is in invalid state */
161-
#define HAL_BSEC_INVALID_STATE_WITH_TAMPER (0x23U << BSEC_SR_NVSTATE_Pos) /*!< BSEC is in invalid state with an active confirmed tamper triggered */
158+
#define HAL_BSEC_OPEN_STATE (0x16UL << BSEC_SR_NVSTATE_Pos) /*!< BSEC is in open state */
159+
#define HAL_BSEC_CLOSED_STATE (0x0DUL << BSEC_SR_NVSTATE_Pos) /*!< BSEC is in closed state */
160+
#define HAL_BSEC_INVALID_STATE (0x07UL << BSEC_SR_NVSTATE_Pos) /*!< BSEC is in invalid state */
161+
#define HAL_BSEC_INVALID_STATE_WITH_TAMPER (0x23UL << BSEC_SR_NVSTATE_Pos) /*!< BSEC is in invalid state with an active confirmed tamper triggered */
162162
/**
163163
* @}
164164
*/

stm32cube/stm32mp2xx/drivers/include/stm32mp2xx_hal_cryp.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -468,13 +468,13 @@ typedef void (*pCRYP_CallbackTypeDef)(CRYP_HandleTypeDef *hcryp); /*!< point
468468
/** @defgroup CRYP_Key_Mode CRYP or SAES Key Mode
469469
* @{
470470
*/
471-
#define CRYP_KEYMODE_NORMAL 0x00000000U /*!< Normal key usage, Key registers are freely usable */
471+
#define CRYP_KEYMODE_NORMAL 0x00000000UL /*!< Normal key usage, Key registers are freely usable */
472472
#if defined (SAES_CR_WRAPEN)
473473
#define CRYP_KEYMODE_WRAPPED SAES_CR_WRAPEN /*!< Only for SAES, Wrapped key: to encrypt or decrypt AES keys */
474-
#define CRYP_KEYMODE_SHARED (0x02U << CRYP_CR_KMOD_Pos) /*!< Only for SAES, Wrapped key: to encrypt or decrypt AES keys */
474+
#define CRYP_KEYMODE_SHARED (0x02UL << CRYP_CR_KMOD_Pos) /*!< Only for SAES, Wrapped key: to encrypt or decrypt AES keys */
475475
#else
476476
#define CRYP_KEYMODE_WRAPPED SAES_CR_KMOD_0 /*!< Only for SAES, Wrapped key: to encrypt or decrypt AES keys */
477-
#define CRYP_KEYMODE_SHARED (0x02U << CRYP_CR_KMOD_Pos) /*!< Key shared by SAES peripheral */
477+
#define CRYP_KEYMODE_SHARED (0x02UL << CRYP_CR_KMOD_Pos) /*!< Key shared by SAES peripheral */
478478
#endif /* SAES_CR_WRAPEN */
479479
/**
480480
* @}
@@ -484,7 +484,7 @@ typedef void (*pCRYP_CallbackTypeDef)(CRYP_HandleTypeDef *hcryp); /*!< point
484484
* @{
485485
*/
486486

487-
#define CRYP_KEYSEL_NORMAL 0x00000000U /*!< Normal key, key registers SAES_KEYx or CRYP_KEYx */
487+
#define CRYP_KEYSEL_NORMAL 0x00000000UL /*!< Normal key, key registers SAES_KEYx or CRYP_KEYx */
488488
#define CRYP_KEYSEL_HW SAES_CR_KEYSEL_0 /*!< Only for SAES, Hardware key : derived hardware
489489
unique key (DHUK 256-bit) */
490490
#define CRYP_KEYSEL_SW SAES_CR_KEYSEL_1 /*!< Only for SAES, Software key : boot hardware
@@ -507,7 +507,7 @@ typedef void (*pCRYP_CallbackTypeDef)(CRYP_HandleTypeDef *hcryp); /*!< point
507507

508508
#define CRYP_KEYPROT_ENABLE SAES_CR_KEYPROT /*!< Only for SAES, Key can't be shared between
509509
two applications with different security contexts */
510-
#define CRYP_KEYPROT_DISABLE 0x00000000U /*!< Only for SAES, Key can be shared between
510+
#define CRYP_KEYPROT_DISABLE 0x00000000UL /*!< Only for SAES, Key can be shared between
511511
two applications with different security contexts */
512512

513513
/**
@@ -518,11 +518,11 @@ typedef void (*pCRYP_CallbackTypeDef)(CRYP_HandleTypeDef *hcryp); /*!< point
518518
* @{
519519
*/
520520
#if defined(SAES_CR_WRAPID)
521-
#define CRYP_KEYSHARED_SELF 0x00000000U /*!< Only for SAES, key is used by SAES peripheral */
521+
#define CRYP_KEYSHARED_SELF 0x00000000UL /*!< Only for SAES, key is used by SAES peripheral */
522522
#define CRYP_KEYSHARED_CRYP1 SAES_CR_WRAPID_CRYP1 /*!< Only for SAES, key is shared with CRYP1 peripheral */
523523
#define CRYP_KEYSHARED_CRYP2 SAES_CR_WRAPID_CRYP2 /*!< Only for SAES, key is shared with CRYP2 peripheral */
524524
#else
525-
#define CRYP_KEYSHARED_CRYP1 0x00000000U /*!< Only for SAES, key is shared with CRYP1 peripheral */
525+
#define CRYP_KEYSHARED_CRYP1 0x00000000UL /*!< Only for SAES, key is shared with CRYP1 peripheral */
526526
#define CRYP_KEYSHARED_CRYP2 SAES_CR_KSHAREID_0 /*!< Only for SAES, key is shared with CRYP2 peripheral */
527527
#endif /* SAES_CR_WRAPID */
528528
/**
@@ -533,7 +533,7 @@ typedef void (*pCRYP_CallbackTypeDef)(CRYP_HandleTypeDef *hcryp); /*!< point
533533
* @{
534534
*/
535535

536-
#define CRYP_MODE_ENCRYPT 0x00000000U /*!< SAES peripheral encryption mode */
536+
#define CRYP_MODE_ENCRYPT 0x00000000UL /*!< SAES peripheral encryption mode */
537537
#if defined (SAES_CR_WRAPEN)
538538
#define CRYP_MODE_KEY_DERIVATION SAES_CR_OPMOD_0 /*!< SAES peripheral key derivation */
539539
#define CRYP_MODE_DECRYPT SAES_CR_OPMOD_1 /*!< SAES peripheral decryption mode */
@@ -551,7 +551,7 @@ typedef void (*pCRYP_CallbackTypeDef)(CRYP_HandleTypeDef *hcryp); /*!< point
551551
* @{
552552
*/
553553

554-
#define CRYP_OPERATINGMODE_ENCRYPT 0x00000000U /*!< CRYP peripheral encryption mode */
554+
#define CRYP_OPERATINGMODE_ENCRYPT 0x00000000UL /*!< CRYP peripheral encryption mode */
555555
#define CRYP_OPERATINGMODE_DECRYPT CRYP_CR_ALGODIR /*!< CRYP peripheral decryption mode */
556556

557557
/**
@@ -568,7 +568,7 @@ typedef void (*pCRYP_CallbackTypeDef)(CRYP_HandleTypeDef *hcryp); /*!< point
568568
* @param INSTANCE: specifies the HW instance.
569569
* @retval None
570570
*/
571-
#define IS_CRYP_INSTANCE(INSTANCE) ((INSTANCE) == CRYP1 || (INSTANCE) == CRYP2)
571+
#define IS_CRYP_INSTANCE(INSTANCE) (((INSTANCE) == CRYP1) || ((INSTANCE) == CRYP2))
572572
#define IS_SAES_INSTANCE(INSTANCE) ((INSTANCE) == SAES)
573573

574574
/** @brief Reset CRYP handle state

0 commit comments

Comments
 (0)