From: Icenowy Zheng Date: Sat, 11 Sep 2021 17:39:16 +0000 (+0200) Subject: sunxi: call fdt_fixup_ethernet again to set macaddr for more aliases X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=2753b07269c099844ccd4c21de5790e3f9b8bdbd;p=u-boot.git sunxi: call fdt_fixup_ethernet again to set macaddr for more aliases Sometimes some ethernet aliases do not exist in U-Boot DT but they exist in the DT used to boot the system (for example, modified via DT overlays). In this situation setup_environment is called again in ft_board_setup() to generate macaddr environment variable for them. However now the call to fdt_fixup_ethernet() is moved before the call of ft_board_setup(). Call fdt_fixup_ethernet() again to add MAC addresses for the extra ethernet aliases. Signed-off-by: Icenowy Zheng [updated commit message] Signed-off-by: Jernej Skrabec Signed-off-by: Andre Przywara --- diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 2790a0f9e8..d0a93da409 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -912,10 +912,12 @@ int ft_board_setup(void *blob, struct bd_info *bd) int __maybe_unused r; /* - * Call setup_environment again in case the boot fdt has - * ethernet aliases the u-boot copy does not have. + * Call setup_environment and fdt_fixup_ethernet again + * in case the boot fdt has ethernet aliases the u-boot + * copy does not have. */ setup_environment(blob); + fdt_fixup_ethernet(blob); bluetooth_dt_fixup(blob);