From: Kumar Gala <galak@kernel.crashing.org>
Date: Thu, 21 May 2009 13:36:43 +0000 (-0500)
Subject: 85xx: Always attempt ethernet device tree fixup
X-Git-Tag: v2009.08-rc1~153^2~16
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=22419d77976bbd0df9fcf45513f1b96bd73e50d1;p=u-boot

85xx: Always attempt ethernet device tree fixup

Its reasonable that we may have ethernet devices but dont have drivers
or support enabled for them in u-boot and want the device tree fixed up.
Unconditionally calling the ethernet fixup is fine since if we dont have
ethernet nodes that match (or aliases) we will not attempt to do
anything.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Timur Tabi <timur@freescale.com>
---

diff --git a/cpu/mpc85xx/fdt.c b/cpu/mpc85xx/fdt.c
index 26a8f48552..a692529689 100644
--- a/cpu/mpc85xx/fdt.c
+++ b/cpu/mpc85xx/fdt.c
@@ -278,12 +278,9 @@ void ft_cpu_setup(void *blob, bd_t *bd)
 	if (!IS_E_PROCESSOR(get_svr()))
 		fdt_fixup_crypto_node(blob, 0);
 
-#if defined(CONFIG_HAS_ETH0) || defined(CONFIG_HAS_ETH1) ||\
-    defined(CONFIG_HAS_ETH2) || defined(CONFIG_HAS_ETH3)
 	fdt_fixup_ethernet(blob);
 
 	fdt_add_enet_stashing(blob);
-#endif
 
 	do_fixup_by_prop_u32(blob, "device_type", "cpu", 4,
 		"timebase-frequency", bd->bi_busfreq / 8, 1);