May 2010 - flashrom - mail.coreboot.org

[PATCH] Add flashrom.exe to make clean
by Carl-Daniel Hailfinger May 30, 2010

May 30, 2010

make clean only removed files named *.o and flashrom although the generated binary may have a filename extension like .exe . Add flashrom.exe unconditionally to the list of files removed at make clean. This allows users to run make clean without specifying the target architecture. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-make_clean_dos/Makefile =================================================================== --- flashrom-make_clean_dos/Makefile (Revision 1017) +++ flashrom-make_clean_dos/Makefile (Arbeitskopie) @@ -255,8 +255,10 @@ %.o: %.c .features $(CC) $(CFLAGS) $(CPPFLAGS) $(FEATURE_CFLAGS) $(SVNDEF) -o $@ -c $< +# Make sure to add all names of generated binaries here. +# This includes all frontends and libflashrom. clean: - rm -f $(PROGRAM) *.o + rm -f $(PROGRAM) $(PROGRAM).exe *.o distclean: clean rm -f .dependencies .features .libdeps -- http://www.hailfinger.org/

3 3

[commit] r1022 - trunk
by repository service May 30, 2010

May 30, 2010

Author: hailfinger Date: Mon May 31 00:35:14 2010 New Revision: 1022 URL: http://flashrom.org/trac/coreboot/changeset/1022 Log: Add flashrom.exe unconditionally to the list of files removed at make clean. This allows users to run make clean without specifying the target architecture. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Idwer Vollering <vidwer(a)gmail.com> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Mon May 31 00:24:40 2010 (r1021) +++ trunk/Makefile Mon May 31 00:35:14 2010 (r1022) @@ -255,8 +255,10 @@ %.o: %.c .features $(CC) $(CFLAGS) $(CPPFLAGS) $(FEATURE_CFLAGS) $(SVNDEF) -o $@ -c $< +# Make sure to add all names of generated binaries here. +# This includes all frontends and libflashrom. clean: - rm -f $(PROGRAM) *.o + rm -f $(PROGRAM) $(PROGRAM).exe *.o distclean: clean rm -f .dependencies .features .libdeps

1 0

[PATCH] Remove unnecessary includes
by Carl-Daniel Hailfinger May 30, 2010

May 30, 2010

