flashrom December 2012

flashrom@flashrom.org

33 participants
119 discussions

[commit] r1630 - trunk
by repository service 26 Dec '12

26 Dec '12

Author: stefanct Date: Wed Dec 26 20:51:23 2012 New Revision: 1630 URL: http://flashrom.org/trac/flashrom/changeset/1630 Log: Add general programmer sanity checks. And remove the completely unused vendor field. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/flashrom.c trunk/programmer.h Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Wed Dec 26 08:55:00 2012 (r1629) +++ trunk/flashrom.c Wed Dec 26 20:51:23 2012 (r1630) @@ -1557,8 +1557,9 @@ int selfcheck(void) { - int ret = 0; const struct flashchip *chip; + int i; + int ret = 0; /* Safety check. Instead of aborting after the first error, check * if more errors exist. @@ -1567,6 +1568,32 @@ msg_gerr("Programmer table miscompilation!\n"); ret = 1; } + for (i = 0; i < PROGRAMMER_INVALID; i++) { + const struct programmer_entry p = programmer_table[i]; + if (p.name == NULL) { + msg_gerr("All programmers need a valid name, but the one with index %d does not!\n", i); + ret = 1; + /* This might hide other problems with this programmer, but allows for better error + * messages below without jumping through hoops. */ + continue; + } + if (p.init == NULL) { + msg_gerr("Programmer %s does not have a valid init function!\n", p.name); + ret = 1; + } + if (p.delay == NULL) { + msg_gerr("Programmer %s does not have a valid delay function!\n", p.name); + ret = 1; + } + if (p.map_flash_region == NULL) { + msg_gerr("Programmer %s does not have a valid map_flash_region function!\n", p.name); + ret = 1; + } + if (p.unmap_flash_region == NULL) { + msg_gerr("Programmer %s does not have a valid unmap_flash_region function!\n", p.name); + ret = 1; + } + } /* It would be favorable if we could also check for correct termination * of the following arrays, but we don't know their sizes in here... * For 'flashchips' we check the first element to be non-null. In the Modified: trunk/programmer.h ============================================================================== --- trunk/programmer.h Wed Dec 26 08:55:00 2012 (r1629) +++ trunk/programmer.h Wed Dec 26 20:51:23 2012 (r1630) @@ -91,13 +91,11 @@ }; struct programmer_entry { - const char *vendor; const char *name; int (*init) (void); - void *(*map_flash_region) (const char *descr, unsigned long phys_addr, - size_t len); + void *(*map_flash_region) (const char *descr, unsigned long phys_addr, size_t len); void (*unmap_flash_region) (void *virt_addr, size_t len); void (*delay) (int usecs);

1 0

[PATCH 2/2] Makefile: fix compilation on non-x86 architectures.
by Stefan Tauner 26 Dec '12

26 Dec '12

