diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
| commit | f82642e33899766892499b163e60560fbbf87773 (patch) | |
| tree | ab90f076f18e56b2b3e8c9375b95917daa78c1d9 /lib_blackfin/post.c | |
| parent | b59b16ca24bc7e77ec113021a6d77b9b32fcf192 (diff) | |
| parent | 360fe71e82b83e264c964c9447c537e9a1f643c8 (diff) | |
| download | u-boot-imx-f82642e33899766892499b163e60560fbbf87773.zip u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.gz u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.bz2 | |
Merge 'next' branch
Conflicts:
board/freescale/mpc8536ds/mpc8536ds.c
include/configs/mgcoge.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'lib_blackfin/post.c')
| -rw-r--r-- | lib_blackfin/post.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib_blackfin/post.c b/lib_blackfin/post.c index 3c4d5c5..4ab9e8b 100644 --- a/lib_blackfin/post.c +++ b/lib_blackfin/post.c @@ -345,7 +345,7 @@ int post_log(char *format, ...) { va_list args; uint i; - char printbuffer[CFG_PBSIZE]; + char printbuffer[CONFIG_SYS_PBSIZE]; va_start(args, format); @@ -419,7 +419,7 @@ void post_reloc(void) */ unsigned long post_time_ms(unsigned long base) { - return (unsigned long)get_ticks() / (get_tbclk() / CFG_HZ) - base; + return (unsigned long)get_ticks() / (get_tbclk() / CONFIG_SYS_HZ) - base; } #endif /* CONFIG_POST */ |