From: Stephen Warren <swarren@nvidia.com>
Date: Thu, 19 Apr 2012 11:09:49 +0000 (+0000)
Subject: arm: restore fdt_fixup_ethernet call to do_bootm_linux
X-Git-Tag: v2012.04.01~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9e02a6b8e514a3256471a820cdb567668098fa22;p=oweals%2Fu-boot.git

arm: restore fdt_fixup_ethernet call to do_bootm_linux

Commit 0a672d4 "arm: Add Prep subcommand support to bootm" re-organized
do_bootm_linux for ARM. During the re-organization, the call to
fdt_fixup_ethernet() was removed. I assume this was useful, so add it
back.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Tom Rini <trini@ti.com>
---

diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index cba457fcc9..599547d2c8 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -256,6 +256,7 @@ static int create_fdt(bootm_headers_t *images)
 
 	fdt_chosen(*of_flat_tree, 1);
 	fixup_memory_node(*of_flat_tree);
+	fdt_fixup_ethernet(*of_flat_tree);
 	fdt_initrd(*of_flat_tree, *initrd_start, *initrd_end, 1);
 
 	return 0;