Merge branch 'master' of git://git.denx.de/u-boot-arm

This commit is contained in:
Stefano Babic
2014-08-08 10:18:40 +02:00
290 changed files with 8927 additions and 3151 deletions

View File

@@ -56,14 +56,16 @@ ulong flash_init(void)
int flash_get_offsets(ulong base, flash_info_t * info)
{
int j, k;
int i;
if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_SST) {
info->start[0] = base;
for (k = 0, j = 0; j < CONFIG_SYS_SST_SECT; j++, k++) {
info->start[k + 1] = info->start[k] + CONFIG_SYS_SST_SECTSZ;
info->protect[k] = 0;
info->protect[0] = 0;
for (i = 1; i < CONFIG_SYS_SST_SECT; i++) {
info->start[i] = info->start[i - 1]
+ CONFIG_SYS_SST_SECTSZ;
info->protect[i] = 0;
}
}