Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added support for more SPI flash #32

Closed
wants to merge 1 commit into from
Closed

Added support for more SPI flash #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions progalgspiflash.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,34 @@ ProgAlgSPIFlash::~ProgAlgSPIFlash(void)
fclose(fp_dbg);
}

int ProgAlgSPIFlash::spi_flashinfo_amd(unsigned char *buf)
{
fprintf(stderr, "Found AMD / Cypress / Spansion Device, Device ID 0x%02x%02x\n",
buf[1], buf[2]);
switch (buf[1])
{
case 0x02: {
switch (buf[2])
{
case 0x20:
pages = 131072;
pgsize = 512;
sector_size = 262144;
break;
default:
fprintf(stderr, "Unexpected AMD Device ID LSB 0x%02x\n", buf[2]);
}
break;
}
default:
fprintf(stderr, "Unexpected AMD Device ID MSB 0x%02x\n", buf[1]);
return -1;
}
fprintf(stderr, " \n");

return 1;
}

int ProgAlgSPIFlash::spi_flashinfo_s33(unsigned char *buf)
{
fprintf(stderr, "Found Intel Device, Device ID 0x%02x%02x\n",
Expand Down Expand Up @@ -445,6 +473,10 @@ int ProgAlgSPIFlash::spi_flashinfo_m25p_mx25l(unsigned char *buf, int is_mx25l)
fbuf[1], fbuf[2]);
switch (fbuf[2])
{
case 0x16:
pages = 16384;
sector_size = 65536;
break;
case 0x17:
pages = 32768;
sector_size = 65536;
Expand Down Expand Up @@ -559,6 +591,9 @@ int ProgAlgSPIFlash::spi_flashinfo(void)

switch (fbuf[0])
{
case 0x01:
res = spi_flashinfo_amd(fbuf);
break;
case 0x1f: {
switch (fbuf[1]>> 5) /* Family code*/ {
case 1:
Expand Down Expand Up @@ -1241,6 +1276,7 @@ int ProgAlgSPIFlash::program(BitFile &pfile)
switch (manf_id) {
case 0x1f: /* Atmel */
return program_at45(pfile);
case 0x01: /* AMD */
case 0x20: /* Numonyx */
case 0xc2: /* Macronix */
case 0x30: /* AMIC */
Expand Down Expand Up @@ -1433,6 +1469,7 @@ int ProgAlgSPIFlash::erase(void)
switch (manf_id) {
case 0x1f: /* Atmel */
return erase_at45();
case 0x01: /* AMD */
case 0x20: /* Numonyx */
case 0xc2: /* Macronix */
case 0x30: /* AMIC */
Expand Down
1 change: 1 addition & 0 deletions progalgspiflash.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ class ProgAlgSPIFlash
int xc_user(byte *in, byte *out, int len);
int spi_xfer_user1(uint8_t *last_miso, int miso_len, int miso_skip,
uint8_t *mosi, int mosi_len, int preamble);
int spi_flashinfo_amd (unsigned char * fbuf);
int spi_flashinfo_s33 (unsigned char * fbuf);
int spi_flashinfo_amic (unsigned char * fbuf);
int spi_flashinfo_amic_quad (unsigned char * fbuf);
Expand Down