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/esd/hh405/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/esd/hh405/flash.c')
-rw-r--r-- | board/esd/hh405/flash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/esd/hh405/flash.c b/board/esd/hh405/flash.c index 89af119..274ada9 100644 --- a/board/esd/hh405/flash.c +++ b/board/esd/hh405/flash.c @@ -48,7 +48,7 @@ unsigned long flash_init (void) int size_val = 0; /* 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; } @@ -91,7 +91,7 @@ unsigned long flash_init (void) /* Monitor protection ON by default */ (void)flash_protect(FLAG_PROTECT_SET, - -CFG_MONITOR_LEN, + -CONFIG_SYS_MONITOR_LEN, 0xffffffff, &flash_info[0]); |