diff options
author | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 07:18:01 (GMT) |
---|---|---|
committer | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 07:18:01 (GMT) |
commit | 50bd0057ba8fceeb48533f8b1a652ccd0e170838 (patch) | |
tree | ea1a183343573c2a48248923b96d316c0956727c /board/mvblue/flash.c | |
parent | 9dbc366744960013965fce8851035b6141f3b3ae (diff) | |
parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
download | u-boot-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.xz |
Merge git://git.denx.de/u-boot into x1
Conflicts:
drivers/usb/usb_ohci.c
Diffstat (limited to 'board/mvblue/flash.c')
-rw-r--r-- | board/mvblue/flash.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/board/mvblue/flash.c b/board/mvblue/flash.c index 0c0738c..2d6acf5 100644 --- a/board/mvblue/flash.c +++ b/board/mvblue/flash.c @@ -31,7 +31,7 @@ #define mvdebug(p) #endif -flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; +flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; #define FLASH_BUS_WIDTH 8 @@ -65,7 +65,7 @@ unsigned long flash_init (void) unsigned long size_b0; int i; - for (i=0; i<CFG_MAX_FLASH_BANKS; ++i) { + for (i=0; i<CONFIG_SYS_MAX_FLASH_BANKS; ++i) { flash_info[i].flash_id = FLASH_UNKNOWN; } @@ -416,7 +416,7 @@ int flash_erase (flash_info_t *info, int s_first, int s_last) addr = (FDT *)(info->start[l_sect]); while ((addr[0] & ERASE_CONFIRM_DATA) != ERASE_CONFIRM_DATA) { - if ((now = get_timer(start)) > CFG_FLASH_ERASE_TOUT) { + if ((now = get_timer(start)) > CONFIG_SYS_FLASH_ERASE_TOUT) { printf ("Timeout\n"); return 1; } @@ -554,7 +554,7 @@ static int write_char (flash_info_t *info, ulong dest, uchar data) start = get_timer (0); addr = (vu_char *)dest; while (( (*addr) & WRITE_CONFIRM_DATA) != (data & WRITE_CONFIRM_DATA)) { - if (get_timer(start) > CFG_FLASH_WRITE_TOUT) { + if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT) { printf(" *** ERROR: Flash write timeout !"); return (1); } |