diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-10-16 15:01:15 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:54:03 +0200 |
| commit | 6d0f6bcf337c5261c08fabe12982178c2c489d76 (patch) | |
| tree | ae13958ffa9c6b58c2ea97aac07a4ad2f04a350f /board/integratorap/integratorap.c | |
| parent | 71edc271816ec82cf0550dd6980be2da3cc2ad9e (diff) | |
| download | u-boot-imx-6d0f6bcf337c5261c08fabe12982178c2c489d76.zip u-boot-imx-6d0f6bcf337c5261c08fabe12982178c2c489d76.tar.gz u-boot-imx-6d0f6bcf337c5261c08fabe12982178c2c489d76.tar.bz2 | |
rename CFG_ macros to CONFIG_SYS
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'board/integratorap/integratorap.c')
| -rw-r--r-- | board/integratorap/integratorap.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/board/integratorap/integratorap.c b/board/integratorap/integratorap.c index 687c486..ddacabb 100644 --- a/board/integratorap/integratorap.c +++ b/board/integratorap/integratorap.c @@ -519,7 +519,7 @@ extern void dram_query(void); * can be divided by 16 or 256 * and is a 16-bit counter */ -/* U-Boot expects a 32 bit timer running at CFG_HZ*/ +/* U-Boot expects a 32 bit timer running at CONFIG_SYS_HZ*/ static ulong timestamp; /* U-Boot ticks since startup */ static ulong total_count = 0; /* Total timer count */ static ulong lastdec; /* Timer reading at last call */ @@ -527,12 +527,12 @@ static ulong div_clock = 256; /* Divisor applied to the timer clock */ static ulong div_timer = 1; /* Divisor to convert timer reading * change to U-Boot ticks */ -/* CFG_HZ = CFG_HZ_CLOCK/(div_clock * div_timer) */ +/* CONFIG_SYS_HZ = CONFIG_SYS_HZ_CLOCK/(div_clock * div_timer) */ #define TIMER_LOAD_VAL 0x0000FFFFL -#define READ_TIMER ((*(volatile ulong *)(CFG_TIMERBASE+4)) & 0x0000FFFFL) +#define READ_TIMER ((*(volatile ulong *)(CONFIG_SYS_TIMERBASE+4)) & 0x0000FFFFL) -/* all function return values in U-Boot ticks i.e. (1/CFG_HZ) sec +/* all function return values in U-Boot ticks i.e. (1/CONFIG_SYS_HZ) sec * - unless otherwise stated */ @@ -543,7 +543,7 @@ static ulong div_timer = 1; /* Divisor to convert timer reading int interrupt_init (void) { /* Load timer with initial value */ - *(volatile ulong *)(CFG_TIMERBASE + 0) = TIMER_LOAD_VAL; + *(volatile ulong *)(CONFIG_SYS_TIMERBASE + 0) = TIMER_LOAD_VAL; /* Set timer to be * enabled 1 * free-running 0 @@ -551,12 +551,12 @@ int interrupt_init (void) * divider 256 10 * XX 00 */ - *(volatile ulong *)(CFG_TIMERBASE + 8) = 0x00000088; + *(volatile ulong *)(CONFIG_SYS_TIMERBASE + 8) = 0x00000088; total_count = 0; /* init the timestamp and lastdec value */ reset_timer_masked(); - div_timer = CFG_HZ_CLOCK / CFG_HZ; + div_timer = CONFIG_SYS_HZ_CLOCK / CONFIG_SYS_HZ; div_timer /= div_clock; return (0); @@ -588,7 +588,7 @@ void udelay (unsigned long usec) ulong tmo, tmp; /* Convert to U-Boot ticks */ - tmo = usec * CFG_HZ; + tmo = usec * CONFIG_SYS_HZ; tmo /= (1000000L); tmp = get_timer_masked(); /* get current timestamp */ @@ -647,7 +647,7 @@ unsigned long long get_ticks(void) */ ulong get_tbclk (void) { - return CFG_HZ_CLOCK/div_clock; + return CONFIG_SYS_HZ_CLOCK/div_clock; } int board_eth_init(bd_t *bis) |