summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2012-04-19 11:09:49 +0000
committerWolfgang Denk <wd@denx.de>2012-04-23 22:11:18 +0200
commit9e02a6b8e514a3256471a820cdb567668098fa22 (patch)
treed3b9bd75669e0afe67c1fa22fc81a0a14ecf2216
parent1723997610ace497252d6f9a44ec76c06951ae43 (diff)
downloadtalos-obmc-uboot-9e02a6b8e514a3256471a820cdb567668098fa22.tar.gz
talos-obmc-uboot-9e02a6b8e514a3256471a820cdb567668098fa22.zip
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>
-rw-r--r--arch/arm/lib/bootm.c1
1 files changed, 1 insertions, 0 deletions
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;
OpenPOWER on IntegriCloud