Skip to content
Snippets Groups Projects
Commit 96f5c4b2 authored by Prafulla Wadaskar's avatar Prafulla Wadaskar Committed by Albert ARIBAUD
Browse files

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: default avatarPrafulla Wadaskar <prafulla@marvell.com>
parent bfacf466
No related branches found
No related tags found
No related merge requests found
...@@ -190,3 +190,21 @@ void reset_cpu (unsigned long ignored) ...@@ -190,3 +190,21 @@ void reset_cpu (unsigned long ignored)
while(1); 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;
}
...@@ -153,3 +153,21 @@ int timer_init(void) ...@@ -153,3 +153,21 @@ int timer_init(void)
return 0; 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;
}
...@@ -167,3 +167,21 @@ void timer_init_r(void) ...@@ -167,3 +167,21 @@ void timer_init_r(void)
lastdec = read_timer(); lastdec = read_timer();
timestamp = 0; 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;
}
...@@ -197,3 +197,21 @@ void reset_cpu (unsigned long ignored) ...@@ -197,3 +197,21 @@ void reset_cpu (unsigned long ignored)
/*enable functional WDT clock */ /*enable functional WDT clock */
writel(APBC_APBCLK | APBC_FNCLK, &mpmu->wdtpcr); 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;
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment