flashrom

flashrom@flashrom.org

1 participants
9182 discussions

[commit] r941 - trunk
by repository service 15 Mar '10

15 Mar '10

Author: snelson Date: Tue Mar 16 01:51:31 2010 New Revision: 941 URL: http://flashrom.org/trac/coreboot/changeset/941 Log: remove some copied functions (from 82802ab.c) and use the 82802ab equivalents fix missing prototypes to _82802ab functions Signed-off-by: Sean Nelson <audiohacked(a)gmail.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/chipdrivers.h trunk/sharplhf00l04.c Modified: trunk/chipdrivers.h ============================================================================== --- trunk/chipdrivers.h Tue Mar 16 01:45:00 2010 (r940) +++ trunk/chipdrivers.h Tue Mar 16 01:51:31 2010 (r941) @@ -59,6 +59,8 @@ int erase_82802ab(struct flashchip *flash); int erase_82802ab_block(struct flashchip *flash, unsigned int page, unsigned int pagesize); int write_82802ab(struct flashchip *flash, uint8_t *buf); +void print_82802ab_status(uint8_t status); +void write_page_82802ab(chipaddr bios, uint8_t *src, chipaddr dst, int page_size); /* jedec.c */ uint8_t oddparity(uint8_t val); Modified: trunk/sharplhf00l04.c ============================================================================== --- trunk/sharplhf00l04.c Tue Mar 16 01:45:00 2010 (r940) +++ trunk/sharplhf00l04.c Tue Mar 16 01:51:31 2010 (r941) @@ -22,18 +22,6 @@ #include "flash.h" #include "chipdrivers.h" -// I need that Berkeley bit-map printer -void print_lhf00l04_status(uint8_t status) -{ - printf("%s", status & 0x80 ? "Ready:" : "Busy:"); - printf("%s", status & 0x40 ? "BE SUSPEND:" : "BE RUN/FINISH:"); - printf("%s", status & 0x20 ? "BE ERROR:" : "BE OK:"); - printf("%s", status & 0x10 ? "PROG ERR:" : "PROG OK:"); - printf("%s", status & 0x8 ? "VP ERR:" : "VPP OK:"); - printf("%s", status & 0x4 ? "PROG SUSPEND:" : "PROG RUN/FINISH:"); - printf("%s", status & 0x2 ? "WP|TBL#|WP#,ABORT:" : "UNLOCK:"); -} - /* FIXME: The datasheet is unclear whether we should use toggle_ready_jedec * or wait_82802ab. */ @@ -48,7 +36,7 @@ chip_writeb(0x50, bios); printf("Erase at 0x%lx\n", bios); status = wait_82802ab(flash->virtual_memory); - print_lhf00l04_status(status); + print_82802ab_status(status); // clear write protect printf("write protect is at 0x%lx\n", (wrprotect)); printf("write protect is 0x%x\n", chip_readb(wrprotect)); @@ -61,7 +49,7 @@ programmer_delay(10); // now let's see what the register is status = wait_82802ab(flash->virtual_memory); - print_lhf00l04_status(status); + print_82802ab_status(status); printf("DONE BLOCK 0x%x\n", blockaddr); if (check_erased_range(flash, blockaddr, blocklen)) { @@ -71,19 +59,6 @@ return 0; } -void write_page_lhf00l04(chipaddr bios, uint8_t *src, - chipaddr dst, int page_size) -{ - int i; - - for (i = 0; i < page_size; i++) { - /* transfer data from source to destination */ - chip_writeb(0x40, dst); - chip_writeb(*src++, dst++); - wait_82802ab(bios); - } -} - int write_lhf00l04(struct flashchip *flash, uint8_t *buf) { int i; @@ -98,7 +73,7 @@ printf("Programming page: "); for (i = 0; i < total_size / page_size; i++) { printf("%04d at address: 0x%08x", i, i * page_size); - write_page_lhf00l04(bios, buf + i * page_size, + write_page_82802ab(bios, buf + i * page_size, bios + i * page_size, page_size); printf("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); }

1 0

[commit] r940 - trunk
by repository service 15 Mar '10

15 Mar '10

