Skip to content

Commit f519f00

Browse files
nashifhenrikbrixandersen
nashif
authored and
henrikbrixandersen
committed
soc: nxp: move init code from SYS_INIT to hooks
Replace SYS_INIT with SoC hooks and adapt SoC init code Signed-off-by: Anas Nashif <anas.nashif@intel.com>
1 parent 2121730 commit f519f00

File tree

50 files changed

+73
-158
lines changed

Some content is hidden

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

50 files changed

+73
-158
lines changed

‎soc/nxp/imx/imx6sx/Kconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ config SOC_SERIES_IMX6SX
99
select CPU_HAS_FPU
1010
select CPU_HAS_ARM_MPU
1111
select CLOCK_CONTROL
12+
select SOC_EARLY_INIT_HOOK
1213

1314
config SOC_MCIMX6X_M4
1415
select HAS_IMX_HAL

‎soc/nxp/imx/imx6sx/soc.c‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ static void SOC_ClockInit(void)
287287
*
288288
* @return 0
289289
*/
290-
static int mcimx6x_m4_init(void)
290+
void soc_early_init_hook(void)
291291
{
292292
/* Configure RDC */
293293
SOC_RdcInit();
@@ -300,8 +300,4 @@ static int mcimx6x_m4_init(void)
300300

301301
/* Initialize clock */
302302
SOC_ClockInit();
303-
304-
return 0;
305303
}
306-
307-
SYS_INIT(mcimx6x_m4_init, PRE_KERNEL_1, 0);

‎soc/nxp/imx/imx7d/Kconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ config SOC_SERIES_IMX7D
88
select CLOCK_CONTROL
99
select CPU_HAS_FPU
1010
select CPU_HAS_ARM_MPU
11+
select SOC_EARLY_INIT_HOOK
1112

1213
config SOC_MCIMX7D_M4
1314
select HAS_IMX_HAL

‎soc/nxp/imx/imx7d/soc.c‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ static void nxp_mcimx7_mu_config(void)
222222
}
223223
#endif /* CONFIG_IPM_IMX */
224224

225-
static int nxp_mcimx7_init(void)
225+
void soc_early_init_hook(void)
226226
{
227227

228228
/* SoC specific RDC settings */
@@ -250,8 +250,4 @@ static int nxp_mcimx7_init(void)
250250
#ifdef CONFIG_IPM_IMX
251251
nxp_mcimx7_mu_config();
252252
#endif /* CONFIG_IPM_IMX */
253-
254-
return 0;
255253
}
256-
257-
SYS_INIT(nxp_mcimx7_init, PRE_KERNEL_1, 0);

‎soc/nxp/imx/imx8m/Kconfig‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ config SOC_MIMX8MM6_A53
1010
select HAS_MCUX_IOMUXC if PINCTRL
1111
select HAS_MCUX_RDC
1212
select HAS_MCUX_CACHE
13+
select SOC_PREP_HOOK
1314

1415
config SOC_MIMX8MM6_M4
1516
select ARM
@@ -21,6 +22,7 @@ config SOC_MIMX8MM6_M4
2122
select HAS_MCUX_RDC
2223
select HAS_MCUX_IGPIO
2324
select HAS_MCUX_IOMUXC
25+
select SOC_EARLY_INIT_HOOK
2426

2527
config SOC_MIMX8ML8_A53
2628
select ARM64
@@ -31,6 +33,7 @@ config SOC_MIMX8ML8_A53
3133
select HAS_MCUX_IOMUXC if PINCTRL
3234
select HAS_MCUX_RDC
3335
select HAS_MCUX_CACHE
36+
select SOC_PREP_HOOK
3437

3538
config SOC_MIMX8MN6_A53
3639
select ARM64
@@ -41,6 +44,7 @@ config SOC_MIMX8MN6_A53
4144
select HAS_MCUX_IOMUXC if PINCTRL
4245
select HAS_MCUX_RDC
4346
select HAS_MCUX_CACHE
47+
select SOC_PREP_HOOK
4448

4549
config SOC_MIMX8ML8_ADSP
4650
select XTENSA
@@ -71,6 +75,7 @@ config SOC_MIMX8ML8_M7
7175
select ARM_MPU
7276
select HAS_MCUX_IGPIO
7377
select HAS_MCUX_IOMUXC
78+
select SOC_EARLY_INIT_HOOK
7479

7580
config SOC_MIMX8MQ6_M4
7681
select ARM

‎soc/nxp/imx/imx8m/a53/soc.c‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,7 @@ static void soc_rdc_init(void)
5252

5353
#endif
5454

55-
static int soc_init(void)
55+
void soc_prep_hook(void)
5656
{
5757
soc_rdc_init();
58-
59-
return 0;
6058
}
61-
62-
SYS_INIT(soc_init, EARLY, 1);

‎soc/nxp/imx/imx8m/m4_mini/soc.c‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,16 +148,12 @@ static void SOC_ClockInit(void)
148148
CLOCK_EnableClock(kCLOCK_Sec_Debug);
149149
}
150150

151-
static int nxp_mimx8mm6_init(void)
151+
void soc_early_init_hook(void)
152152
{
153153

154154
/* SoC specific RDC settings */
155155
SOC_RdcInit();
156156

157157
/* SoC specific Clock settings */
158158
SOC_ClockInit();
159-
160-
return 0;
161159
}
162-
163-
SYS_INIT(nxp_mimx8mm6_init, PRE_KERNEL_1, 0);

‎soc/nxp/imx/imx8m/m4_quad/soc.c‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,16 +111,12 @@ static void SOC_ClockInit(void)
111111
CLOCK_EnableClock(kCLOCK_Sec_Debug);
112112
}
113113

114-
static int nxp_mimx8mq6_init(void)
114+
void soc_early_init_hook(void)
115115
{
116116

117117
/* SoC specific RDC settings */
118118
SOC_RdcInit();
119119

120120
/* SoC specific Clock settings */
121121
SOC_ClockInit();
122-
123-
return 0;
124122
}
125-
126-
SYS_INIT(nxp_mimx8mq6_init, PRE_KERNEL_1, 0);

‎soc/nxp/imx/imx8m/m7/soc.c‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ static void gpio_init(void)
203203
#endif
204204
}
205205

206-
static int nxp_mimx8ml8_init(void)
206+
void soc_early_init_hook(void)
207207
{
208208

209209
/* SoC specific RDC settings */
@@ -213,8 +213,4 @@ static int nxp_mimx8ml8_init(void)
213213
SOC_ClockInit();
214214

215215
gpio_init();
216-
217-
return 0;
218216
}
219-
220-
SYS_INIT(nxp_mimx8ml8_init, PRE_KERNEL_1, 0);

‎soc/nxp/imxrt/imxrt10xx/Kconfig‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ config SOC_SERIES_IMXRT10XX
66
select CPU_CORTEX_M_HAS_DWT
77
select CPU_HAS_ICACHE
88
select CPU_HAS_DCACHE
9-
select SOC_RESET_HOOK
109
select CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS
1110
select ARM
1211
select CLOCK_CONTROL
@@ -29,6 +28,8 @@ config SOC_SERIES_IMXRT10XX
2928
select HAS_MCUX_USB_EHCI
3029
select HAS_SWO
3130
select HAS_PM
31+
select SOC_RESET_HOOK
32+
select SOC_EARLY_INIT_HOOK
3233

3334
config SOC_MIMXRT1011
3435
select CPU_HAS_FPU

0 commit comments

Comments
 (0)