[U-Boot] [PATCH 2/2] arm: imx8: don't duplicate build_info()

[Peng Fan]

> Subject: [PATCH 2/2] arm: imx8: don't duplicate build_info()
> 
> Move build_info() to common place.
> 
> Signed-off-by: Anatolij Gustschin <agust at denx.de>
> Cc: Marcel Ziswiler <marcel.ziswiler at toradex.com>
> Cc: Peng Fan <peng.fan at nxp.com>
> ---
>  arch/arm/include/asm/arch-imx8/sys_proto.h  |  1 +
>  arch/arm/mach-imx/imx8/misc.c               | 13 +++++++++++++
>  board/freescale/imx8qm_mek/imx8qm_mek.c     | 13 -------------
>  board/freescale/imx8qxp_mek/imx8qxp_mek.c   | 13 -------------
>  board/toradex/apalis-imx8/apalis-imx8.c     | 13 -------------
>  board/toradex/colibri-imx8x/colibri-imx8x.c | 13 -------------
>  6 files changed, 14 insertions(+), 52 deletions(-)
> 
> diff --git a/arch/arm/include/asm/arch-imx8/sys_proto.h
> b/arch/arm/include/asm/arch-imx8/sys_proto.h
> index 3f5bbe9dcc..b8d2a0b8f0 100644
> --- a/arch/arm/include/asm/arch-imx8/sys_proto.h
> +++ b/arch/arm/include/asm/arch-imx8/sys_proto.h
> @@ -16,6 +16,7 @@ struct pass_over_info_t {
>  	u32 g_ap_mu;
>  };
> 
> +void build_info(void);
>  enum boot_device get_boot_device(void);  int print_bootinfo(void);  int
> sc_pm_setup_uart(sc_rsrc_t uart_rsrc, sc_pm_clock_rate_t clk_rate); diff
> --git a/arch/arm/mach-imx/imx8/misc.c b/arch/arm/mach-imx/imx8/misc.c
> index fb92362bbf..fe73e29eee 100644
> --- a/arch/arm/mach-imx/imx8/misc.c
> +++ b/arch/arm/mach-imx/imx8/misc.c
> @@ -24,3 +24,16 @@ int sc_pm_setup_uart(sc_rsrc_t uart_rsrc,
> sc_pm_clock_rate_t clk_rate)
> 
>  	return 0;
>  }
> +
> +void build_info(void)
> +{
> +	u32 sc_build = 0, sc_commit = 0;
> +
> +	/* Get SCFW build and commit id */
> +	sc_misc_build_info(-1, &sc_build, &sc_commit);
> +	if (!sc_build) {
> +		printf("SCFW does not support build info\n");
> +		sc_commit = 0; /* Display 0 if build info not supported */
> +	}
> +	printf("Build: SCFW %x\n", sc_commit); }
> diff --git a/board/freescale/imx8qm_mek/imx8qm_mek.c
> b/board/freescale/imx8qm_mek/imx8qm_mek.c
> index 249c29e0f2..b7a609b097 100644
> --- a/board/freescale/imx8qm_mek/imx8qm_mek.c
> +++ b/board/freescale/imx8qm_mek/imx8qm_mek.c
> @@ -78,19 +78,6 @@ int board_phy_config(struct phy_device *phydev)  }
> #endif
> 
> -void build_info(void)
> -{
> -	u32 sc_build = 0, sc_commit = 0;
> -
> -	/* Get SCFW build and commit id */
> -	sc_misc_build_info(-1, &sc_build, &sc_commit);
> -	if (!sc_build) {
> -		printf("SCFW does not support build info\n");
> -		sc_commit = 0; /* Display 0 when the build info is not supported*/
> -	}
> -	printf("Build: SCFW %x\n", sc_commit);
> -}
> -
>  int checkboard(void)
>  {
>  	puts("Board: iMX8QM MEK\n");
> diff --git a/board/freescale/imx8qxp_mek/imx8qxp_mek.c
> b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
> index 1038f26d69..af116360d7 100644
> --- a/board/freescale/imx8qxp_mek/imx8qxp_mek.c
> +++ b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
> @@ -94,19 +94,6 @@ int board_phy_config(struct phy_device *phydev)  }
> #endif
> 
> -void build_info(void)
> -{
> -	u32 sc_build = 0, sc_commit = 0;
> -
> -	/* Get SCFW build and commit id */
> -	sc_misc_build_info(-1, &sc_build, &sc_commit);
> -	if (!sc_build) {
> -		printf("SCFW does not support build info\n");
> -		sc_commit = 0; /* Display 0 when the build info is not supported */
> -	}
> -	printf("Build: SCFW %x\n", sc_commit);
> -}
> -
>  int checkboard(void)
>  {
>  	puts("Board: iMX8QXP MEK\n");
> diff --git a/board/toradex/apalis-imx8/apalis-imx8.c
> b/board/toradex/apalis-imx8/apalis-imx8.c
> index 4243b0e174..5433c7581b 100644
> --- a/board/toradex/apalis-imx8/apalis-imx8.c
> +++ b/board/toradex/apalis-imx8/apalis-imx8.c
> @@ -71,19 +71,6 @@ int board_phy_config(struct phy_device *phydev)  }
> #endif
> 
> -void build_info(void)
> -{
> -	u32 sc_build = 0, sc_commit = 0;
> -
> -	/* Get SCFW build and commit id */
> -	sc_misc_build_info(-1, &sc_build, &sc_commit);
> -	if (!sc_build) {
> -		printf("SCFW does not support build info\n");
> -		sc_commit = 0; /* Display 0 if build info not supported */
> -	}
> -	printf("Build: SCFW %x\n", sc_commit);
> -}
> -
>  int checkboard(void)
>  {
>  	puts("Model: Toradex Apalis iMX8\n");
> diff --git a/board/toradex/colibri-imx8x/colibri-imx8x.c
> b/board/toradex/colibri-imx8x/colibri-imx8x.c
> index a146148556..8c725b7593 100644
> --- a/board/toradex/colibri-imx8x/colibri-imx8x.c
> +++ b/board/toradex/colibri-imx8x/colibri-imx8x.c
> @@ -83,19 +83,6 @@ int board_phy_config(struct phy_device *phydev)  }
> #endif
> 
> -void build_info(void)
> -{
> -	u32 sc_build = 0, sc_commit = 0;
> -
> -	/* Get SCFW build and commit id */
> -	sc_misc_build_info(-1, &sc_build, &sc_commit);
> -	if (!sc_build) {
> -		printf("SCFW does not support build info\n");
> -		sc_commit = 0; /* Display 0 if build info not supported */
> -	}
> -	printf("Build: SCFW %x\n", sc_commit);
> -}
> -
>  int checkboard(void)
>  {
>  	puts("Model: Toradex Colibri iMX8X\n");

Reviewed-by: Peng Fan <peng.fan at nxp.com>

> --
> 2.17.1