Author: snelson Date: Tue Mar 16 01:45:00 2010 New Revision: 940 URL: http://flashrom.org/trac/coreboot/changeset/940 Log: kill dead w39v080fa.c functions Signed-off-by: Sean Nelson <audiohacked(a)gmail.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/chipdrivers.h trunk/w39v080fa.c Modified: trunk/chipdrivers.h ============================================================================== --- trunk/chipdrivers.h Tue Mar 16 01:35:53 2010 (r939) +++ trunk/chipdrivers.h Tue Mar 16 01:45:00 2010 (r940) @@ -122,9 +122,6 @@ int printlock_w39v040c(struct flashchip *flash); /* w39V080fa.c */ -int probe_winbond_fwhub(struct flashchip *flash); -int erase_winbond_fwhub(struct flashchip *flash); -int write_winbond_fwhub(struct flashchip *flash, uint8_t *buf); int unlock_winbond_fwhub(struct flashchip *flash); /* w29ee011.c */ Modified: trunk/w39v080fa.c ============================================================================== --- trunk/w39v080fa.c Tue Mar 16 01:35:53 2010 (r939) +++ trunk/w39v080fa.c Tue Mar 16 01:45:00 2010 (r940) @@ -111,69 +111,3 @@ return 0; } - -static int erase_sector_winbond_fwhub(struct flashchip *flash, - unsigned int sector) -{ - chipaddr bios = flash->virtual_memory; - /* Remember: too much sleep can waste your day. */ - - printf("0x%08x\b\b\b\b\b\b\b\b\b\b", sector); - - /* Sector Erase */ - chip_writeb(0xAA, bios + 0x5555); - chip_writeb(0x55, bios + 0x2AAA); - chip_writeb(0x80, bios + 0x5555); - - chip_writeb(0xAA, bios + 0x5555); - chip_writeb(0x55, bios + 0x2AAA); - chip_writeb(0x30, bios + sector); - - /* wait for Toggle bit ready */ - toggle_ready_jedec(bios); - - if (check_erased_range(flash, sector, flash->page_size)) { - fprintf(stderr, "ERASE FAILED!\n"); - return -1; - } - return 0; -} - -int erase_winbond_fwhub(struct flashchip *flash) -{ - int i, total_size = flash->total_size * 1024; - - unlock_winbond_fwhub(flash); - - printf("Erasing: "); - - for (i = 0; i < total_size; i += flash->page_size) { - if (erase_sector_winbond_fwhub(flash, i)) { - fprintf(stderr, "ERASE FAILED!\n"); - return -1; - } - } - - printf("\n"); - - return 0; -} - -int write_winbond_fwhub(struct flashchip *flash, uint8_t *buf) -{ - int i; - int total_size = flash->total_size * 1024; - chipaddr bios = flash->virtual_memory; - - if (erase_winbond_fwhub(flash)) - return -1; - - printf("Programming: "); - for (i = 0; i < total_size; i += flash->page_size) { - printf("0x%08x\b\b\b\b\b\b\b\b\b\b", i); - write_sector_jedec_common(flash, buf + i, bios + i, flash->page_size, 0xffff); - } - printf("\n"); - - return 0; -}

1 0

[commit] r939 - trunk
by repository service 15 Mar '10

15 Mar '10

