diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
| commit | f82642e33899766892499b163e60560fbbf87773 (patch) | |
| tree | ab90f076f18e56b2b3e8c9375b95917daa78c1d9 /board/psyent/common | |
| parent | b59b16ca24bc7e77ec113021a6d77b9b32fcf192 (diff) | |
| parent | 360fe71e82b83e264c964c9447c537e9a1f643c8 (diff) | |
| download | u-boot-imx-f82642e33899766892499b163e60560fbbf87773.zip u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.gz u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.bz2 | |
Merge 'next' branch
Conflicts:
board/freescale/mpc8536ds/mpc8536ds.c
include/configs/mgcoge.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'board/psyent/common')
| -rw-r--r-- | board/psyent/common/AMDLV065D.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/board/psyent/common/AMDLV065D.c b/board/psyent/common/AMDLV065D.c index 8a7b14e..0fcf354 100644 --- a/board/psyent/common/AMDLV065D.c +++ b/board/psyent/common/AMDLV065D.c @@ -30,7 +30,7 @@ #endif #define SECTSZ (64 * 1024) -flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; +flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; /*----------------------------------------------------------------------*/ unsigned long flash_init (void) @@ -39,18 +39,18 @@ unsigned long flash_init (void) unsigned long addr; flash_info_t *fli = &flash_info[0]; - fli->size = CFG_FLASH_SIZE; - fli->sector_count = CFG_MAX_FLASH_SECT; + fli->size = CONFIG_SYS_FLASH_SIZE; + fli->sector_count = CONFIG_SYS_MAX_FLASH_SECT; fli->flash_id = FLASH_MAN_AMD + FLASH_AMDLV065D; - addr = CFG_FLASH_BASE; + addr = CONFIG_SYS_FLASH_BASE; for (i = 0; i < fli->sector_count; ++i) { fli->start[i] = addr; addr += SECTSZ; fli->protect[i] = 1; } - return (CFG_FLASH_SIZE); + return (CONFIG_SYS_FLASH_SIZE); } /*--------------------------------------------------------------------*/ void flash_print_info (flash_info_t * info) @@ -135,7 +135,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last) while ( readb (addr2) != 0xff) { udelay (1000 * 1000); putc ('.'); - if (get_timer (start) > CFG_FLASH_ERASE_TOUT) { + if (get_timer (start) > CONFIG_SYS_FLASH_ERASE_TOUT) { printf ("timeout\n"); return 1; } @@ -177,7 +177,7 @@ int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt) /* Verify write */ start = get_timer (0); while (readb (dst) != b) { - if (get_timer (start) > CFG_FLASH_WRITE_TOUT) { + if (get_timer (start) > CONFIG_SYS_FLASH_WRITE_TOUT) { return 1; } } |