From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andre Schwarz Date: Thu, 13 Mar 2008 18:05:13 +0100 Subject: [U-Boot-Users] [PATCH] mpc5200 without fec In-Reply-To: References: <47D9232C.5020208@matrix-vision.de> Message-ID: <47D95EC9.8080205@matrix-vision.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Grant Likely schrieb: > On Thu, Mar 13, 2008 at 6:50 AM, Andr? Schwarz > wrote: > >> 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 >> > > Hmm; if there is no fec node; then won't this just fail silently? In > which case; I'd rather avoid adding more inline #ifdefs to the code. > (correct me if I'm wrong) > > Cheers, > g. > > it fails - but not silently. If you don't care for the error messages on the console you don't need it. I don't like _any_ error message :-) After all it's not a board specific #ifdef ... >> --- >> >> >> MATRIX VISION GmbH, Talstra?e 16, DE-71570 Oppenweiler - Registergericht: Amtsgericht Stuttgart, HRB 271090 >> Gesch?ftsf?hrer: Gerhard Thullner, Werner Armingeon, Uwe Furtner >> >> 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 at 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 >> >> ------------------------------------------------------------------------- >> This SF.net email is sponsored by: Microsoft >> Defy all challenges. Microsoft(R) Visual Studio 2008. >> http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ >> _______________________________________________ >> U-Boot-Users mailing list >> U-Boot-Users at lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/u-boot-users >> >> >> > > > > MATRIX VISION GmbH, Talstra?e 16, DE-71570 Oppenweiler - Registergericht: Amtsgericht Stuttgart, HRB 271090 Gesch?ftsf?hrer: Gerhard Thullner, Werner Armingeon, Uwe Furtner -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.denx.de/pipermail/u-boot/attachments/20080313/c2ec8934/attachment.htm