Author: snelson Date: Tue Mar 16 01:35:53 2010 New Revision: 939 URL: http://flashrom.org/trac/coreboot/changeset/939 Log: kill dead w39v040c.c functions Signed-off-by: Sean Nelson <audiohacked(a)gmail.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/chipdrivers.h trunk/w39v040c.c Modified: trunk/chipdrivers.h ============================================================================== --- trunk/chipdrivers.h Tue Mar 16 01:32:30 2010 (r938) +++ trunk/chipdrivers.h Tue Mar 16 01:35:53 2010 (r939) @@ -119,9 +119,6 @@ int printlock_sst_fwhub(struct flashchip *flash); /* w39v040c.c */ -int probe_w39v040c(struct flashchip *flash); -int erase_w39v040c(struct flashchip *flash); -int write_w39v040c(struct flashchip *flash, uint8_t *buf); int printlock_w39v040c(struct flashchip *flash); /* w39V080fa.c */ Modified: trunk/w39v040c.c ============================================================================== --- trunk/w39v040c.c Tue Mar 16 01:32:30 2010 (r938) +++ trunk/w39v040c.c Tue Mar 16 01:35:53 2010 (r939) @@ -21,36 +21,6 @@ #include "flash.h" #include "chipdrivers.h" -int probe_w39v040c(struct flashchip *flash) -{ - chipaddr bios = flash->virtual_memory; - int result = probe_jedec(flash); - uint8_t lock; - - if (!result) - return result; - - chip_writeb(0xAA, bios + 0x5555); - programmer_delay(10); - chip_writeb(0x55, bios + 0x2AAA); - programmer_delay(10); - chip_writeb(0x90, bios + 0x5555); - programmer_delay(10); - - lock = chip_readb(bios + 0xfff2); - - chip_writeb(0xAA, bios + 0x5555); - programmer_delay(10); - chip_writeb(0x55, bios + 0x2AAA); - programmer_delay(10); - chip_writeb(0xF0, bios + 0x5555); - programmer_delay(40); - - printf("%s: Boot block #TBL is %slocked, rest of chip #WP is %slocked.\n", - __func__, lock & 0x4 ? "" : "un", lock & 0x8 ? "" : "un"); - return 1; -} - int printlock_w39v040c(struct flashchip *flash) { chipaddr bios = flash->virtual_memory; @@ -76,42 +46,3 @@ __func__, lock & 0x4 ? "" : "un", lock & 0x8 ? "" : "un"); return 0; } - -int erase_w39v040c(struct flashchip *flash) -{ - int i; - unsigned int total_size = flash->total_size * 1024; - - for (i = 0; i < total_size; i += flash->page_size) { - if (erase_sector_jedec(flash, i, flash->page_size)) { - fprintf(stderr, "ERASE FAILED!\n"); - return -1; - } - } - - return 0; -} - -int write_w39v040c(struct flashchip *flash, uint8_t *buf) -{ - int i; - int total_size = flash->total_size * 1024; - int page_size = flash->page_size; - chipaddr bios = flash->virtual_memory; - - if (erase_flash(flash)) { - fprintf(stderr, "ERASE FAILED!\n"); - return -1; - } - - printf("Programming page: "); - for (i = 0; i < total_size / page_size; i++) { - printf("%04d at address: 0x%08x", i, i * page_size); - write_sector_jedec_common(flash, buf + i * page_size, - bios + i * page_size, page_size, 0xffff); - printf("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); - } - printf("\n"); - - return 0; -}

1 0

[commit] r938 - trunk
by repository service 15 Mar '10

15 Mar '10

Author: snelson Date: Tue Mar 16 01:32:30 2010 New Revision: 938 URL: http://flashrom.org/trac/coreboot/changeset/938 Log: kill dead pm49fl00x.c functions Signed-off-by: Sean Nelson <audiohacked(a)gmail.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/pm49fl00x.c Modified: trunk/pm49fl00x.c ============================================================================== --- trunk/pm49fl00x.c Mon Mar 15 04:48:42 2010 (r937) +++ trunk/pm49fl00x.c Tue Mar 16 01:32:30 2010 (r938) @@ -48,72 +48,3 @@ write_lockbits_49fl00x(flash->virtual_registers, flash->total_size * 1024, 1, flash->page_size); return 0; } - -int erase_49fl00x(struct flashchip *flash) -{ - int i; - int total_size = flash->total_size * 1024; - int page_size = flash->page_size; - - /* unprotected */ - write_lockbits_49fl00x(flash->virtual_registers, - total_size, 0, page_size); - - /* - * erase_chip_jedec() will not work... Datasheet says - * "Chip erase is available in A/A Mux Mode only". - */ - printf("Erasing page: "); - for (i = 0; i < total_size / page_size; i++) { - /* erase the page */ - if (erase_block_jedec(flash, i * page_size, page_size)) { - fprintf(stderr, "ERASE FAILED!\n"); - return -1; - } - printf("%04d at address: 0x%08x", i, i * page_size); - printf("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); - fflush(stdout); - } - printf("\n"); - - /* protected */ - write_lockbits_49fl00x(flash->virtual_registers, - total_size, 1, page_size); - - return 0; -} - -int write_49fl00x(struct flashchip *flash, uint8_t *buf) -{ - int i; - int total_size = flash->total_size * 1024; - int page_size = flash->page_size; - chipaddr bios = flash->virtual_memory; - - /* unprotected */ - write_lockbits_49fl00x(flash->virtual_registers, total_size, 0, - page_size); - - printf("Programming page: "); - for (i = 0; i < total_size / page_size; i++) { - /* erase the page before programming */ - if (erase_block_jedec(flash, i * page_size, page_size)) { - fprintf(stderr, "ERASE FAILED!\n"); - return -1; - } - - /* write to the sector */ - printf("%04d at address: 0x%08x", i, i * page_size); - write_sector_jedec_common(flash, buf + i * page_size, - bios + i * page_size, page_size, 0xffff); - printf("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); - fflush(stdout); - } - printf("\n"); - - /* protected */ - write_lockbits_49fl00x(flash->virtual_registers, total_size, 1, - page_size); - - return 0; -}

