aboutsummaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorTom Rini2017-12-27 08:17:05 -0500
committerTom Rini2017-12-27 08:17:05 -0500
commit8e5f0497c8a8ab9bd7314737f2edb4711733b6fe (patch)
tree7ef6e942cb4fda392bb736f728b55b6882e265bd /arch/arm
parent7e3caa81e0e9cc5e2beed4a3a1c334e2119f4498 (diff)
parent4ace304062e143da8ab7851d0c8570d61777ec06 (diff)
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/lib/bootm-fdt.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c
index eaa817b9ac8..fcc2a0e2146 100644
--- a/arch/arm/lib/bootm-fdt.c
+++ b/arch/arm/lib/bootm-fdt.c
@@ -25,6 +25,13 @@
DECLARE_GLOBAL_DATA_PTR;
+#ifdef CONFIG_FMAN_ENET
+__weak int fdt_update_ethernet_dt(void *blob)
+{
+ return 0;
+}
+#endif
+
int arch_fixup_fdt(void *blob)
{
int ret = 0;
@@ -64,5 +71,10 @@ int arch_fixup_fdt(void *blob)
#endif
#endif
+#ifdef CONFIG_FMAN_ENET
+ ret = fdt_update_ethernet_dt(blob);
+ if (ret)
+ return ret;
+#endif
return 0;
}