summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Schwarz <andre.schwarz@matrix-vision.de>2008-03-13 13:50:52 +0100
committerWolfgang Denk <wd@denx.de>2008-03-25 23:59:43 +0100
commitc512389cc4a10253249271ff6c887c6dab1f0db2 (patch)
treea103f2779a07cbbf4648c48c1717090a00a419aa
parentaa3511e422946041ef626f80a05ae5e8bfc700e6 (diff)
downloadu-boot-imx-c512389cc4a10253249271ff6c887c6dab1f0db2.zip
u-boot-imx-c512389cc4a10253249271ff6c887c6dab1f0db2.tar.gz
u-boot-imx-c512389cc4a10253249271ff6c887c6dab1f0db2.tar.bz2
MPC5200: support setup without FEC
Include FEC specific nodes in ft_cpu_setup only if CONFIG_MPC5xxx_FEC is defined. Systems without FEC, i.e. no FEC node in DTB, should be possible. Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de> Acked-by: Grant Likely <grant.likely@secretlab.ca>
-rw-r--r--cpu/mpc5xxx/cpu.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/cpu/mpc5xxx/cpu.c b/cpu/mpc5xxx/cpu.c
index e4d6168..dbfdd97 100644
--- a/cpu/mpc5xxx/cpu.c
+++ b/cpu/mpc5xxx/cpu.c
@@ -119,7 +119,9 @@ void ft_cpu_setup(void *blob, bd_t *bd)
{
int div = in_8((void*)CFG_MBAR + 0x204) & 0x0020 ? 8 : 4;
char * cpu_path = "/cpus/" OF_CPU;
+#ifdef CONFIG_MPC5xxx_FEC
char * eth_path = "/" OF_SOC "/ethernet@3000";
+#endif
do_fixup_by_path_u32(blob, cpu_path, "timebase-frequency", OF_TBCLK, 1);
do_fixup_by_path_u32(blob, cpu_path, "bus-frequency", bd->bi_busfreq, 1);
@@ -127,7 +129,9 @@ void ft_cpu_setup(void *blob, bd_t *bd)
do_fixup_by_path_u32(blob, "/" OF_SOC, "bus-frequency", bd->bi_ipbfreq, 1);
do_fixup_by_path_u32(blob, "/" OF_SOC, "system-frequency",
bd->bi_busfreq*div, 1);
+#ifdef CONFIG_MPC5xxx_FEC
do_fixup_by_path(blob, eth_path, "mac-address", bd->bi_enetaddr, 6, 0);
do_fixup_by_path(blob, eth_path, "local-mac-address", bd->bi_enetaddr, 6, 0);
+#endif
}
#endif