1 0

Re: [flashrom] [PATCH] Fix non-FWH chips with FWH-like commands
by Carl-Daniel Hailfinger 15 Mar '10

15 Mar '10

On 14.03.2010 01:13, Michael Karcher wrote: > Flash registers are not mapped on these chips, but the unprotection > code in erase_82802ab_block tried to access them. > > Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> > I have a patch which switches these chips to use FEATURE_BITS. Let me dig it up. Regards, Carl-Daniel -- "I do consider assignment statements and pointer variables to be among computer science's most valuable treasures." -- Donald E. Knuth

2 4

[commit] r937 - trunk
by repository service 15 Mar '10

15 Mar '10

Author: hailfinger Date: Mon Mar 15 04:48:42 2010 New Revision: 937 URL: http://flashrom.org/trac/coreboot/changeset/937 Log: Add FEATURE_REGISTERMAP to * Intel 82802AB, 82802AC * Sharp LHF00L04 * SST SST49LF004C, SST49LF008C, SST49LF016C, SST49LF160C * ST M50FLW040A, M50FLW040B, M50FLW080A, M50FLW080B, M50FW002, M50FW016 M50FW040, M50FW080, M50LPW116 Make register mapping conditional on FEATURE_REGISTERMAP in 82802ab.c. Replace probe_49lfxxxc with probe_82802ab. Replace probe_28sf040 with probe_82802ab. Replace probe_sst_fwhub with probe_jedec. Add printlock_sst_fwhub to chips which used probe_sst_fwhub. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> Modified: trunk/82802ab.c trunk/chipdrivers.h trunk/flashchips.c trunk/sst_fwhub.c Modified: trunk/82802ab.c ============================================================================== --- trunk/82802ab.c Sun Mar 14 18:57:52 2010 (r936) +++ trunk/82802ab.c Mon Mar 15 04:48:42 2010 (r937) @@ -69,7 +69,8 @@ if (id1 != flash->manufacture_id || id2 != flash->model_id) return 0; - map_flash_registers(flash); + if (flash->feature_bits & FEATURE_REGISTERMAP) + map_flash_registers(flash); return 1; } Modified: trunk/chipdrivers.h ============================================================================== --- trunk/chipdrivers.h Sun Mar 14 18:57:52 2010 (r936) +++ trunk/chipdrivers.h Mon Mar 15 04:48:42 2010 (r937) @@ -112,11 +112,11 @@ int unlock_49lfxxxc(struct flashchip *flash); /* sst_fwhub.c */ -int probe_sst_fwhub(struct flashchip *flash); int erase_sst_fwhub(struct flashchip *flash); int erase_sst_fwhub_block(struct flashchip *flash, unsigned int offset, unsigned int page_size); int erase_sst_fwhub_sector(struct flashchip *flash, unsigned int offset, unsigned int page_size); int write_sst_fwhub(struct flashchip *flash, uint8_t *buf); +int printlock_sst_fwhub(struct flashchip *flash); /* w39v040c.c */ int probe_w39v040c(struct flashchip *flash); Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Sun Mar 14 18:57:52 2010 (r936) +++ trunk/flashchips.c Mon Mar 15 04:48:42 2010 (r937) @@ -2392,7 +2392,7 @@ .model_id = I_82802AB, .total_size = 512, .page_size = 64 * 1024, - .feature_bits = 0, + .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_OK_PRW, .probe = probe_82802ab, .probe_timing = TIMING_IGNORED, /* routine does not use probe_timing (82802ab.c) */ @@ -2415,7 +2415,7 @@ .model_id = I_82802AC, .total_size = 1024, .page_size = 64 * 1024, - .feature_bits = 0, + .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_OK_PRW, .probe = probe_82802ab, .probe_timing = TIMING_IGNORED, /* routine does not use probe_timing (82802ab.c) */ @@ -3442,9 +3442,9 @@ .model_id = SHARP_LHF00L04, .total_size = 1024, .page_size = 64 * 1024, - .feature_bits = FEATURE_EITHER_RESET, + .feature_bits = FEATURE_EITHER_RESET | FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, - .probe = probe_49lfxxxc, + .probe = probe_82802ab, .probe_timing = TIMING_ZERO, .block_erasers = { @@ -3723,7 +3723,7 @@ .page_size = 256, .feature_bits = 0, .tested = TEST_UNTESTED, - .probe = probe_28sf040, + .probe = probe_82802ab, .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (sst28sf040.c) */ .block_erasers = { @@ -4078,8 +4078,8 @@ .page_size = 16 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, .tested = TEST_OK_PRW, - .probe = probe_sst_fwhub, - .probe_timing = 1, /* 150 ns | routine is wrapper to probe_jedec (sst_fwhub.c) */ + .probe = probe_jedec, + .probe_timing = 1, /* 150 ns */ .block_erasers = { { @@ -4093,6 +4093,7 @@ .block_erase = NULL, /* AA 55 80 AA 55 10, only in A/A mux mode */ } }, + .printlock = printlock_sst_fwhub, .write = write_sst_fwhub, .read = read_memmapped, }, @@ -4107,8 +4108,8 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, .tested = TEST_OK_PR, - .probe = probe_sst_fwhub, - .probe_timing = 1, /* 150 ns | routine is wrapper to probe_jedec (sst_fwhub.c) */ + .probe = probe_jedec, + .probe_timing = 1, /* 150 ns */ .block_erasers = { { @@ -4122,6 +4123,7 @@ .block_erase = NULL, /* AA 55 80 AA 55 10, only in A/A mux mode */ } }, + .printlock = printlock_sst_fwhub, .write = write_sst_fwhub, .read = read_memmapped, }, @@ -4139,8 +4141,8 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, .tested = TEST_OK_PREW, - .probe = probe_sst_fwhub, - .probe_timing = 1, /* 150 ns | routine is wrapper to probe_jedec (sst_fwhub.c) */ + .probe = probe_jedec, + .probe_timing = 1, /* 150 ns */ .block_erasers = { { @@ -4154,6 +4156,7 @@ .block_erase = NULL, /* AA 55 80 AA 55 10, only in A/A mux mode */ }, }, + .printlock = printlock_sst_fwhub, .write = write_sst_fwhub, .read = read_memmapped, }, @@ -4166,9 +4169,9 @@ .model_id = SST_49LF004C, .total_size = 512, .page_size = 4 * 1024, - .feature_bits = 0, + .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, - .probe = probe_49lfxxxc, + .probe = probe_82802ab, .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (sst49lfxxxc.c) */ .block_erasers = { @@ -4199,8 +4202,8 @@ .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, .tested = TEST_OK_PRW, - .probe = probe_sst_fwhub, - .probe_timing = 1, /* 150 ns | routine is wrapper to probe_jedec (sst_fwhub.c) */ + .probe = probe_jedec, + .probe_timing = 1, /* 150 ns */ .block_erasers = { { @@ -4214,6 +4217,7 @@ .block_erase = NULL, /* AA 55 80 AA 55 10, only in A/A mux mode */ } }, + .printlock = printlock_sst_fwhub, .write = write_sst_fwhub, .read = read_memmapped, }, @@ -4226,9 +4230,9 @@ .model_id = SST_49LF008C, .total_size = 1024, .page_size = 4 * 1024, - .feature_bits = 0, + .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, - .probe = probe_49lfxxxc, + .probe = probe_82802ab, .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (sst49lfxxxc.c) */ .block_erasers = { @@ -4257,9 +4261,9 @@ .model_id = SST_49LF016C, .total_size = 2048, .page_size = 4 * 1024, - .feature_bits = 0, + .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_OK_PRW, - .probe = probe_49lfxxxc, + .probe = probe_82802ab, .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (sst49lfxxxc.c) */ .block_erasers = { @@ -4378,7 +4382,7 @@ .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = 1, /* 150ns | routine is wrapper to probe_jedec (sst_fwhub.c) */ + .probe_timing = 1, /* 150ns */ .block_erasers = { { @@ -4433,9 +4437,9 @@ .model_id = SST_49LF160C, .total_size = 2048, .page_size = 4 * 1024, - .feature_bits = 0, + .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_OK_PRW, - .probe = probe_49lfxxxc, + .probe = probe_82802ab, .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (sst49lfxxxc.c) */ .block_erasers = { @@ -4966,7 +4970,7 @@ .model_id = ST_M50FLW040A, .total_size = 512, .page_size = 64 * 1024, - .feature_bits = 0, + .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, .probe = probe_82802ab, .probe_timing = TIMING_FIXME, @@ -5000,7 +5004,7 @@ .model_id = ST_M50FLW040B, .total_size = 512, .page_size = 64 * 1024, - .feature_bits = 0, + .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, .probe = probe_82802ab, .probe_timing = TIMING_FIXME, @@ -5034,7 +5038,7 @@ .model_id = ST_M50FLW080A, .total_size = 1024, .page_size = 64 * 1024, - .feature_bits = 0, + .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, .probe = probe_82802ab, .probe_timing = TIMING_FIXME, @@ -5068,7 +5072,7 @@ .model_id = ST_M50FLW080B, .total_size = 1024, .page_size = 64 * 1024, - .feature_bits = 0, + .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, .probe = probe_82802ab, .probe_timing = TIMING_FIXME, @@ -5102,7 +5106,7 @@ .model_id = ST_M50FW002, .total_size = 256, .page_size = 64 * 1024, - .feature_bits = 0, + .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, .probe = probe_82802ab, .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (sst49lfxxxc.c) */ @@ -5133,7 +5137,7 @@ .model_id = ST_M50FW016, .total_size = 2048, .page_size = 64 * 1024, - .feature_bits = 0, + .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, .probe = probe_82802ab, .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (82802ab.c) */ @@ -5159,7 +5163,7 @@ .model_id = ST_M50FW040, .total_size = 512, .page_size = 64 * 1024, - .feature_bits = 0, + .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_OK_PRW, .probe = probe_82802ab, .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (82802ab.c) */ @@ -5185,7 +5189,7 @@ .model_id = ST_M50FW080, .total_size = 1024, .page_size = 64 * 1024, - .feature_bits = 0, + .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_OK_PRW, .probe = probe_82802ab, .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (82802ab.c) */ @@ -5211,7 +5215,7 @@ .model_id = ST_M50LPW116, .total_size = 2048, .page_size = 64 * 1024, - .feature_bits = 0, + .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, .probe = probe_82802ab, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ Modified: trunk/sst_fwhub.c ============================================================================== --- trunk/sst_fwhub.c Sun Mar 14 18:57:52 2010 (r936) +++ trunk/sst_fwhub.c Mon Mar 15 04:48:42 2010 (r937) @@ -83,18 +83,14 @@ return blockstatus; } -/* probe_jedec works fine for probing */ -int probe_sst_fwhub(struct flashchip *flash) +int printlock_sst_fwhub(struct flashchip *flash) { int i; - if (probe_jedec(flash) == 0) - return 0; - for (i = 0; i < flash->total_size * 1024; i += flash->page_size) check_sst_fwhub_block_lock(flash, i); - return 1; + return 0; } int erase_sst_fwhub_block(struct flashchip *flash, unsigned int offset, unsigned int page_size)

1 0

Enabling Gigabyte GA-MA69VM-S2
by GatoLoko 15 Mar '10

15 Mar '10

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 This board has a supported chipset and a supported bios, but it's connected indirectly through IT8716 and not recognized. - -- Raúl Soriano (GatoLoko), SpainTeam Local Community Contact. http://www.ubuntuspain.org - http://wiki.ubuntu.com/GatoLoko -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAkuJwa4ACgkQ063tJLOwQucjdACfSfZMkU2oN1V6QbAo2XIhAIXH j/4An2d9dxyoLkZeBqXgqn2ZkxqZbv/J =d3h4 -----END PGP SIGNATURE-----

3 3

[PATCH] Fix EN29F002(A)(N) eraseblock tables (B and T transposed)
by TJ 14 Mar '10

14 Mar '10

Based on reading the datasheet the eraseblocks for B and T variations look to have been accidentally transposed. http://www.datasheetcatalog.org/datasheet/EonSiliconSolution/mXssvqt.pdf --- flashchips.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flashchips.c b/flashchips.c index 2953dd6..b5be180 100644 --- a/flashchips.c +++ b/flashchips.c @@ -2244,10 +2244,10 @@ struct flashchip flashchips[] = { { { .eraseblocks = { - {64 * 1024, 3}, - {32 * 1024, 1}, - {8 * 1024, 2}, {16 * 1024, 1}, + {8 * 1024, 2}, + {32 * 1024, 1}, + {64 * 1024, 3}, }, .block_erase = erase_sector_jedec, }, { @@ -2276,10 +2276,10 @@ struct flashchip flashchips[] = { { { .eraseblocks = { - {16 * 1024, 1}, - {8 * 1024, 2}, - {32 * 1024, 1}, {64 * 1024, 3}, + {32 * 1024, 1}, + {8 * 1024, 2}, + {16 * 1024, 1}, }, .block_erase = erase_sector_jedec, }, { -- 1.6.3.3