- Use a new variable NO_PCI to centralize the disabling of programmers. - Reorder the disabling code alphabetically. - Clean up the section that presets all programmer config variables. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- Makefile | 193 ++++++++++++++++++++++---------------------------------------- 1 file changed, 69 insertions(+), 124 deletions(-) diff --git a/Makefile b/Makefile index a8d0ad8..0550213 100644 --- a/Makefile +++ b/Makefile @@ -73,6 +73,10 @@ ifneq ($(HOST_OS), SunOS) STRIP_ARGS = -s endif +# In circumstances we know beforehand that PCI support is unavailable, we set this to yes and +# use it to disable default programmers needing it. +NO_PCI = no + # Determine the destination OS. # IMPORTANT: The following line must be placed before TARGET_OS is ever used # (of course), but should come after any lines setting CC because the line @@ -150,66 +154,8 @@ UNSUPPORTED_FEATURES += CONFIG_INTERNAL=yes else override CONFIG_INTERNAL = no endif -ifeq ($(CONFIG_RAYER_SPI), yes) -UNSUPPORTED_FEATURES += CONFIG_RAYER_SPI=yes -else -override CONFIG_RAYER_SPI = no -endif -ifeq ($(CONFIG_NIC3COM), yes) -UNSUPPORTED_FEATURES += CONFIG_NIC3COM=yes -else -override CONFIG_NIC3COM = no -endif -ifeq ($(CONFIG_GFXNVIDIA), yes) -UNSUPPORTED_FEATURES += CONFIG_GFXNVIDIA=yes -else -override CONFIG_GFXNVIDIA = no -endif -ifeq ($(CONFIG_SATASII), yes) -UNSUPPORTED_FEATURES += CONFIG_SATASII=yes -else -override CONFIG_SATASII = no -endif -ifeq ($(CONFIG_ATAHPT), yes) -UNSUPPORTED_FEATURES += CONFIG_ATAHPT=yes -else -override CONFIG_ATAHPT = no -endif -ifeq ($(CONFIG_DRKAISER), yes) -UNSUPPORTED_FEATURES += CONFIG_DRKAISER=yes -else -override CONFIG_DRKAISER = no -endif -ifeq ($(CONFIG_NICREALTEK), yes) -UNSUPPORTED_FEATURES += CONFIG_NICREALTEK=yes -else -override CONFIG_NICREALTEK = no -endif -ifeq ($(CONFIG_NICNATSEMI), yes) -UNSUPPORTED_FEATURES += CONFIG_NICNATSEMI=yes -else -override CONFIG_NICNATSEMI = no -endif -ifeq ($(CONFIG_NICINTEL), yes) -UNSUPPORTED_FEATURES += CONFIG_NICINTEL=yes -else -override CONFIG_NICINTEL = no -endif -ifeq ($(CONFIG_NICINTEL_SPI), yes) -UNSUPPORTED_FEATURES += CONFIG_NICINTEL_SPI=yes -else -override CONFIG_NICINTEL_SPI = no -endif -ifeq ($(CONFIG_OGP_SPI), yes) -UNSUPPORTED_FEATURES += CONFIG_OGP_SPI=yes -else -override CONFIG_OGP_SPI = no -endif -ifeq ($(CONFIG_SATAMV), yes) -UNSUPPORTED_FEATURES += CONFIG_SATAMV=yes -else -override CONFIG_SATAMV = no -endif +# All others are disabled together below. +NO_PCI = yes endif ifeq ($(TARGET_OS), libpayload) @@ -257,38 +203,73 @@ endif override ARCH := $(strip $(shell LC_ALL=C $(CC) $(CPPFLAGS) -E arch.h 2>/dev/null | grep -v '^\#' | grep '"' | cut -f 2 -d'"')) # PCI port I/O support is unimplemented on PPC/MIPS and unavailable on ARM. -# Right now this means the drivers below only work on x86. +# Right now this means those drivers only work on x86, disable them elsewhere if not selected explicitly. ifneq ($(ARCH), x86) +NO_PCI = yes +endif + +# Disable all programmers which require PCI access because it is apparently not available on the target. +ifeq ($(NO_PCI), yes) +ifeq ($(CONFIG_ATAHPT), yes) +UNSUPPORTED_FEATURES += CONFIG_ATAHPT=yes +else +override CONFIG_ATAHPT = no +endif +ifeq ($(CONFIG_DRKAISER), yes) +UNSUPPORTED_FEATURES += CONFIG_DRKAISER=yes +else +override CONFIG_DRKAISER = no +endif +ifeq ($(CONFIG_GFXNVIDIA), yes) +UNSUPPORTED_FEATURES += CONFIG_GFXNVIDIA=yes +else +override CONFIG_GFXNVIDIA = no +endif ifeq ($(CONFIG_NIC3COM), yes) UNSUPPORTED_FEATURES += CONFIG_NIC3COM=yes else override CONFIG_NIC3COM = no endif -ifeq ($(CONFIG_NICREALTEK), yes) -UNSUPPORTED_FEATURES += CONFIG_NICREALTEK=yes +ifeq ($(CONFIG_NICINTEL), yes) +UNSUPPORTED_FEATURES += CONFIG_NICINTEL=yes else -override CONFIG_NICREALTEK = no +override CONFIG_NICINTEL = no +endif +ifeq ($(CONFIG_NICINTEL_SPI), yes) +UNSUPPORTED_FEATURES += CONFIG_NICINTEL_SPI=yes +else +override CONFIG_NICINTEL_SPI = no endif ifeq ($(CONFIG_NICNATSEMI), yes) UNSUPPORTED_FEATURES += CONFIG_NICNATSEMI=yes else override CONFIG_NICNATSEMI = no endif +ifeq ($(CONFIG_NICREALTEK), yes) +UNSUPPORTED_FEATURES += CONFIG_NICREALTEK=yes +else +override CONFIG_NICREALTEK = no +endif +ifeq ($(CONFIG_OGP_SPI), yes) +UNSUPPORTED_FEATURES += CONFIG_OGP_SPI=yes +else +override CONFIG_OGP_SPI = no +endif ifeq ($(CONFIG_RAYER_SPI), yes) UNSUPPORTED_FEATURES += CONFIG_RAYER_SPI=yes else override CONFIG_RAYER_SPI = no endif -ifeq ($(CONFIG_ATAHPT), yes) -UNSUPPORTED_FEATURES += CONFIG_ATAHPT=yes -else -override CONFIG_ATAHPT = no -endif ifeq ($(CONFIG_SATAMV), yes) UNSUPPORTED_FEATURES += CONFIG_SATAMV=yes else override CONFIG_SATAMV = no endif +ifeq ($(CONFIG_SATASII), yes) +UNSUPPORTED_FEATURES += CONFIG_SATASII=yes +else +override CONFIG_SATASII = no +endif endif ############################################################################### @@ -321,67 +302,31 @@ RELEASENAME ?= $(VERSION) SVNDEF := -D'FLASHROM_VERSION="$(VERSION)"' -# Always enable internal/onboard support for now. +# Enable programmer modules by default (and disable them later if needed), sorted alphabetically. +CONFIG_BUSPIRATE_SPI ?= yes +CONFIG_DRKAISER ?= yes +CONFIG_DUMMY ?= yes +CONFIG_FT2232_SPI ?= yes +CONFIG_GFXNVIDIA ?= yes CONFIG_INTERNAL ?= yes - -# Always enable serprog for now. Needs to be disabled on Windows. -CONFIG_SERPROG ?= yes - -# RayeR SPIPGM hardware support -CONFIG_RAYER_SPI ?= yes - -# PonyProg2000 SPI hardware support -CONFIG_PONY_SPI ?= yes - -# Always enable 3Com NICs for now. +CONFIG_LINUX_SPI ?= yes CONFIG_NIC3COM ?= yes - -# Enable NVIDIA graphics cards. Note: write and erase do not work properly. -CONFIG_GFXNVIDIA ?= yes - -# Always enable SiI SATA controllers for now. -CONFIG_SATASII ?= yes - -# Highpoint (HPT) ATA/RAID controller support. -# IMPORTANT: This code is not yet working! -CONFIG_ATAHPT ?= no - -# Always enable FT2232 SPI dongles for now. -CONFIG_FT2232_SPI ?= yes - -# Always enable dummy tracing for now. -CONFIG_DUMMY ?= yes - -# Always enable Dr. Kaiser for now. -CONFIG_DRKAISER ?= yes - -# Always enable Realtek NICs for now. -CONFIG_NICREALTEK ?= yes - -# Disable National Semiconductor NICs until support is complete and tested. -CONFIG_NICNATSEMI ?= no - -# Always enable Intel NICs for now. -CONFIG_NICINTEL ?= yes - -# Always enable SPI on Intel NICs for now. CONFIG_NICINTEL_SPI ?= yes - -# Always enable SPI on OGP cards for now. +CONFIG_NICINTEL ?= yes +CONFIG_NICREALTEK ?= yes CONFIG_OGP_SPI ?= yes +CONFIG_PONY_SPI ?= yes +CONFIG_RAYER_SPI ?= yes +CONFIG_SATAMV ?= yes +CONFIG_SATASII ?= yes +CONFIG_SERPROG ?= yes -# Always enable Bus Pirate SPI for now. -CONFIG_BUSPIRATE_SPI ?= yes - +# Highpoint (HPT) ATA/RAID controller support is not yet working! +CONFIG_ATAHPT ?= no # Disable Dediprog SF100 until support is complete and tested. CONFIG_DEDIPROG ?= no - -# Always enable Marvell SATA controllers for now. -CONFIG_SATAMV ?= yes - -# Enable Linux spidev interface by default. We disable it on non-Linux targets. -CONFIG_LINUX_SPI ?= yes - +# Disable National Semiconductor NICs until support is complete and tested. +CONFIG_NICNATSEMI ?= no # Disable wiki printing by default. It is only useful if you have wiki access. CONFIG_PRINT_WIKI ?= no @@ -749,7 +694,7 @@ ifeq ($(PROGRAMMER_OBJS),) @false endif ifneq ($(UNSUPPORTED_FEATURES), ) - @echo "The following features are unavailable on your machine: $(UNSUPPORTED_FEATURES)" + @echo "The following features are unavailable on the target machine: $(UNSUPPORTED_FEATURES)" @false endif -- Kind regards, Stefan Tauner