Vladimir Serbinenko sent a patch for standalone flashrom, and that patch made a few #include statements conditional. While that may still be needed, it is always a good idea to remove unneeded #include statements completely. unistd.h was only used to get a definition of NULL in all files. Add our own NULL #define and remove unistd.h from flash.h stdio.h has no place in flash.h, it should be included only in files which really need it. Replace a few printf with msg_* to eliminate the need for stdio.h. Add #include statements in individual .c files where needed. It might make sense to make the system #include statements in some .c files conditional on the circumstances where they are actually needed, especially in files which have OS dependent accesses. Such a patch would be a good followup to this one. Compile tests on non-x86 and non-Linux platforms highly appreciated. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-include_cleanup/flash.h =================================================================== --- flashrom-include_cleanup/flash.h (Revision 1017) +++ flashrom-include_cleanup/flash.h (Arbeitskopie) @@ -24,9 +24,7 @@ #ifndef __FLASH_H__ #define __FLASH_H__ 1 -#include <unistd.h> #include <stdint.h> -#include <stdio.h> #include "hwaccess.h" #ifdef _WIN32 #include <windows.h> @@ -34,6 +32,10 @@ #undef max #endif +#ifndef NULL +#define NULL ((void *) 0) +#endif + typedef unsigned long chipaddr; enum programmer { @@ -556,7 +558,6 @@ extern int verbose; extern const char *flashrom_version; extern char *chip_to_probe; -#define printf_debug(x...) { if (verbose) printf(x); } void map_flash_registers(struct flashchip *flash); int read_memmapped(struct flashchip *flash, uint8_t *buf, int start, int len); int erase_flash(struct flashchip *flash); Index: flashrom-include_cleanup/drkaiser.c =================================================================== --- flashrom-include_cleanup/drkaiser.c (Revision 1017) +++ flashrom-include_cleanup/drkaiser.c (Arbeitskopie) @@ -19,8 +19,6 @@ */ #include <stdlib.h> -#include <string.h> -#include <sys/types.h> #include "flash.h" #define PCI_VENDOR_ID_DRKAISER 0x1803 Index: flashrom-include_cleanup/nicrealtek.c =================================================================== --- flashrom-include_cleanup/nicrealtek.c (Revision 1017) +++ flashrom-include_cleanup/nicrealtek.c (Arbeitskopie) @@ -21,8 +21,6 @@ #if defined(__i386__) || defined(__x86_64__) #include <stdlib.h> -#include <string.h> -#include <sys/types.h> #include "flash.h" #define PCI_VENDOR_ID_REALTEK 0x10ec Index: flashrom-include_cleanup/physmap.c =================================================================== --- flashrom-include_cleanup/physmap.c (Revision 1017) +++ flashrom-include_cleanup/physmap.c (Arbeitskopie) @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <unistd.h> +#include <stdio.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> @@ -311,7 +313,7 @@ { char msrfilename[64]; memset(msrfilename, 0, 64); - sprintf(msrfilename, "/dev/cpu/%d/msr", cpu); + snprintf(msrfilename, sizeof(msrfilename), "/dev/cpu/%d/msr", cpu); if (fd_msr != -1) { msg_pinfo("MSR was already initialized\n"); @@ -394,7 +396,7 @@ { char msrfilename[64]; memset(msrfilename, 0, 64); - sprintf(msrfilename, "/dev/cpu%d", cpu); + snprintf(msrfilename, sizeof(msrfilename), "/dev/cpu%d", cpu); if (fd_msr != -1) { msg_pinfo("MSR was already initialized\n"); Index: flashrom-include_cleanup/sst49lfxxxc.c =================================================================== --- flashrom-include_cleanup/sst49lfxxxc.c (Revision 1017) +++ flashrom-include_cleanup/sst49lfxxxc.c (Arbeitskopie) @@ -20,7 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <stdlib.h> #include "flash.h" #include "chipdrivers.h" Index: flashrom-include_cleanup/sharplhf00l04.c =================================================================== --- flashrom-include_cleanup/sharplhf00l04.c (Revision 1017) +++ flashrom-include_cleanup/sharplhf00l04.c (Arbeitskopie) @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <stdlib.h> #include "flash.h" #include "chipdrivers.h" Index: flashrom-include_cleanup/nic3com.c =================================================================== --- flashrom-include_cleanup/nic3com.c (Revision 1017) +++ flashrom-include_cleanup/nic3com.c (Arbeitskopie) @@ -21,8 +21,6 @@ #if defined(__i386__) || defined(__x86_64__) #include <stdlib.h> -#include <string.h> -#include <sys/types.h> #include "flash.h" #define BIOS_ROM_ADDR 0x04 Index: flashrom-include_cleanup/spi.c =================================================================== --- flashrom-include_cleanup/spi.c (Revision 1017) +++ flashrom-include_cleanup/spi.c (Arbeitskopie) @@ -22,7 +22,6 @@ * Contains the generic SPI framework */ -#include <string.h> #include "flash.h" #include "flashchips.h" #include "chipdrivers.h" Index: flashrom-include_cleanup/satasii.c =================================================================== --- flashrom-include_cleanup/satasii.c (Revision 1017) +++ flashrom-include_cleanup/satasii.c (Arbeitskopie) @@ -21,7 +21,6 @@ /* Datasheets can be found on http://www.siliconimage.com. Great thanks! */ #include <stdlib.h> -#include <string.h> #include "flash.h" #define PCI_VENDOR_ID_SII 0x1095 Index: flashrom-include_cleanup/wbsio_spi.c =================================================================== --- flashrom-include_cleanup/wbsio_spi.c (Revision 1017) +++ flashrom-include_cleanup/wbsio_spi.c (Arbeitskopie) @@ -20,7 +20,6 @@ #if defined(__i386__) || defined(__x86_64__) -#include <string.h> #include "flash.h" #include "chipdrivers.h" #include "spi.h" Index: flashrom-include_cleanup/stm50flw0x0x.c =================================================================== --- flashrom-include_cleanup/stm50flw0x0x.c (Revision 1017) +++ flashrom-include_cleanup/stm50flw0x0x.c (Arbeitskopie) @@ -27,8 +27,6 @@ * ST M50FLW080B (not yet tested) */ -#include <string.h> -#include <stdlib.h> #include "flash.h" #include "flashchips.h" #include "chipdrivers.h" Index: flashrom-include_cleanup/sst_fwhub.c =================================================================== --- flashrom-include_cleanup/sst_fwhub.c (Revision 1017) +++ flashrom-include_cleanup/sst_fwhub.c (Arbeitskopie) @@ -22,8 +22,6 @@ /* Adapted from the Intel FW hub stuff for 82802ax parts. */ -#include <stdlib.h> -#include <string.h> #include "flash.h" #include "chipdrivers.h" Index: flashrom-include_cleanup/chipset_enable.c =================================================================== --- flashrom-include_cleanup/chipset_enable.c (Revision 1017) +++ flashrom-include_cleanup/chipset_enable.c (Arbeitskopie) @@ -27,6 +27,7 @@ #define _LARGEFILE64_SOURCE +#include <unistd.h> #include <stdlib.h> #include <string.h> #include <sys/types.h> Index: flashrom-include_cleanup/sb600spi.c =================================================================== --- flashrom-include_cleanup/sb600spi.c (Revision 1017) +++ flashrom-include_cleanup/sb600spi.c (Arbeitskopie) @@ -23,7 +23,6 @@ #if defined(__i386__) || defined(__x86_64__) -#include <string.h> #include "flash.h" #include "chipdrivers.h" #include "spi.h" Index: flashrom-include_cleanup/cli_classic.c =================================================================== --- flashrom-include_cleanup/cli_classic.c (Revision 1017) +++ flashrom-include_cleanup/cli_classic.c (Arbeitskopie) @@ -21,6 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdio.h> #include <fcntl.h> #include <sys/types.h> #include <sys/stat.h> Index: flashrom-include_cleanup/programmer.c =================================================================== --- flashrom-include_cleanup/programmer.c (Revision 1017) +++ flashrom-include_cleanup/programmer.c (Arbeitskopie) @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <stdlib.h> #include "flash.h" /* No-op shutdown() for programmers which don't need special handling */ Index: flashrom-include_cleanup/flashrom.c =================================================================== --- flashrom-include_cleanup/flashrom.c (Revision 1017) +++ flashrom-include_cleanup/flashrom.c (Arbeitskopie) @@ -21,6 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdio.h> #include <fcntl.h> #include <sys/types.h> #include <sys/stat.h> Index: flashrom-include_cleanup/layout.c =================================================================== --- flashrom-include_cleanup/layout.c (Revision 1017) +++ flashrom-include_cleanup/layout.c (Arbeitskopie) @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdio.h> #include <stdlib.h> #include <string.h> #include <ctype.h> @@ -73,7 +74,7 @@ mb_vendor_offset = *(walk - 2); if ((*walk) == 0 || ((*walk) & 0x3ff) != 0 || (*walk) > size || mb_part_offset > size || mb_vendor_offset > size) { - printf("Flash image seems to be a legacy BIOS. Disabling checks.\n"); + msg_pinfo("Flash image seems to be a legacy BIOS. Disabling checks.\n"); return 0; } @@ -81,25 +82,25 @@ mb_vendor = (char *)(bios + size - mb_vendor_offset); if (!isprint((unsigned char)*mb_part) || !isprint((unsigned char)*mb_vendor)) { - printf("Flash image seems to have garbage in the ID location." + msg_pinfo("Flash image seems to have garbage in the ID location." " Disabling checks.\n"); return 0; } - printf_debug("coreboot last image size " + msg_pdbg("coreboot last image size " "(not ROM size) is %d bytes.\n", *walk); mainboard_part = strdup(mb_part); mainboard_vendor = strdup(mb_vendor); - printf_debug("Manufacturer: %s\n", mainboard_vendor); - printf_debug("Mainboard ID: %s\n", mainboard_part); + msg_pdbg("Manufacturer: %s\n", mainboard_vendor); + msg_pdbg("Mainboard ID: %s\n", mainboard_part); /* * If lb_vendor is not set, the coreboot table was * not found. Nor was -m VENDOR:PART specified. */ if (!lb_vendor || !lb_part) { - printf("Note: If the following flash access fails, " + msg_pinfo("Note: If the following flash access fails, " "try -m <vendor>:<mainboard>.\n"); return 0; } @@ -109,13 +110,13 @@ */ if (!strcasecmp(mainboard_vendor, lb_vendor) && !strcasecmp(mainboard_part, lb_part)) { - printf_debug("This firmware image matches this mainboard.\n"); + msg_pdbg("This firmware image matches this mainboard.\n"); } else { if (force_boardmismatch) { - printf("WARNING: This firmware image does not " + msg_pinfo("WARNING: This firmware image does not " "seem to fit to this machine - forcing it.\n"); } else { - printf("ERROR: Your firmware image (%s:%s) does not " + msg_pinfo("ERROR: Your firmware image (%s:%s) does not " "appear to\n be correct for the detected " "mainboard (%s:%s)\n\nOverride with -p internal:" "boardmismatch=force if you are absolutely sure " @@ -141,7 +142,7 @@ romlayout = fopen(name, "r"); if (!romlayout) { - fprintf(stderr, "ERROR: Could not open ROM layout (%s).\n", + msg_gerr("ERROR: Could not open ROM layout (%s).\n", name); return -1; } @@ -159,7 +160,7 @@ tstr1 = strtok(tempstr, ":"); tstr2 = strtok(NULL, ":"); if (!tstr1 || !tstr2) { - fprintf(stderr, "Error parsing layout file.\n"); + msg_gerr("Error parsing layout file.\n"); fclose(romlayout); return 1; } @@ -170,7 +171,7 @@ } for (i = 0; i < romimages; i++) { - printf_debug("romlayout %08x - %08x named %s\n", + msg_gdbg("romlayout %08x - %08x named %s\n", rom_entries[i].start, rom_entries[i].end, rom_entries[i].name); } @@ -187,16 +188,16 @@ if (!romimages) return -1; - printf("Looking for \"%s\"... ", name); + msg_ginfo("Looking for \"%s\"... ", name); for (i = 0; i < romimages; i++) { if (!strcmp(rom_entries[i].name, name)) { rom_entries[i].included = 1; - printf("found.\n"); + msg_ginfo("found.\n"); return i; } } - printf("not found.\n"); // Not found. Error. + msg_ginfo("not found.\n"); // Not found. Error. return -1; } Index: flashrom-include_cleanup/udelay.c =================================================================== --- flashrom-include_cleanup/udelay.c (Revision 1017) +++ flashrom-include_cleanup/udelay.c (Arbeitskopie) @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <unistd.h> #include <sys/time.h> #include <stdlib.h> #include <limits.h> @@ -63,7 +64,7 @@ unsigned long timeusec; int i, tries = 0; - printf("Calibrating delay loop... "); + msg_pinfo("Calibrating delay loop... "); recalibrate: count = 1000; @@ -113,7 +114,7 @@ timeusec = measure_delay(10000); msg_pdbg("10000 myus = %ld us, ", timeusec); - printf("OK.\n"); + msg_pinfo("OK.\n"); } void internal_delay(int usecs) Index: flashrom-include_cleanup/82802ab.c =================================================================== --- flashrom-include_cleanup/82802ab.c (Revision 1017) +++ flashrom-include_cleanup/82802ab.c (Arbeitskopie) @@ -26,8 +26,6 @@ * - Order number: 290658-004 */ -#include <string.h> -#include <stdlib.h> #include "flash.h" #include "chipdrivers.h" Index: flashrom-include_cleanup/cbtable.c =================================================================== --- flashrom-include_cleanup/cbtable.c (Revision 1017) +++ flashrom-include_cleanup/cbtable.c (Arbeitskopie) @@ -22,6 +22,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <unistd.h> +#include <stdio.h> #include <stdlib.h> #include <sys/types.h> #include <string.h> Index: flashrom-include_cleanup/print.c =================================================================== --- flashrom-include_cleanup/print.c (Revision 1017) +++ flashrom-include_cleanup/print.c (Arbeitskopie) @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdio.h> #include <string.h> #include <stdlib.h> #include "flash.h" Index: flashrom-include_cleanup/dediprog.c =================================================================== --- flashrom-include_cleanup/dediprog.c (Revision 1017) +++ flashrom-include_cleanup/dediprog.c (Arbeitskopie) @@ -18,9 +18,6 @@ */ #include <string.h> -#include <stdlib.h> -#include <ctype.h> -#include <sys/types.h> #include <usb.h> #include "flash.h" #include "chipdrivers.h" Index: flashrom-include_cleanup/board_enable.c =================================================================== --- flashrom-include_cleanup/board_enable.c (Revision 1017) +++ flashrom-include_cleanup/board_enable.c (Arbeitskopie) @@ -25,7 +25,6 @@ */ #include <string.h> -#include <fcntl.h> #include "flash.h" #if defined(__i386__) || defined(__x86_64__) @@ -107,8 +106,8 @@ OUTB(0x55, port); /* enter conf mode */ id = sio_read(port, 0x20); if (id != 0x44) { - fprintf(stderr, "\nERROR: %s: FDC37B787: Wrong ID 0x%02X.\n", - name, id); + msg_perr("\nERROR: %s: FDC37B787: Wrong ID 0x%02X.\n", + name, id); OUTB(0xAA, port); /* leave conf mode */ return -1; } @@ -118,8 +117,8 @@ val = sio_read(port, 0xC8); /* GP50 */ if ((val & 0x1B) != 0x10) /* output, no invert, GPIO */ { - fprintf(stderr, "\nERROR: %s: GPIO50 mode 0x%02X unexpected.\n", - name, val); + msg_perr("\nERROR: %s: GPIO50 mode 0x%02X unexpected.\n", + name, val); OUTB(0xAA, port); return -1; } -- http://www.hailfinger.org/

