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

board/rbc823/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:46 +00:00
parent bfdd1e186d
commit 6915840ffb
1 changed files with 180 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

210
board/rbc823/flash.c
View File

@ -24,18 +24,15 @@
#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;
@ -46,7 +43,8 @@ unsigned long flash_init (void)
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]);
@ -67,7 +65,7 @@ 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;
} }
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
@ -91,41 +89,56 @@ 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:
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;
} }
@ -141,12 +154,9 @@ void flash_print_info (flash_info_t *info)
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],
@ -156,8 +166,6 @@ void flash_print_info (flash_info_t *info)
putc('\n'); putc('\n');
return; return;
} }
/*-----------------------------------------------------------------------
*/
/* /*
* The following code cannot be run from FLASH! * The following code cannot be run from FLASH!
@ -173,9 +181,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,11 +189,9 @@ 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) {
switch (value)
{
case 0x01: /*AMD_MANUFACT*/ case 0x01: /*AMD_MANUFACT*/
info->flash_id = FLASH_MAN_AMD; info->flash_id = FLASH_MAN_AMD;
break; break;
@ -204,11 +208,10 @@ static ulong flash_get_size (vu_long *addr, flash_info_t *info)
} }
value = caddr[1]; /* device ID */ value = caddr[1]; /* device ID */
#if 0
printf("Device ID: %02x\n", value); debug("Device ID: %02x\n", value);
#endif
switch (value) switch (value) {
{
case AMD_ID_LV040B: case AMD_ID_LV040B:
info->flash_id += FLASH_AM040; info->flash_id += FLASH_AM040;
info->sector_count = 8; info->sector_count = 8;
@ -217,17 +220,18 @@ static ulong flash_get_size (vu_long *addr, flash_info_t *info)
default: default:
info->flash_id = FLASH_UNKNOWN; info->flash_id = FLASH_UNKNOWN;
return (0); /* => no or unknown flash */ 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,31 +239,28 @@ 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;
} }
@ -271,10 +272,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",
@ -320,9 +320,9 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
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) {
{ now = get_timer(start);
if ((now = get_timer(start)) > CONFIG_SYS_FLASH_ERASE_TOUT) { if (now > CONFIG_SYS_FLASH_ERASE_TOUT) {
printf("Timeout\n"); printf("Timeout\n");
return 1; return 1;
} }
@ -343,7 +343,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
@ -360,23 +360,27 @@ 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) {
data = (data << 8) | (*(uchar *)cp);
}
if ((rc = write_word(info, wp, data)) != 0) { for (; cnt == 0 && i < 4; ++i, ++cp)
return (rc); data = (data << 8) | (*(uchar *)cp);
}
rc = write_word(info, wp, data);
if (rc != 0)
return rc;
wp += 4; wp += 4;
} }
@ -385,19 +389,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
@ -407,14 +412,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
@ -422,8 +426,9 @@ int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt)
*/ */
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,12 +436,10 @@ 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 */ /* Disable interrupts which might cause a timeout here */
flag = disable_interrupts(); flag = disable_interrupts();
@ -452,18 +455,13 @@ 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 ((*cdest ^ *cdata) & 0x80) while ((*cdest ^ *cdata) & 0x80) {
{ if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT)
if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT) { return 1;
return (1);
}
} }
cdata++ ; cdata++ ;
cdest++ ; cdest++ ;
} }
return (0); return 0;
} }
/*-----------------------------------------------------------------------
*/