Message ID | 1315570750-472-1-git-send-email-greg.ungerer@opengear.com |
---|---|
State | Accepted |
Commit | 3a52cfa5cc402c06bb80ce46eedb5496150d4046 |
Headers | show |
Dear Greg Ungerer, In message <1315570750-472-1-git-send-email-greg.ungerer@opengear.com> you wrote: > Move the TIMER_ definitions before they are used in KS8695 timer.c code. > Fixes: > > timer.c: In function `timer_init´: > timer.c:37: error: `TIMER_COUNT´ undeclared (first use in this function) > timer.c:37: error: (Each undeclared identifier is reported only once > timer.c:37: error: for each function it appears in.) > timer.c:38: error: `TIMER_PULSE´ undeclared (first use in this function) > > Signed-off-by: Greg Ungerer <greg.ungerer@opengear.com> > --- > arch/arm/cpu/arm920t/ks8695/timer.c | 16 ++++++++-------- > 1 files changed, 8 insertions(+), 8 deletions(-) Applied, thanks. Best regards, Wolfgang Denk
Dear Greg, In message <1315570750-472-1-git-send-email-greg.ungerer@opengear.com> you wrote: > Move the TIMER_ definitions before they are used in KS8695 timer.c code. > Fixes: Could you please also fix the remaining warnings: Configuring for cm4008 board... eth.c:546:2: warning: #warning Ethernet driver is deprecated. Please update to use CONFIG_NET_MULTI cm4008.c: In function 'env_flash_cmdline': cm4008.c:67: warning: pointer targets in passing argument 2 of 'setenv' differ in signedness text data bss dec hex filename 116840 2512 37480 156832 264a0 /work/wd/tmp-arm/u-boot Configuring for cm41xx board... eth.c:546:2: warning: #warning Ethernet driver is deprecated. Please update to use CONFIG_NET_MULTI cm41xx.c: In function 'env_flash_cmdline': cm41xx.c:67: warning: pointer targets in passing argument 2 of 'setenv' differ in signedness text data bss dec hex filename 116856 2512 37464 156832 264a0 /work/wd/tmp-arm/u-boot Thanks in advance. Best regards, Wolfgang Denk
Hi Wolfgang, On 09/10/2011 08:32 AM, Wolfgang Denk wrote: > Dear Greg, > > In message<1315570750-472-1-git-send-email-greg.ungerer@opengear.com> you wrote: >> Move the TIMER_ definitions before they are used in KS8695 timer.c code. >> Fixes: > > Could you please also fix the remaining warnings: Sure thing. Patches coming soon. Regards Greg > Configuring for cm4008 board... > eth.c:546:2: warning: #warning Ethernet driver is deprecated. Please update to use CONFIG_NET_MULTI > cm4008.c: In function 'env_flash_cmdline': > cm4008.c:67: warning: pointer targets in passing argument 2 of 'setenv' differ in signedness > text data bss dec hex filename > 116840 2512 37480 156832 264a0 /work/wd/tmp-arm/u-boot > > > > Configuring for cm41xx board... > eth.c:546:2: warning: #warning Ethernet driver is deprecated. Please update to use CONFIG_NET_MULTI > cm41xx.c: In function 'env_flash_cmdline': > cm41xx.c:67: warning: pointer targets in passing argument 2 of 'setenv' differ in signedness > text data bss dec hex filename > 116856 2512 37464 156832 264a0 /work/wd/tmp-arm/u-boot > > > Thanks in advance. > > Best regards, > > Wolfgang Denk >
diff --git a/arch/arm/cpu/arm920t/ks8695/timer.c b/arch/arm/cpu/arm920t/ks8695/timer.c index 234fe91..0852502 100644 --- a/arch/arm/cpu/arm920t/ks8695/timer.c +++ b/arch/arm/cpu/arm920t/ks8695/timer.c @@ -24,6 +24,14 @@ #include <asm/arch/platform.h> /* + * Initial timer set constants. Nothing complicated, just set for a 1ms + * tick. + */ +#define TIMER_INTERVAL (TICKS_PER_uSEC * mSEC_1) +#define TIMER_COUNT (TIMER_INTERVAL / 2) +#define TIMER_PULSE TIMER_COUNT + +/* * Handy KS8695 register access functions. */ #define ks8695_read(a) *((volatile ulong *) (KS8695_IO_BASE + (a))) @@ -42,14 +50,6 @@ int timer_init (void) return 0; } -/* - * Initial timer set constants. Nothing complicated, just set for a 1ms - * tick. - */ -#define TIMER_INTERVAL (TICKS_PER_uSEC * mSEC_1) -#define TIMER_COUNT (TIMER_INTERVAL / 2) -#define TIMER_PULSE TIMER_COUNT - ulong get_timer_masked(void) { /* Check for timer wrap */
Move the TIMER_ definitions before they are used in KS8695 timer.c code. Fixes: timer.c: In function ‘timer_init’: timer.c:37: error: ‘TIMER_COUNT’ undeclared (first use in this function) timer.c:37: error: (Each undeclared identifier is reported only once timer.c:37: error: for each function it appears in.) timer.c:38: error: ‘TIMER_PULSE’ undeclared (first use in this function) Signed-off-by: Greg Ungerer <greg.ungerer@opengear.com> --- arch/arm/cpu/arm920t/ks8695/timer.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-)