2 2

[commit] r1021 - trunk
by repository service May 30, 2010

May 30, 2010

Author: hailfinger Date: Mon May 31 00:24:40 2010 New Revision: 1021 URL: http://flashrom.org/trac/coreboot/changeset/1021 Log: Remove unneeded #include statements completely. unistd.h was only used to get a definition of NULL in all files. Add our own NULL #define and remove unistd.h from flash.h stdio.h has no place in flash.h, it should be included only in files which really need it. Add #include statements in individual .c files where needed. Replace a few printf with msg_* to eliminate the need for stdio.h. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/82802ab.c trunk/board_enable.c trunk/cbtable.c trunk/chipset_enable.c trunk/cli_classic.c trunk/dediprog.c trunk/drkaiser.c trunk/flash.h trunk/flashrom.c trunk/hwaccess.c trunk/layout.c trunk/nic3com.c trunk/nicrealtek.c trunk/physmap.c trunk/print.c trunk/programmer.c trunk/satasii.c trunk/sb600spi.c trunk/sharplhf00l04.c trunk/spi.c trunk/sst49lfxxxc.c trunk/sst_fwhub.c trunk/stm50flw0x0x.c trunk/udelay.c trunk/wbsio_spi.c Modified: trunk/82802ab.c ============================================================================== --- trunk/82802ab.c Sun May 30 19:50:16 2010 (r1020) +++ trunk/82802ab.c Mon May 31 00:24:40 2010 (r1021) @@ -26,8 +26,6 @@ * - Order number: 290658-004 */ -#include <string.h> -#include <stdlib.h> #include "flash.h" #include "chipdrivers.h" Modified: trunk/board_enable.c ============================================================================== --- trunk/board_enable.c Sun May 30 19:50:16 2010 (r1020) +++ trunk/board_enable.c Mon May 31 00:24:40 2010 (r1021) @@ -25,7 +25,6 @@ */ #include <string.h> -#include <fcntl.h> #include "flash.h" #if defined(__i386__) || defined(__x86_64__) @@ -107,8 +106,8 @@ OUTB(0x55, port); /* enter conf mode */ id = sio_read(port, 0x20); if (id != 0x44) { - fprintf(stderr, "\nERROR: %s: FDC37B787: Wrong ID 0x%02X.\n", - name, id); + msg_perr("\nERROR: %s: FDC37B787: Wrong ID 0x%02X.\n", + name, id); OUTB(0xAA, port); /* leave conf mode */ return -1; } @@ -118,8 +117,8 @@ val = sio_read(port, 0xC8); /* GP50 */ if ((val & 0x1B) != 0x10) /* output, no invert, GPIO */ { - fprintf(stderr, "\nERROR: %s: GPIO50 mode 0x%02X unexpected.\n", - name, val); + msg_perr("\nERROR: %s: GPIO50 mode 0x%02X unexpected.\n", + name, val); OUTB(0xAA, port); return -1; } Modified: trunk/cbtable.c ============================================================================== --- trunk/cbtable.c Sun May 30 19:50:16 2010 (r1020) +++ trunk/cbtable.c Mon May 31 00:24:40 2010 (r1021) @@ -22,6 +22,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <unistd.h> +#include <stdio.h> #include <stdlib.h> #include <sys/types.h> #include <string.h> Modified: trunk/chipset_enable.c ============================================================================== --- trunk/chipset_enable.c Sun May 30 19:50:16 2010 (r1020) +++ trunk/chipset_enable.c Mon May 31 00:24:40 2010 (r1021) @@ -27,6 +27,7 @@ #define _LARGEFILE64_SOURCE +#include <unistd.h> #include <stdlib.h> #include <string.h> #include <sys/types.h> Modified: trunk/cli_classic.c ============================================================================== --- trunk/cli_classic.c Sun May 30 19:50:16 2010 (r1020) +++ trunk/cli_classic.c Mon May 31 00:24:40 2010 (r1021) @@ -21,6 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdio.h> #include <fcntl.h> #include <sys/types.h> #include <sys/stat.h> Modified: trunk/dediprog.c ============================================================================== --- trunk/dediprog.c Sun May 30 19:50:16 2010 (r1020) +++ trunk/dediprog.c Mon May 31 00:24:40 2010 (r1021) @@ -18,9 +18,6 @@ */ #include <string.h> -#include <stdlib.h> -#include <ctype.h> -#include <sys/types.h> #include <usb.h> #include "flash.h" #include "chipdrivers.h" Modified: trunk/drkaiser.c ============================================================================== --- trunk/drkaiser.c Sun May 30 19:50:16 2010 (r1020) +++ trunk/drkaiser.c Mon May 31 00:24:40 2010 (r1021) @@ -19,8 +19,6 @@ */ #include <stdlib.h> -#include <string.h> -#include <sys/types.h> #include "flash.h" #define PCI_VENDOR_ID_DRKAISER 0x1803 Modified: trunk/flash.h ============================================================================== --- trunk/flash.h Sun May 30 19:50:16 2010 (r1020) +++ trunk/flash.h Mon May 31 00:24:40 2010 (r1021) @@ -24,9 +24,7 @@ #ifndef __FLASH_H__ #define __FLASH_H__ 1 -#include <unistd.h> #include <stdint.h> -#include <stdio.h> #include "hwaccess.h" #ifdef _WIN32 #include <windows.h> @@ -34,6 +32,10 @@ #undef max #endif +#ifndef NULL +#define NULL ((void *) 0) +#endif + typedef unsigned long chipaddr; enum programmer { @@ -556,7 +558,6 @@ extern int verbose; extern const char *flashrom_version; extern char *chip_to_probe; -#define printf_debug(x...) { if (verbose) printf(x); } void map_flash_registers(struct flashchip *flash); int read_memmapped(struct flashchip *flash, uint8_t *buf, int start, int len); int erase_flash(struct flashchip *flash); Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Sun May 30 19:50:16 2010 (r1020) +++ trunk/flashrom.c Mon May 31 00:24:40 2010 (r1021) @@ -21,6 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdio.h> #include <fcntl.h> #include <sys/types.h> #include <sys/stat.h> Modified: trunk/hwaccess.c ============================================================================== --- trunk/hwaccess.c Sun May 30 19:50:16 2010 (r1020) +++ trunk/hwaccess.c Mon May 31 00:24:40 2010 (r1021) @@ -21,6 +21,7 @@ #include <stdint.h> #include <string.h> #include <stdlib.h> +#include <unistd.h> #include <fcntl.h> #include <sys/types.h> #include <errno.h> Modified: trunk/layout.c ============================================================================== --- trunk/layout.c Sun May 30 19:50:16 2010 (r1020) +++ trunk/layout.c Mon May 31 00:24:40 2010 (r1021) @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdio.h> #include <stdlib.h> #include <string.h> #include <ctype.h> @@ -73,7 +74,7 @@ mb_vendor_offset = *(walk - 2); if ((*walk) == 0 || ((*walk) & 0x3ff) != 0 || (*walk) > size || mb_part_offset > size || mb_vendor_offset > size) { - printf("Flash image seems to be a legacy BIOS. Disabling checks.\n"); + msg_pinfo("Flash image seems to be a legacy BIOS. Disabling checks.\n"); return 0; } @@ -81,25 +82,25 @@ mb_vendor = (char *)(bios + size - mb_vendor_offset); if (!isprint((unsigned char)*mb_part) || !isprint((unsigned char)*mb_vendor)) { - printf("Flash image seems to have garbage in the ID location." + msg_pinfo("Flash image seems to have garbage in the ID location." " Disabling checks.\n"); return 0; } - printf_debug("coreboot last image size " + msg_pdbg("coreboot last image size " "(not ROM size) is %d bytes.\n", *walk); mainboard_part = strdup(mb_part); mainboard_vendor = strdup(mb_vendor); - printf_debug("Manufacturer: %s\n", mainboard_vendor); - printf_debug("Mainboard ID: %s\n", mainboard_part); + msg_pdbg("Manufacturer: %s\n", mainboard_vendor); + msg_pdbg("Mainboard ID: %s\n", mainboard_part); /* * If lb_vendor is not set, the coreboot table was * not found. Nor was -m VENDOR:PART specified. */ if (!lb_vendor || !lb_part) { - printf("Note: If the following flash access fails, " + msg_pinfo("Note: If the following flash access fails, " "try -m <vendor>:<mainboard>.\n"); return 0; } @@ -109,13 +110,13 @@ */ if (!strcasecmp(mainboard_vendor, lb_vendor) && !strcasecmp(mainboard_part, lb_part)) { - printf_debug("This firmware image matches this mainboard.\n"); + msg_pdbg("This firmware image matches this mainboard.\n"); } else { if (force_boardmismatch) { - printf("WARNING: This firmware image does not " + msg_pinfo("WARNING: This firmware image does not " "seem to fit to this machine - forcing it.\n"); } else { - printf("ERROR: Your firmware image (%s:%s) does not " + msg_pinfo("ERROR: Your firmware image (%s:%s) does not " "appear to\n be correct for the detected " "mainboard (%s:%s)\n\nOverride with -p internal:" "boardmismatch=force if you are absolutely sure " @@ -141,7 +142,7 @@ romlayout = fopen(name, "r"); if (!romlayout) { - fprintf(stderr, "ERROR: Could not open ROM layout (%s).\n", + msg_gerr("ERROR: Could not open ROM layout (%s).\n", name); return -1; } @@ -159,7 +160,7 @@ tstr1 = strtok(tempstr, ":"); tstr2 = strtok(NULL, ":"); if (!tstr1 || !tstr2) { - fprintf(stderr, "Error parsing layout file.\n"); + msg_gerr("Error parsing layout file.\n"); fclose(romlayout); return 1; } @@ -170,7 +171,7 @@ } for (i = 0; i < romimages; i++) { - printf_debug("romlayout %08x - %08x named %s\n", + msg_gdbg("romlayout %08x - %08x named %s\n", rom_entries[i].start, rom_entries[i].end, rom_entries[i].name); } @@ -187,16 +188,16 @@ if (!romimages) return -1; - printf("Looking for \"%s\"... ", name); + msg_ginfo("Looking for \"%s\"... ", name); for (i = 0; i < romimages; i++) { if (!strcmp(rom_entries[i].name, name)) { rom_entries[i].included = 1; - printf("found.\n"); + msg_ginfo("found.\n"); return i; } } - printf("not found.\n"); // Not found. Error. + msg_ginfo("not found.\n"); // Not found. Error. return -1; } Modified: trunk/nic3com.c ============================================================================== --- trunk/nic3com.c Sun May 30 19:50:16 2010 (r1020) +++ trunk/nic3com.c Mon May 31 00:24:40 2010 (r1021) @@ -21,8 +21,6 @@ #if defined(__i386__) || defined(__x86_64__) #include <stdlib.h> -#include <string.h> -#include <sys/types.h> #include "flash.h" #define BIOS_ROM_ADDR 0x04 Modified: trunk/nicrealtek.c ============================================================================== --- trunk/nicrealtek.c Sun May 30 19:50:16 2010 (r1020) +++ trunk/nicrealtek.c Mon May 31 00:24:40 2010 (r1021) @@ -21,8 +21,6 @@ #if defined(__i386__) || defined(__x86_64__) #include <stdlib.h> -#include <string.h> -#include <sys/types.h> #include "flash.h" #define PCI_VENDOR_ID_REALTEK 0x10ec Modified: trunk/physmap.c ============================================================================== --- trunk/physmap.c Sun May 30 19:50:16 2010 (r1020) +++ trunk/physmap.c Mon May 31 00:24:40 2010 (r1021) @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <unistd.h> +#include <stdio.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> @@ -310,8 +312,8 @@ int setup_cpu_msr(int cpu) { char msrfilename[64]; - memset(msrfilename, 0, 64); - sprintf(msrfilename, "/dev/cpu/%d/msr", cpu); + memset(msrfilename, 0, sizeof(msrfilename)); + snprintf(msrfilename, sizeof(msrfilename), "/dev/cpu/%d/msr", cpu); if (fd_msr != -1) { msg_pinfo("MSR was already initialized\n"); @@ -393,8 +395,8 @@ int setup_cpu_msr(int cpu) { char msrfilename[64]; - memset(msrfilename, 0, 64); - sprintf(msrfilename, "/dev/cpu%d", cpu); + memset(msrfilename, 0, sizeof(msrfilename)); + snprintf(msrfilename, sizeof(msrfilename), "/dev/cpu%d", cpu); if (fd_msr != -1) { msg_pinfo("MSR was already initialized\n"); Modified: trunk/print.c ============================================================================== --- trunk/print.c Sun May 30 19:50:16 2010 (r1020) +++ trunk/print.c Mon May 31 00:24:40 2010 (r1021) @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdio.h> #include <string.h> #include <stdlib.h> #include "flash.h" Modified: trunk/programmer.c ============================================================================== --- trunk/programmer.c Sun May 30 19:50:16 2010 (r1020) +++ trunk/programmer.c Mon May 31 00:24:40 2010 (r1021) @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <stdlib.h> #include "flash.h" /* No-op shutdown() for programmers which don't need special handling */ Modified: trunk/satasii.c ============================================================================== --- trunk/satasii.c Sun May 30 19:50:16 2010 (r1020) +++ trunk/satasii.c Mon May 31 00:24:40 2010 (r1021) @@ -21,7 +21,6 @@ /* Datasheets can be found on http://www.siliconimage.com. Great thanks! */ #include <stdlib.h> -#include <string.h> #include "flash.h" #define PCI_VENDOR_ID_SII 0x1095 Modified: trunk/sb600spi.c ============================================================================== --- trunk/sb600spi.c Sun May 30 19:50:16 2010 (r1020) +++ trunk/sb600spi.c Mon May 31 00:24:40 2010 (r1021) @@ -23,7 +23,6 @@ #if defined(__i386__) || defined(__x86_64__) -#include <string.h> #include "flash.h" #include "chipdrivers.h" #include "spi.h" Modified: trunk/sharplhf00l04.c ============================================================================== --- trunk/sharplhf00l04.c Sun May 30 19:50:16 2010 (r1020) +++ trunk/sharplhf00l04.c Mon May 31 00:24:40 2010 (r1021) @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <stdlib.h> #include "flash.h" #include "chipdrivers.h" Modified: trunk/spi.c ============================================================================== --- trunk/spi.c Sun May 30 19:50:16 2010 (r1020) +++ trunk/spi.c Mon May 31 00:24:40 2010 (r1021) @@ -22,7 +22,6 @@ * Contains the generic SPI framework */ -#include <string.h> #include "flash.h" #include "flashchips.h" #include "chipdrivers.h" Modified: trunk/sst49lfxxxc.c ============================================================================== --- trunk/sst49lfxxxc.c Sun May 30 19:50:16 2010 (r1020) +++ trunk/sst49lfxxxc.c Mon May 31 00:24:40 2010 (r1021) @@ -20,7 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <stdlib.h> #include "flash.h" #include "chipdrivers.h" Modified: trunk/sst_fwhub.c ============================================================================== --- trunk/sst_fwhub.c Sun May 30 19:50:16 2010 (r1020) +++ trunk/sst_fwhub.c Mon May 31 00:24:40 2010 (r1021) @@ -22,8 +22,6 @@ /* Adapted from the Intel FW hub stuff for 82802ax parts. */ -#include <stdlib.h> -#include <string.h> #include "flash.h" #include "chipdrivers.h" Modified: trunk/stm50flw0x0x.c ============================================================================== --- trunk/stm50flw0x0x.c Sun May 30 19:50:16 2010 (r1020) +++ trunk/stm50flw0x0x.c Mon May 31 00:24:40 2010 (r1021) @@ -27,8 +27,6 @@ * ST M50FLW080B (not yet tested) */ -#include <string.h> -#include <stdlib.h> #include "flash.h" #include "flashchips.h" #include "chipdrivers.h" Modified: trunk/udelay.c ============================================================================== --- trunk/udelay.c Sun May 30 19:50:16 2010 (r1020) +++ trunk/udelay.c Mon May 31 00:24:40 2010 (r1021) @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <unistd.h> #include <sys/time.h> #include <stdlib.h> #include <limits.h> @@ -63,7 +64,7 @@ unsigned long timeusec; int i, tries = 0; - printf("Calibrating delay loop... "); + msg_pinfo("Calibrating delay loop... "); recalibrate: count = 1000; @@ -113,7 +114,7 @@ timeusec = measure_delay(10000); msg_pdbg("10000 myus = %ld us, ", timeusec); - printf("OK.\n"); + msg_pinfo("OK.\n"); } void internal_delay(int usecs) Modified: trunk/wbsio_spi.c ============================================================================== --- trunk/wbsio_spi.c Sun May 30 19:50:16 2010 (r1020) +++ trunk/wbsio_spi.c Mon May 31 00:24:40 2010 (r1021) @@ -20,7 +20,6 @@ #if defined(__i386__) || defined(__x86_64__) -#include <string.h> #include "flash.h" #include "chipdrivers.h" #include "spi.h"

