From 5f648d7a02a74be53b35e1ce68573543362251d3 Mon Sep 17 00:00:00 2001 From: none Date: Wed, 22 Jan 2020 09:58:13 +0100 Subject: [PATCH] cleanup --- apps/flashprog.c | 4 +- apps/octonet/Makefile | 4 +- apps/octonet/ddtest.c | 10 +-- apps/octonet/ddupdate.c | 55 +++++++------ apps/octonet/flash.c | 175 +++++++++++++++++++++++----------------- apps/octonet/flash.h | 1 + 6 files changed, 143 insertions(+), 106 deletions(-) diff --git a/apps/flashprog.c b/apps/flashprog.c index 8546f9d..841b72e 100644 --- a/apps/flashprog.c +++ b/apps/flashprog.c @@ -43,7 +43,7 @@ void get_ddid(int ddb, struct ddb_id *ddbid) { if (ioctl(ddb, IOCTL_DDB_ID, ddbid)>=0) return; memset(ddbid, 0, sizeof(*ddbid)); - flashread(ddb, id, 0, 4); + flashread(ddb, linknr, id, 0, 4); printf("%02x %02x %02x %02x\n", id[0], id[1], id[2], id[3]); ddbid->subvendor=(id[0] << 8) | id[1]; @@ -158,7 +158,7 @@ int main(int argc, char **argv) #endif if (dump) { - flashdump(ddb, dump, 128); + flashdump(ddb, linknr, dump, 128); return 0; } diff --git a/apps/octonet/Makefile b/apps/octonet/Makefile index bcc10c8..0d29c03 100644 --- a/apps/octonet/Makefile +++ b/apps/octonet/Makefile @@ -6,10 +6,10 @@ install: all install -m 0755 octokey $(DESTDIR)/usr/bin install -m 0755 ddflash $(DESTDIR)/usr/bin -ddflash: ddflash.c +ddflash: ddflash.c flash.h flash.c $(CC) -o ddflash ddflash.c -ddtest: ddtest.c +ddtest: ddtest.c flash.h flash.c $(CC) -o ddtest ddtest.c octonet: octonet.c diff --git a/apps/octonet/ddtest.c b/apps/octonet/ddtest.c index ba8e9fe..58070c3 100644 --- a/apps/octonet/ddtest.c +++ b/apps/octonet/ddtest.c @@ -63,7 +63,7 @@ int ReadFlash(int ddb, int argc, char *argv[], uint32_t Flags) write(fd, Buffer, Len); close(fd); } else - Dump(Buffer,Start,Len); + dump(Buffer,Start,Len); free(Buffer); return 0; @@ -192,7 +192,7 @@ int ReadDeviceMemory(int dev,int argc, char* argv[],uint32_t Flags) struct ddb_mem mem = {.off=Start, .len=Len, .buf=Buffer }; ioctl(dev, IOCTL_DDB_READ_MEM, &mem); } - Dump(Buffer,Start,Len); + dump(Buffer,Start,Len); free(Buffer); return 0; } @@ -340,7 +340,7 @@ int flashioc(int dev,int argc, char* argv[],uint32_t Flags) } if( ReadLen > 0 ) - Dump(Buffer,0,ReadLen); + dump(Buffer,0,ReadLen); return 0; @@ -1248,7 +1248,7 @@ int lic_import(int dev, int argc, char* argv[], uint32_t Flags) return -1; } - Dump(Buffer,0,24); + dump(Buffer,0,24); Flash = FlashDetect(dev); switch(Flash) { @@ -1410,7 +1410,7 @@ int i2cread(int dev, int argc, char* argv[], uint32_t Flags) } if (!Silent) { printf("OK\n"); - Dump(&Buffer[0],0,ReadLen); + dump(&Buffer[0],0,ReadLen); } } while (Repeat); free(Buffer); diff --git a/apps/octonet/ddupdate.c b/apps/octonet/ddupdate.c index a3d4f26..bc8ca8d 100644 --- a/apps/octonet/ddupdate.c +++ b/apps/octonet/ddupdate.c @@ -100,7 +100,11 @@ static int update_flash(struct ddflash *ddf) if (!fname) fname = devid2fname(ddf->id.device, &name); if (name) - printf("Card: %s\n", name); + printf("Card: %s\n", name); + if (ddf->flash_name) + printf("Flash: %s\n", ddf->flash_name); + printf("Version:%08x\n", ddf->id.hw); + //printf("REGMAPa: %08x\n", ddf->id.regmap); if ((res = update_image(ddf, fname, 0x10000, 0x100000, 1, 0)) == 1) stat |= 1; return stat; @@ -108,12 +112,10 @@ static int update_flash(struct ddflash *ddf) return stat; } -static int ddupdate(struct ddflash *ddf) +static int update_link(struct ddflash *ddf) { int ret; - if (verbose >= 2) - printf("Detect flash type\n"); ret = flash_detect(ddf); if (ret < 0) return ret; @@ -125,7 +127,7 @@ static int ddupdate(struct ddflash *ddf) return ret; } -static int proc_card(int ddbnum, char *fname) +static int update_card(int ddbnum, char *fname) { struct ddflash ddf; char ddbname[80]; @@ -133,8 +135,6 @@ static int proc_card(int ddbnum, char *fname) int ddb, ret, link, links; sprintf(ddbname, "/dev/ddbridge/card%d", ddbnum); - if (verbose >= 2) - printf("Update card %s\n", ddbname); ddb = open(ddbname, O_RDWR); if (ddb < 0) return -3; @@ -158,19 +158,19 @@ static int proc_card(int ddbnum, char *fname) case 0x300: case 0x301: case 0x307: - links = 1; + links = 2; break; default: break; } } - //printf("%08x %08x\n", ddf.id.device, ddf.id.subdevice); if (ddf.id.device) { - ret = ddupdate(&ddf); - if (ret < 0) - break; + printf("\n\nUpdate card %s link %u:\n", ddbname, link); + ret = update_link(&ddf); + //if (ret < 0) + // break; } } @@ -179,10 +179,19 @@ out: return ret; } +usage() +{ + printf("ddupdate [OPTION]\n\n" + "-n N\n only update card N (default with N=0)\n\n" + "-a \n update all cards\n\n" + "-b file\n fpga image file override (ignored if -a is used)\n\n" + "-v \n more verbose (up to -v -v -v)\n\n" + ); +} int main(int argc, char **argv) { - int ddbnum = 0, all = 0, i, force = 0; + int ddbnum = -1, all = 0, i, force = 0; char *fname = 0; while (1) { @@ -212,12 +221,7 @@ int main(int argc, char **argv) verbose++; break; case 'h': - printf("ddupdate [OPTION]\n\n" - "-n N\n only update card N (default with N=0)\n\n" - "-a \n update all cards\n\n" - "-b file\n fpga image file override (not if -a is used)\n\n" - "-v \n more verbose (up to -v -v -v)\n\n" - ); + usage(); break; default: break; @@ -227,12 +231,17 @@ int main(int argc, char **argv) if (optind < argc) { printf("Warning: unused arguments\n"); } - + if (!all && (ddbnum < 0)) { + printf("Select card number or all cards\n\n"); + usage(); + return -1; + } + if (!all) - return proc_card(ddbnum, fname); + return update_card(ddbnum, fname); - for (i = 0; i < 20; i++) { - int ret = proc_card(i, 0); + for (i = 0; i < 100; i++) { + int ret = update_card(i, 0); if (ret == -3) /* could not open, no more cards! */ break; diff --git a/apps/octonet/flash.c b/apps/octonet/flash.c index b8f2234..54df0c3 100644 --- a/apps/octonet/flash.c +++ b/apps/octonet/flash.c @@ -134,7 +134,7 @@ static int flashdetect(int fd, uint32_t *sector_size, uint32_t *flash_size) #if 1 -int flashread(int ddb, uint8_t *buf, uint32_t addr, uint32_t len) +int flashread(int ddb, int link, uint8_t *buf, uint32_t addr, uint32_t len) { int ret; uint8_t cmd[4]; @@ -150,7 +150,7 @@ int flashread(int ddb, uint8_t *buf, uint32_t addr, uint32_t len) l = 1024; else l = len; - ret = flashio(ddb, linknr, cmd, 4, buf, l); + ret = flashio(ddb, link, cmd, 4, buf, l); if (ret < 0) return ret; addr += l; @@ -169,14 +169,14 @@ static int flashread(int ddb, uint8_t *buf, uint32_t addr, uint32_t len) } #endif -int flashdump(int ddb, uint32_t addr, uint32_t len) +int flashdump(int ddb, int link, uint32_t addr, uint32_t len) { int i, j; uint8_t buf[32]; int bl = sizeof(buf); for (j=0; j 31 && b[i] < 127) ? b[i] : '.'); - printf("|\n"); - } -} - - - - int FlashWriteAtmel(int dev,uint32_t FlashOffset, uint8_t *Buffer,int BufferSize) { int err = 0; @@ -573,7 +551,7 @@ int FlashWritePageMode(int dev, uint32_t FlashOffset, { if( (j & 0xFFFF) == 0 ) { - printf(" Programm %08x\n",FlashOffset + j); + printf(" Program %08x\n",FlashOffset + j); } Cmd[0] = 0x06; // WREN @@ -656,7 +634,7 @@ int flashwrite_pagemode(struct ddflash *ddf, int dev, uint32_t FlashOffset, break; while (1) { - cmd[0] = 0x05; // RDRS + cmd[0] = 0x05; // RDSR err = flashio(ddf->fd, ddf->link, cmd, 1, &cmd[0], 1); if (err < 0) break; @@ -687,11 +665,11 @@ int flashwrite_pagemode(struct ddflash *ddf, int dev, uint32_t FlashOffset, printf("file read error %d,%d at %u\n", rlen, errno, j); return -1; } - printf ("write %u bytes at %08x\n", len, j); + //printf ("write %u bytes at %08x\n", len, j); if ((j & 0xFFFF) == 0) - printf(" Programm %08x\n", FlashOffset + j); + printf(" Program %08x\n", FlashOffset + j); cmd[0] = 0x06; // WREN err = flashio(ddf->fd, ddf->link, cmd, 1, NULL, 0); @@ -892,51 +870,50 @@ static int flash_detect(struct ddflash *ddf) if (id[0] == 0xBF && id[1] == 0x25 && id[2] == 0x41) { ddf->flash_type = SSTI_SST25VF016B; - printf("Flash: SSTI SST25VF016B 16 MBit\n"); + ddf->flash_name = "SSTI SST25VF016B 16 MBit"; ddf->sector_size = 4096; ddf->size = 0x200000; } else if (id[0] == 0xBF && id[1] == 0x25 && id[2] == 0x4A) { ddf->flash_type = SSTI_SST25VF032B; - printf("Flash: SSTI SST25VF032B 32 MBit\n"); + ddf->flash_name = "SSTI SST25VF032B 32 MBit"; ddf->sector_size = 4096; ddf->size = 0x400000; } else if (id[0] == 0xBF && id[1] == 0x25 && id[2] == 0x4B) { ddf->flash_type = SSTI_SST25VF064C; - printf("Flash: SSTI SST25VF064C 64 MBit\n"); + ddf->flash_name = "SSTI SST25VF064C 64 MBit"; ddf->sector_size = 4096; ddf->size = 0x800000; } else if (id[0] == 0x01 && id[1] == 0x40 && id[2] == 0x15) { ddf->flash_type = SPANSION_S25FL116K; - printf("Flash: SPANSION S25FL116K 16 MBit\n"); + ddf->flash_name = "SPANSION S25FL116K 16 MBit"; ddf->sector_size = 4096; ddf->size = 0x200000; } else if (id[0] == 0x01 && id[1] == 0x40 && id[2] == 0x16) { ddf->flash_type = SPANSION_S25FL132K; - printf("Flash: SPANSION S25FL132K 32 MBit\n"); + ddf->flash_name = "SPANSION S25FL132K 32 MBit"; ddf->sector_size = 4096; ddf->size = 0x400000; } else if (id[0] == 0x01 && id[1] == 0x40 && id[2] == 0x17) { ddf->flash_type = SPANSION_S25FL164K; - printf("Flash: SPANSION S25FL164K 64 MBit\n"); + ddf->flash_name = "SPANSION S25FL164K 64 MBit"; ddf->sector_size = 4096; ddf->size = 0x800000; } else if (id[0] == 0x1F && id[1] == 0x28) { ddf->flash_type = ATMEL_AT45DB642D; - printf("Flash: Atmel AT45DB642D 64 MBit\n"); + ddf->flash_name = "Atmel AT45DB642D 64 MBit"; ddf->sector_size = 1024; ddf->size = 0x800000; } else if (id[0] == 0xef && id[1] == 0x40 && id[2] == 0x15) { ddf->flash_type = WINBOND_W25Q16JV; - printf("Flash: Winbond W25Q16JV 16 MBit\n"); + ddf->flash_name = "Winbond W25Q16JV 16 MBit"; ddf->sector_size = 4096; ddf->size = 0x200000; } else { - printf("Unknown Flash Flash ID = %02x %02x %02x\n", id[0], id[1], id[2]); + printf("Unknown Flash Flash ID = %02x %02x %02x !!!\n", id[0], id[1], id[2]); return -1; } if (ddf->sector_size) { ddf->buffer = malloc(ddf->sector_size); - //printf("allocated buffer %08x@%08x\n", ddf->sector_size, (uint32_t) ddf->buffer); if (!ddf->buffer) return -1; } @@ -985,82 +962,82 @@ static char *devid2fname(uint16_t devid, char **name) switch (devid) { case 0x0002: fname="DVBBridgeV1A_DVBBridgeV1A.bit"; - *name = "Octopus 35\n"; + *name = "Octopus 35"; break; case 0x0003: fname="DVBBridgeV1B_DVBBridgeV1B.fpga"; - *name = "Octopus\n"; + *name = "Octopus"; break; case 0x0005: fname="DVBBridgeV2A_DD01_0005_STD.fpga"; - *name = "Octopus Classic\n"; + *name = "Octopus Classic"; break; case 0x0006: fname="DVBBridgeV2A_DD01_0006_STD.fpga"; - *name = "CineS2 V7\n"; + *name = "CineS2 V7"; break; case 0x0007: fname="DVBBridgeV2A_DD01_0007_MXL.fpga"; - *name = "Octopus 4/8\n"; + *name = "Octopus 4/8"; break; case 0x0008: fname="DVBBridgeV2A_DD01_0008_CXD.fpga"; - *name = "Octopus 4/8\n"; + *name = "Octopus 4/8"; break; case 0x0009: fname="DVBBridgeV2A_DD01_0009_SX8.fpga"; - *name = "Octopus MAXSX8\n"; + *name = "Octopus MAXSX8"; break; case 0x000b: fname="DVBBridgeV2A_DD01_000B_SX8.fpga"; - *name = "Octopus MAXSX8 Basic\n"; + *name = "Octopus MAXSX8 Basic"; break; case 0x000a: fname="DVBBridgeV2A_DD01_000A_M4.fpga"; - *name = "Octopus MAXM4\n"; + *name = "Octopus MAXM4"; break; case 0x0011: fname="DVBBridgeV2B_DD01_0011.fpga"; - *name = "Octopus CI\n"; + *name = "Octopus CI"; break; case 0x0012: fname="DVBBridgeV2B_DD01_0012_STD.fpga"; - *name = "Octopus CI\n"; + *name = "Octopus CI"; break; case 0x0013: fname="DVBBridgeV2B_DD01_0013_PRO.fpga"; - *name = "Octopus PRO\n"; + *name = "Octopus PRO"; break; case 0x0020: fname="DVBBridgeV2C_DD01_0020.fpga"; - *name = "Octopus GT Mini\n"; + *name = "Octopus GT Mini"; break; case 0x0201: fname="DVBModulatorV1B_DVBModulatorV1B.bit"; - *name = "Modulator\n"; + *name = "Modulator"; break; case 0x0203: fname="DVBModulatorV1B_DD01_0203.fpga"; - *name = "Modulator Test\n"; + *name = "Modulator Test"; break; case 0x0210: fname="DVBModulatorV2A_DD01_0210.fpga"; - *name = "Modulator V2\n"; + *name = "Modulator V2"; break; case 0x0220: fname="SDRModulatorV1A_DD01_0220.fpga"; - *name = "SDRModulator ATV\n"; + *name = "SDRModulator ATV"; break; case 0x0221: fname="SDRModulatorV1A_DD01_0221_IQ.fpga"; - *name = "SDRModulator IQ\n"; + *name = "SDRModulator IQ"; break; case 0x0222: fname="SDRModulatorV1A_DD01_0222_DVBT.fpga"; - *name = "SDRModulator DVBT\n"; + *name = "SDRModulator DVBT"; break; default: - *name = "UNKNOWN\n"; + *name = "UNKNOWN"; break; } return fname; @@ -1085,11 +1062,11 @@ static int flashcmp(struct ddflash *ddf, int fs, uint32_t addr, uint32_t maxlen, printf("file too big\n"); return -1; } - printf("flash file len %u, compare to %08x in flash\n", len, addr); + //printf("flash file len %u, compare to %08x in flash: ", len, addr); for (j = 0; j < len; j += bl, addr += bl) { if (len - j < bl) bl = len - j; - flashread(ddf->fd, buf, addr, bl); + flashread(ddf->fd, ddf->link, buf, addr, bl); rlen = read(fs, buf2, bl); if (rlen < 0 || rlen != bl) { printf("read error\n"); @@ -1098,15 +1075,60 @@ static int flashcmp(struct ddflash *ddf, int fs, uint32_t addr, uint32_t maxlen, if (memcmp(buf, buf2, bl)) { printf("flash differs at %08x (offset %u)\n", addr, j); - dump(buf, 32); - dump(buf2, 32); + dump(buf, bl); + printf("\n"); + dump(buf2, bl); return addr; } } - printf("flash same as file\n"); + //printf("flash same as file\n"); return -2; } +static uint32_t crctab[] = { + 0x00000000,0x04c11db7,0x09823b6e,0x0d4326d9,0x130476dc,0x17c56b6b,0x1a864db2,0x1e475005, + 0x2608edb8,0x22c9f00f,0x2f8ad6d6,0x2b4bcb61,0x350c9b64,0x31cd86d3,0x3c8ea00a,0x384fbdbd, + 0x4c11db70,0x48d0c6c7,0x4593e01e,0x4152fda9,0x5f15adac,0x5bd4b01b,0x569796c2,0x52568b75, + 0x6a1936c8,0x6ed82b7f,0x639b0da6,0x675a1011,0x791d4014,0x7ddc5da3,0x709f7b7a,0x745e66cd, + 0x9823b6e0,0x9ce2ab57,0x91a18d8e,0x95609039,0x8b27c03c,0x8fe6dd8b,0x82a5fb52,0x8664e6e5, + 0xbe2b5b58,0xbaea46ef,0xb7a96036,0xb3687d81,0xad2f2d84,0xa9ee3033,0xa4ad16ea,0xa06c0b5d, + 0xd4326d90,0xd0f37027,0xddb056fe,0xd9714b49,0xc7361b4c,0xc3f706fb,0xceb42022,0xca753d95, + 0xf23a8028,0xf6fb9d9f,0xfbb8bb46,0xff79a6f1,0xe13ef6f4,0xe5ffeb43,0xe8bccd9a,0xec7dd02d, + 0x34867077,0x30476dc0,0x3d044b19,0x39c556ae,0x278206ab,0x23431b1c,0x2e003dc5,0x2ac12072, + 0x128e9dcf,0x164f8078,0x1b0ca6a1,0x1fcdbb16,0x018aeb13,0x054bf6a4,0x0808d07d,0x0cc9cdca, + 0x7897ab07,0x7c56b6b0,0x71159069,0x75d48dde,0x6b93dddb,0x6f52c06c,0x6211e6b5,0x66d0fb02, + 0x5e9f46bf,0x5a5e5b08,0x571d7dd1,0x53dc6066,0x4d9b3063,0x495a2dd4,0x44190b0d,0x40d816ba, + 0xaca5c697,0xa864db20,0xa527fdf9,0xa1e6e04e,0xbfa1b04b,0xbb60adfc,0xb6238b25,0xb2e29692, + 0x8aad2b2f,0x8e6c3698,0x832f1041,0x87ee0df6,0x99a95df3,0x9d684044,0x902b669d,0x94ea7b2a, + 0xe0b41de7,0xe4750050,0xe9362689,0xedf73b3e,0xf3b06b3b,0xf771768c,0xfa325055,0xfef34de2, + 0xc6bcf05f,0xc27dede8,0xcf3ecb31,0xcbffd686,0xd5b88683,0xd1799b34,0xdc3abded,0xd8fba05a, + 0x690ce0ee,0x6dcdfd59,0x608edb80,0x644fc637,0x7a089632,0x7ec98b85,0x738aad5c,0x774bb0eb, + 0x4f040d56,0x4bc510e1,0x46863638,0x42472b8f,0x5c007b8a,0x58c1663d,0x558240e4,0x51435d53, + 0x251d3b9e,0x21dc2629,0x2c9f00f0,0x285e1d47,0x36194d42,0x32d850f5,0x3f9b762c,0x3b5a6b9b, + 0x0315d626,0x07d4cb91,0x0a97ed48,0x0e56f0ff,0x1011a0fa,0x14d0bd4d,0x19939b94,0x1d528623, + 0xf12f560e,0xf5ee4bb9,0xf8ad6d60,0xfc6c70d7,0xe22b20d2,0xe6ea3d65,0xeba91bbc,0xef68060b, + 0xd727bbb6,0xd3e6a601,0xdea580d8,0xda649d6f,0xc423cd6a,0xc0e2d0dd,0xcda1f604,0xc960ebb3, + 0xbd3e8d7e,0xb9ff90c9,0xb4bcb610,0xb07daba7,0xae3afba2,0xaafbe615,0xa7b8c0cc,0xa379dd7b, + 0x9b3660c6,0x9ff77d71,0x92b45ba8,0x9675461f,0x8832161a,0x8cf30bad,0x81b02d74,0x857130c3, + 0x5d8a9099,0x594b8d2e,0x5408abf7,0x50c9b640,0x4e8ee645,0x4a4ffbf2,0x470cdd2b,0x43cdc09c, + 0x7b827d21,0x7f436096,0x7200464f,0x76c15bf8,0x68860bfd,0x6c47164a,0x61043093,0x65c52d24, + 0x119b4be9,0x155a565e,0x18197087,0x1cd86d30,0x029f3d35,0x065e2082,0x0b1d065b,0x0fdc1bec, + 0x3793a651,0x3352bbe6,0x3e119d3f,0x3ad08088,0x2497d08d,0x2056cd3a,0x2d15ebe3,0x29d4f654, + 0xc5a92679,0xc1683bce,0xcc2b1d17,0xc8ea00a0,0xd6ad50a5,0xd26c4d12,0xdf2f6bcb,0xdbee767c, + 0xe3a1cbc1,0xe760d676,0xea23f0af,0xeee2ed18,0xf0a5bd1d,0xf464a0aa,0xf9278673,0xfde69bc4, + 0x89b8fd09,0x8d79e0be,0x803ac667,0x84fbdbd0,0x9abc8bd5,0x9e7d9662,0x933eb0bb,0x97ffad0c, + 0xafb010b1,0xab710d06,0xa6322bdf,0xa2f33668,0xbcb4666d,0xb8757bda,0xb5365d03,0xb1f740b4, +}; + +static uint32_t crc32(uint8_t *buf, uint32_t len) +{ + uint32_t crc = 0xFFFFFFFF, j; + + for (j = 0; j < len; j++) + crc = ((crc << 8) ^ crctab[(crc >> 24) ^ buf[j]]); + return crc; +} + static int check_fw(struct ddflash *ddf, char *fn, uint32_t *fw_off) { int fd, fsize, ret = 0; @@ -1117,7 +1139,7 @@ static int check_fw(struct ddflash *ddf, char *fn, uint32_t *fw_off) unsigned int devid, version, length; unsigned int cid[8]; int cids = 0; - uint32_t maxlen = 1024 * 1024; + uint32_t maxlen = 2 * 1024 * 1024, crc; fd = open(fn, O_RDONLY); if (fd < 0) { @@ -1128,10 +1150,12 @@ static int check_fw(struct ddflash *ddf, char *fn, uint32_t *fw_off) if (off < 0) return -1; fsize = off; +#if 0 if (fsize > maxlen) { close(fd); return -1; } +#endif lseek(fd, 0, SEEK_SET); buf = malloc(fsize); if (!buf) @@ -1177,17 +1201,20 @@ static int check_fw(struct ddflash *ddf, char *fn, uint32_t *fw_off) sscanf(val, "%x", &version); } else if (!strcasecmp(key, "Length")) { sscanf(val, "%u", &length); + } else if (!strcasecmp(key, "CRC")) { + sscanf(val, "%x", &crc); } } p++; *fw_off = p; - printf("devid = %04x\n", devid); - printf("version = %08x %08x\n", version, ddf->id.hw); - printf("length = %u\n", length); - printf("fsize = %u, p = %u, f-p = %u\n", fsize, p, fsize - p); + printf(" CRC = %08x\n", crc); + printf(" devid = %04x\n", devid); + printf(" version = %08x (current image = %08x)\n", version, ddf->id.hw); + //printf(" length = %u\n", length); + //printf("fsize = %u, p = %u, f-p = %u\n", fsize, p, fsize - p); if (devid == ddf->id.device) { if (version <= (ddf->id.hw & 0xffffff)) { - printf("%s: older or same version\n", fn); + printf("%s is older or same version as flash\n", fn); ret = -3; /* same id but no newer version */ } } else @@ -1195,7 +1222,7 @@ static int check_fw(struct ddflash *ddf, char *fn, uint32_t *fw_off) out: free(buf); - printf("check_fw = %d\n", ret); + //printf("check_fw = %d\n", ret); return ret; } @@ -1207,7 +1234,7 @@ static int update_image(struct ddflash *ddf, char *fn, int fs, res = 0; uint32_t fw_off = 0; - printf("Check %s\n", fn); + printf("File: %s\n", fn); if (has_header) { int ck; @@ -1224,7 +1251,7 @@ static int update_image(struct ddflash *ddf, char *fn, } res = flashcmp(ddf, fs, adr, len, fw_off); if (res == -2) { - printf("%s: same as flash\n", fn); + printf("Flash already identical to %s\n", fn); } if (res < 0) goto out; diff --git a/apps/octonet/flash.h b/apps/octonet/flash.h index 60c5235..80701c8 100644 --- a/apps/octonet/flash.h +++ b/apps/octonet/flash.h @@ -82,6 +82,7 @@ struct ddflash { struct ddb_id id; uint32_t version; + char *flash_name; uint32_t flash_type; uint32_t sector_size; uint32_t size;