1 0

[PATCH 1/2] Makefile: fix order of libraries.
by Stefan Tauner 26 Dec '12

26 Dec '12

FEATURE_LIBS needs to come *after* PCILIBS in case ZLIB is needed by it. Also, mute the warnings of trying to use pcilib without zlib available. --- If you see any reason this could be wrong, please speak up soon since this seems to be too simple to not commit it :) Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f3cb07a..a8d0ad8 100644 --- a/Makefile +++ b/Makefile @@ -614,7 +614,7 @@ ifeq ($(ARCH), x86) endif $(PROGRAM)$(EXEC_SUFFIX): $(OBJS) - $(CC) $(LDFLAGS) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(FEATURE_LIBS) $(LIBS) $(PCILIBS) $(USBLIBS) + $(CC) $(LDFLAGS) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(LIBS) $(PCILIBS) $(USBLIBS) $(FEATURE_LIBS) libflashrom.a: $(LIBFLASHROM_OBJS) $(AR) rcs $@ $^ @@ -710,7 +710,7 @@ ifeq ($(CHECK_LIBPCI), yes) echo "See README for more information."; echo; \ rm -f .test.c .test.o; exit 1) @printf "Checking if libpci is present and sufficient... " - @$(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(PCILIBS) >/dev/null && \ + @$(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(PCILIBS) >/dev/null 2>&1 && \ echo "yes." || ( echo "no."; \ printf "Checking if libz+libpci are present and sufficient..."; \ $(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(PCILIBS) -lz >/dev/null && \ -- Kind regards, Stefan Tauner

1 0

Re: [flashrom] [PATCH 3/3] [RFC] Unify usbdev_status and pcidev_status into dev_status.
by Carl-Daniel Hailfinger 26 Dec '12

26 Dec '12

Am 17.11.2012 20:09 schrieb Stefan Tauner: > usbdev_status was created for the ft2232 programmer. Its IDs are semantically > different because they indicate USB instead of PCI IDs, but apart from that both > data structures are equal. This change makes life easier for everything involved > in handling and printing the status of devices that is noted in that structure. > > --- > It is still possible to distinguish between PCI and USB devices by using the > struct programmer's type field. It still seems a bit hacky, but i think we are better > off with it anyway. If we really would want to distinguish between the different > types of IDs i'd rater make the IDs a union of different ID types inside struct > dev_status. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Thanks a lot for this cleanup! It kills substantial amounts of duplicated code. Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Apart from the "devs" vs. "devices" naming (which you already resolved in your other reply), there is only one minor nit: > diff --git a/programmer.h b/programmer.h > index 21fa707..90033a9 100644 > --- a/programmer.h > +++ b/programmer.h > @@ -243,12 +250,6 @@ int rpci_write_word(struct pci_dev *dev, int reg, uint16_t data); > int rpci_write_long(struct pci_dev *dev, int reg, uint32_t data); > #endif > > -/* print.c */ > -#if CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_NICNATSEMI+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT+CONFIG_NICINTEL+CONFIG_NICINTEL_SPI+CONFIG_OGP_SPI+CONFIG_SATAMV >= 1 > -/* Not needed for CONFIG_INTERNAL, but for all other PCI-based programmers. */ > -void print_supported_pcidevs(const struct pcidev_status *devs); > -#endif > - > struct usbdev_status { > uint16_t vendor_id; > uint16_t device_id; > @@ -264,6 +265,12 @@ struct pcidev_status { > const char *device_name; > }; > > +/* print.c */ > +#if CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_NICNATSEMI+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT+CONFIG_NICINTEL+CONFIG_NICINTEL_SPI+CONFIG_OGP_SPI+CONFIG_SATAMV >= 1 > +/* Not needed for CONFIG_INTERNAL, but for all other PCI-based programmers. */ > +void print_supported_pcidevs(const struct pcidev_status *devs); > +#endif > + > #if CONFIG_INTERNAL == 1 > /* board_enable.c */ > int board_parse_parameter(const char *boardstring, const char **vendor, const char **model); AFAICS prints_supported_pcidevs has been killed by this patch, no need to keep its declaration in a header. Regards, Carl-Daniel -- http://www.hailfinger.org/

1 0

Re: [flashrom] flashrom regression in 0.9.6.1?
by Stefan Tauner 26 Dec '12

26 Dec '12

On Wed, 26 Dec 2012 11:35:21 +0100 Oliver Lehmann <lehmann(a)ans-netz.de> wrote: > Hi, > > with 0.9.5.2 it was possible to simply upgrade my boards BIOS: > > flashrom v0.9.5.2-r1515 on FreeBSD 9.1-PRERELEASE (amd64), built with > libpci 3.1.10, GCC 4.2.1 20070831 patched [FreeBSD], little endian > flashrom is free software, get the source code at http://www.flashrom.org > > Calibrating delay loop... OK. > Found chipset "AMD SB7x0/SB8x0/SB9x0". Enabling flash write... OK. > Found Winbond flash chip "W25Q32" (4096 kB, SPI) at physical address > 0xffc00000. > Flash image seems to be a legacy BIOS. Disabling coreboot-related checks. > Reading old flash chip contents... done. > Erasing and writing flash chip... Erase/write done. > Verifying flash... VERIFIED. > > It looks like 0.9.6.1 is no longer able to upgrade the BIOS: > > # flashrom -w E35M1-M-ASUS-1502.ROM > flashrom v0.9.6.1-r1564 on FreeBSD 9.1-PRERELEASE (amd64) > flashrom is free software, get the source code at http://www.flashrom.org > > Please select a programmer with the --programmer parameter. > Valid choices are: > internal, dummy, nic3com, nicrealtek, gfxnvidia, drkaiser, satasii, serprog, > buspirate_spi, rayer_spi, pony_spi, nicintel, nicintel_spi, ogp_spi, satamv Hello Oliver, we have changed the command line interface a bit. It is now needed to select the programmer module even in those cases that did not require it previsouly. We have changed the message after that because others had the same problem understanding the new situation as you had. The new message is this: Please select a programmer with the --programmer parameter. Previously this was not necessary because there was a default set. To choose the mainboard of this computer use 'internal'. Valid choices are: internal, dummy, nic3com, nicrealtek, gfxnvidia, drkaiser, satasii, ft2232_spi, serprog, buspirate_spi, rayer_spi, pony_spi, nicintel, nicintel_spi, ogp_spi, satamv, linux_spi. So you just need to ad "-p internal" to the command line. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

2 1

flashrom regression in 0.9.6.1?
by Oliver Lehmann 26 Dec '12

26 Dec '12

Hi, with 0.9.5.2 it was possible to simply upgrade my boards BIOS: flashrom v0.9.5.2-r1515 on FreeBSD 9.1-PRERELEASE (amd64), built with libpci 3.1.10, GCC 4.2.1 20070831 patched [FreeBSD], little endian flashrom is free software, get the source code at http://www.flashrom.org Calibrating delay loop... OK. Found chipset "AMD SB7x0/SB8x0/SB9x0". Enabling flash write... OK. Found Winbond flash chip "W25Q32" (4096 kB, SPI) at physical address 0xffc00000. Flash image seems to be a legacy BIOS. Disabling coreboot-related checks. Reading old flash chip contents... done. Erasing and writing flash chip... Erase/write done. Verifying flash... VERIFIED. It looks like 0.9.6.1 is no longer able to upgrade the BIOS: # flashrom -w E35M1-M-ASUS-1502.ROM flashrom v0.9.6.1-r1564 on FreeBSD 9.1-PRERELEASE (amd64) flashrom is free software, get the source code at http://www.flashrom.org Please select a programmer with the --programmer parameter. Valid choices are: internal, dummy, nic3com, nicrealtek, gfxnvidia, drkaiser, satasii, serprog, buspirate_spi, rayer_spi, pony_spi, nicintel, nicintel_spi, ogp_spi, satamv Exit 1 #

1 0

Re: [flashrom] [PATCH 2/3] Fix memleaks in cli_classic.c.
by Stefan Tauner 25 Dec '12

25 Dec '12

On Fri, 14 Sep 2012 00:38:08 +0200 Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> wrote: > Frees the memory allocated for the following strings > - log file name > - layout file name > - image file name > - programmer parameter (and reset the associated global variable in flashrom.c) > > Also, free the flashchip structs allocated by probe_flash. > > The layout image names were not fixed due to the pending layout patches. > > These bugs were found thanks to valgrind. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> self-acked and committed in r1629. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

[commit] r1629 - trunk
by repository service 25 Dec '12

25 Dec '12

Author: stefanct Date: Wed Dec 26 08:55:00 2012 New Revision: 1629 URL: http://flashrom.org/trac/flashrom/changeset/1629 Log: Fix memleaks in cli_classic.c. Frees the memory allocated for the following strings - log file name - layout file name - image file name - programmer parameter (and reset the associated global variable in flashrom.c) Also, free the flashchip structs allocated by probe_flash. The layout image names were not fixed due to the pending layout patches. These bugs were found thanks to valgrind. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/cli_classic.c trunk/flashrom.c Modified: trunk/cli_classic.c ============================================================================== --- trunk/cli_classic.c Mon Dec 24 23:07:36 2012 (r1628) +++ trunk/cli_classic.c Wed Dec 26 08:55:00 2012 (r1629) @@ -130,7 +130,9 @@ char *filename = NULL; char *layoutfile = NULL; +#ifndef STANDALONE char *logfile = NULL; +#endif /* !STANDALONE */ char *tempstr = NULL; char *pparam = NULL; @@ -217,8 +219,12 @@ break; case 'i': tempstr = strdup(optarg); - if (register_include_arg(tempstr)) + if (register_include_arg(tempstr)) { + free(tempstr); cli_classic_abort_usage(); + } + /* FIXME: A pointer to the image name is saved in a static array (of size MAX_ROMLAYOUT) + * by register_include_arg() and needs to be freed after processing them. */ break; case 'L': if (++operation_specified > 1) { @@ -337,6 +343,7 @@ cli_classic_abort_usage(); if (logfile && open_logfile(logfile)) return 1; + free(logfile); #endif /* !STANDALONE */ #if CONFIG_PRINT_WIKI == 1 @@ -473,6 +480,7 @@ } msg_cinfo("Please note that forced reads most likely contain garbage.\n"); ret = read_flash_to_file(&flashes[0], filename); + free(flashes[0].chip); goto out_shutdown; } ret = 1; @@ -517,6 +525,15 @@ out_shutdown: programmer_shutdown(); out: + for (i = 0; i < chipcount; i++) + free(flashes[i].chip); + + free(filename); + free(layoutfile); + free(pparam); + /* clean up global variables */ + free(chip_to_probe); + chip_to_probe = NULL; #ifndef STANDALONE ret |= close_logfile(); #endif /* !STANDALONE */ Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Mon Dec 24 23:07:36 2012 (r1628) +++ trunk/flashrom.c Wed Dec 26 08:55:00 2012 (r1629) @@ -351,6 +351,7 @@ int i = --shutdown_fn_count; ret |= shutdown_fn[i].func(shutdown_fn[i].data); } + programmer_param = NULL; return ret; }

1 0

Re: [flashrom] My mainboard is not on the list, but I need to upgrade the Bios
by gielle＠mail.com 25 Dec '12

25 Dec '12

I did it and all went fine. Thanks for your support. > ----- Original Message ----- > From: Stefan Tauner > Sent: 12/24/12 10:30 PM > To: Gianfranco Liuzzi > Subject: Re: [flashrom] My mainboard is not on the list, but I need to upgrade the Bios > > On Sat, 15 Dec 2012 10:19:39 -0500 > "Gianfranco Liuzzi" <gielle(a)mail.com> wrote: > > > 1) http://www.asrock.com/mb/VIA/775Dual-VSTA/?cat=Download&os=BIOS This is the download page. Which one should I download, the Windows one or the DOS one? > > doesnt matter since you just need the image file which should be equal > in both packages, but you need to take care that this image is the > correct one. flashrom does only check for correct file size but > nothing else. > > > 2) Can you type me the exact command I should input in the terminal with the options in the right order? Not that I don't know how to use it, but I want to be sure I don't accidentally screw up anything. > > there is virtually no way to screw the command line up so that you > won't notice and can not recover. > -- > Kind regards/Mit freundlichen Grüßen, Stefan Tauner >

1 0

[PATCH 4/4] print_wiki.c: add a programmer column to the PCI and USB devices lists
by Stefan Tauner 25 Dec '12

25 Dec '12

Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- print_wiki.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/print_wiki.c b/print_wiki.c index 83f1ad9..7c39486 100644 --- a/print_wiki.c +++ b/print_wiki.c @@ -77,6 +77,7 @@ static const char chip_th[] = "\ | align=\"center\" | Min \n| align=\"center\" | Max\n\n"; static const char programmer_th[] = "\ +! align=\"left\" | Programmer\n\ ! align=\"left\" | Vendor\n\ ! align=\"left\" | Device\n\ ! align=\"center\" | IDs\n\ @@ -314,14 +315,17 @@ static void print_supported_devs_wiki_helper(const struct programmer_entry prog) int i = 0; static int c = 0; const struct dev_status *devs = prog.devs.status; + const unsigned int count = count_supported_devs_wiki(devs); /* Alternate colors if the vendor changes. */ c = !c; for (i = 0; devs[i].vendor_name != NULL; i++) { - printf("|- bgcolor=\"#%s\"\n| %s || %s || %04x:%04x || {{%s}}\n", (c) ? "eeeeee" : "dddddd", - devs[i].vendor_name, devs[i].device_name, devs[i].vendor_id, devs[i].device_id, - (devs[i].status == NT) ? "?3" : "OK"); + printf("|- bgcolor=\"#%s\"\n", (c) ? "eeeeee" : "dddddd"); + if (i == 0) + printf("| rowspan=\"%u\" | %s |", count, prog.name); + printf("| %s || %s || %04x:%04x || {{%s}}\n", devs[i].vendor_name, devs[i].device_name, + devs[i].vendor_id, devs[i].device_id, (devs[i].status == NT) ? "?3" : "OK"); } } -- Kind regards, Stefan Tauner

1 0

← Newer
1
...
4
5
6
7
8
9
10
11
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom December 2012