mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-08 22:03:22 +09:00
Merge branch 'master' of git://git.denx.de/u-boot-arm
* 'master' of git://git.denx.de/u-boot-arm: arm: add __aeabi_unwind_cpp_pr1() function to avoid linker complaints post: fix compile issue for post tests on kirkwood
This commit is contained in:
commit
4f1a2cd163
@ -23,3 +23,7 @@ int raise (int signum)
|
|||||||
void __aeabi_unwind_cpp_pr0(void)
|
void __aeabi_unwind_cpp_pr0(void)
|
||||||
{
|
{
|
||||||
};
|
};
|
||||||
|
|
||||||
|
void __aeabi_unwind_cpp_pr1(void)
|
||||||
|
{
|
||||||
|
};
|
||||||
|
@ -495,7 +495,7 @@ void post_reloc(void)
|
|||||||
*/
|
*/
|
||||||
unsigned long post_time_ms(unsigned long base)
|
unsigned long post_time_ms(unsigned long base)
|
||||||
{
|
{
|
||||||
#if defined(CONFIG_PPC) || defined(CONFIG_ARM)
|
#if defined(CONFIG_PPC) || defined(CONFIG_ARM) && !defined(CONFIG_KIRKWOOD)
|
||||||
return (unsigned long)lldiv(get_ticks(), get_tbclk() / CONFIG_SYS_HZ)
|
return (unsigned long)lldiv(get_ticks(), get_tbclk() / CONFIG_SYS_HZ)
|
||||||
- base;
|
- base;
|
||||||
#else
|
#else
|
||||||
|
Loading…
Reference in New Issue
Block a user