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/mbx8xx/flash.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/mbx8xx/flash.c')
| -rw-r--r-- | board/mbx8xx/flash.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/board/mbx8xx/flash.c b/board/mbx8xx/flash.c index a491f7bf0..2ec420d51 100644 --- a/board/mbx8xx/flash.c +++ b/board/mbx8xx/flash.c @@ -32,7 +32,7 @@ #include <mpc8xx.h> #include "vpd.h" -flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ +flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; /* info for FLASH chips */ /*----------------------------------------------------------------------- * Functions @@ -51,13 +51,13 @@ unsigned long flash_init (void) ulong addr; /* Init: no FLASHes known */ - 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; } totsize = 0; addr = 0xfc000000; - for(i = 0; i < CFG_MAX_FLASH_BANKS; i++) { + for(i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++) { size = flash_get_size((vu_long *)addr, &flash_info[i]); if (flash_info[i].flash_id == FLASH_UNKNOWN) break; @@ -66,7 +66,7 @@ unsigned long flash_init (void) } addr = 0xfe000000; - for(i = 0; i < CFG_MAX_FLASH_BANKS; i++) { + for(i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++) { size = flash_get_size((vu_long *)addr, &flash_info[i]); if (flash_info[i].flash_id == FLASH_UNKNOWN) @@ -75,11 +75,11 @@ unsigned long flash_init (void) addr += size; } -#if CFG_MONITOR_BASE >= CFG_FLASH_BASE +#if CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, - CFG_MONITOR_BASE, - CFG_MONITOR_BASE+monitor_flash_len-1, + CONFIG_SYS_MONITOR_BASE, + CONFIG_SYS_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); #endif @@ -274,7 +274,7 @@ int flash_erase (flash_info_t *info, int s_first, int s_last) last = start; addr = (vu_long*)(info->start[l_sect]); while ((addr[0] & 0x80808080) != 0x80808080) { - if ((now = get_timer(start)) > CFG_FLASH_ERASE_TOUT) { + if ((now = get_timer(start)) > CONFIG_SYS_FLASH_ERASE_TOUT) { printf ("Timeout\n"); return 1; } @@ -397,7 +397,7 @@ static int write_word (flash_info_t *info, ulong dest, ulong data) /* data polling for D7 */ start = get_timer (0); while ((*((vu_long *)dest) & 0x80808080) != (data & 0x80808080)) { - if (get_timer(start) > CFG_FLASH_WRITE_TOUT) { + if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT) { return (1); } } |