flashrom

flashrom@flashrom.org

5 participants
9161 discussions

[commit] r982 - trunk
by repository service 25 Mar '10

25 Mar '10

Author: snelson Date: Thu Mar 25 00:14:32 2010 New Revision: 982 URL: http://flashrom.org/trac/coreboot/changeset/982 Log: Convert chips' message printing to msg_c* Fixed suggestions by Carl-Daniel. Signed-off-by: Sean Nelson <audiohacked(a)gmail.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/82802ab.c trunk/jedec.c trunk/m29f400bt.c trunk/sharplhf00l04.c trunk/spi25.c trunk/sst28sf040.c trunk/sst49lfxxxc.c trunk/sst_fwhub.c trunk/stm50flw0x0x.c trunk/w29ee011.c trunk/w39v040c.c trunk/w39v080fa.c Modified: trunk/82802ab.c ============================================================================== --- trunk/82802ab.c Thu Mar 25 00:10:01 2010 (r981) +++ trunk/82802ab.c Thu Mar 25 00:14:32 2010 (r982) @@ -34,13 +34,13 @@ // I need that Berkeley bit-map printer void print_status_82802ab(uint8_t status) { - printf_debug("%s", status & 0x80 ? "Ready:" : "Busy:"); - printf_debug("%s", status & 0x40 ? "BE SUSPEND:" : "BE RUN/FINISH:"); - printf_debug("%s", status & 0x20 ? "BE ERROR:" : "BE OK:"); - printf_debug("%s", status & 0x10 ? "PROG ERR:" : "PROG OK:"); - printf_debug("%s", status & 0x8 ? "VP ERR:" : "VPP OK:"); - printf_debug("%s", status & 0x4 ? "PROG SUSPEND:" : "PROG RUN/FINISH:"); - printf_debug("%s", status & 0x2 ? "WP|TBL#|WP#,ABORT:" : "UNLOCK:"); + msg_cdbg("%s", status & 0x80 ? "Ready:" : "Busy:"); + msg_cdbg("%s", status & 0x40 ? "BE SUSPEND:" : "BE RUN/FINISH:"); + msg_cdbg("%s", status & 0x20 ? "BE ERROR:" : "BE OK:"); + msg_cdbg("%s", status & 0x10 ? "PROG ERR:" : "PROG OK:"); + msg_cdbg("%s", status & 0x8 ? "VP ERR:" : "VPP OK:"); + msg_cdbg("%s", status & 0x4 ? "PROG SUSPEND:" : "PROG RUN/FINISH:"); + msg_cdbg("%s", status & 0x2 ? "WP|TBL#|WP#,ABORT:" : "UNLOCK:"); } int probe_82802ab(struct flashchip *flash) @@ -65,21 +65,21 @@ programmer_delay(10); - printf_debug("%s: id1 0x%02x, id2 0x%02x", __func__, id1, id2); + msg_cdbg("%s: id1 0x%02x, id2 0x%02x", __func__, id1, id2); if (!oddparity(id1)) - printf_debug(", id1 parity violation"); + msg_cdbg(", id1 parity violation"); /* Read the product ID location again. We should now see normal flash contents. */ flashcontent1 = chip_readb(bios); flashcontent2 = chip_readb(bios + 0x01); if (id1 == flashcontent1) - printf_debug(", id1 is normal flash content"); + msg_cdbg(", id1 is normal flash content"); if (id2 == flashcontent2) - printf_debug(", id2 is normal flash content"); + msg_cdbg(", id2 is normal flash content"); - printf_debug("\n"); + msg_cdbg("\n"); if (id1 != flash->manufacture_id || id2 != flash->model_id) return 0; @@ -137,10 +137,10 @@ print_status_82802ab(status); if (check_erased_range(flash, page, pagesize)) { - fprintf(stderr, "ERASE FAILED!\n"); + msg_cerr("ERASE FAILED!\n"); return -1; } - printf("DONE BLOCK 0x%x\n", page); + msg_cinfo("DONE BLOCK 0x%x\n", page); return 0; } @@ -150,14 +150,14 @@ int i; unsigned int total_size = flash->total_size * 1024; - printf("total_size is %d; flash->page_size is %d\n", + msg_cspew("total_size is %d; flash->page_size is %d\n", total_size, flash->page_size); for (i = 0; i < total_size; i += flash->page_size) if (erase_block_82802ab(flash, i, flash->page_size)) { - fprintf(stderr, "ERASE FAILED!\n"); + msg_cerr("ERASE FAILED!\n"); return -1; } - printf("DONE ERASE\n"); + msg_cinfo("DONE ERASE\n"); return 0; } @@ -184,14 +184,13 @@ uint8_t *tmpbuf = malloc(page_size); if (!tmpbuf) { - printf("Could not allocate memory!\n"); + msg_cerr("Could not allocate memory!\n"); exit(1); } - printf("Programming page: \n"); + msg_cinfo("Programming page: \n"); for (i = 0; i < total_size / page_size; i++) { - 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("%04d at address: 0x%08x", i, i * page_size); + msg_cinfo("\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"); + msg_cinfo("%04d at address: 0x%08x", i, i * page_size); /* Auto Skip Blocks, which already contain the desired data * Faster, because we only write, what has changed @@ -202,19 +201,19 @@ */ chip_readn(tmpbuf, bios + i * page_size, page_size); if (!memcmp((void *)(buf + i * page_size), tmpbuf, page_size)) { - printf("SKIPPED\n"); + msg_cdbg("SKIPPED\n"); continue; } /* erase block by block and write block by block; this is the most secure way */ if (erase_block_82802ab(flash, i * page_size, page_size)) { - fprintf(stderr, "ERASE FAILED!\n"); + msg_cerr("ERASE FAILED!\n"); return -1; } write_page_82802ab(bios, buf + i * page_size, bios + i * page_size, page_size); } - printf("\n"); + msg_cinfo("DONE!\n"); free(tmpbuf); return 0; @@ -234,7 +233,7 @@ /* Read master lock-bit */ mcfg = chip_readb(bios + 0x3); - msg_cinfo("master lock is "); + msg_cdbg("master lock is "); if (mcfg) { msg_cdbg("locked!\n"); } else { @@ -256,9 +255,11 @@ /* Unlock: clear block lock-bits, if needed */ if (can_unlock && need_unlock) { + msg_cdbg("Unlock: "); chip_writeb(0x60, bios); chip_writeb(0xD0, bios); chip_writeb(0xFF, bios); + msg_cdbg("Done!\n"); } /* Error: master locked or a block is locked */ Modified: trunk/jedec.c ============================================================================== --- trunk/jedec.c Thu Mar 25 00:10:01 2010 (r981) +++ trunk/jedec.c Thu Mar 25 00:14:32 2010 (r982) @@ -55,7 +55,7 @@ tmp1 = tmp2; } if (i > 0x100000) - printf_debug("%s: excessive loops, i=0x%x\n", __func__, i); + msg_cdbg("%s: excessive loops, i=0x%x\n", __func__, i); } void toggle_ready_jedec(chipaddr dst) @@ -89,7 +89,7 @@ } } if (i > 0x100000) - printf_debug("%s: excessive loops, i=0x%x\n", __func__, i); + msg_cdbg("%s: excessive loops, i=0x%x\n", __func__, i); } void start_program_jedec_common(struct flashchip *flash, unsigned int mask) @@ -113,12 +113,12 @@ else if (flash->probe_timing == TIMING_ZERO) { /* No delay. */ probe_timing_enter = probe_timing_exit = 0; } else if (flash->probe_timing == TIMING_FIXME) { /* == _IGNORED */ - printf_debug("Chip lacks correct probe timing information, " + msg_cdbg("Chip lacks correct probe timing information, " "using default 10mS/40uS. "); probe_timing_enter = 10000; probe_timing_exit = 40; } else { - printf("Chip has negative value in probe_timing, failing " + msg_cerr("Chip has negative value in probe_timing, failing " "without chip access\n"); return 0; } @@ -166,9 +166,9 @@ if (probe_timing_exit) programmer_delay(probe_timing_exit); - printf_debug("%s: id1 0x%02x, id2 0x%02x", __func__, largeid1, largeid2); + msg_cdbg("%s: id1 0x%02x, id2 0x%02x", __func__, largeid1, largeid2); if (!oddparity(id1)) - printf_debug(", id1 parity violation"); + msg_cdbg(", id1 parity violation"); /* Read the product ID location again. We should now see normal flash contents. */ flashcontent1 = chip_readb(bios); @@ -185,11 +185,11 @@ } if (largeid1 == flashcontent1) - printf_debug(", id1 is normal flash content"); + msg_cdbg(", id1 is normal flash content"); if (largeid2 == flashcontent2) - printf_debug(", id2 is normal flash content"); + msg_cdbg(", id2 is normal flash content"); - printf_debug("\n"); + msg_cdbg("\n"); if (largeid1 != flash->manufacture_id || largeid2 != flash->model_id) return 0; @@ -223,7 +223,7 @@ toggle_ready_jedec_slow(bios); if (check_erased_range(flash, page, pagesize)) { - fprintf(stderr,"ERASE FAILED!\n"); + msg_cerr("ERASE FAILED!\n"); return -1; } return 0; @@ -253,7 +253,7 @@ toggle_ready_jedec_slow(bios); if (check_erased_range(flash, block, blocksize)) { - fprintf(stderr,"ERASE FAILED!\n"); + msg_cerr("ERASE FAILED!\n"); return -1; } return 0; @@ -282,7 +282,7 @@ toggle_ready_jedec_slow(bios); if (check_erased_range(flash, 0, total_size)) { - fprintf(stderr,"ERASE FAILED!\n"); + msg_cerr("ERASE FAILED!\n"); return -1; } return 0; @@ -330,7 +330,7 @@ dst++, src++; } if (failed) - fprintf(stderr, " writing sector at 0x%lx failed!\n", olddst); + msg_cerr(" writing sector at 0x%lx failed!\n", olddst); return failed; } @@ -364,11 +364,11 @@ failed = verify_range(flash, src, start, page_size, NULL); if (failed && tried++ < MAX_REFLASH_TRIES) { - fprintf(stderr, "retrying.\n"); + msg_cerr("retrying.\n"); goto retry; } if (failed) { - fprintf(stderr, " page 0x%lx failed!\n", + msg_cerr(" page 0x%lx failed!\n", (d - bios) / page_size); } return failed; @@ -387,7 +387,7 @@ return MASK_AAA; break; default: - fprintf(stderr, "%s called with unknown mask\n", __func__); + msg_cerr("%s called with unknown mask\n", __func__); return 0; break; } @@ -403,19 +403,19 @@ mask = getaddrmask(flash); if (erase_chip_jedec(flash)) { - fprintf(stderr,"ERASE FAILED!\n"); + msg_cerr("ERASE FAILED!\n"); return -1; } - printf("Programming page: "); + msg_cinfo("Programming page: "); for (i = 0; i < total_size / page_size; i++) { - printf("%04d at address: 0x%08x", i, i * page_size); + msg_cinfo("%04d at address: 0x%08x", i, i * page_size); if (write_page_write_jedec_common(flash, buf + i * page_size, i * page_size, page_size, mask)) failed = 1; - 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"); + msg_cinfo("\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"); + msg_cinfo("DONE!\n"); return failed; } @@ -431,22 +431,22 @@ programmer_delay(10); if (erase_flash(flash)) { - fprintf(stderr, "ERASE FAILED!\n"); + msg_cerr("ERASE FAILED!\n"); return -1; } - printf("Programming page: "); + msg_cinfo("Programming page: "); for (i = 0; i < flash->total_size; i++) { if ((i & 0x3) == 0) - printf("address: 0x%08lx", (unsigned long)i * 1024); + msg_cinfo("address: 0x%08lx", (unsigned long)i * 1024); write_sector_jedec_common(flash, buf + i * 1024, dst + i * 1024, 1024, mask); if ((i & 0x3) == 0) - printf("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); + msg_cinfo("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); } - printf("\n"); + msg_cinfo("DONE!\n"); return 0; } @@ -458,7 +458,7 @@ mask = getaddrmask(flash); if ((addr != 0) || (blocksize != flash->total_size * 1024)) { - fprintf(stderr, "%s called with incorrect arguments\n", + msg_cerr("%s called with incorrect arguments\n", __func__); return -1; } Modified: trunk/m29f400bt.c ============================================================================== --- trunk/m29f400bt.c Thu Mar 25 00:10:01 2010 (r981) +++ trunk/m29f400bt.c Thu Mar 25 00:14:32 2010 (r982) @@ -42,8 +42,7 @@ //chip_writeb(0xF0, bios); //programmer_delay(5); toggle_ready_jedec(dst); - printf - ("Value in the flash at address 0x%lx = %#x, want %#x\n", + msg_cerr("Value in the flash at address 0x%lx = %#x, want %#x\n", (dst - bios), chip_readb(dst), *src); dst++; src++; @@ -73,7 +72,7 @@ programmer_delay(10); - printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2); + msg_cdbg("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2); if (id1 == flash->manufacture_id && id2 == flash->model_id) return 1; @@ -97,7 +96,7 @@ toggle_ready_jedec(bios); if (check_erased_range(flash, 0, flash->total_size * 1024)) { - fprintf(stderr, "ERASE FAILED!\n"); + msg_cerr("ERASE FAILED!\n"); return -1; } return 0; @@ -121,7 +120,7 @@ toggle_ready_jedec(bios); if (check_erased_range(flash, start, len)) { - fprintf(stderr, "ERASE FAILED!\n"); + msg_cerr("ERASE FAILED!\n"); return -1; } return 0; @@ -130,7 +129,7 @@ int block_erase_chip_m29f400bt(struct flashchip *flash, unsigned int address, unsigned int blocklen) { if ((address != 0) || (blocklen != flash->total_size * 1024)) { - fprintf(stderr, "%s called with incorrect arguments\n", + msg_cerr("%s called with incorrect arguments\n", __func__); return -1; } @@ -145,7 +144,7 @@ chipaddr bios = flash->virtual_memory; //erase_m29f400bt (flash); - printf("Programming page:\n "); + msg_cinfo("Programming page:\n "); /********************************* *Pages for M29F400BT: * 16 0x7c000 0x7ffff TOP @@ -161,47 +160,47 @@ * 64 0x10000 0x1ffff * 64 0x00000 0x0ffff BOTTOM *********************************/ - printf("total_size/page_size = %d\n", total_size / page_size); + msg_cinfo("total_size/page_size = %d\n", total_size / page_size); for (i = 0; i < (total_size / page_size) - 1; i++) { - printf("%04d at address: 0x%08x\n", i, i * page_size); + msg_cinfo("%04d at address: 0x%08x\n", i, i * page_size); if (block_erase_m29f400bt(flash, i * page_size, page_size)) { - fprintf(stderr, "ERASE FAILED!\n"); + msg_cerr("ERASE FAILED!\n"); return -1; } write_page_m29f400bt(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"); + msg_cinfo("\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("%04d at address: 0x%08x\n", 7, 0x70000); + msg_cinfo("%04d at address: 0x%08x\n", 7, 0x70000); if (block_erase_m29f400bt(flash, 0x70000, 32 * 1024)) { - fprintf(stderr, "ERASE FAILED!\n"); + msg_cerr("ERASE FAILED!\n"); return -1; } write_page_m29f400bt(bios, buf + 0x70000, bios + 0x70000, 32 * 1024); - printf("%04d at address: 0x%08x\n", 8, 0x78000); + msg_cinfo("%04d at address: 0x%08x\n", 8, 0x78000); if (block_erase_m29f400bt(flash, 0x78000, 8 * 1024)) { - fprintf(stderr, "ERASE FAILED!\n"); + msg_cerr("ERASE FAILED!\n"); return -1; } write_page_m29f400bt(bios, buf + 0x78000, bios + 0x78000, 8 * 1024); - printf("%04d at address: 0x%08x\n", 9, 0x7a000); + msg_cinfo("%04d at address: 0x%08x\n", 9, 0x7a000); if (block_erase_m29f400bt(flash, 0x7a000, 8 * 1024)) { - fprintf(stderr, "ERASE FAILED!\n"); + msg_cerr("ERASE FAILED!\n"); return -1; } write_page_m29f400bt(bios, buf + 0x7a000, bios + 0x7a000, 8 * 1024); - printf("%04d at address: 0x%08x\n", 10, 0x7c000); + msg_cinfo("%04d at address: 0x%08x\n", 10, 0x7c000); if (block_erase_m29f400bt(flash, 0x7c000, 16 * 1024)) { - fprintf(stderr, "ERASE FAILED!\n"); + msg_cerr("ERASE FAILED!\n"); return -1; } write_page_m29f400bt(bios, buf + 0x7c000, bios + 0x7c000, 16 * 1024); - printf("\n"); + msg_cinfo("\n"); return 0; } @@ -210,7 +209,7 @@ { chipaddr bios = flash->virtual_memory; - printf("Programming page:\n "); + msg_cinfo("Programming page:\n "); /********************************* *Pages for M29F400BT: * 16 0x7c000 0x7ffff TOP @@ -226,35 +225,35 @@ * 64 0x10000 0x1ffff * 64 0x00000 0x0ffff BOTTOM *********************************/ - printf("%04d at address: 0x%08x\n", 7, 0x00000); + msg_cinfo("%04d at address: 0x%08x\n", 7, 0x00000); if (block_erase_m29f400bt(flash, 0x00000, 64 * 1024)) { - fprintf(stderr, "ERASE FAILED!\n"); + msg_cerr("ERASE FAILED!\n"); return -1; } write_page_m29f400bt(bios, buf + 0x00000, bios + 0x00000, 64 * 1024); - printf("%04d at address: 0x%08x\n", 7, 0x10000); + msg_cinfo("%04d at address: 0x%08x\n", 7, 0x10000); if (block_erase_m29f400bt(flash, 0x10000, 64 * 1024)) { - fprintf(stderr, "ERASE FAILED!\n"); + msg_cerr("ERASE FAILED!\n"); return -1; } write_page_m29f400bt(bios, buf + 0x10000, bios + 0x10000, 64 * 1024); - printf("%04d at address: 0x%08x\n", 7, 0x20000); + msg_cinfo("%04d at address: 0x%08x\n", 7, 0x20000); if (block_erase_m29f400bt(flash, 0x20000, 64 * 1024)) { - fprintf(stderr, "ERASE FAILED!\n"); + msg_cerr("ERASE FAILED!\n"); return -1; } write_page_m29f400bt(bios, buf + 0x20000, bios + 0x20000, 64 * 1024); - printf("%04d at address: 0x%08x\n", 7, 0x30000); + msg_cinfo("%04d at address: 0x%08x\n", 7, 0x30000); if (block_erase_m29f400bt(flash, 0x30000, 64 * 1024)) { - fprintf(stderr, "ERASE FAILED!\n"); + msg_cerr("ERASE FAILED!\n"); return -1; } write_page_m29f400bt(bios, buf + 0x30000, bios + 0x30000, 64 * 1024); - printf("\n"); + msg_cinfo("\n"); return 0; } Modified: trunk/sharplhf00l04.c ============================================================================== --- trunk/sharplhf00l04.c Thu Mar 25 00:10:01 2010 (r981) +++ trunk/sharplhf00l04.c Thu Mar 25 00:14:32 2010 (r982) @@ -34,14 +34,14 @@ // clear status register chip_writeb(0x50, bios); - printf("Erase at 0x%lx\n", bios); + msg_cdbg("Erase at 0x%lx\n", bios); status = wait_82802ab(flash->virtual_memory); print_status_82802ab(status); // clear write protect - printf("write protect is at 0x%lx\n", (wrprotect)); - printf("write protect is 0x%x\n", chip_readb(wrprotect)); + msg_cspew("write protect is at 0x%lx\n", (wrprotect)); + msg_cspew("write protect is 0x%x\n", chip_readb(wrprotect)); chip_writeb(0, wrprotect); - printf("write protect is 0x%x\n", chip_readb(wrprotect)); + msg_cspew("write protect is 0x%x\n", chip_readb(wrprotect)); // now start it chip_writeb(0x20, bios); @@ -50,10 +50,10 @@ // now let's see what the register is status = wait_82802ab(flash->virtual_memory); print_status_82802ab(status); - printf("DONE BLOCK 0x%x\n", blockaddr); + msg_cinfo("DONE BLOCK 0x%x\n", blockaddr); if (check_erased_range(flash, blockaddr, blocklen)) { - fprintf(stderr, "ERASE FAILED!\n"); + msg_cerr("ERASE FAILED!\n"); return -1; } return 0; @@ -67,17 +67,17 @@ chipaddr bios = flash->virtual_memory; if (erase_flash(flash)) { - fprintf(stderr, "ERASE FAILED!\n"); + msg_cerr("ERASE FAILED!\n"); return -1; } - printf("Programming page: "); + msg_cinfo("Programming page: "); for (i = 0; i < total_size / page_size; i++) { - printf("%04d at address: 0x%08x", i, i * page_size); + msg_cinfo("%04d at address: 0x%08x", i, 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"); + msg_cinfo("\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"); + msg_cinfo("\n"); return 0; } Modified: trunk/spi25.c ============================================================================== --- trunk/spi25.c Thu Mar 25 00:10:01 2010 (r981) +++ trunk/spi25.c Thu Mar 25 00:14:32 2010 (r982) @@ -39,10 +39,10 @@ ret = spi_send_command(sizeof(cmd), bytes, cmd, readarr); if (ret) return ret; - printf_debug("RDID returned"); + msg_cspew("RDID returned"); for (i = 0; i < bytes; i++) - printf_debug(" 0x%02x", readarr[i]); - printf_debug(". "); + msg_cspew(" 0x%02x", readarr[i]); + msg_cspew(". "); return 0; } @@ -63,7 +63,7 @@ } if (ret) return ret; - printf_debug("REMS returned %02x %02x. ", readarr[0], readarr[1]); + msg_cspew("REMS returned %02x %02x. ", readarr[0], readarr[1]); return 0; } @@ -84,7 +84,7 @@ } if (ret) return ret; - printf_debug("RES returned %02x. ", readarr[0]); + msg_cspew("RES returned %02x. ", readarr[0]); return 0; } @@ -97,7 +97,7 @@ result = spi_send_command(sizeof(cmd), 0, cmd, NULL); if (result) - fprintf(stderr, "%s failed\n", __func__); + msg_cerr("%s failed\n", __func__); return result; } @@ -120,12 +120,12 @@ return 0; if (!oddparity(readarr[0])) - printf_debug("RDID byte 0 parity violation. "); + msg_cdbg("RDID byte 0 parity violation. "); /* Check if this is a continuation vendor ID */ if (readarr[0] == 0x7f) { if (!oddparity(readarr[1])) - printf_debug("RDID byte 1 parity violation. "); + msg_cdbg("RDID byte 1 parity violation. "); id1 = (readarr[0] << 8) | readarr[1]; id2 = readarr[2]; if (bytes > 3) { @@ -137,7 +137,7 @@ id2 = (readarr[1] << 8) | readarr[2]; } - printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2); + msg_cdbg("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2); if (id1 == flash->manufacture_id && id2 == flash->model_id) { /* Print the status register to tell the @@ -192,7 +192,7 @@ #endif return probe_spi_rdid_generic(flash, 4); default: - printf_debug("4b ID not supported on this SPI controller\n"); + msg_cinfo("4b ID not supported on this SPI controller\n"); } return 0; @@ -209,7 +209,7 @@ id1 = readarr[0]; id2 = readarr[1]; - printf_debug("%s: id1 0x%x, id2 0x%x\n", __func__, id1, id2); + msg_cdbg("%s: id1 0x%x, id2 0x%x\n", __func__, id1, id2); if (id1 == flash->manufacture_id && id2 == flash->model_id) { /* Print the status register to tell the @@ -262,7 +262,7 @@ /* FIXME: Handle the case where RES gives a 2-byte response. */ id2 = readarr[0]; - printf_debug("%s: id 0x%x\n", __func__, id2); + msg_cdbg("%s: id 0x%x\n", __func__, id2); if (id2 != flash->model_id) return 0; @@ -283,7 +283,7 @@ /* Read Status Register */ ret = spi_send_command(sizeof(cmd), sizeof(readarr), cmd, readarr); if (ret) - fprintf(stderr, "RDSR failed!\n"); + msg_cerr("RDSR failed!\n"); return readarr[0]; } @@ -291,17 +291,17 @@ /* Prettyprint the status register. Common definitions. */ void spi_prettyprint_status_register_common(uint8_t status) { - printf_debug("Chip status register: Bit 5 / Block Protect 3 (BP3) is " + msg_cdbg("Chip status register: Bit 5 / Block Protect 3 (BP3) is " "%sset\n", (status & (1 << 5)) ? "" : "not "); - printf_debug("Chip status register: Bit 4 / Block Protect 2 (BP2) is " + msg_cdbg("Chip status register: Bit 4 / Block Protect 2 (BP2) is " "%sset\n", (status & (1 << 4)) ? "" : "not "); - printf_debug("Chip status register: Bit 3 / Block Protect 1 (BP1) is " + msg_cdbg("Chip status register: Bit 3 / Block Protect 1 (BP1) is " "%sset\n", (status & (1 << 3)) ? "" : "not "); - printf_debug("Chip status register: Bit 2 / Block Protect 0 (BP0) is " + msg_cdbg("Chip status register: Bit 2 / Block Protect 0 (BP0) is " "%sset\n", (status & (1 << 2)) ? "" : "not "); - printf_debug("Chip status register: Write Enable Latch (WEL) is " + msg_cdbg("Chip status register: Write Enable Latch (WEL) is " "%sset\n", (status & (1 << 1)) ? "" : "not "); - printf_debug("Chip status register: Write In Progress (WIP/BUSY) is " + msg_cdbg("Chip status register: Write In Progress (WIP/BUSY) is " "%sset\n", (status & (1 << 0)) ? "" : "not "); } @@ -311,18 +311,18 @@ */ void spi_prettyprint_status_register_st_m25p(uint8_t status) { - printf_debug("Chip status register: Status Register Write Disable " + msg_cdbg("Chip status register: Status Register Write Disable " "(SRWD) is %sset\n", (status & (1 << 7)) ? "" : "not "); - printf_debug("Chip status register: Bit 6 is " + msg_cdbg("Chip status register: Bit 6 is " "%sset\n", (status & (1 << 6)) ? "" : "not "); spi_prettyprint_status_register_common(status); } void spi_prettyprint_status_register_sst25(uint8_t status) { - printf_debug("Chip status register: Block Protect Write Disable " + msg_cdbg("Chip status register: Block Protect Write Disable " "(BPL) is %sset\n", (status & (1 << 7)) ? "" : "not "); - printf_debug("Chip status register: Auto Address Increment Programming " + msg_cdbg("Chip status register: Auto Address Increment Programming " "(AAI) is %sset\n", (status & (1 << 6)) ? "" : "not "); spi_prettyprint_status_register_common(status); } @@ -342,7 +342,7 @@ "all", "all" }; spi_prettyprint_status_register_sst25(status); - printf_debug("Resulting block protection : %s\n", + msg_cdbg("Resulting block protection : %s\n", bpt[(status & 0x1c) >> 2]); } @@ -356,7 +356,7 @@ "all blocks", "all blocks", "all blocks", "all blocks" }; spi_prettyprint_status_register_sst25(status); - printf_debug("Resulting block protection : %s\n", + msg_cdbg("Resulting block protection : %s\n", bpt[(status & 0x1c) >> 2]); } @@ -365,7 +365,7 @@ uint8_t status; status = spi_read_status_register(); - printf_debug("Chip status register is %02x\n", status); + msg_cdbg("Chip status register is %02x\n", status); switch (flash->manufacture_id) { case ST_ID: if (((flash->model_id & 0xff00) == 0x2000) || @@ -416,13 +416,13 @@ result = spi_disable_blockprotect(); if (result) { - fprintf(stderr, "spi_disable_blockprotect failed\n"); + msg_cerr("spi_disable_blockprotect failed\n"); return result; } result = spi_send_multicommand(cmds); if (result) { - fprintf(stderr, "%s failed during command execution\n", + msg_cerr("%s failed during command execution\n", __func__); return result; } @@ -433,7 +433,7 @@ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(1000 * 1000); if (check_erased_range(flash, 0, flash->total_size * 1024)) { - fprintf(stderr, "ERASE FAILED!\n"); + msg_cerr("ERASE FAILED!\n"); return -1; } return 0; @@ -462,13 +462,13 @@ result = spi_disable_blockprotect(); if (result) { - fprintf(stderr, "spi_disable_blockprotect failed\n"); + msg_cerr("spi_disable_blockprotect failed\n"); return result; } result = spi_send_multicommand(cmds); if (result) { - fprintf(stderr, "%s failed during command execution\n", __func__); + msg_cerr("%s failed during command execution\n", __func__); return result; } /* Wait until the Write-In-Progress bit is cleared. @@ -478,23 +478,12 @@ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(1000 * 1000); if (check_erased_range(flash, 0, flash->total_size * 1024)) { - fprintf(stderr, "ERASE FAILED!\n"); + msg_cerr("ERASE FAILED!\n"); return -1; } return 0; } -int spi_chip_erase_60_c7(struct flashchip *flash) -{ - int result; - result = spi_chip_erase_60(flash); - if (result) { - printf_debug("spi_chip_erase_60 failed, trying c7\n"); - result = spi_chip_erase_c7(flash); - } - return result; -} - int spi_block_erase_52(struct flashchip *flash, unsigned int addr, unsigned int blocklen) { int result; @@ -523,7 +512,7 @@ result = spi_send_multicommand(cmds); if (result) { - fprintf(stderr, "%s failed during command execution at address 0x%x\n", + msg_cerr("%s failed during command execution at address 0x%x\n", __func__, addr); return result; } @@ -533,7 +522,7 @@ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(100 * 1000); if (check_erased_range(flash, addr, blocklen)) { - fprintf(stderr, "ERASE FAILED!\n"); + msg_cerr("ERASE FAILED!\n"); return -1; } return 0; @@ -572,7 +561,7 @@ result = spi_send_multicommand(cmds); if (result) { - fprintf(stderr, "%s failed during command execution at address 0x%x\n", + msg_cerr("%s failed during command execution at address 0x%x\n", __func__, addr); return result; } @@ -582,7 +571,7 @@ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(100 * 1000); if (check_erased_range(flash, addr, blocklen)) { - fprintf(stderr, "ERASE FAILED!\n"); + msg_cerr("ERASE FAILED!\n"); return -1; } return 0; @@ -619,7 +608,7 @@ result = spi_send_multicommand(cmds); if (result) { - fprintf(stderr, "%s failed during command execution at address 0x%x\n", + msg_cerr("%s failed during command execution at address 0x%x\n", __func__, addr); return result; } @@ -629,7 +618,7 @@ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(100 * 1000); if (check_erased_range(flash, addr, blocklen)) { - fprintf(stderr, "ERASE FAILED!\n"); + msg_cerr("ERASE FAILED!\n"); return -1; } return 0; @@ -643,17 +632,17 @@ spi_disable_blockprotect(); - printf("Erasing chip: \n"); + msg_cinfo("Erasing chip: \n"); for (i = 0; i < total_size / erase_size; i++) { rc = spi_block_erase_d8(flash, i * erase_size, erase_size); if (rc) { - fprintf(stderr, "Error erasing block at 0x%x\n", i); + msg_cerr("Error erasing block at 0x%x\n", i); break; } } - printf("\n"); + msg_cinfo("\n"); return rc; } @@ -687,7 +676,7 @@ result = spi_send_multicommand(cmds); if (result) { - fprintf(stderr, "%s failed during command execution at address 0x%x\n", + msg_cerr("%s failed during command execution at address 0x%x\n", __func__, addr); return result; } @@ -697,7 +686,7 @@ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(10 * 1000); if (check_erased_range(flash, addr, blocklen)) { - fprintf(stderr, "ERASE FAILED!\n"); + msg_cerr("ERASE FAILED!\n"); return -1; } return 0; @@ -706,7 +695,7 @@ int spi_block_erase_60(struct flashchip *flash, unsigned int addr, unsigned int blocklen) { if ((addr != 0) || (blocklen != flash->total_size * 1024)) { - fprintf(stderr, "%s called with incorrect arguments\n", + msg_cerr("%s called with incorrect arguments\n", __func__); return -1; } @@ -716,7 +705,7 @@ int spi_block_erase_c7(struct flashchip *flash, unsigned int addr, unsigned int blocklen) { if ((addr != 0) || (blocklen != flash->total_size * 1024)) { - fprintf(stderr, "%s called with incorrect arguments\n", + msg_cerr("%s called with incorrect arguments\n", __func__); return -1; } @@ -732,7 +721,7 @@ result = spi_send_command(sizeof(cmd), JEDEC_EWSR_INSIZE, cmd, NULL); if (result) - fprintf(stderr, "%s failed\n", __func__); + msg_cerr("%s failed\n", __func__); return result; } @@ -765,7 +754,7 @@ result = spi_send_multicommand(cmds); if (result) { - fprintf(stderr, "%s failed during command execution\n", + msg_cerr("%s failed during command execution\n", __func__); } return result; @@ -800,7 +789,7 @@ result = spi_send_multicommand(cmds); if (result) { - fprintf(stderr, "%s failed during command execution at address 0x%x\n", + msg_cerr("%s failed during command execution at address 0x%x\n", __func__, addr); } return result; @@ -835,11 +824,11 @@ }}; if (!len) { - fprintf(stderr, "%s called for zero-length write\n", __func__); + msg_cerr("%s called for zero-length write\n", __func__); return 1; } if (len > 256) { - fprintf(stderr, "%s called for too long a write\n", __func__); + msg_cerr("%s called for too long a write\n", __func__); return 1; } @@ -847,7 +836,7 @@ result = spi_send_multicommand(cmds); if (result) { - fprintf(stderr, "%s failed during command execution at address 0x%x\n", + msg_cerr("%s failed during command execution at address 0x%x\n", __func__, addr); } return result; @@ -861,10 +850,10 @@ status = spi_read_status_register(); /* If there is block protection in effect, unprotect it first. */ if ((status & 0x3c) != 0) { - printf_debug("Some block protection in effect, disabling\n"); + msg_cdbg("Some block protection in effect, disabling\n"); result = spi_write_status_register(status & ~0x3c); if (result) { - fprintf(stderr, "spi_write_status_register failed\n"); + msg_cerr("spi_write_status_register failed\n"); return result; } } @@ -936,12 +925,12 @@ spi_disable_blockprotect(); /* Erase first */ - printf("Erasing flash before programming... "); + msg_cinfo("Erasing flash before programming... "); if (erase_flash(flash)) { - fprintf(stderr, "ERASE FAILED!\n"); + msg_cerr("ERASE FAILED!\n"); return -1; } - printf("done.\n"); + msg_cinfo("done.\n"); for (i = 0; i < total_size; i++) { result = spi_byte_program(i, buf[i]); if (result) @@ -962,7 +951,7 @@ switch (spi_controller) { #if INTERNAL_SUPPORT == 1 case SPI_CONTROLLER_WBSIO: - fprintf(stderr, "%s: impossible with Winbond SPI masters," + msg_cerr("%s: impossible with Winbond SPI masters," " degrading to byte program\n", __func__); return spi_chip_write_1(flash, buf); #endif @@ -970,7 +959,7 @@ break; } if (erase_flash(flash)) { - fprintf(stderr, "ERASE FAILED!\n"); + msg_cerr("ERASE FAILED!\n"); return -1; } /* FIXME: This will fail on ICH/VIA SPI. */ Modified: trunk/sst28sf040.c ============================================================================== --- trunk/sst28sf040.c Thu Mar 25 00:10:01 2010 (r981) +++ trunk/sst28sf040.c Thu Mar 25 00:14:32 2010 (r982) @@ -63,7 +63,7 @@ toggle_ready_jedec(bios); if (check_erased_range(flash, address, sector_size)) { - fprintf(stderr, "ERASE FAILED!\n"); + msg_cerr("ERASE FAILED!\n"); return -1; } return 0; @@ -105,7 +105,7 @@ toggle_ready_jedec(bios); if (check_erased_range(flash, 0, flash->total_size * 1024)) { - fprintf(stderr, "ERASE FAILED!\n"); + msg_cerr("ERASE FAILED!\n"); return -1; } return 0; @@ -120,21 +120,21 @@ unprotect_28sf040(bios); - printf("Programming page: "); + msg_cinfo("Programming page: "); for (i = 0; i < total_size / page_size; i++) { /* erase the page before programming */ if (erase_sector_28sf040(flash, i * page_size, page_size)) { - fprintf(stderr, "ERASE FAILED!\n"); + msg_cerr("ERASE FAILED!\n"); return -1; } /* write to the sector */ - printf("%04d at address: 0x%08x", i, i * page_size); + msg_cinfo("%04d at address: 0x%08x", i, i * page_size); write_sector_28sf040(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"); + msg_cinfo("\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"); + msg_cinfo("\n"); protect_28sf040(bios); @@ -144,7 +144,7 @@ int erase_chip_28sf040(struct flashchip *flash, unsigned int addr, unsigned int blocklen) { if ((addr != 0) || (blocklen != flash->total_size * 1024)) { - fprintf(stderr, "%s called with incorrect arguments\n", + msg_cerr("%s called with incorrect arguments\n", __func__); return -1; } Modified: trunk/sst49lfxxxc.c ============================================================================== --- trunk/sst49lfxxxc.c Thu Mar 25 00:10:01 2010 (r981) +++ trunk/sst49lfxxxc.c Thu Mar 25 00:14:32 2010 (r982) @@ -27,7 +27,7 @@ int unlock_block_49lfxxxc(struct flashchip *flash, unsigned long address, unsigned char bits) { unsigned long lock = flash->virtual_registers + address + 2; - printf_debug("lockbits at address=0x%08lx is 0x%01x\n", lock, chip_readb(lock)); + msg_cdbg("lockbits at address=0x%08lx is 0x%01x\n", lock, chip_readb(lock)); chip_writeb(bits, lock); return 0; @@ -39,30 +39,30 @@ int i, left = flash->total_size * 1024; unsigned long address; - printf_debug("\nbios=0x%08lx\n", registers); + msg_cdbg("\nbios=0x%08lx\n", registers); for (i = 0; left > 65536; i++, left -= 65536) { - printf_debug("lockbits at address=0x%08lx is 0x%01x\n", + msg_cdbg("lockbits at address=0x%08lx is 0x%01x\n", registers + (i * 65536) + 2, chip_readb(registers + (i * 65536) + 2)); chip_writeb(bits, registers + (i * 65536) + 2); } address = i * 65536; - printf_debug("lockbits at address=0x%08lx is 0x%01x\n", + msg_cdbg("lockbits at address=0x%08lx is 0x%01x\n", registers + address + 2, chip_readb(registers + address + 2)); chip_writeb(bits, registers + address + 2); address += 32768; - printf_debug("lockbits at address=0x%08lx is 0x%01x\n", + msg_cdbg("lockbits at address=0x%08lx is 0x%01x\n", registers + address + 2, chip_readb(registers + address + 2)); chip_writeb(bits, registers + address + 2); address += 8192; - printf_debug("lockbits at address=0x%08lx is 0x%01x\n", + msg_cdbg("lockbits at address=0x%08lx is 0x%01x\n", registers + address + 2, chip_readb(registers + address + 2)); chip_writeb(bits, registers + address + 2); address += 8192; - printf_debug("lockbits at address=0x%08lx is 0x%01x\n", + msg_cdbg("lockbits at address=0x%08lx is 0x%01x\n", registers + address + 2, chip_readb(registers + address + 2)); chip_writeb(bits, registers + address + 2); @@ -86,7 +86,7 @@ status = wait_82802ab(bios); if (check_erased_range(flash, address, sector_size)) { - fprintf(stderr, "ERASE FAILED!\n"); + msg_cerr("ERASE FAILED!\n"); return -1; } return 0; @@ -100,21 +100,21 @@ chipaddr bios = flash->virtual_memory; write_lockbits_49lfxxxc(flash, 0); - printf("Programming page: "); + msg_cinfo("Programming page: "); for (i = 0; i < total_size / page_size; i++) { /* erase the page before programming */ if (erase_sector_49lfxxxc(flash, i * page_size, flash->page_size)) { - fprintf(stderr, "ERASE FAILED!\n"); + msg_cerr("ERASE FAILED!\n"); return -1; } /* write to the sector */ - printf("%04d at address: 0x%08x", i, i * page_size); + msg_cinfo("%04d at address: 0x%08x", i, 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"); + msg_cinfo("\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"); + msg_cinfo("\n"); chip_writeb(0xFF, bios); Modified: trunk/sst_fwhub.c ============================================================================== --- trunk/sst_fwhub.c Thu Mar 25 00:10:01 2010 (r981) +++ trunk/sst_fwhub.c Thu Mar 25 00:14:32 2010 (r982) @@ -33,20 +33,20 @@ uint8_t blockstatus; blockstatus = chip_readb(registers + offset + 2); - printf_debug("Lock status for 0x%06x (size 0x%06x) is %02x, ", + msg_cdbg("Lock status for 0x%06x (size 0x%06x) is %02x, ", offset, flash->page_size, blockstatus); switch (blockstatus & 0x3) { case 0x0: - printf_debug("full access\n"); + msg_cdbg("full access\n"); break; case 0x1: - printf_debug("write locked\n"); + msg_cdbg("write locked\n"); break; case 0x2: - printf_debug("locked open\n"); + msg_cdbg("locked open\n"); break; case 0x3: - printf_debug("write locked down\n"); + msg_cdbg("write locked down\n"); break; } /* Return content of the write_locked bit */ @@ -61,11 +61,11 @@ blockstatus = check_sst_fwhub_block_lock(flash, offset); if (blockstatus) { - printf_debug("Trying to clear lock for 0x%06x... ", offset) + msg_cdbg("Trying to clear lock for 0x%06x... ", offset); chip_writeb(0, registers + offset + 2); blockstatus = check_sst_fwhub_block_lock(flash, offset); - printf_debug("%s\n", (blockstatus) ? "failed" : "OK"); + msg_cdbg("%s\n", (blockstatus) ? "failed" : "OK"); } return blockstatus; Modified: trunk/stm50flw0x0x.c ============================================================================== --- trunk/stm50flw0x0x.c Thu Mar 25 00:10:01 2010 (r981) +++ trunk/stm50flw0x0x.c Thu Mar 25 00:14:32 2010 (r982) @@ -61,19 +61,19 @@ // unlock each 4k-sector for (j = 0; j < 0x10000; j += 0x1000) { - printf_debug("unlocking at 0x%x\n", offset + j); + msg_cdbg("unlocking at 0x%x\n", offset + j); chip_writeb(unlock_sector, wrprotect + offset + j); if (chip_readb(wrprotect + offset + j) != unlock_sector) { - printf("Cannot unlock sector @ 0x%x\n", + msg_cerr("Cannot unlock sector @ 0x%x\n", offset + j); return -1; } } } else { - printf_debug("unlocking at 0x%x\n", offset); + msg_cdbg("unlocking at 0x%x\n", offset); chip_writeb(unlock_sector, wrprotect + offset); if (chip_readb(wrprotect + offset) != unlock_sector) { - printf("Cannot unlock sector @ 0x%x\n", offset); + msg_cerr("Cannot unlock sector @ 0x%x\n", offset); return -1; } } @@ -87,7 +87,7 @@ for (i = 0; i < flash->total_size * 1024; i+= flash->page_size) { if(unlock_block_stm50flw0x0x(flash, i)) { - fprintf(stderr, "UNLOCK FAILED!\n"); + msg_cerr("UNLOCK FAILED!\n"); return -1; } } @@ -101,7 +101,7 @@ // clear status register chip_writeb(0x50, bios); - printf_debug("Erase at 0x%lx\n", bios); + msg_cdbg("Erase at 0x%lx\n", bios); // now start it chip_writeb(0x32, bios); chip_writeb(0xd0, bios); @@ -110,10 +110,10 @@ wait_82802ab(flash->virtual_memory); if (check_erased_range(flash, sector, sectorsize)) { - fprintf(stderr, "ERASE FAILED!\n"); + msg_cerr("ERASE FAILED!\n"); return -1; } - printf("DONE BLOCK 0x%x\n", sector); + msg_cinfo("DONE BLOCK 0x%x\n", sector); return 0; } @@ -130,21 +130,20 @@ return -1; } - printf("Erasing page:\n"); + msg_cinfo("Erasing page:\n"); for (i = 0; i < total_size / page_size; i++) { - 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("%04d at address: 0x%08x ", i, i * page_size); + msg_cinfo("\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"); + msg_cinfo("%04d at address: 0x%08x ", i, i * page_size); //if (unlock_block_stm50flw0x0x(flash, i * page_size)) { - // fprintf(stderr, "UNLOCK FAILED!\n"); + // msg_cerr("UNLOCK FAILED!\n"); // return -1; //} if (erase_block_82802ab(flash, i * page_size, page_size)) { - fprintf(stderr, "ERASE FAILED!\n"); + msg_cerr("ERASE FAILED!\n"); return -1; } } - printf("\n"); + msg_cinfo("\n"); return 0; } Modified: trunk/w29ee011.c ============================================================================== --- trunk/w29ee011.c Thu Mar 25 00:10:01 2010 (r981) +++ trunk/w29ee011.c Thu Mar 25 00:14:32 2010 (r982) @@ -29,7 +29,7 @@ extern char *chip_to_probe; if (!chip_to_probe || strcmp(chip_to_probe, "W29EE011")) { - printf_debug("Probing disabled for Winbond W29EE011 because " + msg_cdbg("Probing disabled for Winbond W29EE011 because " "the probing sequence puts the AMIC A49LF040A in " "a funky state. Use 'flashrom -c W29EE011' if you " "have a board with this chip.\n"); @@ -62,7 +62,7 @@ chip_writeb(0xF0, bios + 0x5555); programmer_delay(10); - printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2); + msg_cdbg("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2); if (id1 == flash->manufacture_id && id2 == flash->model_id) return 1; Modified: trunk/w39v040c.c ============================================================================== --- trunk/w39v040c.c Thu Mar 25 00:10:01 2010 (r981) +++ trunk/w39v040c.c Thu Mar 25 00:14:32 2010 (r982) @@ -42,7 +42,7 @@ chip_writeb(0xF0, bios + 0x5555); programmer_delay(40); - printf("%s: Boot block #TBL is %slocked, rest of chip #WP is %slocked.\n", + msg_cdbg("%s: Boot block #TBL is %slocked, rest of chip #WP is %slocked.\n", __func__, lock & 0x4 ? "" : "un", lock & 0x8 ? "" : "un"); return 0; } Modified: trunk/w39v080fa.c ============================================================================== --- trunk/w39v080fa.c Thu Mar 25 00:10:01 2010 (r981) +++ trunk/w39v080fa.c Thu Mar 25 00:14:32 2010 (r982) @@ -26,37 +26,37 @@ chipaddr wrprotect = flash->virtual_registers + offset + 2; uint8_t locking; - printf_debug("Trying to unlock block @0x%08x = 0x%02x\n", offset, + msg_cdbg("Trying to unlock block @0x%08x = 0x%02x\n", offset, chip_readb(wrprotect)); locking = chip_readb(wrprotect); switch (locking & 0x7) { case 0: - printf_debug("Full Access.\n"); + msg_cdbg("Full Access.\n"); return 0; case 1: - printf_debug("Write Lock (Default State).\n"); + msg_cdbg("Write Lock (Default State).\n"); chip_writeb(0, wrprotect); return 0; case 2: - printf_debug("Locked Open (Full Access, Lock Down).\n"); + msg_cdbg("Locked Open (Full Access, Lock Down).\n"); return 0; case 3: - fprintf(stderr, "Error: Write Lock, Locked Down.\n"); + msg_cerr("Error: Write Lock, Locked Down.\n"); return -1; case 4: - printf_debug("Read Lock.\n"); + msg_cdbg("Read Lock.\n"); chip_writeb(0, wrprotect); return 0; case 5: - printf_debug("Read/Write Lock.\n"); + msg_cdbg("Read/Write Lock.\n"); chip_writeb(0, wrprotect); return 0; case 6: - fprintf(stderr, "Error: Read Lock, Locked Down.\n"); + msg_cerr("Error: Read Lock, Locked Down.\n"); return -1; case 7: - fprintf(stderr, "Error: Read/Write Lock, Locked Down.\n"); + msg_cerr("Error: Read/Write Lock, Locked Down.\n"); return -1; } @@ -89,17 +89,17 @@ chip_writeb(0xF0, bios + 0x5555); programmer_delay(10); - printf_debug("Lockout bits:\n"); + msg_cdbg("Lockout bits:\n"); if (locking & (1 << 2)) - fprintf(stderr, "Error: hardware bootblock locking (#TBL).\n"); + msg_cerr("Error: hardware bootblock locking (#TBL).\n"); else - printf_debug("No hardware bootblock locking (good!)\n"); + msg_cdbg("No hardware bootblock locking (good!)\n"); if (locking & (1 << 3)) - fprintf(stderr, "Error: hardware block locking (#WP).\n"); + msg_cerr("Error: hardware block locking (#WP).\n"); else - printf_debug("No hardware block locking (good!)\n"); + msg_cdbg("No hardware block locking (good!)\n"); if (locking & ((1 << 2) | (1 << 3))) return -1;

