flashrom

flashrom@flashrom.org

1 participants
9182 discussions

[PATCH] Allow single-programmer compilation
by Carl-Daniel Hailfinger 10 Jan '10

10 Jan '10

If neither internal (old default) nor dummy (safe default) programmer are selected, we must pick a sensible default programmer. Since there is no reason to prefer a particular external programmer, we abort compilation if more than one of them is selected. If only one is selected, it is clear that the user wants that one to become the default. This fixes single-programmer compilation. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-allow_single_programmer/flashrom.c =================================================================== --- flashrom-allow_single_programmer/flashrom.c (Revision 837) +++ flashrom-allow_single_programmer/flashrom.c (Arbeitskopie) @@ -39,9 +39,38 @@ #elif DUMMY_SUPPORT == 1 enum programmer programmer = PROGRAMMER_DUMMY; #else -/* Activating the #error explodes on make dep. */ -//#error Neither internal nor dummy selected +/* If neither internal nor dummy are selected, we must pick a sensible default. + * Since there is no reason to prefer a particular external programmer, we fail + * if more than one of them is selected. If only one is selected, it is clear + * that the user wants that one to become the default. + */ +#if NIC3COM_SUPPORT+GFXNVIDIA_SUPPORT+DRKAISER_SUPPORT+SATASII_SUPPORT+FT2232_SPI_SUPPORT+SERPROG_SUPPORT+BUSPIRATE_SPI_SUPPORT > 1 +#error Please enable either CONFIG_DUMMY or CONFIG_INTERNAL or disable support for all external programmers except one. #endif +enum programmer programmer = +#if NIC3COM_SUPPORT == 1 + PROGRAMMER_NIC3COM +#endif +#if GFXNVIDIA_SUPPORT == 1 + PROGRAMMER_GFXNVIDIA +#endif +#if DRKAISER_SUPPORT == 1 + PROGRAMMER_DRKAISER +#endif +#if SATASII_SUPPORT == 1 + PROGRAMMER_SATASII +#endif +#if FT2232_SPI_SUPPORT == 1 + PROGRAMMER_FT2232SPI +#endif +#if SERPROG_SUPPORT == 1 + PROGRAMMER_SERPROG +#endif +#if BUSPIRATE_SPI_SUPPORT == 1 + PROGRAMMER_BUSPIRATESPI +#endif +; +#endif char *programmer_param = NULL; -- Developer quote of the year: "We are juggling too many chainsaws and flaming arrows and tigers."

2 2

[commit] r858 - trunk
by svn＠flashrom.org 10 Jan '10

10 Jan '10

Author: hailfinger Date: 2010-01-10 14:28:48 +0100 (Sun, 10 Jan 2010) New Revision: 858 Modified: trunk/flashrom.c Log: If neither internal (old default) nor dummy (safe default) programmer are selected, we must pick a sensible default programmer. Since there is no reason to prefer a particular external programmer, we abort compilation if more than one of them is selected. If only one is selected, it is clear that the user wants that one to become the default. This fixes single-programmer compilation. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Sean Nelson <audiohacked(a)gmail.com> Modified: trunk/flashrom.c =================================================================== --- trunk/flashrom.c 2010-01-10 01:59:50 UTC (rev 857) +++ trunk/flashrom.c 2010-01-10 13:28:48 UTC (rev 858) @@ -39,9 +39,38 @@ #elif DUMMY_SUPPORT == 1 enum programmer programmer = PROGRAMMER_DUMMY; #else -/* Activating the #error explodes on make dep. */ -//#error Neither internal nor dummy selected +/* If neither internal nor dummy are selected, we must pick a sensible default. + * Since there is no reason to prefer a particular external programmer, we fail + * if more than one of them is selected. If only one is selected, it is clear + * that the user wants that one to become the default. + */ +#if NIC3COM_SUPPORT+GFXNVIDIA_SUPPORT+DRKAISER_SUPPORT+SATASII_SUPPORT+FT2232_SPI_SUPPORT+SERPROG_SUPPORT+BUSPIRATE_SPI_SUPPORT > 1 +#error Please enable either CONFIG_DUMMY or CONFIG_INTERNAL or disable support for all external programmers except one. #endif +enum programmer programmer = +#if NIC3COM_SUPPORT == 1 + PROGRAMMER_NIC3COM +#endif +#if GFXNVIDIA_SUPPORT == 1 + PROGRAMMER_GFXNVIDIA +#endif +#if DRKAISER_SUPPORT == 1 + PROGRAMMER_DRKAISER +#endif +#if SATASII_SUPPORT == 1 + PROGRAMMER_SATASII +#endif +#if FT2232_SPI_SUPPORT == 1 + PROGRAMMER_FT2232SPI +#endif +#if SERPROG_SUPPORT == 1 + PROGRAMMER_SERPROG +#endif +#if BUSPIRATE_SPI_SUPPORT == 1 + PROGRAMMER_BUSPIRATESPI +#endif +; +#endif char *programmer_param = NULL;