3 4

Re: [flashrom] [PATCH] Skip DMI laptop check if DMI doesn't work
by Carl-Daniel Hailfinger 14 Mar '10

14 Mar '10

On 14.03.2010 17:07, Michael Karcher wrote: > Also further removes dead code from dmi.c and adds a missing newline. > It would be cool if you could test this code. Signoff seems to be missing, but if you add one, this is Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Regards, Carl-Daniel -- "I do consider assignment statements and pointer variables to be among computer science's most valuable treasures." -- Donald E. Knuth

2 1

[commit] r936 - trunk
by repository service 14 Mar '10

14 Mar '10

Author: mkarcher Date: Sun Mar 14 18:57:52 2010 New Revision: 936 URL: http://flashrom.org/trac/coreboot/changeset/936 Log: Skip DMI laptop check if DMI doesn't work Also further removes dead code from dmi.c and adds a missing newline. Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/dmi.c Modified: trunk/dmi.c ============================================================================== --- trunk/dmi.c Sun Mar 14 01:00:14 2010 (r935) +++ trunk/dmi.c Sun Mar 14 18:57:52 2010 (r936) @@ -24,21 +24,7 @@ #include "flash.h" -enum dmi_strings { - DMI_SYS_MANUFACTURER, - DMI_SYS_PRODUCT, - DMI_SYS_VERSION, - DMI_BB_MANUFACTURER, - DMI_BB_PRODUCT, - DMI_BB_VERSION, - DMI_ID_INVALID, /* This must always be the last entry! */ -}; - -/* - * The short_id for baseboard starts with "m" as in mainboard to leave - * "b" available for BIOS. - */ -const char *dmidecode_names[DMI_ID_INVALID] = { +const char *dmidecode_names[] = { "system-manufacturer", "system-product-name", "system-version", @@ -51,7 +37,7 @@ const char *dmidecode_command = "dmidecode"; int has_dmi_support = 0; -char *dmistrings[DMI_ID_INVALID]; +char *dmistrings[ARRAY_SIZE(dmidecode_names)]; /* Strings longer than 4096 in DMI are just insane. */ #define DMI_MAX_ANSWER_LEN 4096 @@ -104,17 +90,17 @@ char *chassis_type; has_dmi_support = 1; - for (i = 0; i < DMI_ID_INVALID; i++) { + for (i = 0; i < ARRAY_SIZE(dmidecode_names); i++) { dmistrings[i] = get_dmi_string(dmidecode_names[i]); if (!dmistrings[i]) { has_dmi_support = 0; - break; + return; } } chassis_type = get_dmi_string("chassis-type"); if (chassis_type && !strcmp(chassis_type, "Notebook")) { - printf_debug("Laptop detected via DMI"); + printf_debug("Laptop detected via DMI\n"); is_laptop = 1; } free(chassis_type); @@ -175,7 +161,7 @@ if (!has_dmi_support) return 0; - for (i = 0; i < DMI_ID_INVALID; i++) + for (i = 0; i < ARRAY_SIZE(dmidecode_names); i++) if (dmi_compare(dmistrings[i], pattern)) return 1;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom