diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-12-12 07:56:41 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-12-12 07:56:41 +0100 |
| commit | 4f1a2cd1637027f31de7796aedb1fa5fc0ec0f97 (patch) | |
| tree | 3cb09cbdcef3b8d90fffd42d5536823895018a99 | |
| parent | f8d2c65fd980b3c031043c4605b48a383558976b (diff) | |
| parent | 953209bf5ef0889a1baa02aa0ed5324f53ff8fda (diff) | |
| download | blackbird-obmc-uboot-4f1a2cd1637027f31de7796aedb1fa5fc0ec0f97.tar.gz blackbird-obmc-uboot-4f1a2cd1637027f31de7796aedb1fa5fc0ec0f97.zip | |
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
| -rw-r--r-- | arch/arm/lib/eabi_compat.c | 4 | ||||
| -rw-r--r-- | post/post.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/lib/eabi_compat.c b/arch/arm/lib/eabi_compat.c index e1b87bebad..2028dbd715 100644 --- a/arch/arm/lib/eabi_compat.c +++ b/arch/arm/lib/eabi_compat.c @@ -23,3 +23,7 @@ int raise (int signum) void __aeabi_unwind_cpp_pr0(void) { }; + +void __aeabi_unwind_cpp_pr1(void) +{ +}; diff --git a/post/post.c b/post/post.c index 45e08f8ccc..d62f10aa53 100644 --- a/post/post.c +++ b/post/post.c @@ -495,7 +495,7 @@ void post_reloc(void) */ 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) - base; #else |