1 0

Re: [flashrom] [PATCH] Fix copy/paste error in print.c preventing compilation
by Idwer Vollering 25 Mar '10

25 Mar '10

2010/3/25 Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> > Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> > Acked-by: Idwer Vollering <vidwer(a)gmail.com> > --- > print.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/print.c b/print.c > index 0b2adff..32a72d3 100644 > --- a/print.c > +++ b/print.c > @@ -395,7 +395,7 @@ const struct board_info boards_bad[] = { > const struct board_info laptops_ok[] = { > /* Verified working laptops. */ > { "Lenovo", "3000 V100 TF05Cxx", }, > - { "Acer", "Aspire 1520", " > http://support.acer.com/us/en/acerpanam/notebook/0000/Acer/Aspire1520/Aspir…" > }, > + { "Acer", "Aspire 1520", }, > > {}, > }; > -- > 1.7.0 > > > _______________________________________________ > flashrom mailing list > flashrom(a)flashrom.org > http://www.flashrom.org/mailman/listinfo/flashrom >

2 1

[commit] r981 - trunk
by repository service 25 Mar '10

25 Mar '10

Author: mkarcher Date: Thu Mar 25 00:10:01 2010 New Revision: 981 URL: http://flashrom.org/trac/coreboot/changeset/981 Log: Fix copy/paste error in print.c preventing compilation Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> Acked-by: Idwer Vollering <vidwer(a)gmail.com> Modified: trunk/print.c Modified: trunk/print.c ============================================================================== --- trunk/print.c Wed Mar 24 23:56:23 2010 (r980) +++ trunk/print.c Thu Mar 25 00:10:01 2010 (r981) @@ -395,7 +395,7 @@ const struct board_info laptops_ok[] = { /* Verified working laptops. */ { "Lenovo", "3000 V100 TF05Cxx", }, - { "Acer", "Aspire 1520", "http://support.acer.com/us/en/acerpanam/notebook/0000/Acer/Aspire1520/Aspir…" }, + { "Acer", "Aspire 1520", }, {}, };

1 0

[commit] r980 - trunk
by repository service 25 Mar '10

25 Mar '10

Author: mkarcher Date: Wed Mar 24 23:56:23 2010 New Revision: 980 URL: http://flashrom.org/trac/coreboot/changeset/980 Log: Flashrom works on Acer Aspire 1520 (Laptop) with W39V040A See http://www.coreboot.org/pipermail/flashrom/2010-March/002451.html Thanks to Paweł Stawicki for reporting! 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/flashchips.c trunk/print.c trunk/print_wiki.c Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Wed Mar 24 23:56:19 2010 (r979) +++ trunk/flashchips.c Wed Mar 24 23:56:23 2010 (r980) @@ -5738,7 +5738,7 @@ .total_size = 512, .page_size = 64 * 1024, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_UNTESTED, + .tested = TEST_OK_PRW, .probe = probe_jedec, .probe_timing = 10, .block_erasers = Modified: trunk/print.c ============================================================================== --- trunk/print.c Wed Mar 24 23:56:19 2010 (r979) +++ trunk/print.c Wed Mar 24 23:56:23 2010 (r980) @@ -395,6 +395,7 @@ const struct board_info laptops_ok[] = { /* Verified working laptops. */ { "Lenovo", "3000 V100 TF05Cxx", }, + { "Acer", "Aspire 1520", "http://support.acer.com/us/en/acerpanam/notebook/0000/Acer/Aspire1520/Aspir…" }, {}, }; Modified: trunk/print_wiki.c ============================================================================== --- trunk/print_wiki.c Wed Mar 24 23:56:19 2010 (r979) +++ trunk/print_wiki.c Wed Mar 24 23:56:23 2010 (r980) @@ -289,6 +289,7 @@ { "Sun", "Fire x4600", "http://www.sun.com/servers/x64/x4600/" }, /* Verified working laptops. */ + { "Acer", "Aspire 1520", "http://support.acer.com/us/en/acerpanam/notebook/0000/Acer/Aspire1520/Aspir…" }, { "Lenovo", "3000 V100 TF05Cxx", "http://www5.pc.ibm.com/europe/products.nsf/products?openagent&brand=Lenovo3…" }, /* Verified non-working laptops (for now). */

2 1

print/print_wiki status updates.
by Michael Karcher 24 Mar '10

24 Mar '10

Several cleanups and updates of board URLs and board testing status. Patches could be merged as you like. Regards, Michael Karcher

2 3

[commit] r979 - trunk
by repository service 24 Mar '10

24 Mar '10

Author: mkarcher Date: Wed Mar 24 23:56:19 2010 New Revision: 979 URL: http://flashrom.org/trac/coreboot/changeset/979 Log: Shuttle FD37 and MSI K9A2 Platinum are supported FD37: http://www.coreboot.org/pipermail/flashrom/2010-March/002440.html K9A2: http://www.coreboot.org/pipermail/flashrom/2010-March/002433.html Thanks to Sylvain BERTRAND for reporting! 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/print.c trunk/print_wiki.c Modified: trunk/print.c ============================================================================== --- trunk/print.c Wed Mar 24 23:56:14 2010 (r978) +++ trunk/print.c Wed Mar 24 23:56:19 2010 (r979) @@ -319,6 +319,7 @@ { "MSI", "MS-7255 (P4M890M)", }, { "MSI", "MS-7345 (P35 Neo2-FIR)", }, { "MSI", "MS-7368 (K9AG Neo2-Digital)", }, + { "MSI", "MS-7376 (K9A2 Platinum)", }, { "NEC", "PowerMate 2000", }, { "PC Engines", "Alix.1c", }, { "PC Engines", "Alix.2c2", }, @@ -326,6 +327,7 @@ { "PC Engines", "Alix.3c3", }, { "PC Engines", "Alix.3d3", }, { "RCA", "RM4100", }, + { "Shuttle", "FD37", }, { "Sun", "Blade x6250", }, { "Supermicro", "H8QC8", }, { "Thomson", "IP1000", }, Modified: trunk/print_wiki.c ============================================================================== --- trunk/print_wiki.c Wed Mar 24 23:56:14 2010 (r978) +++ trunk/print_wiki.c Wed Mar 24 23:56:19 2010 (r979) @@ -162,6 +162,7 @@ { "MSI", "MS-7255 (P4M890M)", "http://www.msi.com/index.php?func=proddesc&maincat_no=1&prod_no=1082" }, { "MSI", "MS-7345 (P35 Neo2-FIR)","http://www.msi.com/index.php?func=proddesc&maincat_no=1&prod_no=1261" }, { "MSI", "MS-7368 (K9AG Neo2-Digital)", "http://www.msi.com/index.php?func=proddesc&maincat_no=1&prod_no=1241" }, + { "MSI", "MS-7376 (K9A2 Platinum)", "http://www.msi.com/index.php?func=proddesc&maincat_no=1&prod_no=1332" }, { "NEC", "PowerMate 2000", "http://support.necam.com/mobilesolutions/hardware/Desktops/pm2000/celeron/" }, { "PC Engines", "Alix.1c", "http://pcengines.ch/alix1c.htm" }, { "PC Engines", "Alix.2c2", "http://pcengines.ch/alix2c2.htm" }, @@ -169,6 +170,7 @@ { "PC Engines", "Alix.3c3", "http://pcengines.ch/alix3c3.htm" }, { "PC Engines", "Alix.3d3", "http://pcengines.ch/alix3d3.htm" }, { "RCA", "RM4100", "http://www.settoplinux.org/index.php?title=RCA_RM4100" }, + { "Shuttle", "FD37", "http://www.shuttle.eu/products/discontinued/barebones/sd37p2/" }, { "Sun", "Blade x6250", "http://www.sun.com/servers/blades/x6250/" }, { "Supermicro", "H8QC8", "http://www.supermicro.com/Aplus/motherboard/Opteron/nforce/H8QC8.cfm" }, { "Tekram", "P6Pro-A5", "http://www.motherboard.cz/mb/tekram/P6Pro-A5.htm" },

1 0

[commit] r978 - trunk
by repository service 24 Mar '10

24 Mar '10

Author: mkarcher Date: Wed Mar 24 23:56:14 2010 New Revision: 978 URL: http://flashrom.org/trac/coreboot/changeset/978 Log: MSI MS6330 tested with W49F002U and EN29F002 W49F002U: http://www.coreboot.org/pipermail/flashrom/2010-March/002469.html EN29F002: http://www.coreboot.org/pipermail/flashrom/2010-March/002480.html Block erase was broken, chip erase worked, block erase is fixed in r934 but has not been tested since. Thanks to Guy Lacroix for reporting! 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/flashchips.c trunk/print.c trunk/print_wiki.c Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Wed Mar 24 23:56:08 2010 (r977) +++ trunk/flashchips.c Wed Mar 24 23:56:14 2010 (r978) @@ -2130,7 +2130,7 @@ .total_size = 256, .page_size = 256, .feature_bits = FEATURE_ADDR_AAA | FEATURE_EITHER_RESET, - .tested = TEST_UNTESTED, + .tested = TEST_OK_PRW, .probe = probe_jedec, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = @@ -5934,7 +5934,7 @@ .total_size = 256, .page_size = 128, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_UNTESTED, + .tested = TEST_OK_PRW, .probe = probe_jedec, .probe_timing = 10, .block_erasers = Modified: trunk/print.c ============================================================================== --- trunk/print.c Wed Mar 24 23:56:08 2010 (r977) +++ trunk/print.c Wed Mar 24 23:56:14 2010 (r978) @@ -311,6 +311,7 @@ { "Jetway", "J7F4K1G5D-PB", }, { "MSI", "MS-6153", }, { "MSI", "MS-6156", }, + { "MSI", "MS-6330 (K7T Turbo)", }, { "MSI", "MS-6570 (K7N2)", }, { "MSI", "MS-7065", }, { "MSI", "MS-7168 (Orion)", }, Modified: trunk/print_wiki.c ============================================================================== --- trunk/print_wiki.c Wed Mar 24 23:56:08 2010 (r977) +++ trunk/print_wiki.c Wed Mar 24 23:56:14 2010 (r978) @@ -154,6 +154,7 @@ { "Jetway", "J7F4K1G5D-PB", "http://www.jetway.com.tw/jetway/system/productshow2.asp?id=389&proname=J7F4…" }, { "MSI", "MS-6153", "http://www.msi.com/index.php?func=proddesc&maincat_no=1&prod_no=336" }, { "MSI", "MS-6156", "http://uk.ts.fujitsu.com/rl/servicesupport/techsupport/boards/Motherboards/…" }, + { "MSI", "MS-6330 (K7T Turbo)", "http://www.msi.com/index.php?func=proddesc&maincat_no=1&prod_no=327" }, { "MSI", "MS-6570 (K7N2)", "http://www.msi.com/index.php?func=proddesc&maincat_no=1&prod_no=519" }, { "MSI", "MS-7065", "http://browse.geekbench.ca/geekbench2/view/53114" }, { "MSI", "MS-7168 (Orion)", "http://support.packardbell.co.uk/uk/item/index.php?i=spec_orion&pi=platform…" },

1 0

[commit] r977 - trunk
by repository service 24 Mar '10

24 Mar '10

Author: mkarcher Date: Wed Mar 24 23:56:08 2010 New Revision: 977 URL: http://flashrom.org/trac/coreboot/changeset/977 Log: ASUS P6T Deluxe is OK See http://www.coreboot.org/pipermail/flashrom/2010-March/002501.html Thanks to Konstantin Matuschek for reporting. 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/print.c trunk/print_wiki.c Modified: trunk/print.c ============================================================================== --- trunk/print.c Wed Mar 24 23:56:02 2010 (r976) +++ trunk/print.c Wed Mar 24 23:56:08 2010 (r977) @@ -290,6 +290,7 @@ { "ASUS", "P5B-Deluxe", }, { "ASUS", "P5KC", }, { "ASUS", "P5L-MX", }, + { "ASUS", "P6T Deluxe", }, { "ASUS", "P6T Deluxe V2", }, { "A-Trend", "ATC-6220", }, { "BCOM", "WinNET100", }, Modified: trunk/print_wiki.c ============================================================================== --- trunk/print_wiki.c Wed Mar 24 23:56:02 2010 (r976) +++ trunk/print_wiki.c Wed Mar 24 23:56:08 2010 (r977) @@ -134,6 +134,7 @@ { "ASUS", "P5B-Deluxe", "http://www.asus.com/product.aspx?P_ID=bswT66IBSb2rEWNa" }, { "ASUS", "P5KC", "http://www.asus.com/product.aspx?P_ID=fFZ8oUIGmLpwNMjj" }, { "ASUS", "P5L-MX", "http://www.asus.com/product.aspx?P_ID=X70d3NCzH2DE9vWH" }, + { "ASUS", "P6T Deluxe", "http://www.asus.com/product.aspx?P_ID=vXixf82co6Q5v0BZ" }, { "ASUS", "P6T Deluxe V2", "http://www.asus.com/product.aspx?P_ID=iRlP8RG9han6saZx" }, { "A-Trend", "ATC-6220", "http://www.motherboard.cz/mb/atrend/atc6220.htm" }, { "BCOM", "WinNET100", "http://www.coreboot.org/BCOM_WINNET100" },

1 0

[commit] r976 - trunk
by repository service 24 Mar '10

24 Mar '10

Author: mkarcher Date: Wed Mar 24 23:56:02 2010 New Revision: 976 URL: http://flashrom.org/trac/coreboot/changeset/976 Log: Clean up manufacturer mainboard links. The Asus A8NE-FM/S does exist, you find original ASUS pdf manuals in the internet, but seems to be an OEM board that is not documented on the Asus page. A lot of MSI boards are OEM boards that have no page at the MSI site... This patch also adds links in the Wiki for boards from the board enable table. 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/print_wiki.c Modified: trunk/print_wiki.c ============================================================================== --- trunk/print_wiki.c Wed Mar 24 23:55:56 2010 (r975) +++ trunk/print_wiki.c Wed Mar 24 23:56:02 2010 (r976) @@ -106,32 +106,32 @@ { "ASRock", "A770CrossFire", "http://www.asrock.com/mb/overview.asp?Model=A770CrossFire&s=AM2\%2b" }, { "ASRock", "K8S8X", "http://www.asrock.com/mb/overview.asp?Model=K8S8X" }, { "ASRock", "M3A790GXH/128M" "http://www.asrock.com/MB/overview.asp?Model=M3A790GXH/128M" }, - { "ASUS", "A7N8X Deluxe", "http://www.asus.com/Product.aspx?P_ID=wAsRYm41KTp78MFC" }, - { "ASUS", "A7N8X-E Deluxe", "http://www.asus.com/products.aspx?l1=3&l2=13&l3=56&l4=0&model=217&modelmenu…" }, + { "ASUS", "A7N8X Deluxe", "http://www.asus.com/product.aspx?P_ID=wAsRYm41KTp78MFC" }, + { "ASUS", "A7N8X-E Deluxe", "http://www.asus.com/product.aspx?P_ID=TmQtPJv4jIxmL9C2" }, { "ASUS", "A7V133", "ftp://ftp.asus.com.tw/pub/ASUS/mb/socka/kt133a/a7v133/" }, - { "ASUS", "A7V400-MX", "http://www.asus.com.tw/products.aspx?l1=3&l2=13&l3=63&l4=0&model=228&modelm…" }, - { "ASUS", "A7V8X-MX", "http://www.asus.com.tw/products.aspx?l1=3&l2=13&l3=64&l4=0&model=229&modelm…" }, - { "ASUS", "A8N-E", "http://www.asus.com.tw/products.aspx?l1=3&l2=15&l3=171&l4=0&model=455&model…" }, + { "ASUS", "A7V400-MX", "http://www.asus.com/product.aspx?P_ID=hORgEHRBDLMfwAwx" }, + { "ASUS", "A7V8X-MX", "http://www.asus.com/product.aspx?P_ID=SEJOOYqfuQPitx2H" }, + { "ASUS", "A8N-E", "http://www.asus.com/product.aspx?P_ID=DzbA8hgqchMBOVRz" }, { "ASUS", "A8NE-FM/S", "http://www.hardwareschotte.de/hardware/preise/proid_1266090/preis_ASUS+A8NE…" }, - { "ASUS", "A8N-SLI", "http://asus.com/product.aspx?P_ID=J9FKa8z2xVId3pDK" }, - { "ASUS", "A8N-SLI Premium", "http://www.asus.com.tw/products.aspx?l1=3&l2=15&l3=148&l4=0&model=539&model…" }, + { "ASUS", "A8N-SLI", "http://www.asus.com/product.aspx?P_ID=J9FKa8z2xVId3pDK" }, + { "ASUS", "A8N-SLI Premium", "http://www.asus.com/product.aspx?P_ID=nbulqxniNmzf0mH1" }, { "ASUS", "A8V Deluxe", "http://www.asus.com/product.aspx?P_ID=tvpdgPNCPaABZRVU" }, - { "ASUS", "A8V-E Deluxe", "http://www.asus.com.tw/products.aspx?l1=3&l2=15&l3=143&l4=0&model=376&model…" }, - { "ASUS", "A8V-E SE", "http://www.asus.com.tw/products.aspx?l1=3&l2=15&l3=143&l4=0&model=576&model…" }, + { "ASUS", "A8V-E Deluxe", "http://www.asus.com/product.aspx?P_ID=hQBPIJWEZnnGAZEh" }, + { "ASUS", "A8V-E SE", "http://www.asus.com/product.aspx?P_ID=VMfiJJRYTHM4gXIi" }, { "ASUS", "K8V", "http://www.asus.com/product.aspx?P_ID=fG2KZOWF7v6MRFRm" }, { "ASUS", "K8V SE Deluxe", "http://www.asus.com/product.aspx?P_ID=65HeDI8XM1u6Uy6o" }, - { "ASUS", "K8V-X SE", "http://asus.com/product.aspx?P_ID=lzDXlbBVHkdckHVr" }, - { "ASUS", "M2A-MX", "http://www.asus.com/products.aspx?l1=3&l2=101&l3=583&l4=0&model=1909&modelm…" }, - { "ASUS", "M2A-VM", "http://www.asus.com.tw/products.aspx?l1=3&l2=101&l3=496&l4=0&model=1568&mod…" }, - { "ASUS", "M2N-E", "http://www.asus.com/products.aspx?l1=3&l2=101&l3=308&l4=0&model=1181&modelm…" }, - { "ASUS", "M2V", "http://asus.com/Product.aspx?P_ID=OqYlEDFfF6ZqZGvp" }, + { "ASUS", "K8V-X SE", "http://www.asus.com/product.aspx?P_ID=lzDXlbBVHkdckHVr" }, + { "ASUS", "M2A-MX", "http://www.asus.com/product.aspx?P_ID=BmaOnPewi1JgltOZ" }, + { "ASUS", "M2A-VM", "http://www.asus.com/product.aspx?P_ID=St3pWpym8xXpROQS" }, + { "ASUS", "M2N-E", "http://www.asus.com/product.aspx?P_ID=NFlvt10av3F7ayQ9" }, + { "ASUS", "M2V", "http://www.asus.com/product.aspx?P_ID=OqYlEDFfF6ZqZGvp" }, { "ASUS", "M3A78-EM", "http://www.asus.com/product.aspx?P_ID=KjpYqzmAd9vsTM2D" }, - { "ASUS", "P2B", "http://www.motherboard.cz/mb/asus/P2B.htm" }, + { "ASUS", "P2B", "ftp://ftp.asus.com.tw/pub/ASUS/mb/slot1/440bx/p2b/" }, { "ASUS", "P2B-D", "ftp://ftp.asus.com.tw/pub/ASUS/mb/slot1/440bx/p2b-d/" }, { "ASUS", "P2B-DS", "ftp://ftp.asus.com.tw/pub/ASUS/mb/slot1/440bx/p2b-ds/" }, - { "ASUS", "P2B-F", "http://www.motherboard.cz/mb/asus/P2B-F.htm" }, - { "ASUS", "P2L97-S", "http://www.motherboard.cz/mb/asus/P2L97-S.htm" }, - { "ASUS", "P5B-Deluxe", "ftp://ftp.asus.com.tw/pub/ASUS/mb/socket775/P5B-Deluxe/" }, + { "ASUS", "P2B-F", "ftp://ftp.asus.com.tw/pub/ASUS/mb/slot1/440bx/p2b-d/" }, + { "ASUS", "P2L97-S", "ftp://ftp.asus.com.tw/pub/ASUS/mb/slot1/440lx/p2l97-s/" }, + { "ASUS", "P5B-Deluxe", "http://www.asus.com/product.aspx?P_ID=bswT66IBSb2rEWNa" }, { "ASUS", "P5KC", "http://www.asus.com/product.aspx?P_ID=fFZ8oUIGmLpwNMjj" }, { "ASUS", "P5L-MX", "http://www.asus.com/product.aspx?P_ID=X70d3NCzH2DE9vWH" }, { "ASUS", "P6T Deluxe V2", "http://www.asus.com/product.aspx?P_ID=iRlP8RG9han6saZx" }, @@ -140,25 +140,25 @@ { "DFI", "Blood-Iron P35 T2RL", "http://lp.lanparty.com.tw/portal/CM/cmproduct/XX_cmproddetail/XX_WbProdsWin…" }, { "Elitegroup", "K7S5A", "http://www.ecs.com.tw/ECSWebSite/Products/ProductsDetail.aspx?detailid=279&…" }, { "Elitegroup", "P6VAP-A+", "http://www.ecs.com.tw/ECSWebSite/Products/ProductsDetail.aspx?detailid=117&…" }, - { "GIGABYTE", "GA-6BXC", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ClassVal…" }, + { "GIGABYTE", "GA-6BXC", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…" }, { "GIGABYTE", "GA-6BXDU", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…" }, - { "GIGABYTE", "GA-6ZMA", "http://www.gigabyte.de/Support/Motherboard/BIOS_Model.aspx?ProductID=3289" }, - { "GIGABYTE", "GA-EX58-UD4P", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Overview.aspx?Prod…" }, - { "GIGABYTE", "GA-EP35-DS3L", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Overview.aspx?Prod…" }, - { "GIGABYTE", "GA-MA69VM-S2", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Overview.aspx?Prod…" }, + { "GIGABYTE", "GA-6ZMA", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…" }, + { "GIGABYTE", "GA-EX58-UD4P", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…" }, + { "GIGABYTE", "GA-EP35-DS3L", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…" }, + { "GIGABYTE", "GA-MA69VM-S2", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…" }, { "GIGABYTE", "GA-MA790GP-DS4H", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…" }, { "GIGABYTE", "GA-MA78GPM-DS2H", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…" }, { "GIGABYTE", "GA-MA770T-UD3P", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…" }, { "Intel", "EP80759", NULL }, { "Jetway", "J7F4K1G5D-PB", "http://www.jetway.com.tw/jetway/system/productshow2.asp?id=389&proname=J7F4…" }, - { "MSI", "MS-6153", "http://www.msi.com/index.php?func=proddesc&maincat_no=1&cat2_no=&cat3_no=&p…" }, + { "MSI", "MS-6153", "http://www.msi.com/index.php?func=proddesc&maincat_no=1&prod_no=336" }, { "MSI", "MS-6156", "http://uk.ts.fujitsu.com/rl/servicesupport/techsupport/boards/Motherboards/…" }, - { "MSI", "MS-6570 (K7N2)", "http://www.msi-computer.de/index.php?func=proddesc&prod_no=519&maincat_no=1" }, + { "MSI", "MS-6570 (K7N2)", "http://www.msi.com/index.php?func=proddesc&maincat_no=1&prod_no=519" }, { "MSI", "MS-7065", "http://browse.geekbench.ca/geekbench2/view/53114" }, { "MSI", "MS-7168 (Orion)", "http://support.packardbell.co.uk/uk/item/index.php?i=spec_orion&pi=platform…" }, { "MSI", "MS-7236 (945PL Neo3)", "http://www.msi.com/index.php?func=proddesc&maincat_no=1&prod_no=1173" }, - { "MSI", "MS-7255 (P4M890M)", "http://www.tcsbahamas.com/P4M89.htm" }, - { "MSI", "MS-7345 (P35 Neo2-FIR)","http://www.msi.com/index.php?func=prodcpusupport&maincat_no=1&cat2_no=170&c…" }, + { "MSI", "MS-7255 (P4M890M)", "http://www.msi.com/index.php?func=proddesc&maincat_no=1&prod_no=1082" }, + { "MSI", "MS-7345 (P35 Neo2-FIR)","http://www.msi.com/index.php?func=proddesc&maincat_no=1&prod_no=1261" }, { "MSI", "MS-7368 (K9AG Neo2-Digital)", "http://www.msi.com/index.php?func=proddesc&maincat_no=1&prod_no=1241" }, { "NEC", "PowerMate 2000", "http://support.necam.com/mobilesolutions/hardware/Desktops/pm2000/celeron/" }, { "PC Engines", "Alix.1c", "http://pcengines.ch/alix1c.htm" }, @@ -204,6 +204,7 @@ /* Verified working boards that DO need write-enables. */ { "Abit", "VT6X4", "http://www.abit.com.tw/page/en/motherboard/motherboard_detail.php?fMTYPE=Sl…" }, { "Abit", "IP35", "http://www.abit.com.tw/page/en/motherboard/motherboard_detail.php?fMTYPE=LG…" }, + { "Abit", "IP35 Pro", "http://www.abit.com.tw/page/de/motherboard/motherboard_detail.php?fMTYPE=LG…" }, { "Acorp", "6A815EPD", "http://web.archive.org/web/20021206163652/www.acorp.com.tw/English/default.…" }, { "agami", "Aruma", "http://web.archive.org/web/20080212111524/http://www.agami.com/site/ais-600…" }, { "Albatron", "PM266A Pro", "http://www.albatron.com.tw/English/Product/MB/pro_detail.asp?rlink=Overview…" }, /* FIXME */ @@ -214,13 +215,17 @@ { "ASUS", "A7V8X", "http://www.asus.com/product.aspx?P_ID=qfpaGrAy2kLVo0f2" }, { "ASUS", "A7V8X-MX SE", "http://www.asus.com/product.aspx?P_ID=1guVBT1qV5oqhHyZ" }, { "ASUS", "A7V8X-X", "http://www.asus.com/product.aspx?P_ID=YcXfRrWHZ9RKoVmw" }, - { "ASUS", "P4B266", "http://www.ciao.co.uk/ASUS_Intel_845D_Chipset_P4B266__5409807#productdetail" }, + { "ASUS", "M2NBP-VM CSM", "http://www.asus.com/product.aspx?P_ID=MnOfzTGd2KkwG0rF" }, + { "ASUS", "M2V-MX", "http://www.asus.com/product.aspx?P_ID=7grf8Ci4yxnqzt3z" }, + { "ASUS", "P4B266", "ftp://ftp.asus.com.tw/pub/ASUS/mb/sock478/p4b266/" }, { "ASUS", "P4C800-E Deluxe", "http://www.asus.com/product.aspx?P_ID=cFuVCr9bXXCckmcK" }, + { "ASUS", "P4B266-LM", "http://esupport.sony.com/US/perl/swu-list.pl?mdl=PCVRX650" }, { "ASUS", "P4P800-E Deluxe", "http://www.asus.com/product.aspx?P_ID=INIJUvLlif7LHp3g" }, { "ASUS", "P5ND2-SLI Deluxe", "http://www.asus.com/product.aspx?P_ID=WY7XroDuUImVbgp5" }, { "ASUS", "P5A", "ftp://ftp.asus.com.tw/pub/ASUS/mb/sock7/ali/p5a/" }, { "Biostar", "P4M80-M4", "http://www.biostar-usa.com/mbdetails.asp?model=p4m80-m4" }, { "Dell", "PowerEdge 1850", "http://support.dell.com/support/edocs/systems/pe1850/en/index.htm" }, + { "Elitegroup", "K7S6A", "http://www.ecs.com.tw/ECSWebSite/Products/ProductsDetail.aspx?detailid=77&C…" }, { "Elitegroup", "K7VTA3", "http://www.ecs.com.tw/ECSWebSite/Products/ProductsDetail.aspx?detailid=264&…" }, { "EPoX", "EP-8K5A2", "http://www.epox.com/product.asp?ID=EP-8K5A2" }, { "EPoX", "EP-8RDA3+", "http://www.epox.com/product.asp?ID=EP-8RDA3plus" }, @@ -229,23 +234,28 @@ { "GIGABYTE", "GA-7VT600", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…" }, { "GIGABYTE", "GA-7ZM", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…" }, { "GIGABYTE", "GA-K8N-SLI", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…" }, - { "GIGABYTE", "GA-M57SLI-S4", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Overview.aspx?Prod…" }, + { "GIGABYTE", "GA-M57SLI-S4", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…" }, { "GIGABYTE", "GA-M61P-S3", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…" }, { "GIGABYTE", "GA-MA78G-DS3H", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…" }, /* TODO: Rev 1.x or 2.x? */ { "GIGABYTE", "GA-MA78GM-S2H", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…" }, /* TODO: Rev. 1.0, 1.1, or 2.x? */ { "GIGABYTE", "GA-MA790FX-DQ6", "http://www.gigabyte.com.tw/Products/Motherboard/Products_Spec.aspx?ProductI…" }, { "HP", "DL145 G3", "http://h20000.www2.hp.com/bizsupport/TechSupport/Document.jsp?objectID=c008…" }, + { "HP", "Vectra VL400 PC", "http://h20000.www2.hp.com/bizsupport/TechSupport/Document.jsp?objectID=c000…" }, + { "HP", "Vectra VL420 SFF PC", "http://h20000.www2.hp.com/bizsupport/TechSupport/Document.jsp?objectID=c000…" }, { "IBM", "x3455", "http://www-03.ibm.com/systems/x/hardware/rack/x3455/index.html" }, { "Intel", "D201GLY", "http://www.intel.com/support/motherboards/desktop/d201gly/index.htm" }, { "IWILL", "DK8-HTX", "http://web.archive.org/web/20060507170150/http://www.iwill.net/product_2.as…" }, { "Kontron", "986LCD-M", "http://de.kontron.com/products/boards+and+mezzanines/embedded+motherboards/…" }, { "Mitac", "6513WU", "http://web.archive.org/web/20050313054828/http://www.mitac.com/micweb/produ…" }, - { "MSI", "MS-6590 (KT4 Ultra)", "http://www.msicomputer.com/product/p_spec.asp?model=KT4_Ultra&class=mb" }, - { "MSI", "MS-6702E (K8T Neo2-F)","http://www.msicomputer.com/product/p_spec.asp?model=K8T_Neo2-F&class=mb" }, - { "MSI", "MS-6712 (KT4V)", "http://www.msi.com/index.php?func=proddesc&maincat_no=1&cat2_no=&cat3_no=&p…" }, + { "MSI", "MS-6590 (KT4 Ultra)", "http://www.msi.com/index.php?func=proddesc&maincat_no=1&prod_no=502" }, + { "MSI", "MS-6702E (K8T Neo2-F)","http://www.msi.com/index.php?func=proddesc&maincat_no=1&prod_no=588" }, + { "MSI", "MS-6712 (KT4V)", "http://www.msi.com/index.php?func=proddesc&maincat_no=1&prod_no=505" }, + { "MSI", "MS-7005 (651M-L)", "http://www.msi.com/index.php?func=proddesc&maincat_no=1&prod_no=559" }, { "MSI", "MS-7046", "http://www.heimir.de/ms7046/" }, - { "MSI", "MS-7135 (K8N Neo3)", "http://www.msi-computer.de/index.php?func=proddesc&prod_no=170&maincat_no=1" }, + { "MSI", "MS-7135 (K8N Neo3)", "http://www.msi.com/index.php?func=proddesc&maincat_no=1&prod_no=170" }, + { "Shuttle", "AK31", "http://www.motherboard.cz/mb/shuttle/AK31.htm" }, { "Shuttle", "AK38N", "http://eu.shuttle.com/en/desktopdefault.aspx/tabid-36/558_read-9889/" }, + { "Shuttle", "FN25", "http://www.shuttle.eu/products/discontinued/barebones/sn25p/?0=" }, { "Soyo", "SY-7VCA", "http://www.tomshardware.com/reviews/12-socket-370-motherboards,196-15.html" }, { "Tyan", "S2498 (Tomcat K7M)", "http://www.tyan.com/archive/products/html/tomcatk7m.html" }, { "VIA", "EPIA-CN", "http://www.via.com.tw/en/products/mainboards/motherboards.jsp?motherboard_i…" }, @@ -266,7 +276,7 @@ { "Boser", "HS-6637", "http://www.boser.com.tw/manual/HS-62376637v3.4.pdf" }, { "DFI", "855GME-MGF", "http://www.dfi.com.tw/portal/CM/cmproduct/XX_cmproddetail/XX_WbProdsWindow?…" }, { "FIC", "VA-502", "ftp://ftp.fic.com.tw/motherboard/manual/socket7/va-502/" }, - { "MSI", "MS-6178", "http://www.msi-technology.de/index.php?func=proddesc&prod_no=343&maincat_no…" }, + { "MSI", "MS-6178", "http://www.msi.com/index.php?func=proddesc&maincat_no=1&prod_no=343" }, { "MSI", "MS-7260 (K9N Neo)", "http://www.msi.com/index.php?func=proddesc&maincat_no=1&prod_no=255" }, { "Soyo", "SY-5VD", "http://www.soyo.com/content/Downloads/163/&c=80&p=464&l=English" }, { "Sun", "Fire x4540", "http://www.sun.com/servers/x64/x4540/" },

1 0

[commit] r975 - trunk
by repository service 24 Mar '10

24 Mar '10

Author: mkarcher Date: Wed Mar 24 23:55:56 2010 New Revision: 975 URL: http://flashrom.org/trac/coreboot/changeset/975 Log: Abit VT6X4 + Winbond W29C020C and Asus A7V133 + Atmel AT29C010A work Abit VT6X4 / W29C020C: See http://www.coreboot.org/pipermail/flashrom/2010-March/002730.html Fixes typo in comment and marks board-enable as tested (the flashrom running on that machine was patched with the board enable that got in later). Asus A7V133 / Atmel AT29C010A: See http://www.coreboot.org/pipermail/flashrom/2010-March/002729.html Adding "erase" to tested as there is only one erase function. 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/board_enable.c trunk/flashchips.c trunk/print.c trunk/print_wiki.c Modified: trunk/board_enable.c ============================================================================== --- trunk/board_enable.c Wed Mar 24 23:55:50 2010 (r974) +++ trunk/board_enable.c Wed Mar 24 23:55:56 2010 (r975) @@ -1084,7 +1084,7 @@ } /** - * Suited for Abit VT6X5: Pro133x + VT82C686A + * Suited for Abit VT6X4: Pro133x + VT82C686A */ static int via_apollo_gpo4_lower(const char *name) { @@ -1346,7 +1346,7 @@ {0x8086, 0x2926, 0x147b, 0x1084, 0x11ab, 0x4364, 0x147b, 0x1084, NULL, NULL, NULL, "Abit", "IP35", 0, OK, intel_ich_gpio16_raise}, {0x8086, 0x2930, 0x147b, 0x1083, 0x10ec, 0x8167, 0x147b, 0x1083, NULL, NULL, NULL, "Abit", "IP35 Pro", 0, OK, intel_ich_gpio16_raise}, {0x10de, 0x0050, 0x147b, 0x1c1a, 0, 0, 0, 0, NULL, NULL, NULL, "Abit", "KN8 Ultra", 0, NT, nvidia_mcp_gpio2_lower}, - {0x1106, 0x0691, 0, 0, 0x1106, 0x3057, 0, 0, NULL, "abit", "vt6x4", "Abit", "VT6X4", 0, NT, via_apollo_gpo4_lower}, + {0x1106, 0x0691, 0, 0, 0x1106, 0x3057, 0, 0, NULL, "abit", "vt6x4", "Abit", "VT6X4", 0, OK, via_apollo_gpo4_lower}, {0x105a, 0x0d30, 0x105a, 0x4d33, 0x8086, 0x1130, 0x8086, 0, NULL, NULL, NULL, "Acorp", "6A815EPD", 0, OK, board_acorp_6a815epd}, {0x8086, 0x24D4, 0x1849, 0x24D0, 0x8086, 0x24D5, 0x1849, 0x9739, NULL, NULL, NULL, "ASRock", "P4i65GV", 0, OK, intel_ich_gpio23_raise}, {0x1022, 0x746B, 0, 0, 0, 0, 0, 0, NULL, "AGAMI", "ARUMA", "agami", "Aruma", 0, OK, w83627hf_gpio24_raise_2e}, Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Wed Mar 24 23:55:50 2010 (r974) +++ trunk/flashchips.c Wed Mar 24 23:55:56 2010 (r975) @@ -852,7 +852,7 @@ .total_size = 128, .page_size = 128, .feature_bits = FEATURE_LONG_RESET, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PREW, .probe = probe_jedec, .probe_timing = 10000, /* 10mS, Enter=Exec */ .block_erasers = @@ -3819,7 +3819,7 @@ .total_size = 256, .page_size = 128, .feature_bits = FEATURE_LONG_RESET, - .tested = TEST_UNTESTED, + .tested = TEST_OK_PREW, .probe = probe_jedec, .probe_timing = 10, .block_erasers = Modified: trunk/print.c ============================================================================== --- trunk/print.c Wed Mar 24 23:55:50 2010 (r974) +++ trunk/print.c Wed Mar 24 23:55:56 2010 (r975) @@ -263,6 +263,7 @@ { "ASRock", "M3A790GXH/128M" }, { "ASUS", "A7N8X Deluxe", }, { "ASUS", "A7N8X-E Deluxe", }, + { "ASUS", "A7V133", }, { "ASUS", "A7V400-MX", }, { "ASUS", "A7V8X-MX", }, { "ASUS", "A7V8X-X", }, Modified: trunk/print_wiki.c ============================================================================== --- trunk/print_wiki.c Wed Mar 24 23:55:50 2010 (r974) +++ trunk/print_wiki.c Wed Mar 24 23:55:56 2010 (r975) @@ -108,6 +108,7 @@ { "ASRock", "M3A790GXH/128M" "http://www.asrock.com/MB/overview.asp?Model=M3A790GXH/128M" }, { "ASUS", "A7N8X Deluxe", "http://www.asus.com/Product.aspx?P_ID=wAsRYm41KTp78MFC" }, { "ASUS", "A7N8X-E Deluxe", "http://www.asus.com/products.aspx?l1=3&l2=13&l3=56&l4=0&model=217&modelmenu…" }, + { "ASUS", "A7V133", "ftp://ftp.asus.com.tw/pub/ASUS/mb/socka/kt133a/a7v133/" }, { "ASUS", "A7V400-MX", "http://www.asus.com.tw/products.aspx?l1=3&l2=13&l3=63&l4=0&model=228&modelm…" }, { "ASUS", "A7V8X-MX", "http://www.asus.com.tw/products.aspx?l1=3&l2=13&l3=64&l4=0&model=229&modelm…" }, { "ASUS", "A8N-E", "http://www.asus.com.tw/products.aspx?l1=3&l2=15&l3=171&l4=0&model=455&model…" }, @@ -201,6 +202,7 @@ { "VIA", "VB700X", "http://www.via.com.tw/en/products/mainboards/motherboards.jsp?motherboard_i…" }, /* Verified working boards that DO need write-enables. */ + { "Abit", "VT6X4", "http://www.abit.com.tw/page/en/motherboard/motherboard_detail.php?fMTYPE=Sl…" }, { "Abit", "IP35", "http://www.abit.com.tw/page/en/motherboard/motherboard_detail.php?fMTYPE=LG…" }, { "Acorp", "6A815EPD", "http://web.archive.org/web/20021206163652/www.acorp.com.tw/English/default.…" }, { "agami", "Aruma", "http://web.archive.org/web/20080212111524/http://www.agami.com/site/ais-600…" },

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom