diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
| commit | 50bd0057ba8fceeb48533f8b1a652ccd0e170838 (patch) | |
| tree | ea1a183343573c2a48248923b96d316c0956727c /board/sc520_cdp/flash_old.c | |
| parent | 9dbc366744960013965fce8851035b6141f3b3ae (diff) | |
| parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
| download | olio-uboot-2014.01-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.xz olio-uboot-2014.01-50bd0057ba8fceeb48533f8b1a652ccd0e170838.zip | |
Merge git://git.denx.de/u-boot into x1
Conflicts:
drivers/usb/usb_ohci.c
Diffstat (limited to 'board/sc520_cdp/flash_old.c')
| -rw-r--r-- | board/sc520_cdp/flash_old.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/board/sc520_cdp/flash_old.c b/board/sc520_cdp/flash_old.c index b68626e15..9491ca296 100644 --- a/board/sc520_cdp/flash_old.c +++ b/board/sc520_cdp/flash_old.c @@ -89,7 +89,7 @@ ulong flash_init(void) flash_info[i].sector_count = 0; sectsize=0; } - memset(flash_info[i].protect, 0, CFG_MAX_FLASH_SECT); + memset(flash_info[i].protect, 0, CONFIG_SYS_MAX_FLASH_SECT); switch (i) { case 0: flashbase = SC520_FLASH_BANK0_BASE; @@ -240,7 +240,7 @@ int flash_erase(flash_info_t *info, int s_first, int s_last) result = readl(addr); /* check timeout */ - if (get_timer(0) > CFG_FLASH_ERASE_TOUT) { + if (get_timer(0) > CONFIG_SYS_FLASH_ERASE_TOUT) { writel(CMD_READ_ARRAY, addr + 1); chip1 = TMO; break; @@ -342,7 +342,7 @@ volatile static int write_word(flash_info_t *info, ulong dest, ulong data) result = readl(addr); /* check timeout */ - if (get_timer(0) > CFG_FLASH_ERASE_TOUT) { + if (get_timer(0) > CONFIG_SYS_FLASH_ERASE_TOUT) { chip1 = ERR | TMO; break; } |