Browse Source

bugfix: all Marvell specific build fails due to undefined reference to `get_ticks'

after http://patchwork.ozlabs.org/patch/136415/ was applied. All Marvell
build fails with below error

common/libcommon.o: In function `cread_line':
/home/uboot/src/u-boot-arm/common/main.c:717: undefined reference to `get_ticks'
/home/uboot/src/u-boot-arm/common/main.c:717: undefined reference to `get_tbclk'
/home/uboot/src/u-boot-arm/common/main.c:720: undefined reference to `get_ticks'

The same is fixed for Kirkwood, ARMADA100, pantheon and orion5x SoCs

Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
imx_v2013.04_3.5.7_1.0.0_alpha
Prafulla Wadaskar 9 years ago
committed by Albert ARIBAUD
parent
commit
96f5c4b2c9
4 changed files with 72 additions and 0 deletions
  1. +18
    -0
      arch/arm/cpu/arm926ejs/armada100/timer.c
  2. +18
    -0
      arch/arm/cpu/arm926ejs/kirkwood/timer.c
  3. +18
    -0
      arch/arm/cpu/arm926ejs/orion5x/timer.c
  4. +18
    -0
      arch/arm/cpu/arm926ejs/pantheon/timer.c

+ 18
- 0
arch/arm/cpu/arm926ejs/armada100/timer.c View File

@ -190,3 +190,21 @@ void reset_cpu (unsigned long ignored)
while(1);
}
/*
* This function is derived from PowerPC code (read timebase as long long).
* On ARM it just returns the timer value.
*/
unsigned long long get_ticks(void)
{
return get_timer(0);
}
/*
* This function is derived from PowerPC code (timebase clock frequency).
* On ARM it returns the number of timer ticks per second.
*/
ulong get_tbclk (void)
{
return (ulong)CONFIG_SYS_HZ;
}

+ 18
- 0
arch/arm/cpu/arm926ejs/kirkwood/timer.c View File

@ -153,3 +153,21 @@ int timer_init(void)
return 0;
}
/*
* This function is derived from PowerPC code (read timebase as long long).
* On ARM it just returns the timer value.
*/
unsigned long long get_ticks(void)
{
return get_timer(0);
}
/*
* This function is derived from PowerPC code (timebase clock frequency).
* On ARM it returns the number of timer ticks per second.
*/
ulong get_tbclk (void)
{
return (ulong)CONFIG_SYS_HZ;
}

+ 18
- 0
arch/arm/cpu/arm926ejs/orion5x/timer.c View File

@ -167,3 +167,21 @@ void timer_init_r(void)
lastdec = read_timer();
timestamp = 0;
}
/*
* This function is derived from PowerPC code (read timebase as long long).
* On ARM it just returns the timer value.
*/
unsigned long long get_ticks(void)
{
return get_timer(0);
}
/*
* This function is derived from PowerPC code (timebase clock frequency).
* On ARM it returns the number of timer ticks per second.
*/
ulong get_tbclk (void)
{
return (ulong)CONFIG_SYS_HZ;
}

+ 18
- 0
arch/arm/cpu/arm926ejs/pantheon/timer.c View File

@ -197,3 +197,21 @@ void reset_cpu (unsigned long ignored)
/*enable functional WDT clock */
writel(APBC_APBCLK | APBC_FNCLK, &mpmu->wdtpcr);
}
/*
* This function is derived from PowerPC code (read timebase as long long).
* On ARM it just returns the timer value.
*/
unsigned long long get_ticks(void)
{
return get_timer(0);
}
/*
* This function is derived from PowerPC code (timebase clock frequency).
* On ARM it returns the number of timer ticks per second.
*/
ulong get_tbclk (void)
{
return (ulong)CONFIG_SYS_HZ;
}

Loading…
Cancel
Save