Hi Chintan!

On January  7, 2025 thus sayeth Chintan Vankar:
> In order to support Ethernet boot on AM62p, probe AM65 CPSW NUSS
> driver in board_init_f().
> 
> Signed-off-by: Chintan Vankar <c-van...@ti.com>
> ---
>  arch/arm/mach-k3/am62px/am62p5_init.c | 10 ++++++++++
>  1 file changed, 10 insertions(+)
> 
> diff --git a/arch/arm/mach-k3/am62px/am62p5_init.c 
> b/arch/arm/mach-k3/am62px/am62p5_init.c
> index 34ed01cd78c..f8e98b09402 100644
> --- a/arch/arm/mach-k3/am62px/am62p5_init.c
> +++ b/arch/arm/mach-k3/am62px/am62p5_init.c
> @@ -159,6 +159,16 @@ void board_init_f(ulong dummy)
>       }
>  
>       spl_enable_cache();
> +
> +     if (IS_ENABLED(CONFIG_SPL_ETH) && IS_ENABLED(CONFIG_TI_AM65_CPSW_NUSS) 
> &&
> +         spl_boot_device() == BOOT_DEVICE_ETHERNET) {
> +             struct udevice *cpswdev;
> +
> +             if (uclass_get_device_by_driver(UCLASS_MISC, 
> DM_DRIVER_GET(am65_cpsw_nuss),
> +                                             &cpswdev))
> +                     printf("Failed to probe am65_cpsw_nuss driver\n");
> +     }
> +
>       debug("am62px_init: %s done\n", __func__);
>  }
>  

Unfortunately with all the release activities we now have a simple merge 
conflict with -next merging into -master. 
    
~Bryan

Reply via email to