fdt: call fdt_fixup_ethernet after board/system fixups

In commit 26d61195f870 we added fdt_fixup_ethernet to a common code path, which executes before board/system fixups.

However, on sunxi platform board-specific fixup will create ethaddr for ethernet aliases not present in U-Boot FDT, which won't be used in this situation.

Move the call of fdt_fixup_ethernet after board/system fixups, so that board/system fixups can create ethaddr.

---
 common/image-fdt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

index c6e8832d66..f57525f865 100644
@@ -478,8 +478,6 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob,
 		printf("ERROR: arch-specific fdt fixup failed\n");
 		goto err;
 	}
-	/* Update ethernet nodes */
-	fdt_fixup_ethernet(blob);
 	if (IMAGE_OF_BOARD_SETUP) {
 		fdt_ret = ft_board_setup(blob, gd->bd);
 		if (fdt_ret) {

@@ -496,6 +494,8 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob,
 			goto err;
 		}
 	}
+	/* Update ethernet nodes */
+	fdt_fixup_ethernet(blob);
 
 	/* Delete the old LMB reservation */
 	if (lmb)

2.13.5

OK, this is, sadly, approximately the 10th patch in this area. Your patch specifically brings us back to the state that 3f66149d9fb41527ed70a8e0613489e95391b0ff changed us from, and that was fixing another board (and that in turn "fixed" a change from 13d06981a982). So, as is, no, I'm not going to take this patch. But I am going to put together an email, and some re-reading of the code areas in question, to see what we need to do so that everyone is on the same page and functioning. Thanks!

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170911/de13906e/attachment.sig>