summaryrefslogtreecommitdiff
path: root/board/sc520_cdp/flash.c
diff options
context:
space:
mode:
authorwdenk <wdenk>2003-06-27 21:31:46 +0000
committerwdenk <wdenk>2003-06-27 21:31:46 +0000
commit8bde7f776c77b343aca29b8c7b58464d915ac245 (patch)
tree20f1fd99975215e7c658454a15cdb4ed4694e2d4 /board/sc520_cdp/flash.c
parent993cad9364c6b87ae429d1ed1130d8153f6f027e (diff)
downloadu-boot-imx-8bde7f776c77b343aca29b8c7b58464d915ac245.zip
u-boot-imx-8bde7f776c77b343aca29b8c7b58464d915ac245.tar.gz
u-boot-imx-8bde7f776c77b343aca29b8c7b58464d915ac245.tar.bz2
* Code cleanup:
- remove trailing white space, trailing empty lines, C++ comments, etc. - split cmd_boot.c (separate cmd_bdinfo.c and cmd_load.c) * Patches by Kenneth Johansson, 25 Jun 2003: - major rework of command structure (work done mostly by Michal Cendrowski and Joakim Kristiansen)
Diffstat (limited to 'board/sc520_cdp/flash.c')
-rw-r--r--board/sc520_cdp/flash.c251
1 files changed, 123 insertions, 128 deletions
diff --git a/board/sc520_cdp/flash.c b/board/sc520_cdp/flash.c
index 1ebb32e..a4d37e5 100644
--- a/board/sc520_cdp/flash.c
+++ b/board/sc520_cdp/flash.c
@@ -1,7 +1,7 @@
/*
* (C) Copyright 2002, 2003
* Daniel Engström, Omicron Ceti AB, daniel@omicron.se
- *
+ *
* (C) Copyright 2002
* Sysgo Real-Time Solutions, GmbH <www.elinos.com>
* Alex Zuepke <azu@sysgo.de>
@@ -55,122 +55,121 @@ flash_info_t flash_info[SC520_MAX_FLASH_BANKS];
static u32 _probe_flash(u32 addr, u32 bw, int il)
{
u32 result=0;
-
+
/* First do an unlock cycle for the benefit of
* devices that need it */
-
+
switch (bw) {
-
+
case 1:
*(volatile u8*)(addr+0x5555) = 0xaa;
*(volatile u8*)(addr+0x2aaa) = 0x55;
*(volatile u8*)(addr+0x5555) = 0x90;
-
+
/* Read vendor */
result = *(volatile u8*)addr;
result <<= 16;
-
+
/* Read device */
result |= *(volatile u8*)(addr+2);
-
+
/* Return device to data mode */
*(volatile u8*)addr = 0xff;
- *(volatile u8*)(addr+0x5555), 0xf0;
+ *(volatile u8*)(addr+0x5555), 0xf0;
break;
-
+
case 2:
*(volatile u16*)(addr+0xaaaa) = 0xaaaa;
*(volatile u16*)(addr+0x5554) = 0x5555;
-
+
/* Issue identification command */
if (il == 2) {
*(volatile u16*)(addr+0xaaaa) = 0x9090;
-
+
/* Read vendor */
result = *(volatile u8*)addr;
result <<= 16;
-
+
/* Read device */
result |= *(volatile u8*)(addr+2);
-
+
/* Return device to data mode */
*(volatile u16*)addr = 0xffff;
- *(volatile u16*)(addr+0xaaaa), 0xf0f0;
-
+ *(volatile u16*)(addr+0xaaaa), 0xf0f0;
+
} else {
*(volatile u8*)(addr+0xaaaa) = 0x90;
/* Read vendor */
result = *(volatile u16*)addr;
result <<= 16;
-
+
/* Read device */
result |= *(volatile u16*)(addr+2);
-
+
/* Return device to data mode */
*(volatile u8*)addr = 0xff;
- *(volatile u8*)(addr+0xaaaa), 0xf0;
+ *(volatile u8*)(addr+0xaaaa), 0xf0;
}
-
+
break;
-
+
case 4:
*(volatile u32*)(addr+0x5554) = 0xaaaaaaaa;
*(volatile u32*)(addr+0xaaa8) = 0x55555555;
-
+
switch (il) {
case 1:
/* Issue identification command */
*(volatile u8*)(addr+0x5554) = 0x90;
-
+
/* Read vendor */
result = *(volatile u16*)addr;
result <<= 16;
-
+
/* Read device */
result |= *(volatile u16*)(addr+4);
-
+
/* Return device to data mode */
*(volatile u8*)addr = 0xff;
- *(volatile u8*)(addr+0x5554), 0xf0;
+ *(volatile u8*)(addr+0x5554), 0xf0;
break;
-
+
case 2:
/* Issue identification command */
*(volatile u32*)(addr + 0x5554) = 0x00900090;
-
+
/* Read vendor */
result = *(volatile u16*)addr;
result <<= 16;
-
+
/* Read device */
result |= *(volatile u16*)(addr+4);
-
+
/* Return device to data mode */
*(volatile u32*)addr = 0x00ff00ff;
- *(volatile u32*)(addr+0x5554), 0x00f000f0;
+ *(volatile u32*)(addr+0x5554), 0x00f000f0;
break;
-
+
case 4:
/* Issue identification command */
*(volatile u32*)(addr+0x5554) = 0x90909090;
-
+
/* Read vendor */
result = *(volatile u8*)addr;
result <<= 16;
-
+
/* Read device */
result |= *(volatile u8*)(addr+4);
-
+
/* Return device to data mode */
*(volatile u32*)addr = 0xffffffff;
- *(volatile u32*)(addr+0x5554), 0xf0f0f0f0;
+ *(volatile u32*)(addr+0x5554), 0xf0f0f0f0;
break;
}
break;
}
-
-
-
+
+
return result;
}
@@ -180,36 +179,36 @@ asm ("_probe_flash_end:\n"
static int identify_flash(unsigned address, int width)
{
- int is;
+ int is;
int device;
- int vendor;
+ int vendor;
int size;
unsigned res;
-
+
u32 (*_probe_flash_ptr)(u32 a, u32 bw, int il);
-
- size = (unsigned)&_probe_flash_end - (unsigned)_probe_flash;
-
+
+ size = (unsigned)&_probe_flash_end - (unsigned)_probe_flash;
+
if (size > PROBE_BUFFER_SIZE) {
printf("_probe_flash() routine too large (%d) %p - %p\n",
size, &_probe_flash_end, _probe_flash);
return 0;
}
-
+
memcpy(buffer, _probe_flash, size);
_probe_flash_ptr = (void*)buffer;
-
+
is = disable_interrupts();
res = _probe_flash_ptr(address, width, 1);
if (is) {
enable_interrupts();
}
-
-
- vendor = res >> 16;
+
+
+ vendor = res >> 16;
device = res & 0xffff;
-
-
+
+
return res;
}
@@ -217,12 +216,12 @@ ulong flash_init(void)
{
int i, j;
ulong size = 0;
-
+
for (i = 0; i < SC520_MAX_FLASH_BANKS; i++) {
unsigned id;
ulong flashbase = 0;
- int sectsize = 0;
-
+ int sectsize = 0;
+
memset(flash_info[i].protect, 0, CFG_MAX_FLASH_SECT);
switch (i) {
case 0:
@@ -237,7 +236,7 @@ ulong flash_init(void)
default:
panic("configured to many flash banks!\n");
}
-
+
id = identify_flash(flashbase, 4);
switch (id & 0x00ff00ff) {
case 0x000100c8:
@@ -245,31 +244,31 @@ ulong flash_init(void)
flash_info[i].flash_id =
(AMD_MANUFACT & FLASH_VENDMASK) |
(AMD_ID_LV016B & FLASH_TYPEMASK);
-
+
flash_info[i].size = AMD29LV016B_SIZE*4;
flash_info[i].sector_count = AMD29LV016B_SECTORS;
sectsize = (AMD29LV016B_SIZE*4)/AMD29LV016B_SECTORS;
printf("Bank %d: 4 x AMD 29LV017B\n", i);
break;
-
-
+
+
default:
printf("Bank %d have unknown flash %08x\n", i, id);
flash_info[i].flash_id = FLASH_UNKNOWN;
continue;
}
-
+
for (j = 0; j < flash_info[i].sector_count; j++) {
flash_info[i].start[j] = flashbase + j * sectsize;
}
size += flash_info[i].size;
-
+
flash_protect(FLAG_PROTECT_CLEAR,
flash_info[i].start[0],
flash_info[i].start[0] + flash_info[i].size - 1,
&flash_info[i]);
}
-
+
/*
* Protect monitor and environment sectors
*/
@@ -282,7 +281,7 @@ ulong flash_init(void)
CFG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
&flash_info[0]);
-#endif
+#endif
return size;
}
@@ -291,9 +290,9 @@ ulong flash_init(void)
void flash_print_info(flash_info_t *info)
{
int i;
-
+
switch (info->flash_id & FLASH_VENDMASK) {
-
+
case (AMD_MANUFACT & FLASH_VENDMASK):
printf("AMD: ");
switch (info->flash_id & FLASH_TYPEMASK) {
@@ -305,17 +304,17 @@ void flash_print_info(flash_info_t *info)
goto done;
break;
}
-
+
break;
default:
printf("Unknown Vendor ");
break;
}
-
-
+
+
printf(" Size: %ld MB in %d Sectors\n",
info->size >> 20, info->sector_count);
-
+
printf(" Sector Start Addresses:");
for (i = 0; i < info->sector_count; i++) {
if ((i % 5) == 0) {
@@ -325,7 +324,7 @@ void flash_print_info(flash_info_t *info)
info->protect[i] ? " (RO)" : " ");
}
printf ("\n");
-
+
done:
}
@@ -339,7 +338,7 @@ void flash_print_info(flash_info_t *info)
unsigned milli=0; \
\
micro = *(volatile u16*)(0xfffef000+SC520_SWTMRMILLI); \
- \
+ \
for (;;) { \
\
milli += *(volatile u16*)(0xfffef000+SC520_SWTMRMILLI); \
@@ -349,12 +348,12 @@ void flash_print_info(flash_info_t *info)
break; \
} \
} \
-} while (0)
+} while (0)
static u32 _amd_erase_flash(u32 addr, u32 sector)
{
unsigned elapsed;
-
+
/* Issue erase */
*(volatile u32*)(addr + 0x5554) = 0xAAAAAAAA;
*(volatile u32*)(addr + 0xaaa8) = 0x55555555;
@@ -364,21 +363,21 @@ static u32 _amd_erase_flash(u32 addr, u32 sector)
*(volatile u32*)(addr + 0xaaa8) = 0x55555555;
/* Sector erase command comes last */
*(volatile u32*)(addr + sector) = 0x30303030;
-
+
elapsed = *(volatile u16*)(0xfffef000+SC520_SWTMRMILLI); /* dummy read */
elapsed = 0;
__udelay(50);
while (((*(volatile u32*)(addr + sector)) & 0x80808080) != 0x80808080) {
-
+
elapsed += *(volatile u16*)(0xfffef000+SC520_SWTMRMILLI);
if (elapsed > ((CFG_FLASH_ERASE_TOUT/CFG_HZ) * 1000)) {
*(volatile u32*)(addr) = 0xf0f0f0f0;
- return 1;
+ return 1;
}
}
-
+
*(volatile u32*)(addr) = 0xf0f0f0f0;
-
+
return 0;
}
@@ -392,7 +391,7 @@ int flash_erase(flash_info_t *info, int s_first, int s_last)
int prot;
int sect;
unsigned size;
-
+
if ((s_first < 0) || (s_first > s_last)) {
if (info->flash_id == FLASH_UNKNOWN) {
printf("- missing\n");
@@ -401,66 +400,66 @@ int flash_erase(flash_info_t *info, int s_first, int s_last)
}
return 1;
}
-
+
if ((info->flash_id & FLASH_VENDMASK) == (AMD_MANUFACT & FLASH_VENDMASK)) {
- size = (unsigned)&_amd_erase_flash_end - (unsigned)_amd_erase_flash;
-
+ size = (unsigned)&_amd_erase_flash_end - (unsigned)_amd_erase_flash;
+
if (size > PROBE_BUFFER_SIZE) {
printf("_amd_erase_flash() routine too large (%d) %p - %p\n",
size, &_amd_erase_flash_end, _amd_erase_flash);
return 0;
}
-
+
memcpy(buffer, _amd_erase_flash, size);
_erase_flash_ptr = (void*)buffer;
-
+
} else {
printf ("Can't erase unknown flash type - aborted\n");
return 1;
}
-
+
prot = 0;
for (sect=s_first; sect<=s_last; ++sect) {
if (info->protect[sect]) {
prot++;
}
}
-
+
if (prot) {
printf ("- Warning: %d protected sectors will not be erased!\n", prot);
} else {
printf ("\n");
}
-
-
+
+
/* Start erase on unprotected sectors */
for (sect = s_first; sect<=s_last; sect++) {
-
+
if (info->protect[sect] == 0) { /* not protected */
int res;
int flag;
-
+
/* Disable interrupts which might cause a timeout here */
flag = disable_interrupts();
-
+
res = _erase_flash_ptr(info->start[0], info->start[sect]-info->start[0]);
-
+
/* re-enable interrupts if necessary */
if (flag) {
enable_interrupts();
}
-
-
+
+
if (res) {
printf("Erase timed out, sector %d\n", sect);
return res;
}
-
- putc('.');
- }
+
+ putc('.');
+ }
}
-
+
return 0;
}
@@ -476,33 +475,33 @@ static int _amd_write_word(unsigned start, unsigned dest, unsigned data)
volatile u32 *dest2 = (u32*)dest;
volatile u32 *data2 = (u32*)&data;
unsigned elapsed;
-
+
/* Check if Flash is (sufficiently) erased */
if ((*((volatile u32*)dest) & (u32)data) != (u32)data) {
return 2;
}
-
+
addr2[0x5554] = 0xAAAAAAAA;
addr2[0xaaa8] = 0x55555555;
addr2[0x5554] = 0xA0A0A0A0;
-
+
dest2[0] = data;
-
+
elapsed = *(volatile u16*)(0xfffef000+SC520_SWTMRMILLI); /* dummy read */
elapsed = 0;
-
+
/* data polling for D7 */
while ((dest2[0] & 0x80808080) != (data2[0] & 0x80808080)) {
elapsed += *(volatile u16*)(0xfffef000+SC520_SWTMRMILLI);
if (elapsed > ((CFG_FLASH_WRITE_TOUT/CFG_HZ) * 1000)) {
addr2[0] = 0xf0f0f0f0;
- return 1;
+ return 1;
}
}
-
+
addr2[0] = 0xf0f0f0f0;
-
+
return 0;
}
@@ -511,8 +510,6 @@ asm ("_amd_write_word_end:\n"
".long 0\n");
-
-
/*-----------------------------------------------------------------------
* Copy memory to flash, returns:
* 0 - OK
@@ -528,19 +525,19 @@ int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt)
int flag;
u32 (*_write_word_ptr)(unsigned start, unsigned dest, unsigned data);
unsigned size;
-
+
if ((info->flash_id & FLASH_VENDMASK) == (AMD_MANUFACT & FLASH_VENDMASK)) {
- size = (unsigned)&_amd_write_word_end - (unsigned)_amd_write_word;
-
+ size = (unsigned)&_amd_write_word_end - (unsigned)_amd_write_word;
+
if (size > PROBE_BUFFER_SIZE) {
printf("_amd_write_word() routine too large (%d) %p - %p\n",
size, &_amd_write_word_end, _amd_write_word);
return 0;
}
-
+
memcpy(buffer, _amd_write_word, size);
_write_word_ptr = (void*)buffer;
-
+
} else {
printf ("Can't program unknown flash type - aborted\n");
return 3;
@@ -548,7 +545,7 @@ int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt)
wp = (addr & ~3); /* get lower word aligned address */
-
+
/*
* handle unaligned start bytes
@@ -566,12 +563,12 @@ int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt)
for (; cnt==0 && i<4; ++i, ++cp) {
data |= (*(uchar *)cp) << (8*i);
}
-
+
/* Disable interrupts which might cause a timeout here */
flag = disable_interrupts();
-
+
rc = _write_word_ptr(info->start[0], wp, data);
-
+
/* re-enable interrupts if necessary */
if (flag) {
enable_interrupts();
@@ -581,22 +578,22 @@ int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt)
}
wp += 4;
}
-
+
/*
* handle word aligned part
*/
while (cnt >= 4) {
data = 0;
-
+
for (i=0; i<4; ++i) {
data |= *src++ << (8*i);
}
-
+
/* Disable interrupts which might cause a timeout here */
flag = disable_interrupts();
rc = _write_word_ptr(info->start[0], wp, data);
-
+
/* re-enable interrupts if necessary */
if (flag) {
enable_interrupts();
@@ -607,11 +604,11 @@ int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt)
wp += 4;
cnt -= 4;
}
-
+
if (cnt == 0) {
return 0;
}
-
+
/*
* handle unaligned tail bytes
*/
@@ -620,7 +617,7 @@ int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt)
data |= *src++ << (8*i);
--cnt;
}
-
+
for (; i<4; ++i, ++cp) {
data |= (*(uchar *)cp) << (8*i);
}
@@ -629,14 +626,12 @@ int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt)
flag = disable_interrupts();
rc = _write_word_ptr(info->start[0], wp, data);
-
+
/* re-enable interrupts if necessary */
if (flag) {
enable_interrupts();
}
-
- return rc;
-
-}
+ return rc;
+}