On Tue, Mar 26, 2024 at 09:19:49AM -0300, Fabio Estevam wrote:

From: Fabio Estevam festevam@denx.de

Add a weak default reset_cpu() implementation just like it is done on arch/arm/mach-imx/cpu.c.

This allows the removal of the empty reset_cpu() in several board files.

Signed-off-by: Fabio Estevam festevam@denx.de

Thanks Fabio!

Tested-by: Hiago De Franco hiago.franco@toradex.com # Toradex Colibri iMX8X

---

arch/arm/mach-imx/imx8/cpu.c | 4 ++++ board/advantech/imx8qm_dmsse20_a1/imx8qm_dmsse20_a1.c | 11 ----------- board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c | 8 -------- board/congatec/cgtqmx8/cgtqmx8.c | 7 ------- board/freescale/imx8qm_mek/imx8qm_mek.c | 8 -------- board/freescale/imx8qxp_mek/imx8qxp_mek.c | 8 -------- board/toradex/apalis-imx8/apalis-imx8.c | 8 -------- board/toradex/colibri-imx8x/colibri-imx8x.c | 8 -------- 8 files changed, 4 insertions(+), 58 deletions(-)

diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c index 0b91e448a5d..6e643188f40 100644 --- a/arch/arm/mach-imx/imx8/cpu.c +++ b/arch/arm/mach-imx/imx8/cpu.c @@ -84,6 +84,10 @@ static char *get_reset_cause(void) } }

+__weak void reset_cpu(void) +{ +}

int arch_cpu_init(void) { #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_RECOVER_DATA_SECTION) diff --git a/board/advantech/imx8qm_dmsse20_a1/imx8qm_dmsse20_a1.c b/board/advantech/imx8qm_dmsse20_a1/imx8qm_dmsse20_a1.c index 8b4d73052eb..56b7bdb57c9 100644 --- a/board/advantech/imx8qm_dmsse20_a1/imx8qm_dmsse20_a1.c +++ b/board/advantech/imx8qm_dmsse20_a1/imx8qm_dmsse20_a1.c @@ -136,17 +136,6 @@ void detail_board_ddr_info(void) puts("\nDDR "); }

-/*

• • Board specific reset that is system reset.
• */

-void reset_cpu(void) -{

• puts("SCI reboot request");
• while (1)

• putc('.');
  

-}

#ifdef CONFIG_OF_BOARD_SETUP int ft_board_setup(void *blob, struct bd_info *bd) { diff --git a/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c b/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c index 206ce7d5c13..7f766a688bb 100644 --- a/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c +++ b/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c @@ -112,14 +112,6 @@ int board_init(void) return 0; }

-/*

• • Board specific reset that is system reset.
• */

-void reset_cpu(void) -{

• /* TODO */

-}

int board_mmc_get_env_dev(int devno) { return devno; diff --git a/board/congatec/cgtqmx8/cgtqmx8.c b/board/congatec/cgtqmx8/cgtqmx8.c index 26189ff66f5..3b01354bb6b 100644 --- a/board/congatec/cgtqmx8/cgtqmx8.c +++ b/board/congatec/cgtqmx8/cgtqmx8.c @@ -371,13 +371,6 @@ void detail_board_ddr_info(void) puts("\nDDR "); }

-/*

• • Board specific reset that is system reset.
• */

-void reset_cpu(void) -{

• /* TODO */

-}

#ifdef CONFIG_OF_BOARD_SETUP int ft_board_setup(void *blob, struct bd_info *bd) diff --git a/board/freescale/imx8qm_mek/imx8qm_mek.c b/board/freescale/imx8qm_mek/imx8qm_mek.c index d96d1d07bb1..2b209c8886f 100644 --- a/board/freescale/imx8qm_mek/imx8qm_mek.c +++ b/board/freescale/imx8qm_mek/imx8qm_mek.c @@ -102,14 +102,6 @@ int board_init(void) return 0; }

-/*

• • Board specific reset that is system reset.
• */

-void reset_cpu(void) -{

• /* TODO */

-}

#ifdef CONFIG_OF_BOARD_SETUP int ft_board_setup(void *blob, struct bd_info *bd) { diff --git a/board/freescale/imx8qxp_mek/imx8qxp_mek.c b/board/freescale/imx8qxp_mek/imx8qxp_mek.c index 516cefd2f24..833bee55462 100644 --- a/board/freescale/imx8qxp_mek/imx8qxp_mek.c +++ b/board/freescale/imx8qxp_mek/imx8qxp_mek.c @@ -126,14 +126,6 @@ int board_init(void) return 0; }

-/*

• • Board specific reset that is system reset.
• */

-void reset_cpu(void) -{

• /* TODO */

-}

#ifdef CONFIG_OF_BOARD_SETUP int ft_board_setup(void *blob, struct bd_info *bd) { diff --git a/board/toradex/apalis-imx8/apalis-imx8.c b/board/toradex/apalis-imx8/apalis-imx8.c index 49719f2f553..0f993e644d7 100644 --- a/board/toradex/apalis-imx8/apalis-imx8.c +++ b/board/toradex/apalis-imx8/apalis-imx8.c @@ -291,14 +291,6 @@ int board_init(void) return 0; }

-/*

• • Board specific reset that is system reset.
• */

-void reset_cpu(void) -{

• /* TODO */

-}

#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) int ft_board_setup(void *blob, struct bd_info *bd) { diff --git a/board/toradex/colibri-imx8x/colibri-imx8x.c b/board/toradex/colibri-imx8x/colibri-imx8x.c index 6fc8076163c..a507d666c07 100644 --- a/board/toradex/colibri-imx8x/colibri-imx8x.c +++ b/board/toradex/colibri-imx8x/colibri-imx8x.c @@ -140,14 +140,6 @@ int board_init(void) return 0; }

-/*

• • Board specific reset that is system reset.
• */

-void reset_cpu(void) -{

• /* TODO */

-}

#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) int ft_board_setup(void *blob, struct bd_info *bd) { -- 2.34.1