leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

board/svm_sc8xx/flash.c: CodingStyle cleanup

Browse Source 
Make (mostly) checkpatch clean (don't convert to use I/O accessors
yet, so there will be "Use of volatile is usually wrong" warnings
left.

Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
Wolfgang Denk
2011-11-04 15:55:49 +00:00
parent 13bcd3c4d7
commit 8adc9052d0
1 changed files with 359 additions and 472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

403
board/svm_sc8xx/flash.c
View File

@@ -27,16 +27,13 @@
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET) #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
#endif #endif
flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; /* info for FLASH chips */ flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* Functions * Functions
*/ */
static int write_word(flash_info_t *info, ulong dest, ulong data); static int write_word(flash_info_t *info, ulong dest, ulong data);
#if 0
static ulong flash_get_size (vu_long *addr, flash_info_t *info);
static void flash_get_offsets (ulong base, flash_info_t *info);
#endif
#ifdef CONFIG_BOOT_8B #ifdef CONFIG_BOOT_8B
static int my_in_8(unsigned char *addr); static int my_in_8(unsigned char *addr);
static void my_out_8(unsigned char *addr, int val); static void my_out_8(unsigned char *addr, int val);
@@ -62,85 +59,95 @@ unsigned long flash_init (void)
size_b0 = 0; size_b0 = 0;
size_b1 = 0; size_b1 = 0;
/* Init: no FLASHes known */ /* Init: no FLASHes known */
for (i=0; i<CONFIG_SYS_MAX_FLASH_BANKS; ++i) { for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; ++i)
flash_info[i].flash_id = FLASH_UNKNOWN; flash_info[i].flash_id = FLASH_UNKNOWN;
}
#ifdef CONFIG_SYS_DOC_BASE #ifdef CONFIG_SYS_DOC_BASE
#ifndef CONFIG_FEL8xx_AT #ifndef CONFIG_FEL8xx_AT
memctl->memc_or5 = (0xffff8000 | CONFIG_SYS_OR_TIMING_DOC ); /* 32k bytes */ /* 32k bytes */
memctl->memc_or5 = (0xffff8000 | CONFIG_SYS_OR_TIMING_DOC);
memctl->memc_br5 = CONFIG_SYS_DOC_BASE | 0x401; memctl->memc_br5 = CONFIG_SYS_DOC_BASE | 0x401;
#else #else
memctl->memc_or3 = (0xffff8000 | CONFIG_SYS_OR_TIMING_DOC ); /* 32k bytes */ /* 32k bytes */
memctl->memc_or3 = (0xffff8000 | CONFIG_SYS_OR_TIMING_DOC);
memctl->memc_br3 = CONFIG_SYS_DOC_BASE | 0x401; memctl->memc_br3 = CONFIG_SYS_DOC_BASE | 0x401;
#endif #endif
#endif #endif
#if defined(CONFIG_BOOT_8B) #if defined(CONFIG_BOOT_8B)
/* memctl->memc_or0 = 0xfff80ff4; /###* 4MB bytes */
/* memctl->memc_br0 = 0x40000401; */
size_b0 = 0x80000; /* 512 K */ size_b0 = 0x80000; /* 512 K */
flash_info[0].flash_id = FLASH_MAN_AMD | FLASH_AM040; flash_info[0].flash_id = FLASH_MAN_AMD | FLASH_AM040;
flash_info[0].sector_count = 8; flash_info[0].sector_count = 8;
flash_info[0].size = 0x00080000; flash_info[0].size = 0x00080000;
/* set up sector start address table */ /* set up sector start address table */
for (i = 0; i < flash_info[0].sector_count; i++) for (i = 0; i < flash_info[0].sector_count; i++)
flash_info[0].start[i] = 0x40000000 + (i * 0x10000); flash_info[0].start[i] = 0x40000000 + (i * 0x10000);
/* protect all sectors */ /* protect all sectors */
for (i = 0; i < flash_info[0].sector_count; i++) for (i = 0; i < flash_info[0].sector_count; i++)
flash_info[0].protect[i] = 0x1; flash_info[0].protect[i] = 0x1;
#elif defined(CONFIG_BOOT_16B) #elif defined(CONFIG_BOOT_16B)
/* memctl->memc_or0 = 0xfff80ff4; /###* 4MB bytes */
/* memctl->memc_br0 = 0x40000401; */
size_b0 = 0x400000; /* 4MB , assume AMD29LV320B */ size_b0 = 0x400000; /* 4MB , assume AMD29LV320B */
flash_info[0].flash_id = FLASH_MAN_AMD | FLASH_AM320B; flash_info[0].flash_id = FLASH_MAN_AMD | FLASH_AM320B;
flash_info[0].sector_count = 67; flash_info[0].sector_count = 67;
flash_info[0].size = 0x00400000; flash_info[0].size = 0x00400000;
/* set up sector start address table */ /* set up sector start address table */
flash_info[0].start[0] = 0x40000000; flash_info[0].start[0] = 0x40000000;
flash_info[0].start[1] = 0x40000000 + 0x4000; flash_info[0].start[1] = 0x40000000 + 0x4000;
flash_info[0].start[2] = 0x40000000 + 0x6000; flash_info[0].start[2] = 0x40000000 + 0x6000;
flash_info[0].start[3] = 0x40000000 + 0x8000; flash_info[0].start[3] = 0x40000000 + 0x8000;
for (i = 4; i < flash_info[0].sector_count; i++)
flash_info[0].start[i] = 0x40000000 + 0x10000 + ((i-4) * 0x10000); for (i = 4; i < flash_info[0].sector_count; i++) {
flash_info[0].start[i] =
0x40000000 + 0x10000 + ((i - 4) * 0x10000);
}
/* protect all sectors */ /* protect all sectors */
for (i = 0; i < flash_info[0].sector_count; i++) for (i = 0; i < flash_info[0].sector_count; i++)
flash_info[0].protect[i] = 0x1; flash_info[0].protect[i] = 0x1;
#endif #endif
#ifdef CONFIG_BOOT_32B #ifdef CONFIG_BOOT_32B
/* Static FLASH Bank configuration here - FIXME XXX */ /* Static FLASH Bank configuration here - FIXME XXX */
size_b0 = flash_get_size((vu_long *) FLASH_BASE0_PRELIM,
size_b0 = flash_get_size((vu_long *)FLASH_BASE0_PRELIM, &flash_info[0]); &flash_info[0]);
if (flash_info[0].flash_id == FLASH_UNKNOWN) { if (flash_info[0].flash_id == FLASH_UNKNOWN) {
printf("## Unknown FLASH on Bank 0 - Size = 0x%08lx = %ld MB\n", printf("## Unknown FLASH on Bank 0 - Size = 0x%08lx = %ld MB\n",
size_b0, size_b0 << 20); size_b0, size_b0 << 20);
} }
size_b1 = flash_get_size((vu_long *)FLASH_BASE1_PRELIM, &flash_info[1]); size_b1 = flash_get_size((vu_long *) FLASH_BASE1_PRELIM,
&flash_info[1]);
if (size_b1 > size_b0) { if (size_b1 > size_b0) {
printf("## ERROR: " printf("## ERROR: "
"Bank 1 (0x%08lx = %ld MB) > Bank 0 (0x%08lx = %ld MB)\n", "Bank 1 (0x%08lx = %ld MB) > Bank 0 (0x%08lx = %ld MB)\n",
size_b1, size_b1<<20, size_b1, size_b1 << 20, size_b0, size_b0 << 20);
size_b0, size_b0<<20
);
flash_info[0].flash_id = FLASH_UNKNOWN; flash_info[0].flash_id = FLASH_UNKNOWN;
flash_info[1].flash_id = FLASH_UNKNOWN; flash_info[1].flash_id = FLASH_UNKNOWN;
flash_info[0].sector_count = -1; flash_info[0].sector_count = -1;
flash_info[1].sector_count = -1; flash_info[1].sector_count = -1;
flash_info[0].size = 0; flash_info[0].size = 0;
flash_info[1].size = 0; flash_info[1].size = 0;
return (0);
return 0;
} }
/* Remap FLASH according to real size */ /* Remap FLASH according to real size */
memctl->memc_or0 = CONFIG_SYS_OR_TIMING_FLASH | (-size_b0 & OR_AM_MSK); memctl->memc_or0 = CONFIG_SYS_OR_TIMING_FLASH |
memctl->memc_br0 = (CONFIG_SYS_FLASH_BASE & BR_BA_MSK) | BR_MS_GPCM | BR_V; (-size_b0 & OR_AM_MSK);
memctl->memc_br0 = (CONFIG_SYS_FLASH_BASE & BR_BA_MSK) |
BR_MS_GPCM | BR_V;
/* Re-do sizing to get full correct info */ /* Re-do sizing to get full correct info */
size_b0 = flash_get_size((vu_long *)CONFIG_SYS_FLASH_BASE, &flash_info[0]); size_b0 = flash_get_size((vu_long *) CONFIG_SYS_FLASH_BASE,
&flash_info[0]);
flash_get_offsets(CONFIG_SYS_FLASH_BASE, &flash_info[0]); flash_get_offsets(CONFIG_SYS_FLASH_BASE, &flash_info[0]);
@@ -156,20 +163,21 @@ unsigned long flash_init (void)
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CONFIG_ENV_ADDR, CONFIG_ENV_ADDR,
CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);
&flash_info[0]);
#endif #endif
if (size_b1) { if (size_b1) {
memctl->memc_or1 = CONFIG_SYS_OR_TIMING_FLASH | (-size_b1 & 0xFFFF8000); memctl->memc_or1 = CONFIG_SYS_OR_TIMING_FLASH |
memctl->memc_br1 = ((CONFIG_SYS_FLASH_BASE + size_b0) & BR_BA_MSK) | (-size_b1 & 0xFFFF8000);
BR_MS_GPCM | BR_V; memctl->memc_br1 = ((CONFIG_SYS_FLASH_BASE +
size_b0) & BR_BA_MSK) | BR_MS_GPCM | BR_V;
/* Re-do sizing to get full correct info */ /* Re-do sizing to get full correct info */
size_b1 = flash_get_size((vu_long *)(CONFIG_SYS_FLASH_BASE + size_b0), size_b1 = flash_get_size((vu_long *)(CONFIG_SYS_FLASH_BASE +
&flash_info[1]); size_b0), &flash_info[1]);
flash_get_offsets (CONFIG_SYS_FLASH_BASE + size_b0, &flash_info[1]); flash_get_offsets(CONFIG_SYS_FLASH_BASE + size_b0,
&flash_info[1]);
#if CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE #if CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE
/* monitor protection ON by default */ /* monitor protection ON by default */
@@ -199,39 +207,10 @@ unsigned long flash_init (void)
#endif /* CONFIG_BOOT_32B */ #endif /* CONFIG_BOOT_32B */
return (size_b0 + size_b1); return size_b0 + size_b1;
} }
#if 0
/*-----------------------------------------------------------------------
*/
static void flash_get_offsets (ulong base, flash_info_t *info)
{
int i;
/* set up sector start address table */
if (info->flash_id & FLASH_BTYPE) {
/* set sector offsets for bottom boot block type */
info->start[0] = base + 0x00000000;
info->start[1] = base + 0x00008000;
info->start[2] = base + 0x0000C000;
info->start[3] = base + 0x00010000;
for (i = 4; i < info->sector_count; i++) {
info->start[i] = base + (i * 0x00020000) - 0x00060000;
}
} else {
/* set sector offsets for top boot block type */
i = info->sector_count - 1;
info->start[i--] = base + info->size - 0x00008000;
info->start[i--] = base + info->size - 0x0000C000;
info->start[i--] = base + info->size - 0x00010000;
for (; i >= 0; i--) {
info->start[i] = base + i * 0x00020000;
}
}
}
#endif
/*-----------------------------------------------------------------------
*/
void flash_print_info(flash_info_t *info) void flash_print_info(flash_info_t *info)
{ {
int i; int i;
@@ -242,29 +221,44 @@ void flash_print_info (flash_info_t *info)
} }
switch (info->flash_id & FLASH_VENDMASK) { switch (info->flash_id & FLASH_VENDMASK) {
case FLASH_MAN_AMD: printf ("AMD "); break; case FLASH_MAN_AMD:
case FLASH_MAN_FUJ: printf ("FUJITSU "); break; printf("AMD ");
default: printf ("Unknown Vendor "); break; break;
case FLASH_MAN_FUJ:
printf("FUJITSU ");
break;
default:
printf("Unknown Vendor ");
break;
} }
switch (info->flash_id & FLASH_TYPEMASK) { switch (info->flash_id & FLASH_TYPEMASK) {
case FLASH_AM400B: printf ("AM29LV400B (4 Mbit, bottom boot sect)\n"); case FLASH_AM400B:
printf("AM29LV400B (4 Mbit, bottom boot sect)\n");
break; break;
case FLASH_AM400T: printf ("AM29LV400T (4 Mbit, top boot sector)\n"); case FLASH_AM400T:
printf("AM29LV400T (4 Mbit, top boot sector)\n");
break; break;
case FLASH_AM800B: printf ("AM29LV800B (8 Mbit, bottom boot sect)\n"); case FLASH_AM800B:
printf("AM29LV800B (8 Mbit, bottom boot sect)\n");
break; break;
case FLASH_AM800T: printf ("AM29LV800T (8 Mbit, top boot sector)\n"); case FLASH_AM800T:
printf("AM29LV800T (8 Mbit, top boot sector)\n");
break; break;
case FLASH_AM160B: printf ("AM29LV160B (16 Mbit, bottom boot sect)\n"); case FLASH_AM160B:
printf("AM29LV160B (16 Mbit, bottom boot sect)\n");
break; break;
case FLASH_AM160T: printf ("AM29LV160T (16 Mbit, top boot sector)\n"); case FLASH_AM160T:
printf("AM29LV160T (16 Mbit, top boot sector)\n");
break; break;
case FLASH_AM320B: printf ("AM29LV320B (32 Mbit, bottom boot sect)\n"); case FLASH_AM320B:
printf("AM29LV320B (32 Mbit, bottom boot sect)\n");
break; break;
case FLASH_AM320T: printf ("AM29LV320T (32 Mbit, top boot sector)\n"); case FLASH_AM320T:
printf("AM29LV320T (32 Mbit, top boot sector)\n");
break; break;
default: printf ("Unknown Chip Type\n"); default:
printf("Unknown Chip Type\n");
break; break;
} }
@@ -276,152 +270,15 @@ void flash_print_info (flash_info_t *info)
if ((i % 5) == 0) if ((i % 5) == 0)
printf("\n "); printf("\n ");
printf(" %08lX%s", printf(" %08lX%s",
info->start[i], info->start[i], info->protect[i] ? " (RO)" : " ");
info->protect[i] ? " (RO)" : " "
);
} }
printf("\n"); printf("\n");
return; return;
} }
/*-----------------------------------------------------------------------
*/
/*-----------------------------------------------------------------------
*/
/* /*
* The following code cannot be run from FLASH! * The following code cannot be run from FLASH!
*/ */
#if 0
static ulong flash_get_size (vu_long *addr, flash_info_t *info)
{
short i;
ulong value;
ulong base = (ulong)addr;
/* Write auto select command: read Manufacturer ID */
addr[0x0555] = 0x00AA00AA;
addr[0x02AA] = 0x00550055;
addr[0x0555] = 0x00900090;
value = addr[0];
switch (value) {
case AMD_MANUFACT:
info->flash_id = FLASH_MAN_AMD;
break;
case FUJ_MANUFACT:
info->flash_id = FLASH_MAN_FUJ;
break;
default:
info->flash_id = FLASH_UNKNOWN;
info->sector_count = 0;
info->size = 0;
return (0); /* no or unknown flash */
}
value = addr[1]; /* device ID */
switch (value) {
case AMD_ID_LV400T:
info->flash_id += FLASH_AM400T;
info->sector_count = 11;
info->size = 0x00100000;
break; /* => 1 MB */
case AMD_ID_LV400B:
info->flash_id += FLASH_AM400B;
info->sector_count = 11;
info->size = 0x00100000;
break; /* => 1 MB */
case AMD_ID_LV800T:
info->flash_id += FLASH_AM800T;
info->sector_count = 19;
info->size = 0x00200000;
break; /* => 2 MB */
case AMD_ID_LV800B:
info->flash_id += FLASH_AM800B;
info->sector_count = 19;
info->size = 0x00200000;
break; /* => 2 MB */
case AMD_ID_LV160T:
info->flash_id += FLASH_AM160T;
info->sector_count = 35;
info->size = 0x00400000;
break; /* => 4 MB */
case AMD_ID_LV160B:
info->flash_id += FLASH_AM160B;
info->sector_count = 35;
info->size = 0x00400000;
break; /* => 4 MB */
#if 0 /* enable when device IDs are available */
case AMD_ID_LV320T:
info->flash_id += FLASH_AM320T;
info->sector_count = 67;
info->size = 0x00800000;
break; /* => 8 MB */
case AMD_ID_LV320B:
info->flash_id += FLASH_AM320B;
info->sector_count = 67;
info->size = 0x00800000;
break; /* => 8 MB */
#endif
default:
info->flash_id = FLASH_UNKNOWN;
return (0); /* => no or unknown flash */
}
/* set up sector start address table */
if (info->flash_id & FLASH_BTYPE) {
/* set sector offsets for bottom boot block type */
info->start[0] = base + 0x00000000;
info->start[1] = base + 0x00008000;
info->start[2] = base + 0x0000C000;
info->start[3] = base + 0x00010000;
for (i = 4; i < info->sector_count; i++) {
info->start[i] = base + (i * 0x00020000) - 0x00060000;
}
} else {
/* set sector offsets for top boot block type */
i = info->sector_count - 1;
info->start[i--] = base + info->size - 0x00008000;
info->start[i--] = base + info->size - 0x0000C000;
info->start[i--] = base + info->size - 0x00010000;
for (; i >= 0; i--) {
info->start[i] = base + i * 0x00020000;
}
}
/* check for protected sectors */
for (i = 0; i < info->sector_count; i++) {
/* read sector protection at sector address, (A7 .. A0) = 0x02 */
/* D0 = 1 if protected */
addr = (volatile unsigned long *)(info->start[i]);
info->protect[i] = addr[2] & 1;
}
/*
* Prevent writes to uninitialized FLASH.
*/
if (info->flash_id != FLASH_UNKNOWN) {
addr = (volatile unsigned long *)info->start[0];
*addr = 0x00F000F0; /* reset bank */
}
return (info->size);
}
#endif
/*-----------------------------------------------------------------------
*/
int flash_erase(flash_info_t *info, int s_first, int s_last) int flash_erase(flash_info_t *info, int s_first, int s_last)
{ {
@@ -430,11 +287,11 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
ulong start, now, last; ulong start, now, last;
if ((s_first < 0) || (s_first > s_last)) { if ((s_first < 0) || (s_first > s_last)) {
if (info->flash_id == FLASH_UNKNOWN) { if (info->flash_id == FLASH_UNKNOWN)
printf("- missing\n"); printf("- missing\n");
} else { else
printf("- no sectors to erase\n"); printf("- no sectors to erase\n");
}
return 1; return 1;
} }
@@ -447,10 +304,9 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
prot = 0; prot = 0;
for (sect = s_first; sect <= s_last; ++sect) { for (sect = s_first; sect <= s_last; ++sect) {
if (info->protect[sect]) { if (info->protect[sect])
prot++; prot++;
} }
}
if (prot) { if (prot) {
printf("- Warning: %d protected sectors will not be erased!\n", printf("- Warning: %d protected sectors will not be erased!\n",
@@ -463,20 +319,26 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
/* Disable interrupts which might cause a timeout here */ /* Disable interrupts which might cause a timeout here */
flag = disable_interrupts(); flag = disable_interrupts();
#if defined(CONFIG_BOOT_8B) #if defined(CONFIG_BOOT_8B)
my_out_8((unsigned char *)((ulong)addr + 0x555), 0xaa); my_out_8((unsigned char *)((ulong)addr + 0x555), 0xaa);
my_out_8((unsigned char *)((ulong)addr + 0x2aa), 0x55); my_out_8((unsigned char *)((ulong)addr + 0x2aa), 0x55);
my_out_8((unsigned char *)((ulong)addr + 0x555), 0x90); my_out_8((unsigned char *)((ulong)addr + 0x555), 0x90);
in_mid = my_in_8((unsigned char *)addr); in_mid = my_in_8((unsigned char *)addr);
in_did = my_in_8((unsigned char *)((ulong)addr + 1)); in_did = my_in_8((unsigned char *)((ulong)addr + 1));
printf(" man ID=0x%x, dev ID=0x%x.\n", in_mid, in_did); printf(" man ID=0x%x, dev ID=0x%x.\n", in_mid, in_did);
my_out_8((unsigned char *)addr, 0xf0); my_out_8((unsigned char *)addr, 0xf0);
udelay(1); udelay(1);
my_out_8((unsigned char *)((ulong)addr + 0x555), 0xaa); my_out_8((unsigned char *)((ulong)addr + 0x555), 0xaa);
my_out_8((unsigned char *)((ulong)addr + 0x2aa), 0x55); my_out_8((unsigned char *)((ulong)addr + 0x2aa), 0x55);
my_out_8((unsigned char *)((ulong)addr + 0x555), 0x80); my_out_8((unsigned char *)((ulong)addr + 0x555), 0x80);
my_out_8((unsigned char *)((ulong)addr + 0x555), 0xaa); my_out_8((unsigned char *)((ulong)addr + 0x555), 0xaa);
my_out_8((unsigned char *)((ulong)addr + 0x2aa), 0x55); my_out_8((unsigned char *)((ulong)addr + 0x2aa), 0x55);
/* Start erase on unprotected sectors */ /* Start erase on unprotected sectors */
for (sect = s_first; sect <= s_last; sect++) { for (sect = s_first; sect <= s_last; sect++) {
if (info->protect[sect] == 0) { /* not protected */ if (info->protect[sect] == 0) { /* not protected */
@@ -513,16 +375,21 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
my_out_be32((unsigned *)((ulong)addr + 0x1554), 0xaa); my_out_be32((unsigned *)((ulong)addr + 0x1554), 0xaa);
my_out_be32((unsigned *)((ulong)addr + 0xaa8), 0x55); my_out_be32((unsigned *)((ulong)addr + 0xaa8), 0x55);
my_out_be32((unsigned *)((ulong)addr + 0x1554), 0x90); my_out_be32((unsigned *)((ulong)addr + 0x1554), 0x90);
in_mid = my_in_be32((unsigned *)addr); in_mid = my_in_be32((unsigned *)addr);
in_did = my_in_be32((unsigned *)((ulong)addr + 4)); in_did = my_in_be32((unsigned *)((ulong)addr + 4));
printf(" man ID=0x%x, dev ID=0x%x.\n", in_mid, in_did); printf(" man ID=0x%x, dev ID=0x%x.\n", in_mid, in_did);
my_out_be32((unsigned *) addr, 0xf0); my_out_be32((unsigned *) addr, 0xf0);
udelay(1); udelay(1);
my_out_be32((unsigned *)((ulong)addr + 0x1554), 0xaa); my_out_be32((unsigned *)((ulong)addr + 0x1554), 0xaa);
my_out_be32((unsigned *)((ulong)addr + 0xaa8), 0x55); my_out_be32((unsigned *)((ulong)addr + 0xaa8), 0x55);
my_out_be32((unsigned *)((ulong)addr + 0x1554), 0x80); my_out_be32((unsigned *)((ulong)addr + 0x1554), 0x80);
my_out_be32((unsigned *)((ulong)addr + 0x1554), 0xaa); my_out_be32((unsigned *)((ulong)addr + 0x1554), 0xaa);
my_out_be32((unsigned *)((ulong)addr + 0xaa8), 0x55); my_out_be32((unsigned *)((ulong)addr + 0xaa8), 0x55);
/* Start erase on unprotected sectors */ /* Start erase on unprotected sectors */
for (sect = s_first; sect <= s_last; sect++) { for (sect = s_first; sect <= s_last; sect++) {
if (info->protect[sect] == 0) { /* not protected */ if (info->protect[sect] == 0) { /* not protected */
@@ -561,7 +428,8 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
#error CONFIG_BOOT_(size)B missing. #error CONFIG_BOOT_(size)B missing.
#endif #endif
{ {
if ((now = get_timer(start)) > CONFIG_SYS_FLASH_ERASE_TOUT) { now = get_timer(start);
if (now > CONFIG_SYS_FLASH_ERASE_TOUT) {
printf("Timeout\n"); printf("Timeout\n");
return 1; return 1;
} }
@@ -574,6 +442,7 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
DONE: DONE:
/* reset to read mode */ /* reset to read mode */
addr = (volatile unsigned long *) info->start[0]; addr = (volatile unsigned long *) info->start[0];
#if defined(CONFIG_BOOT_8B) #if defined(CONFIG_BOOT_8B)
my_out_8((unsigned char *) addr, 0xf0); my_out_8((unsigned char *) addr, 0xf0);
#elif defined(CONFIG_BOOT_16B) #elif defined(CONFIG_BOOT_16B)
@@ -587,7 +456,7 @@ DONE:
return 0; return 0;
} }
/*----------------------------------------------------------------------- /*
* Copy memory to flash, returns: * Copy memory to flash, returns:
* 0 - OK * 0 - OK
* 1 - write timeout * 1 - write timeout
@@ -604,23 +473,26 @@ int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt)
/* /*
* handle unaligned start bytes * handle unaligned start bytes
*/ */
if ((l = addr - wp) != 0) { l = addr - wp;
if (l != 0) {
data = 0; data = 0;
for (i=0, cp=wp; i<l; ++i, ++cp) { for (i = 0, cp = wp; i < l; ++i, ++cp)
data = (data << 8) | (*(uchar *) cp); data = (data << 8) | (*(uchar *) cp);
}
for (; i < 4 && cnt > 0; ++i) { for (; i < 4 && cnt > 0; ++i) {
data = (data << 8) | *src++; data = (data << 8) | *src++;
--cnt; --cnt;
++cp; ++cp;
} }
for (; cnt==0 && i<4; ++i, ++cp) { for (; cnt == 0 && i < 4; ++i, ++cp)
data = (data << 8) | (*(uchar *) cp); data = (data << 8) | (*(uchar *) cp);
}
if ((rc = write_word(info, wp, data)) != 0) { rc = write_word(info, wp, data);
return (rc);
} if (rc != 0)
return rc;
wp += 4; wp += 4;
} }
@@ -629,19 +501,20 @@ int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt)
*/ */
while (cnt >= 4) { while (cnt >= 4) {
data = 0; data = 0;
for (i=0; i<4; ++i) { for (i = 0; i < 4; ++i)
data = (data << 8) | *src++; data = (data << 8) | *src++;
}
if ((rc = write_word(info, wp, data)) != 0) { rc = write_word(info, wp, data);
return (rc);
} if (rc != 0)
return rc;
wp += 4; wp += 4;
cnt -= 4; cnt -= 4;
} }
if (cnt == 0) { if (cnt == 0)
return (0); return 0;
}
/* /*
* handle unaligned tail bytes * handle unaligned tail bytes
@@ -651,14 +524,13 @@ int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt)
data = (data << 8) | *src++; data = (data << 8) | *src++;
--cnt; --cnt;
} }
for (; i<4; ++i, ++cp) { for (; i < 4; ++i, ++cp)
data = (data << 8) | (*(uchar *) cp); data = (data << 8) | (*(uchar *) cp);
return write_word(info, wp, data);
} }
return (write_word(info, wp, data)); /*
}
/*-----------------------------------------------------------------------
* Write a word to Flash, returns: * Write a word to Flash, returns:
* 0 - OK * 0 - OK
* 1 - write timeout * 1 - write timeout
@@ -673,44 +545,53 @@ static int write_word (flash_info_t *info, ulong dest, ulong data)
int data_short[2]; int data_short[2];
/* Check if Flash is (sufficiently) erased */ /* Check if Flash is (sufficiently) erased */
if ( ((ulong) *(ulong *)dest & data) != data ) { if (((ulong)*(ulong *)dest & data) != data)
return (2); return 2;
}
/* Disable interrupts which might cause a timeout here */ /* Disable interrupts which might cause a timeout here */
flag = disable_interrupts(); flag = disable_interrupts();
#if defined(CONFIG_BOOT_8B) #if defined(CONFIG_BOOT_8B)
#ifdef DEBUG #ifdef DEBUG
{ {
int in_mid, in_did; int in_mid, in_did;
my_out_8((unsigned char *) (addr + 0x555), 0xaa); my_out_8((unsigned char *) (addr + 0x555), 0xaa);
my_out_8((unsigned char *) (addr + 0x2aa), 0x55); my_out_8((unsigned char *) (addr + 0x2aa), 0x55);
my_out_8((unsigned char *) (addr + 0x555), 0x90); my_out_8((unsigned char *) (addr + 0x555), 0x90);
in_mid = my_in_8((unsigned char *) addr); in_mid = my_in_8((unsigned char *) addr);
in_did = my_in_8((unsigned char *) (addr + 1)); in_did = my_in_8((unsigned char *) (addr + 1));
printf(" man ID=0x%x, dev ID=0x%x.\n", in_mid, in_did); printf(" man ID=0x%x, dev ID=0x%x.\n", in_mid, in_did);
my_out_8((unsigned char *) addr, 0xf0); my_out_8((unsigned char *) addr, 0xf0);
udelay(1); udelay(1);
} }
#endif #endif
{ {
int data_ch[4]; int data_ch[4];
data_ch[0] = (int) ((data >> 24) & 0xff); data_ch[0] = (int) ((data >> 24) & 0xff);
data_ch[1] = (int) ((data >> 16) & 0xff); data_ch[1] = (int) ((data >> 16) & 0xff);
data_ch[2] = (int) ((data >> 8) & 0xff); data_ch[2] = (int) ((data >> 8) & 0xff);
data_ch[3] = (int) (data & 0xff); data_ch[3] = (int) (data & 0xff);
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
my_out_8((unsigned char *) (addr + 0x555), 0xaa); my_out_8((unsigned char *) (addr + 0x555), 0xaa);
my_out_8((unsigned char *) (addr + 0x2aa), 0x55); my_out_8((unsigned char *) (addr + 0x2aa), 0x55);
my_out_8((unsigned char *) (addr + 0x555), 0xa0); my_out_8((unsigned char *) (addr + 0x555), 0xa0);
my_out_8((unsigned char *) (dest + i), data_ch[i]); my_out_8((unsigned char *) (dest + i), data_ch[i]);
/* re-enable interrupts if necessary */ /* re-enable interrupts if necessary */
if (flag) if (flag)
enable_interrupts(); enable_interrupts();
start = get_timer(0); start = get_timer(0);
last = start; last = start;
while( ( my_in_8((unsigned char *) (dest+i)) ) != ( data_ch[i] ) ) { while ((my_in_8((unsigned char *)(dest + i))) !=
if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT ) { (data_ch[i])) {
if (get_timer(start) >
CONFIG_SYS_FLASH_WRITE_TOUT) {
return 1; return 1;
} }
} }
@@ -723,18 +604,21 @@ static int write_word (flash_info_t *info, ulong dest, ulong data)
my_out_be16((unsigned short *)((ulong)addr + 0xaaa), 0xaa); my_out_be16((unsigned short *)((ulong)addr + 0xaaa), 0xaa);
my_out_be16((unsigned short *)((ulong)addr + 0x554), 0x55); my_out_be16((unsigned short *)((ulong)addr + 0x554), 0x55);
my_out_be16((unsigned short *)((ulong)addr + 0xaaa), 0xa0); my_out_be16((unsigned short *)((ulong)addr + 0xaaa), 0xa0);
my_out_be16( (unsigned short *) (dest+(i*2)) ,data_short[i]); my_out_be16((unsigned short *)(dest + (i * 2)),
data_short[i]);
/* re-enable interrupts if necessary */ /* re-enable interrupts if necessary */
if (flag) if (flag)
enable_interrupts(); enable_interrupts();
start = get_timer(0); start = get_timer(0);
last = start; last = start;
while( ( my_in_be16((unsigned short *) (dest+(i*2))) ) != ( data_short[i] ) ) { while ((my_in_be16((unsigned short *)(dest + (i * 2)))) !=
if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT ) { (data_short[i])) {
if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT)
return 1; return 1;
} }
} }
}
#elif defined(CONFIG_BOOT_32B) #elif defined(CONFIG_BOOT_32B)
addr[0x0555] = 0x00AA00AA; addr[0x0555] = 0x00AA00AA;
addr[0x02AA] = 0x00550055; addr[0x02AA] = 0x00550055;
@@ -749,20 +633,19 @@ static int write_word (flash_info_t *info, ulong dest, ulong data)
/* data polling for D7 */ /* data polling for D7 */
start = get_timer(0); start = get_timer(0);
while ((*((vu_long *)dest) & 0x00800080) != (data & 0x00800080)) { while ((*((vu_long *)dest) & 0x00800080) != (data & 0x00800080)) {
if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT) { if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT)
return (1); return 1;
}
} }
#endif #endif
return 0;
return (0);
} }
#ifdef CONFIG_BOOT_8B #ifdef CONFIG_BOOT_8B
static int my_in_8(unsigned char *addr) static int my_in_8(unsigned char *addr)
{ {
int ret; int ret;
__asm__ __volatile__("lbz%U1%X1 %0,%1; eieio":"=r"(ret):"m"(*addr)); __asm__ __volatile__("lbz%U1%X1 %0,%1; eieio":"=r"(ret):"m"(*addr));
return ret; return ret;
} }
@@ -776,8 +659,10 @@ static int my_in_be16( unsigned short *addr)
{ {
int ret; int ret;
__asm__ __volatile__("lhz%U1%X1 %0,%1; eieio":"=r"(ret):"m"(*addr)); __asm__ __volatile__("lhz%U1%X1 %0,%1; eieio":"=r"(ret):"m"(*addr));
return ret; return ret;
} }
static void my_out_be16(unsigned short *addr, int val) static void my_out_be16(unsigned short *addr, int val)
{ {
__asm__ __volatile__("sth%U0%X0 %1,%0; eieio":"=m"(*addr):"r"(val)); __asm__ __volatile__("sth%U0%X0 %1,%0; eieio":"=m"(*addr):"r"(val));
@@ -788,8 +673,10 @@ static unsigned my_in_be32( unsigned *addr)
{ {
unsigned ret; unsigned ret;
__asm__ __volatile__("lwz%U1%X1 %0,%1; eieio":"=r"(ret):"m"(*addr)); __asm__ __volatile__("lwz%U1%X1 %0,%1; eieio":"=r"(ret):"m"(*addr));
return ret; return ret;
} }
static void my_out_be32(unsigned *addr, int val) static void my_out_be32(unsigned *addr, int val)
{ {
__asm__ __volatile__("stw%U0%X0 %1,%0; eieio":"=m"(*addr):"r"(val)); __asm__ __volatile__("stw%U0%X0 %1,%0; eieio":"=m"(*addr):"r"(val));