minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 12:39:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

board/genietv/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:40 +00:00
parent 28c665d4d5
commit 098a8a83ea
1 changed files with 178 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

354
board/genietv/flash.c
View File

@ -24,32 +24,33 @@
#include <common.h> #include <common.h>
#include <mpc8xx.h> #include <mpc8xx.h>
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 ulong flash_get_size (vu_long *addr, flash_info_t *info); static ulong flash_get_size(vu_long *addr, flash_info_t *info);
static int write_word (flash_info_t *info, ulong dest, ulong data); static int write_word(flash_info_t *info, ulong dest, ulong data);
static void flash_get_offsets (ulong base, flash_info_t *info); static void flash_get_offsets(ulong base, flash_info_t *info);
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
*/ */
unsigned long flash_init (void) unsigned long flash_init(void)
{ {
unsigned long size_b0, size_b1; unsigned long size_b0, size_b1;
int i; int i;
/* 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;
/* Detect size */ /* Detect size */
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]);
/* Setup offsets */ /* Setup offsets */
flash_get_offsets (CONFIG_SYS_FLASH_BASE, &flash_info[0]); flash_get_offsets(CONFIG_SYS_FLASH_BASE, &flash_info[0]);
#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 */
@ -67,13 +68,13 @@ unsigned long flash_init (void)
flash_info[0].size = size_b0; flash_info[0].size = size_b0;
flash_info[1].size = size_b1; flash_info[1].size = size_b1;
return (size_b0 + size_b1); return size_b0 + size_b1;
} }
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* Fix this to support variable sector sizes * Fix this to support variable sector sizes
*/ */
static void flash_get_offsets (ulong base, flash_info_t *info) static void flash_get_offsets(ulong base, flash_info_t *info)
{ {
int i; int i;
@ -87,73 +88,85 @@ static void flash_get_offsets (ulong base, flash_info_t *info)
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
*/ */
void flash_print_info (flash_info_t *info) void flash_print_info(flash_info_t *info)
{ {
int i; int i;
if (info->flash_id == FLASH_UNKNOWN) if (info->flash_id == FLASH_UNKNOWN) {
{ puts("missing or unknown FLASH type\n");
puts ("missing or unknown FLASH type\n");
return; return;
} }
switch (info->flash_id & FLASH_VENDMASK) switch (info->flash_id & FLASH_VENDMASK) {
{ case FLASH_MAN_AMD:
case FLASH_MAN_AMD: printf ("AMD "); break; printf("AMD ");
case FLASH_MAN_FUJ: printf ("FUJITSU "); break; break;
case FLASH_MAN_BM: printf ("BRIGHT MICRO "); break; case FLASH_MAN_FUJ:
default: printf ("Unknown Vendor "); break; printf("FUJITSU ");
break;
case FLASH_MAN_BM:
printf("BRIGHT MICRO ");
break;
default:
printf("Unknown Vendor ");
break;
} }
switch (info->flash_id & FLASH_TYPEMASK) switch (info->flash_id & FLASH_TYPEMASK) {
{ case FLASH_AM040:
case FLASH_AM040: printf ("29F040 or 29LV040 (4 Mbit, uniform sectors)\n"); printf("29F040 or 29LV040 (4 Mbit, uniform sectors)\n");
break; break;
case FLASH_AM400B: printf ("AM29LV400B (4 Mbit, bottom boot sect)\n"); case FLASH_AM400B:
break; printf("AM29LV400B (4 Mbit, bottom boot sect)\n");
case FLASH_AM400T: printf ("AM29LV400T (4 Mbit, top boot sector)\n"); break;
break; case FLASH_AM400T:
case FLASH_AM800B: printf ("AM29LV800B (8 Mbit, bottom boot sect)\n"); printf("AM29LV400T (4 Mbit, top boot sector)\n");
break; break;
case FLASH_AM800T: printf ("AM29LV800T (8 Mbit, top boot sector)\n"); case FLASH_AM800B:
break; printf("AM29LV800B (8 Mbit, bottom boot sect)\n");
case FLASH_AM160B: printf ("AM29LV160B (16 Mbit, bottom boot sect)\n"); break;
break; case FLASH_AM800T:
case FLASH_AM160T: printf ("AM29LV160T (16 Mbit, top boot sector)\n"); printf("AM29LV800T (8 Mbit, top boot sector)\n");
break; break;
case FLASH_AM320B: printf ("AM29LV320B (32 Mbit, bottom boot sect)\n"); case FLASH_AM160B:
break; printf("AM29LV160B (16 Mbit, bottom boot sect)\n");
case FLASH_AM320T: printf ("AM29LV320T (32 Mbit, top boot sector)\n"); break;
break; case FLASH_AM160T:
default: printf ("Unknown Chip Type\n"); printf("AM29LV160T (16 Mbit, top boot sector)\n");
break; break;
case FLASH_AM320B:
printf("AM29LV320B (32 Mbit, bottom boot sect)\n");
break;
case FLASH_AM320T:
printf("AM29LV320T (32 Mbit, top boot sector)\n");
break;
default:
printf("Unknown Chip Type\n");
break;
} }
if (info->size >> 20) { if (info->size >> 20) {
printf (" Size: %ld MB in %d Sectors\n", printf(" Size: %ld MB in %d Sectors\n",
info->size >> 20, info->size >> 20,
info->sector_count); info->sector_count);
} else { } else {
printf (" Size: %ld KB in %d Sectors\n", printf(" Size: %ld KB in %d Sectors\n",
info->size >> 10, info->size >> 10,
info->sector_count); info->sector_count);
} }
puts (" Sector Start Addresses:"); puts(" Sector Start Addresses:");
for (i=0; i<info->sector_count; ++i) for (i = 0; i < info->sector_count; ++i) {
{
if ((i % 5) == 0) if ((i % 5) == 0)
{ puts("\n ");
puts ("\n ");
}
printf (" %08lX%s", printf(" %08lX%s",
info->start[i], info->start[i],
info->protect[i] ? " (RO)" : " "); info->protect[i] ? " (RO)" : " ");
} }
putc ('\n'); putc('\n');
return; return;
} }
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
@ -163,7 +176,7 @@ void flash_print_info (flash_info_t *info)
* The following code cannot be run from FLASH! * The following code cannot be run from FLASH!
*/ */
static ulong flash_get_size (vu_long *addr, flash_info_t *info) static ulong flash_get_size(vu_long *addr, flash_info_t *info)
{ {
short i; short i;
volatile unsigned char *caddr; volatile unsigned char *caddr;
@ -173,9 +186,7 @@ static ulong flash_get_size (vu_long *addr, flash_info_t *info)
/* Write auto select command: read Manufacturer ID */ /* Write auto select command: read Manufacturer ID */
#if 0 debug("Base address is: %08x\n", caddr);
printf("Base address is: %08x\n", caddr);
#endif
caddr[0x0555] = 0xAA; caddr[0x0555] = 0xAA;
caddr[0x02AA] = 0x55; caddr[0x02AA] = 0x55;
@ -183,51 +194,47 @@ static ulong flash_get_size (vu_long *addr, flash_info_t *info)
value = caddr[0]; value = caddr[0];
#if 0 debug("Manufact ID: %02x\n", value);
printf("Manufact ID: %02x\n", value);
#endif
switch (value)
{
case 0x1: /* AMD_MANUFACT */
info->flash_id = FLASH_MAN_AMD;
break;
case 0x4: /* FUJ_MANUFACT */ switch (value) {
info->flash_id = FLASH_MAN_FUJ; case 0x1: /* AMD_MANUFACT */
info->flash_id = FLASH_MAN_AMD;
break;
case 0x4: /* FUJ_MANUFACT */
info->flash_id = FLASH_MAN_FUJ;
break;
default:
info->flash_id = FLASH_UNKNOWN;
info->sector_count = 0;
info->size = 0;
break; break;
default:
info->flash_id = FLASH_UNKNOWN;
info->sector_count = 0;
info->size = 0;
break;
} }
value = caddr[1]; /* device ID */ value = caddr[1]; /* device ID */
#if 0
printf("Device ID: %02x\n", value);
#endif
switch (value)
{
case AMD_ID_LV040B:
info->flash_id += FLASH_AM040;
info->sector_count = 8;
info->size = 0x00080000;
break; /* => 512Kb */
default: debug("Device ID: %02x\n", value);
info->flash_id = FLASH_UNKNOWN;
return (0); /* => no or unknown flash */
switch (value) {
case AMD_ID_LV040B:
info->flash_id += FLASH_AM040;
info->sector_count = 8;
info->size = 0x00080000;
break; /* => 512Kb */
default:
info->flash_id = FLASH_UNKNOWN;
return 0; /* => no or unknown flash */
} }
flash_get_offsets ((ulong)addr, &flash_info[0]); flash_get_offsets((ulong)addr, &flash_info[0]);
/* check for protected sectors */ /* check for protected sectors */
for (i = 0; i < info->sector_count; i++) for (i = 0; i < info->sector_count; i++) {
{ /*
/* read sector protection at sector address, (A7 .. A0) = 0x02 */ * read sector protection at sector address,
/* D0 = 1 if protected */ * (A7 .. A0) = 0x02
* D0 = 1 if protected
*/
caddr = (volatile unsigned char *)(info->start[i]); caddr = (volatile unsigned char *)(info->start[i]);
info->protect[i] = caddr[2] & 1; info->protect[i] = caddr[2] & 1;
} }
@ -235,52 +242,47 @@ static ulong flash_get_size (vu_long *addr, flash_info_t *info)
/* /*
* Prevent writes to uninitialized FLASH. * Prevent writes to uninitialized FLASH.
*/ */
if (info->flash_id != FLASH_UNKNOWN) if (info->flash_id != FLASH_UNKNOWN) {
{
caddr = (volatile unsigned char *)info->start[0]; caddr = (volatile unsigned char *)info->start[0];
*caddr = 0xF0; /* reset bank */ *caddr = 0xF0; /* reset bank */
} }
return (info->size); return info->size;
} }
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)
{ {
volatile unsigned char *addr = (volatile unsigned char *)(info->start[0]); volatile unsigned char *addr =
(volatile unsigned char *)(info->start[0]);
int flag, prot, sect, l_sect; int flag, prot, sect, l_sect;
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;
} }
if ((info->flash_id == FLASH_UNKNOWN) || if ((info->flash_id == FLASH_UNKNOWN) ||
(info->flash_id > FLASH_AMD_COMP)) { (info->flash_id > FLASH_AMD_COMP)) {
printf ("Can't erase unknown flash type - aborted\n"); printf("Can't erase unknown flash type - aborted\n");
return 1; return 1;
} }
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",
prot); prot);
} else { } else {
printf ("\n"); printf("\n");
} }
l_sect = -1; l_sect = -1;
@ -295,7 +297,7 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
addr[0x02AA] = 0x55; addr[0x02AA] = 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 */
addr = (volatile unsigned char *)(info->start[sect]); addr = (volatile unsigned char *)(info->start[sect]);
addr[0] = 0x30; addr[0] = 0x30;
@ -308,7 +310,7 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
enable_interrupts(); enable_interrupts();
/* wait at least 80us - let's wait 1 ms */ /* wait at least 80us - let's wait 1 ms */
udelay (1000); udelay(1000);
/* /*
* We wait for the last triggered sector * We wait for the last triggered sector
@ -316,19 +318,21 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
if (l_sect < 0) if (l_sect < 0)
goto DONE; goto DONE;
start = get_timer (0); start = get_timer(0);
last = start; last = start;
addr = (volatile unsigned char *)(info->start[l_sect]); addr = (volatile unsigned char *)(info->start[l_sect]);
while ((addr[0] & 0xFF) != 0xFF) while ((addr[0] & 0xFF) != 0xFF) {
{
if ((now = get_timer(start)) > CONFIG_SYS_FLASH_ERASE_TOUT) { now = get_timer(start);
printf ("Timeout\n");
if (now > CONFIG_SYS_FLASH_ERASE_TOUT) {
printf("Timeout\n");
return 1; return 1;
} }
/* show that we're waiting */ /* show that we're waiting */
if ((now - last) > 1000) { /* every second */ if ((now - last) > 1000) { /* every second */
putc ('.'); putc('.');
last = now; last = now;
} }
} }
@ -339,7 +343,7 @@ DONE:
addr[0] = 0xF0; /* reset bank */ addr[0] = 0xF0; /* reset bank */
printf (" done\n"); printf(" done\n");
return 0; return 0;
} }
@ -350,7 +354,7 @@ DONE:
* 2 - Flash not erased * 2 - Flash not erased
*/ */
int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt) int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt)
{ {
ulong cp, wp, data; ulong cp, wp, data;
int i, l, rc; int i, l, rc;
@ -360,23 +364,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;
} }
@ -385,33 +392,33 @@ 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
*/ */
data = 0; data = 0;
for (i=0, cp=wp; i<4 && cnt>0; ++i, ++cp) { for (i = 0, cp = wp; i < 4 && cnt > 0; ++i, ++cp) {
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);
} }
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
@ -420,10 +427,11 @@ int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt)
* 1 - write timeout * 1 - write timeout
* 2 - Flash not erased * 2 - Flash not erased
*/ */
static int write_word (flash_info_t *info, ulong dest, ulong data) static int write_word(flash_info_t *info, ulong dest, ulong data)
{ {
volatile unsigned char *addr = (volatile unsigned char*)(info->start[0]), volatile unsigned char *cdest, *cdata;
*cdest,*cdata; volatile unsigned char *addr =
(volatile unsigned char *)(info->start[0]);
ulong start; ulong start;
int flag, count = 4 ; int flag, count = 4 ;
@ -431,39 +439,33 @@ static int write_word (flash_info_t *info, ulong dest, ulong data)
cdata = (volatile unsigned char *)&data ; cdata = (volatile unsigned char *)&data ;
/* Check if Flash is (sufficiently) erased */ /* Check if Flash is (sufficiently) erased */
if ((*((vu_long *)dest) & data) != data) { if ((*((vu_long *)dest) & data) != data)
return (2); return 2;
}
while(count--) while (count--) {
{
/* Disable interrupts which might cause a timeout here */
flag = disable_interrupts();
addr[0x0555] = 0xAA; /* Disable interrupts which might cause a timeout here */
addr[0x02AA] = 0x55; flag = disable_interrupts();
addr[0x0555] = 0xA0;
*cdest = *cdata; addr[0x0555] = 0xAA;
addr[0x02AA] = 0x55;
addr[0x0555] = 0xA0;
/* re-enable interrupts if necessary */ *cdest = *cdata;
if (flag)
enable_interrupts();
/* data polling for D7 */ /* re-enable interrupts if necessary */
start = get_timer (0); if (flag)
while ((*cdest ^ *cdata) & 0x80) enable_interrupts();
{
if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT) { /* data polling for D7 */
return (1); start = get_timer(0);
while ((*cdest ^ *cdata) & 0x80) {
if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT)
return 1;
} }
}
cdata++ ; cdata++ ;
cdest++ ; cdest++ ;
} }
return (0); return 0;
} }
/*-----------------------------------------------------------------------
*/