1 0

[PATCH] Chipset: Fix sis5x0 register write verification.
by Luc Verhaegen 10 Jan '10

10 Jan '10

Also remove separate sis 5596 routine: superio code will be handled separately, which then turns this routine into the sis 5511 chipset enable. Signed-off-by: Luc Verhaegen <libv(a)skynet.be> --- chipset_enable.c | 16 +++------------- 1 files changed, 3 insertions(+), 13 deletions(-) diff --git a/chipset_enable.c b/chipset_enable.c index 6a0fc4f..f106f96 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -144,16 +144,6 @@ static int enable_flash_sis5511(struct pci_dev *dev, const char *name) return ret; } -static int enable_flash_sis5596(struct pci_dev *dev, const char *name) -{ - int ret; - - ret = enable_flash_sis5511(dev, name); - - /* FIXME: Needs same superio handling as enable_flash_sis630 */ - return ret; -} - static int enable_flash_sis530(struct pci_dev *dev, const char *name) { uint8_t new, newer; @@ -170,7 +160,7 @@ static int enable_flash_sis530(struct pci_dev *dev, const char *name) new &= (~0x20); new |= 0x4; pci_write_byte(sbdev, 0x45, new); - newer = pci_read_byte(dev, 0x45); + newer = pci_read_byte(sbdev, 0x45); if (newer != new) { printf_debug("tried to set register 0x%x to 0x%x on %s failed (WARNING ONLY)\n", 0x45, new, name); printf_debug("Stuck at 0x%x\n", newer); @@ -196,7 +186,7 @@ static int enable_flash_sis540(struct pci_dev *dev, const char *name) new &= (~0x80); new |= 0x40; pci_write_byte(sbdev, 0x45, new); - newer = pci_read_byte(dev, 0x45); + newer = pci_read_byte(sbdev, 0x45); if (newer != new) { printf_debug("tried to set register 0x%x to 0x%x on %s failed (WARNING ONLY)\n", 0x45, new, name); printf_debug("Stuck at 0x%x\n", newer); @@ -1206,7 +1196,7 @@ const struct penable chipset_enables[] = { {0x1039, 0x0496, NT, "SiS", "85C496+497", enable_flash_sis85c496}, {0x1039, 0x0406, NT, "SiS", "501/5101/5501", enable_flash_sis501}, {0x1039, 0x5511, NT, "SiS", "5511", enable_flash_sis5511}, - {0x1039, 0x5596, NT, "SiS", "5596", enable_flash_sis5596}, + {0x1039, 0x5596, NT, "SiS", "5596", enable_flash_sis5511}, {0x1039, 0x5571, NT, "SiS", "5571", enable_flash_sis530}, {0x1039, 0x5591, NT, "SiS", "5591/5592", enable_flash_sis530}, {0x1039, 0x5597, NT, "SiS", "5597/5598/5581/5120", enable_flash_sis530}, -- 1.6.0.2 --/04w6evG8XlLl3ft--

1 0

Elitegroup A780GM-M3
by G. Balut 10 Jan '10

10 Jan '10

I've never flashed a BIOS before and my board wasn't listed as working but I saw the chipset when I did a flashrom -L so backed up, verified the backup, erased it and then did the upgrade. That worked and verified. I did hit one 'issue' that's probably a non-issue because I seriously had no idea what I was doing. You asked for an email with "the flashrom output with the additional -V option for all operations you tested (-V, -rV, -wV, -EV". I could not add the verify option on the command line; it only accepted one command at a time. I did have to boot with the nopat option added to my kernel (mandriva 2010.0 2.6.31.5-desktop-1mnb) Anyway, I've attached the output from the bios write and the verify I did afterwards. I didn't save the erase command I did before I did the -w option - which included an erase - so I'm not quite getting exactly how you're supposed to do this stuff but I've since rebooted and seen that what had been my unrecognized CPU is showing up just fine (that's what I flashed it for), everything seems stable and no hangups like I had before. Does that make sense? :) The motherboard was the ECS A780GM-M3, CPU is AMD Sempron 140. And may I suggest - since I have no idea what I'm doing WRT flashing bios, could someone add examples to the man page or add to the one command line listed up on wikipedia of how to do it so us idiots would know what to do to flash a bios. :) I looked around but all I found was the 'how to do it with a dos boot disk and the exe utility' which I couldn't use so I gambled on what I was doing with this which is really kinda spooky. Anyway, a huge thank you from this bios idjit!

1 0

[PATCH] Convert sb600spi to msg_*
by Sean Nelson 09 Jan '10

09 Jan '10

Convert all messages in sb600spi.c to the new message infrastructure. Signed-off-by: Sean Nelson<audiohacked(a)gmail.com>

2 3

[commit] r857 - trunk
by svn＠flashrom.org 09 Jan '10

09 Jan '10

Author: hailfinger Date: 2010-01-10 02:59:50 +0100 (Sun, 10 Jan 2010) New Revision: 857 Modified: trunk/sb600spi.c Log: Convert all messages in sb600spi.c to the new message infrastructure. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Sean Nelson <audiohacked(a)gmail.com> Modified: trunk/sb600spi.c =================================================================== --- trunk/sb600spi.c 2010-01-10 01:34:00 UTC (rev 856) +++ trunk/sb600spi.c 2010-01-10 01:59:50 UTC (rev 857) @@ -24,17 +24,6 @@ #include "flash.h" #include "spi.h" -/* Change this to #define if you want lowlevel debugging of commands - * sent to the SB600/SB700 SPI controller. - */ -#undef COMM_DEBUG - -#ifdef COMM_DEBUG -#define msg_comm_debug printf_debug -#else -#define msg_comm_debug(...) do {} while (0) -#endif - /* This struct is unused, but helps visualize the SB600 SPI BAR layout. *struct sb600_spi_controller { * unsigned int spi_cntrl0; / * 00h * / @@ -65,28 +54,28 @@ spi_disable_blockprotect(); /* Erase first */ - printf("Erasing flash before programming... "); + msg_pinfo("Erasing flash before programming... "); if (erase_flash(flash)) { - fprintf(stderr, "ERASE FAILED!\n"); + msg_perr("ERASE FAILED!\n"); return -1; } - printf("done.\n"); + msg_pinfo("done.\n"); - printf("Programming flash"); + msg_pinfo("Programming flash"); for (i = 0; i < total_size; i++, buf++) { result = spi_nbyte_program(i, buf, 1); if (result) { - fprintf(stderr, "Write error!\n"); + msg_perr("Write error!\n"); return result; } /* wait program complete. */ if (i % 0x8000 == 0) - printf("."); + msg_pspew("."); while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) ; } - printf(" done.\n"); + msg_pinfo(" done.\n"); return result; } @@ -95,7 +84,7 @@ mmio_writeb(mmio_readb(sb600_spibar + 2) | 0x10, sb600_spibar + 2); while (mmio_readb(sb600_spibar + 0xD) & 0x7) - printf("reset\n"); + msg_pspew("reset\n"); } static void execute_command(void) @@ -116,17 +105,17 @@ writecnt--; - msg_comm_debug("%s, cmd=%x, writecnt=%x, readcnt=%x\n", - __func__, cmd, writecnt, readcnt); + msg_pspew("%s, cmd=%x, writecnt=%x, readcnt=%x\n", + __func__, cmd, writecnt, readcnt); if (readcnt > 8) { - printf("%s, SB600 SPI controller can not receive %d bytes, " + msg_pinfo("%s, SB600 SPI controller can not receive %d bytes, " "it is limited to 8 bytes\n", __func__, readcnt); return SPI_INVALID_LENGTH; } if (writecnt > 8) { - printf("%s, SB600 SPI controller can not send %d bytes, " + msg_pinfo("%s, SB600 SPI controller can not send %d bytes, " "it is limited to 8 bytes\n", __func__, writecnt); return SPI_INVALID_LENGTH; } @@ -146,10 +135,10 @@ /* Send the write byte to FIFO. */ for (count = 0; count < writecnt; count++, writearr++) { - msg_comm_debug(" [%x]", *writearr); + msg_pspew(" [%x]", *writearr); mmio_writeb(*writearr, sb600_spibar + 0xC); } - msg_comm_debug("\n"); + msg_pspew("\n"); /* * We should send the data by sequence, which means we need to reset @@ -175,16 +164,16 @@ /* Skip the bytes we sent. */ for (count = 0; count < writecnt; count++) { cmd = mmio_readb(sb600_spibar + 0xC); - msg_comm_debug("[ %2x]", cmd); + msg_pspew("[ %2x]", cmd); } - msg_comm_debug("The FIFO pointer after skipping is %d.\n", - mmio_readb(sb600_spibar + 0xd) & 0x07); + msg_pspew("The FIFO pointer after skipping is %d.\n", + mmio_readb(sb600_spibar + 0xd) & 0x07); for (count = 0; count < readcnt; count++, readarr++) { *readarr = mmio_readb(sb600_spibar + 0xC); - msg_comm_debug("[%02x]", *readarr); + msg_pspew("[%02x]", *readarr); } - msg_comm_debug("\n"); + msg_pspew("\n"); return 0; }

1 0

[PATCH] Change a few probe timings to FIXME
by Carl-Daniel Hailfinger 09 Jan '10

09 Jan '10

Change a few probe timings to TIMING_FIXME. They previously had TIMING_IGNORED, but now they use probe_jedec directly or indirectly and that function does not ignore probe timing. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-probe_timing_fixme/flashchips.c =================================================================== --- flashrom-probe_timing_fixme/flashchips.c (Revision 844) +++ flashrom-probe_timing_fixme/flashchips.c (Arbeitskopie) @@ -4241,15 +4241,15 @@ .manufacture_id = ST_ID, .model_id = ST_M50FLW040A, .total_size = 512, .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (stm50flw0x0x.c) */ + .probe_timing = TIMING_FIXME, .erase = erase_stm50flw0x0x, .write = write_stm50flw0x0x, .read = read_memmapped, }, { .vendor = "ST", @@ -4258,15 +4258,15 @@ .manufacture_id = ST_ID, .model_id = ST_M50FLW040B, .total_size = 512, .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (stm50flw0x0x.c) */ + .probe_timing = TIMING_FIXME, .erase = erase_stm50flw0x0x, .write = write_stm50flw0x0x, .read = read_memmapped, }, { .vendor = "ST", @@ -4275,15 +4275,15 @@ .manufacture_id = ST_ID, .model_id = ST_M50FLW080A, .total_size = 1024, .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_OK_PREW, .probe = probe_jedec, - .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (stm50flw0x0x.c) */ + .probe_timing = TIMING_FIXME, .erase = erase_stm50flw0x0x, .write = write_stm50flw0x0x, .read = read_memmapped, }, { .vendor = "ST", @@ -4292,15 +4292,15 @@ .manufacture_id = ST_ID, .model_id = ST_M50FLW080B, .total_size = 1024, .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (stm50flw0x0x.c) */ + .probe_timing = TIMING_FIXME, .erase = erase_stm50flw0x0x, .write = write_stm50flw0x0x, .read = read_memmapped, }, { .vendor = "ST", @@ -4692,15 +4692,15 @@ .bustype = CHIP_BUSTYPE_LPC, .manufacture_id = WINBOND_ID, .model_id = W_39V040C, .total_size = 512, .page_size = 64 * 1024, .tested = TEST_OK_PREW, .probe = probe_w39v040c, - .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (w39v040c.c) */ + .probe_timing = TIMING_FIXME, .erase = erase_w39v040c, .write = write_w39v040c, .read = read_memmapped, }, { .vendor = "Winbond", -- Developer quote of the year: "We are juggling too many chainsaws and flaming arrows and tigers."

2 2

[commit] r856 - trunk
by svn＠flashrom.org 09 Jan '10

09 Jan '10

Author: hailfinger Date: 2010-01-10 02:34:00 +0100 (Sun, 10 Jan 2010) New Revision: 856 Modified: trunk/flashchips.c Log: Change a few probe timings to TIMING_FIXME. They previously had TIMING_IGNORED, but now they use probe_jedec directly or indirectly and that function does not ignore probe timing. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Sean Nelson <audiohacked(a)gmail.com> Modified: trunk/flashchips.c =================================================================== --- trunk/flashchips.c 2010-01-10 01:09:58 UTC (rev 855) +++ trunk/flashchips.c 2010-01-10 01:34:00 UTC (rev 856) @@ -4245,7 +4245,7 @@ .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (stm50flw0x0x.c) */ + .probe_timing = TIMING_FIXME, .erase = erase_stm50flw0x0x, .write = write_stm50flw0x0x, .read = read_memmapped, @@ -4262,7 +4262,7 @@ .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (stm50flw0x0x.c) */ + .probe_timing = TIMING_FIXME, .erase = erase_stm50flw0x0x, .write = write_stm50flw0x0x, .read = read_memmapped, @@ -4279,7 +4279,7 @@ .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_OK_PREW, .probe = probe_jedec, - .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (stm50flw0x0x.c) */ + .probe_timing = TIMING_FIXME, .erase = erase_stm50flw0x0x, .write = write_stm50flw0x0x, .read = read_memmapped, @@ -4296,7 +4296,7 @@ .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (stm50flw0x0x.c) */ + .probe_timing = TIMING_FIXME, .erase = erase_stm50flw0x0x, .write = write_stm50flw0x0x, .read = read_memmapped, @@ -4696,7 +4696,7 @@ .page_size = 64 * 1024, .tested = TEST_OK_PREW, .probe = probe_w39v040c, - .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (w39v040c.c) */ + .probe_timing = TIMING_FIXME, .erase = erase_w39v040c, .write = write_w39v040c, .read = read_memmapped,

1 0

[PATCH] Convert it87spi to msg_*
by Sean Nelson 09 Jan '10

09 Jan '10

Convert all messages in it87spi.c to the new message infrastructure. Signed-off-by: Sean Nelson <audiohacked(a)gmail.com>

2 4

[PATCH] Convert ft2232_spi to msg_*
by Sean Nelson 09 Jan '10

09 Jan '10

Convert all messages in ft2232_spi.c to the new message infrastructure. Signed-off-by: Sean Nelson <audiohacked(a)gmail.com>

2 4

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom