From: Reinhard Meyer Date: Mon, 04 Jul 2011 09:37:54 +0200 Subject: [U-Boot] [PATCH 3/8] Fix compile problem for some boards in the clock code. In-Reply-To: <1309462387-22926-4-git-send-email-awaterman@dawning.com> References: <4E0C6CDC.4020806@dawning.com> <1309462387-22926-1-git-send-email-awaterman@dawning.com> <1309462387-22926-4-git-send-email-awaterman@dawning.com> Message-ID: <4E116DD2.8060204@emk-elektronik.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Dear Alex Waterman, > Some boards use AT91_SLOW_CLOCK and other use > CONFIG_SYS_AT91_SLOW_CLOCK. This patch makes it so the arm926ejs > clock code will return which ever is set. > > Signed-off-by: Alex Waterman > --- > arch/arm/cpu/arm926ejs/at91/clock.c | 4 ++++ > 1 files changed, 4 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/cpu/arm926ejs/at91/clock.c b/arch/arm/cpu/arm926ejs/at91/clock.c > index 608af2c..0083bd2 100644 > --- a/arch/arm/cpu/arm926ejs/at91/clock.c > +++ b/arch/arm/cpu/arm926ejs/at91/clock.c > @@ -57,7 +57,11 @@ static unsigned long at91_css_to_rate(unsigned long css) > { > switch (css) { > case AT91_PMC_MCKR_CSS_SLOW: > +#ifdef AT91_SLOW_CLOCK > + return AT91_SLOW_CLOCK; > +#else > return CONFIG_SYS_AT91_SLOW_CLOCK; > +#endif > case AT91_PMC_MCKR_CSS_MAIN: > return gd->main_clk_rate_hz; > case AT91_PMC_MCKR_CSS_PLLA: NAK. "Compile problems" for some boards shall not be fixed by hacks into common source. Fix the board's definition file instead. Best Regards, Reinhard