1 0

Report for SST29EE020 part
by Néstor a.k.a. DarkMan May 30, 2010

May 30, 2010

Hello, attached are the output of the read, erase and write operations for SST29EE020 part. Motherboard: Shuttle AV11V30 Processor: Pentium III Chipset: Via Apollo Pro 133 Software version: flashrom v0.9.2-r1017 on Linux 2.6.24-27-generic (i686), built with libpci 2.2.4, GCC 4.2.4 (Ubuntu 4.2.4-1ubuntu4), little endian I hope you find this useful. Greetings and thank you for develop this project! Nestor E. _________________________________________________________________ Disfruta de Messenger y Hotmail en tu BlackBerry ¡Hazlo ya! http://serviciosmoviles.es.msn.com/messenger/blackberry.aspx

3 3

Re: [flashrom] [PATCH 1/2] Add hp xw9400 board enable.
by crow May 30, 2010

May 30, 2010

On Sun, May 30, 2010 at 7:42 PM, Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> wrote: > Also modifies nvidia_mcp_gpio_set to cope with multiple MCP55 chips on > the same board, like on the Tyan S2915-E. > > Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> Acked-by: Adis Salcin <crow(a)linux.org.ba>

1 1

Winbond W39V040FA supported
by Guenter May 30, 2010

May 30, 2010

