[PATCH] arm: imx8m: remove unused and obsolete board_fix_fdt() in SOC context

Peng Fan peng.fan at oss.nxp.com
Wed Apr 26 03:30:26 CEST 2023



On 4/25/2023 10:19 PM, Hugo Villeneuve wrote:
> From: Hugo Villeneuve <hvilleneuve at dimonoff.com>
> 
> It doesn't seem appropriate for arch/SOC to use a board-level
> functionality (CONFIG_OF_BOARD_FIXUP), because this prevents boards
> that need to do FDT fixup from using that feature.
> 
> Also, this code is completely dead and useless (from comments by
> Rasmus Villemoes on the mailing list):
> 
>    - No in-tree imx8m-based board seems to set CONFIG_OF_BOARD_FIXUP
>    - The nodes which that function wants to disable don't even exist in
>      the U-Boot copy of imx8mp.dtsi.
> 
> This code was introduced in commit 35bb60787b88. It seems to be some
> random import of code from downstream NXP U-Boot, with a commit
> message that makes no sense in upstream context.
> 
> Signed-off-by: Hugo Villeneuve <hvilleneuve at dimonoff.com>

Acked-by: Peng Fan <peng.fan at nxp.com>
> ---
>   arch/arm/mach-imx/imx8m/soc.c | 34 ----------------------------------
>   1 file changed, 34 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
> index df865e997d..2ec5c3dc43 100644
> --- a/arch/arm/mach-imx/imx8m/soc.c
> +++ b/arch/arm/mach-imx/imx8m/soc.c
> @@ -1395,40 +1395,6 @@ usb_modify_speed:
>   }
>   #endif
>   
> -#ifdef CONFIG_OF_BOARD_FIXUP
> -#ifndef CONFIG_SPL_BUILD
> -int board_fix_fdt(void *fdt)
> -{
> -	if (is_imx8mpul()) {
> -		int i = 0;
> -		int nodeoff, ret;
> -		const char *status = "disabled";
> -		static const char * const dsi_nodes[] = {
> -			"/soc at 0/bus at 32c00000/mipi_dsi at 32e60000",
> -			"/soc at 0/bus at 32c00000/lcd-controller at 32e80000",
> -			"/dsi-host"
> -		};
> -
> -		for (i = 0; i < ARRAY_SIZE(dsi_nodes); i++) {
> -			nodeoff = fdt_path_offset(fdt, dsi_nodes[i]);
> -			if (nodeoff > 0) {
> -set_status:
> -				ret = fdt_setprop(fdt, nodeoff, "status", status,
> -						  strlen(status) + 1);
> -				if (ret == -FDT_ERR_NOSPACE) {
> -					ret = fdt_increase_size(fdt, 512);
> -					if (!ret)
> -						goto set_status;
> -				}
> -			}
> -		}
> -	}
> -
> -	return 0;
> -}
> -#endif
> -#endif
> -
>   #if !CONFIG_IS_ENABLED(SYSRESET)
>   void reset_cpu(void)
>   {


More information about the U-Boot mailing list