Skip to content

Commit 4df6996

Browse files
haduongquangmanuargue
haduongquang
authored and
manuargue
committed
s32: soc: s32z27: update config to RTD 2.0.0
Update tool-generated code to Real-Time Drivers 2.0.0 for configurations: - Clock/OsIf - UART - SPI - CANEXCEL - NETC/MRU Signed-off-by: Ha Duong Quang <[email protected]>
1 parent 30223f2 commit 4df6996

27 files changed

+4014
-3863
lines changed

‎s32/soc/s32z270/include/CanEXCEL_Ip_Cfg.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022-2023 NXP
2+
* Copyright 2022-2024 NXP
33
*
44
* SPDX-License-Identifier: BSD-3-Clause
55
*/
@@ -32,15 +32,15 @@ extern "C"{
3232
#define CANEXCEL_IP_CFG_AR_RELEASE_MAJOR_VERSION_H 4
3333
#define CANEXCEL_IP_CFG_AR_RELEASE_MINOR_VERSION_H 7
3434
#define CANEXCEL_IP_CFG_AR_RELEASE_REVISION_VERSION_H 0
35-
#define CANEXCEL_IP_CFG_SW_MAJOR_VERSION_H 1
35+
#define CANEXCEL_IP_CFG_SW_MAJOR_VERSION_H 2
3636
#define CANEXCEL_IP_CFG_SW_MINOR_VERSION_H 0
3737
#define CANEXCEL_IP_CFG_SW_PATCH_VERSION_H 0
3838
/*==================================================================================================
3939
* FILE VERSION CHECKS
4040
==================================================================================================*/
4141
/* External Structures generated by CanEXCEL_Ip_PBCfg */
4242
#define CANEXCEL_IP_CONFIG_EXT \
43-
CANEXCEL_IP_INIT_SA_PB_CFG
43+
CANEXCEL_IP_INIT_SA_PB_CFG
4444
#define CANEXCEL_IP_STATE_EXT CANEXCEL_IP_INIT_SA_STATE_PB_CFG
4545
/* Time out value in uS */
4646
#define CANEXCEL_IP_TIMEOUT_DURATION (10000)
@@ -52,6 +52,8 @@ extern "C"{
5252
#define CANEXCEL_IP_MAX_FILTER_BANK (32U)
5353
#define CANEXCEL_IP_ERROR_INTERRUPT_SUPPORT (STD_ON)
5454
#define CANEXCEL_IP_USE_FRZ_IRQ (STD_ON)
55+
#define CANEXCEL_IP_FEATURE_HAS_MSGDESC_RXCTRL_MODE (STD_ON)
56+
#define CANEXCEL_IP_HAS_SYSLOCK01 (STD_OFF)
5557

5658
#ifdef __cplusplus
5759
}

‎s32/soc/s32z270/include/CanEXCEL_Ip_CfgDefines.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022-2023 NXP
2+
* Copyright 2022-2024 NXP
33
*
44
* SPDX-License-Identifier: BSD-3-Clause
55
*/
@@ -25,8 +25,8 @@ extern "C"{
2525
* 3) internal and external interfaces from this unit
2626
2727
==================================================================================================*/
28-
#include "S32Z2.h"
29-
28+
#include "S32Z2.h"
29+
3030
/*==================================================================================================
3131
* SOURCE FILE VERSION INFORMATION
3232
==================================================================================================*/
@@ -37,7 +37,7 @@ extern "C"{
3737
#define CANEXCEL_IP_CFGDEFINES_AR_RELEASE_MAJOR_VERSION_H 4
3838
#define CANEXCEL_IP_CFGDEFINES_AR_RELEASE_MINOR_VERSION_H 7
3939
#define CANEXCEL_IP_CFGDEFINES_AR_RELEASE_REVISION_VERSION_H 0
40-
#define CANEXCEL_IP_CFGDEFINES_SW_MAJOR_VERSION_H 1
40+
#define CANEXCEL_IP_CFGDEFINES_SW_MAJOR_VERSION_H 2
4141
#define CANEXCEL_IP_CFGDEFINES_SW_MINOR_VERSION_H 0
4242
#define CANEXCEL_IP_CFGDEFINES_SW_PATCH_VERSION_H 0
4343
/*==================================================================================================
@@ -60,3 +60,4 @@ extern "C"{
6060
/** @} */
6161

6262
#endif /* CANEXCEL_IP_CFGDEFINES_H */
63+

‎s32/soc/s32z270/include/CanEXCEL_Ip_Sa_Init_PBcfg.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022-2023 NXP
2+
* Copyright 2022-2024 NXP
33
*
44
* SPDX-License-Identifier: BSD-3-Clause
55
*/
@@ -18,7 +18,7 @@
1818
#define CANEXCEL_IP_SA_AR_RELEASE_MAJOR_VERSION_INIT_PBCFG_H 4
1919
#define CANEXCEL_IP_SA_AR_RELEASE_MINOR_VERSION_INIT_PBCFG_H 7
2020
#define CANEXCEL_IP_SA_AR_RELEASE_REVISION_VERSION_INIT_PBCFG_H 0
21-
#define CANEXCEL_IP_SA_SW_MAJOR_VERSION_INIT_PBCFG_H 1
21+
#define CANEXCEL_IP_SA_SW_MAJOR_VERSION_INIT_PBCFG_H 2
2222
#define CANEXCEL_IP_SA_SW_MINOR_VERSION_INIT_PBCFG_H 0
2323
#define CANEXCEL_IP_SA_SW_PATCH_VERSION_INIT_PBCFG_H 0
2424

‎s32/soc/s32z270/include/Clock_Ip_Cfg.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*
2-
* Copyright 2022-2023 NXP
2+
* Copyright 2022-2024 NXP
33
*
44
* SPDX-License-Identifier: BSD-3-Clause
55
*/
66

77
/**
88
* @file Clock_Ip_Cfg.h
9-
* @version 1.0.0
9+
* @version 2.0.0
1010
*
1111
* @brief AUTOSAR Mcu - Clock configuration header file.
1212
* @details This file is the header containing all the necessary information for CLOCK
@@ -40,7 +40,7 @@ extern "C"{
4040
#define CLOCK_IP_CFG_AR_RELEASE_MAJOR_VERSION 4
4141
#define CLOCK_IP_CFG_AR_RELEASE_MINOR_VERSION 7
4242
#define CLOCK_IP_CFG_AR_RELEASE_REVISION_VERSION 0
43-
#define CLOCK_IP_CFG_SW_MAJOR_VERSION 1
43+
#define CLOCK_IP_CFG_SW_MAJOR_VERSION 2
4444
#define CLOCK_IP_CFG_SW_MINOR_VERSION 0
4545
#define CLOCK_IP_CFG_SW_PATCH_VERSION 0
4646

@@ -109,7 +109,7 @@ typedef enum
109109
CLOCK_IP_RAM_MEMORY_CONFIG_EXIT_POINT = 0x88U,
110110
CLOCK_IP_FLASH_MEMORY_CONFIG_ENTRY_POINT = 0x89U,
111111
CLOCK_IP_FLASH_MEMORY_CONFIG_EXIT_POINT = 0x90U
112-
112+
113113
} Clock_Ip_MemoryConfigStageType;
114114
#endif
115115

‎s32/soc/s32z270/include/Clock_Ip_Cfg_Defines.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*
2-
* Copyright 2022-2023 NXP
2+
* Copyright 2022-2024 NXP
33
*
44
* SPDX-License-Identifier: BSD-3-Clause
55
*/
66

77
/**
88
* @file Clock_Ip_Cfg_Defines.h
9-
* @version 1.0.0
9+
* @version 2.0.0
1010
*
1111
* @brief AUTOSAR Mcu - Post-Build(PB) configuration file code template.
1212
* @details Code template for Post-Build(PB) configuration file generation.
@@ -58,7 +58,7 @@ extern "C"{
5858
#define CLOCK_IP_CFG_DEFINES_AR_RELEASE_MAJOR_VERSION 4
5959
#define CLOCK_IP_CFG_DEFINES_AR_RELEASE_MINOR_VERSION 7
6060
#define CLOCK_IP_CFG_DEFINES_AR_RELEASE_REVISION_VERSION 0
61-
#define CLOCK_IP_CFG_DEFINES_SW_MAJOR_VERSION 1
61+
#define CLOCK_IP_CFG_DEFINES_SW_MAJOR_VERSION 2
6262
#define CLOCK_IP_CFG_DEFINES_SW_MINOR_VERSION 0
6363
#define CLOCK_IP_CFG_DEFINES_SW_PATCH_VERSION 0
6464

‎s32/soc/s32z270/include/DeviceDefinition.h

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
/*
2+
* Copyright 2022-2024 NXP
3+
*
4+
* SPDX-License-Identifier: BSD-3-Clause
5+
*/
6+
7+
#ifndef DEVICEDEFINITION_H
8+
#define DEVICEDEFINITION_H
9+
10+
/**
11+
* @file DeviceDefinition.h
12+
*
13+
* @addtogroup BASENXP_COMPONENT
14+
* @{
15+
*/
16+
17+
#ifdef __cplusplus
18+
extern "C"{
19+
#endif
20+
21+
22+
/*==================================================================================================
23+
* INCLUDE FILES
24+
* 1) system and project includes
25+
* 2) needed interfaces from external units
26+
* 3) internal and external interfaces from this unit
27+
==================================================================================================*/
28+
29+
/*==================================================================================================
30+
* SOURCE FILE VERSION INFORMATION
31+
==================================================================================================*/
32+
33+
/**
34+
@{
35+
* @brief Parameters that shall be published within the modules header file.
36+
* The integration of incompatible files shall be avoided.
37+
*/
38+
#define DEVICEDEFINITION_VENDOR_ID 43
39+
#define DEVICEDEFINITION_MODULE_ID 0
40+
#define DEVICEDEFINITION_AR_RELEASE_MAJOR_VERSION_H 4
41+
#define DEVICEDEFINITION_AR_RELEASE_MINOR_VERSION_H 7
42+
#define DEVICEDEFINITION_AR_RELEASE_REVISION_VERSION_H 0
43+
#define DEVICEDEFINITION_SW_MAJOR_VERSION_H 2
44+
#define DEVICEDEFINITION_SW_MINOR_VERSION_H 0
45+
#define DEVICEDEFINITION_SW_PATCH_VERSION_H 0
46+
/**@}*/
47+
/*==================================================================================================
48+
* FILE VERSION CHECKS
49+
==================================================================================================*/
50+
51+
/*==================================================================================================
52+
* CONSTANTS
53+
==================================================================================================*/
54+
55+
/*==================================================================================================
56+
* DEFINES AND MACROS
57+
==================================================================================================*/
58+
/**
59+
* @brief This macro define specific derivative and sub derivative.
60+
*/
61+
#ifndef S32Z2XX
62+
#define S32Z2XX
63+
#endif
64+
65+
#ifndef S32Z2X
66+
#define S32Z2X
67+
#endif
68+
69+
#ifndef DERIVATIVE_S32Z2XX
70+
#define DERIVATIVE_S32Z2XX
71+
#endif
72+
/**
73+
* @brief This macro define specific platform.
74+
*/
75+
#ifndef S32ZSE
76+
#define S32ZSE
77+
#endif
78+
79+
/*==================================================================================================
80+
* ENUMS
81+
==================================================================================================*/
82+
83+
/*==================================================================================================
84+
* STRUCTURES AND OTHER TYPEDEFS
85+
==================================================================================================*/
86+
87+
/*==================================================================================================
88+
* GLOBAL VARIABLE DECLARATIONS
89+
==================================================================================================*/
90+
91+
/*==================================================================================================
92+
* FUNCTION PROTOTYPES
93+
==================================================================================================*/
94+
95+
#ifdef __cplusplus
96+
}
97+
#endif
98+
99+
100+
/** @} */
101+
102+
#endif /* DEVICEDEFINITION_H */
103+

‎s32/soc/s32z270/include/Linflexd_Uart_Ip_Cfg.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022-2023 NXP
2+
* Copyright 2022-2024 NXP
33
*
44
* SPDX-License-Identifier: BSD-3-Clause
55
*/
@@ -21,16 +21,16 @@ extern "C"{
2121

2222

2323
/*==================================================================================================
24-
* INCLUDE FILES
25-
* 1) system and project includes
26-
* 2) needed interfaces from external units
27-
* 3) internal and external interfaces from this unit
28-
* 4) user callback header files
24+
* INCLUDE FILES
25+
* 1) system and project includes
26+
* 2) needed interfaces from external units
27+
* 3) internal and external interfaces from this unit
28+
* 4) user callback header files
2929
==================================================================================================*/
3030

3131
#include "Linflexd_Uart_Ip_Sa_Init_PBcfg.h"
3232

33-
#include "StandardTypes.h"
33+
#include "Std_Types.h"
3434

3535
/*==================================================================================================
3636
* SOURCE FILE VERSION INFORMATION
@@ -39,7 +39,7 @@ extern "C"{
3939
#define LINFLEXD_UART_IP_CFG_AR_RELEASE_MAJOR_VERSION 4
4040
#define LINFLEXD_UART_IP_CFG_AR_RELEASE_MINOR_VERSION 7
4141
#define LINFLEXD_UART_IP_CFG_AR_RELEASE_REVISION_VERSION 0
42-
#define LINFLEXD_UART_IP_CFG_SW_MAJOR_VERSION 1
42+
#define LINFLEXD_UART_IP_CFG_SW_MAJOR_VERSION 2
4343
#define LINFLEXD_UART_IP_CFG_SW_MINOR_VERSION 0
4444
#define LINFLEXD_UART_IP_CFG_SW_PATCH_VERSION 0
4545

@@ -63,11 +63,11 @@ extern "C"{
6363
#error "Software Version Numbers of Linflexd_Uart_Ip_Cfg.h and Linflexd_Uart_Ip_Sa_Init_PBcfg.h are different"
6464
#endif
6565
#ifndef DISABLE_MCAL_INTERMODULE_ASR_CHECK
66-
/* Check if current file and StandardTypes.h header file are of the same Autosar version */
66+
/* Check if current file and Std_Types.h header file are of the same Autosar version */
6767
#if ((LINFLEXD_UART_IP_CFG_AR_RELEASE_MAJOR_VERSION != STD_AR_RELEASE_MAJOR_VERSION) || \
6868
(LINFLEXD_UART_IP_CFG_AR_RELEASE_MINOR_VERSION != STD_AR_RELEASE_MINOR_VERSION) \
6969
)
70-
#error "AutoSar Version Numbers of Linflexd_Uart_Ip_Cfg.h and StandardTypes.h are different"
70+
#error "AutoSar Version Numbers of Linflexd_Uart_Ip_Cfg.h and Std_Types.h are different"
7171
#endif
7272
#endif
7373

‎s32/soc/s32z270/include/Linflexd_Uart_Ip_Defines.h

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022-2023 NXP
2+
* Copyright 2022-2024 NXP
33
*
44
* SPDX-License-Identifier: BSD-3-Clause
55
*/
@@ -25,7 +25,6 @@ extern "C"{
2525
* 3) internal and external interfaces from this unit
2626
* 4) user callback header files
2727
==================================================================================================*/
28-
#include <zephyr/devicetree.h>
2928
#include "S32Z2_LINFLEXD.h"
3029
#include "Mcal.h"
3130
/*==================================================================================================
@@ -35,7 +34,7 @@ extern "C"{
3534
#define LINFLEXD_UART_IP_DEFINES_AR_RELEASE_MAJOR_VERSION 4
3635
#define LINFLEXD_UART_IP_DEFINES_AR_RELEASE_MINOR_VERSION 7
3736
#define LINFLEXD_UART_IP_DEFINES_AR_RELEASE_REVISION_VERSION 0
38-
#define LINFLEXD_UART_IP_DEFINES_SW_MAJOR_VERSION 1
37+
#define LINFLEXD_UART_IP_DEFINES_SW_MAJOR_VERSION 2
3938
#define LINFLEXD_UART_IP_DEFINES_SW_MINOR_VERSION 0
4039
#define LINFLEXD_UART_IP_DEFINES_SW_PATCH_VERSION 0
4140

@@ -46,7 +45,7 @@ extern "C"{
4645
/* Checks against Mcal.h */
4746
#if ((LINFLEXD_UART_IP_DEFINES_AR_RELEASE_MAJOR_VERSION != MCAL_AR_RELEASE_MAJOR_VERSION) || \
4847
(LINFLEXD_UART_IP_DEFINES_AR_RELEASE_MINOR_VERSION != MCAL_AR_RELEASE_MINOR_VERSION) \
49-
)
48+
)
5049
#error "AUTOSAR Version Numbers of Linflexd_Uart_Ip_Defines.h and Mcal.h are different"
5150
#endif
5251
#endif
@@ -55,49 +54,52 @@ extern "C"{
5554
==================================================================================================*/
5655

5756
/*==================================================================================================
58-
* DEFINES AND MACROS
57+
* DEFINES AND MACROS
5958
==================================================================================================*/
60-
/* @Custom baudrate values */
61-
#define LINFLEXD_UART_IP_CUSTOM_BAUDRATE
59+
/** Number of instances of the LIN module. */
60+
#define LINFLEXD_IP_INSTANCE_COUNT LINFLEXD_INSTANCE_COUNT
6261

62+
/** Array initializer of LINFLEXD peripheral base pointers */
63+
#define LINFLEXD_IP_BASE_PTRS IP_LINFLEXD_BASE_PTRS
6364
/* @brief Development error detection */
6465
#define LINFLEXD_UART_IP_DEV_ERROR_DETECT (STD_OFF)
6566

6667
/* @brief Total number of channels configured */
67-
#define LINFLEXD_UART_IP_NUMBER_OF_INSTANCES (DT_NUM_INST_STATUS_OKAY(nxp_s32_linflexd))
68+
#define LINFLEXD_UART_IP_NUMBER_OF_INSTANCES (2U)
6869

6970
/* @brief Uart Osif source counter. This parameter is used to select between different OsIf counter implementation */
7071
#define LINFLEXD_UART_IP_TIMEOUT_TYPE (OSIF_COUNTER_DUMMY)
7172

72-
/* @brief Number of loops before returning STATUS_TIMEOUT.*/
73-
#define LINFLEXD_UART_IP_TIMEOUT_VALUE_US (0)
73+
/* @brief Number of loops before returning LINFLEXD_STATUS_TIMEOUT.*/
74+
#define LINFLEXD_UART_IP_TIMEOUT_VALUE_US (0U)
7475

75-
/* @brief LINFLEXD rx/tx/error interrupt lines ored together. */
76+
/* @brief LINFLEXD rx/tx/error interrupt lines ORED together. */
7677
#define LINFLEXD_UART_IP_ORED_INT_LINES (1U)
7778

78-
/* @brief LINFlexD DMA support */
79+
/* @brief LINFLEXD DMA support */
7980
#define LINFLEXD_UART_IP_HAS_DMA_ENABLED (STD_OFF)
8081

81-
/* @brief LINFlexD User-mode support */
82-
#define LINFLEXD_UART_IP_ENABLE_USER_MODE_SUPPORT (STD_OFF)
83-
8482
/* @brief LINFLEXD DMA enabled instances */
85-
#define LINFLEXD_UART_IP_INST_HAS_DMA {(boolean)TRUE, (boolean)TRUE, (boolean)TRUE, (boolean)TRUE, (boolean)TRUE, (boolean)TRUE, (boolean)TRUE, (boolean)TRUE, (boolean)TRUE, (boolean)TRUE, (boolean)TRUE, (boolean)TRUE, (boolean)TRUE}
83+
#define LINFLEXD_UART_IP_INST_HAS_DMA \
84+
{(boolean)TRUE, (boolean)TRUE, (boolean)TRUE, (boolean)TRUE, (boolean)TRUE, (boolean)TRUE, (boolean)TRUE, (boolean)TRUE, (boolean)TRUE, (boolean)TRUE, (boolean)TRUE, (boolean)TRUE, (boolean)TRUE}
85+
86+
/* @brief Support for User mode. If this parameter has been configured to TRUE, the Uart driver can be executed from both supervisor and user mode. */
87+
#define LINFLEXD_UART_IP_ENABLE_USER_MODE_SUPPORT (STD_OFF)
8688

8789
/* @brief Support for Uart Timeout Interrupt. If this parameter has been configured to TRUE, the Uart driver will enable Timeout Interrupt. */
8890
#define LINFLEXD_UART_IP_ENABLE_TIMEOUT_INTERRUPT (STD_OFF)
8991

9092
#if (STD_ON == LINFLEXD_UART_IP_ENABLE_TIMEOUT_INTERRUPT)
91-
/* @brief Array of instances that have loopback mode enabled. */
92-
#define LINFLEXD_UART_IP_ENABLE_TIMEOUT_INTERRUPT_PER_INSTANCE {(boolean) FALSE, (boolean) FALSE, (boolean) FALSE, (boolean) FALSE, (boolean) FALSE, (boolean) FALSE, (boolean) FALSE, (boolean) FALSE, (boolean) FALSE, (boolean) FALSE, (boolean) FALSE, (boolean) FALSE, (boolean) FALSE}
93+
/* @brief Array of instances that have timeout interrupt enabled. */
94+
#define LINFLEXD_UART_IP_ENABLE_TIMEOUT_INTERRUPT_PER_INSTANCE {(boolean) FALSE,(boolean) FALSE,(boolean) FALSE,(boolean) FALSE,(boolean) FALSE,(boolean) FALSE,(boolean) FALSE,(boolean) FALSE,(boolean) FALSE,(boolean) FALSE,(boolean) FALSE,(boolean) FALSE,(boolean) FALSE }
9395
#endif
9496

9597
/* @brief Support for Internal Loopback. If this parameter has been configured to TRUE, the Uart driver will be executed in Loopback mode. */
9698
#define LINFLEXD_UART_IP_ENABLE_INTERNAL_LOOPBACK (STD_OFF)
9799

98100
#if (STD_ON == LINFLEXD_UART_IP_ENABLE_INTERNAL_LOOPBACK)
99101
/* @brief Array of instances that have loopback mode enabled. */
100-
#define LINFLEXD_UART_IP_ENABLE_INTERNAL_LOOPBACK_PER_INSTANCE {(boolean) FALSE, (boolean) FALSE, (boolean) FALSE, (boolean) FALSE, (boolean) FALSE, (boolean) FALSE, (boolean) FALSE, (boolean) FALSE, (boolean) FALSE, (boolean) FALSE, (boolean) FALSE, (boolean) FALSE, (boolean) FALSE}
102+
#define LINFLEXD_UART_IP_ENABLE_INTERNAL_LOOPBACK_PER_INSTANCE {(boolean) FALSE,(boolean) FALSE,(boolean) FALSE,(boolean) FALSE,(boolean) FALSE,(boolean) FALSE,(boolean) FALSE,(boolean) FALSE,(boolean) FALSE,(boolean) FALSE,(boolean) FALSE,(boolean) FALSE,(boolean) FALSE }
101103
#endif
102104

103105
/* Check the driver user mode is enabled only when the MCAL_ENABLE_USER_MODE_SUPPORT is enabled */

0 commit comments

Comments
 (0)