Hi, after some very great help on IRC which resulted in this patch: http://patchwork.coreboot.org/patch/1343/ the Lex CI852A embedded board is now supported with Winbond W39V040FA. Attached the verbose output of the tools. thanks, Gün.

2 2

[commit] r1020 - trunk
by repository service May 30, 2010

May 30, 2010

Author: uwe Date: Sun May 30 19:50:16 2010 New Revision: 1020 URL: http://flashrom.org/trac/coreboot/changeset/1020 Log: Mark the following chip as supported: - Winbond W39V040FA (reported by Guenter <lists(a)gknw.net>) Read (thus also probe), write (thus also erase), and verify tested. http://www.flashrom.org/pipermail/flashrom/2010-May/003078.html Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/flashchips.c Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Sun May 30 19:00:19 2010 (r1019) +++ trunk/flashchips.c Sun May 30 19:50:16 2010 (r1020) @@ -6087,7 +6087,7 @@ .total_size = 512, .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, - .tested = TEST_UNTESTED, + .tested = TEST_OK_PREW, .probe = probe_jedec, .probe_timing = 10, .block_erasers =

1 0

[PATCH 2/2] Add URL/note for HP xw9400
by Michael Karcher May 30, 2010

May 30, 2010

Not ready for commit because of the pending list refactoring. Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> --- print_wiki.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/print_wiki.c b/print_wiki.c index 3d51bfa..9f15a53 100644 --- a/print_wiki.c +++ b/print_wiki.c @@ -259,6 +259,7 @@ const struct board_info_url boards_url[] = { { "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…" }, + { "HP", "xw9400", "http://h20000.www2.hp.com/bizsupport/TechSupport/Home.jsp?lang=en&cc=us&pro…" }, { "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…" }, @@ -338,6 +339,7 @@ const struct board_info_notes boards_notes[] = { /* Verified working boards that DO need write-enables. */ #if defined(__i386__) || defined(__x86_64__) { "Acer", "Aspire One", "See http://www.coreboot.org/pipermail/coreboot/2009-May/048041.html." }, + { "HP", "xw9400", "Boot block is write protected unless the solder points next to F2 are shorted." }, #endif /* Verified non-working boards (for now). */ -- 1.7.1

1 0

[PATCH 1/2] Add hp xw9400 board enable.
by Michael Karcher May 30, 2010

May 30, 2010

Also modifies nvidia_mcp_gpio_set to cope with multiple MCP55 chips on the same board, like on the Tyan S2915-E. Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> --- board_enable.c | 43 +++++++++++++++++++++++++++++++++++-------- 1 files changed, 35 insertions(+), 8 deletions(-) diff --git a/board_enable.c b/board_enable.c index b5eb63f..497cfd9 100644 --- a/board_enable.c +++ b/board_enable.c @@ -552,6 +552,7 @@ static int nvidia_mcp_gpio_set(int gpio, int raise) { struct pci_dev *dev; uint16_t base; + uint16_t devclass; uint8_t tmp; if ((gpio < 0) || (gpio >= 0x40)) { @@ -566,17 +567,33 @@ static int nvidia_mcp_gpio_set(int gpio, int raise) case 0x0050: /* MCP04 */ case 0x0060: /* MCP2 */ break; - default: - /* Newer MCPs use the SMBus Controller */ - dev = pci_dev_find_vendorclass(0x10DE, 0x0C05); - switch (dev->device_id) { - case 0x0264: /* MCP51 */ + case 0x0260: /* MCP51 */ + case 0x0364: /* MCP55 */ + /* find SMBus controller on *this* southbridge */ + /* The infamous Tyan S2915-E has two south bridges; they are + easily told apart from each other by the class of the + LPC bridge, but have the same SMBus bridge IDs */ + if (dev->func != 0) { + msg_perr("MCP LCP bridge at unexpected function" + " number %d\n", dev->func); + return -1; + } + + dev = pci_get_dev(pacc, dev->domain, dev->bus, dev->dev, 1); + if (!dev) { + msg_perr("MCP SMBus controller could not be found\n"); + return -1; + } + devclass = pci_read_word(dev, 0x0a); + if (devclass != 0x0C05) { + msg_perr("Unexpected device class %04x for SMBus" + " controller\n", devclass); + return -1; + } break; - default: + default: msg_perr("\nERROR: no NVIDIA LPC/SMBus controller found.\n"); return -1; - } - break; } base = pci_read_long(dev, 0x64) & 0x0000FF00; /* System control area */ @@ -618,6 +635,15 @@ static int nvidia_mcp_gpio2_raise(const char *name) return nvidia_mcp_gpio_set(0x02, 1); } + +/** + * Suited for HP xw9400 (Tyan S2915-E OEM): nVidia MCP55. + */ +static int nvidia_mcp_gpio5_raise(const char *name) +{ + return nvidia_mcp_gpio_set(0x05, 1); +} + /** * Suited for Abit NF7-S: NVIDIA CK804. */ @@ -1437,6 +1463,7 @@ struct board_pciid_enable board_pciid_enables[] = { {0x1166, 0x0223, 0x103c, 0x320d, 0x102b, 0x0522, 0x103c, 0x31fa, NULL, "hp", "dl145_g3", "HP", "DL145 G3", 0, OK, board_hp_dl145_g3_enable}, {0x8086, 0x2415, 0x103c, 0x1249, 0x10b7, 0x9200, 0x103c, 0x1246, NULL, NULL, NULL, "HP", "Vectra VL400", 0, OK, board_hp_vl400}, {0x8086, 0x1a30, 0x103c, 0x1a30, 0x8086, 0x2443, 0x103c, 0x2440, "^VL420$", NULL, NULL, "HP", "VL420 SFF", 0, OK, intel_ich_gpio22_raise}, + {0x10de, 0x0369, 0x103c, 0x12fe, 0x10de, 0x0364, 0x103c, 0x12fe, NULL, NULL, NULL, "HP", "xw9400", 0, OK, nvidia_mcp_gpio5_raise}, {0x8086, 0x27A0, 0, 0, 0x8086, 0x27B9, 0, 0, NULL, "ibase", "mb899", "iBASE", "MB899", 0, NT, intel_ich_gpio26_raise}, {0x1166, 0x0205, 0x1014, 0x0347, 0x1002, 0x515E, 0x1014, 0x0325, NULL, NULL, NULL, "IBM", "x3455", 0, OK, board_ibm_x3455}, {0x1039, 0x5513, 0x8086, 0xd61f, 0x1039, 0x6330, 0x8086, 0xd61f, NULL, NULL, NULL, "Intel", "D201GLY", 0, OK, wbsio_check_for_spi}, -- 1.7.1

1 0