提交 e110c4fe 编写于 作者: G Graeme Russ 提交者: Wolfgang Denk

Timer: Allow reset_timer() only for systems with low resolution timers

上级 5c8404af
...@@ -91,7 +91,9 @@ static unsigned int mg_wait (u32 expect, u32 msec) ...@@ -91,7 +91,9 @@ static unsigned int mg_wait (u32 expect, u32 msec)
u32 from, cur, err; u32 from, cur, err;
err = MG_ERR_NONE; err = MG_ERR_NONE;
#ifdef CONFIG_SYS_LOW_RES_TIMER
reset_timer(); reset_timer();
#endif
from = get_timer(0); from = get_timer(0);
status = readb(mg_base() + MG_REG_STATUS); status = readb(mg_base() + MG_REG_STATUS);
......
...@@ -573,7 +573,9 @@ static int flash_status_check (flash_info_t * info, flash_sect_t sector, ...@@ -573,7 +573,9 @@ static int flash_status_check (flash_info_t * info, flash_sect_t sector,
#endif #endif
/* Wait for command completion */ /* Wait for command completion */
#ifdef CONFIG_SYS_LOW_RES_TIMER
reset_timer(); reset_timer();
#endif
start = get_timer (0); start = get_timer (0);
while (flash_is_busy (info, sector)) { while (flash_is_busy (info, sector)) {
if (get_timer (start) > tout) { if (get_timer (start) > tout) {
...@@ -662,7 +664,9 @@ static int flash_status_poll(flash_info_t *info, void *src, void *dst, ...@@ -662,7 +664,9 @@ static int flash_status_poll(flash_info_t *info, void *src, void *dst,
#endif #endif
/* Wait for command completion */ /* Wait for command completion */
#ifdef CONFIG_SYS_LOW_RES_TIMER
reset_timer(); reset_timer();
#endif
start = get_timer(0); start = get_timer(0);
while (1) { while (1) {
switch (info->portwidth) { switch (info->portwidth) {
......
...@@ -118,6 +118,7 @@ ...@@ -118,6 +118,7 @@
* TMRMS represents the desired mecs per tick (msecs per interrupt). * TMRMS represents the desired mecs per tick (msecs per interrupt).
*----------------------------------------------------------------------*/ *----------------------------------------------------------------------*/
#define CONFIG_SYS_HZ 1000 /* Always 1000 */ #define CONFIG_SYS_HZ 1000 /* Always 1000 */
#define CONFIG_SYS_LOW_RES_TIMER
#define CONFIG_SYS_NIOS_TMRBASE 0x00920860 /* Tick timer base addr */ #define CONFIG_SYS_NIOS_TMRBASE 0x00920860 /* Tick timer base addr */
#define CONFIG_SYS_NIOS_TMRIRQ 3 /* Timer IRQ num */ #define CONFIG_SYS_NIOS_TMRIRQ 3 /* Timer IRQ num */
#define CONFIG_SYS_NIOS_TMRMS 10 /* Desired period (msec)*/ #define CONFIG_SYS_NIOS_TMRMS 10 /* Desired period (msec)*/
......
...@@ -128,6 +128,7 @@ ...@@ -128,6 +128,7 @@
* TMRMS represents the desired mecs per tick (msecs per interrupt). * TMRMS represents the desired mecs per tick (msecs per interrupt).
*----------------------------------------------------------------------*/ *----------------------------------------------------------------------*/
#define CONFIG_SYS_HZ 1000 /* Always 1000 */ #define CONFIG_SYS_HZ 1000 /* Always 1000 */
#define CONFIG_SYS_LOW_RES_TIMER
#define CONFIG_SYS_NIOS_TMRBASE 0x02120820 /* Tick timer base addr */ #define CONFIG_SYS_NIOS_TMRBASE 0x02120820 /* Tick timer base addr */
#define CONFIG_SYS_NIOS_TMRIRQ 3 /* Timer IRQ num */ #define CONFIG_SYS_NIOS_TMRIRQ 3 /* Timer IRQ num */
#define CONFIG_SYS_NIOS_TMRMS 10 /* Desired period */ #define CONFIG_SYS_NIOS_TMRMS 10 /* Desired period */
......
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
/* /*
* TIMER * TIMER
*/ */
#define CONFIG_SYS_LOW_RES_TIMER
#define CONFIG_SYS_NIOS_TMRBASE CONFIG_SYS_TIMER_BASE #define CONFIG_SYS_NIOS_TMRBASE CONFIG_SYS_TIMER_BASE
#define CONFIG_SYS_NIOS_TMRIRQ CONFIG_SYS_TIMER_IRQ #define CONFIG_SYS_NIOS_TMRIRQ CONFIG_SYS_TIMER_IRQ
#define CONFIG_SYS_HZ 1000 /* Always 1000 */ #define CONFIG_SYS_HZ 1000 /* Always 1000 */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册