coreboot May 2009

coreboot@coreboot.org

92 participants
571 discussions

[PATCH] flashrom: Add --programmer to help text and man page
by Carl-Daniel Hailfinger 09 May '09

09 May '09

Add --programmer to help text and man page. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-programmer_help/flashrom.8 =================================================================== --- flashrom-programmer_help/flashrom.8 (Revision 480) +++ flashrom-programmer_help/flashrom.8 (Arbeitskopie) @@ -123,6 +123,11 @@ Please let us know if you can verify other boards to work or not work out of the box. .TP +.B "\-p, \-\-programmer <name>" +Specify the programmer device. Currently supported are: +.sp + internal (default, for onboard flash) +.TP .B "\-h, \-\-help" Show a help text and exit. .TP Index: flashrom-programmer_help/flashrom.c =================================================================== --- flashrom-programmer_help/flashrom.c (Revision 480) +++ flashrom-programmer_help/flashrom.c (Arbeitskopie) @@ -313,6 +313,7 @@ " -l | --layout <file.layout>: read rom layout from file\n" " -i | --image <name>: only flash image name from flash layout\n" " -L | --list-supported: print supported devices\n" + " -p | --programmer <name>: specify the programmer device or internal\n" " -h | --help: print this help text\n" " -R | --version: print the version (release)\n" "\n" " If no file is specified, then all that happens" -- http://www.hailfinger.org/ Index: flashrom-programmer_help/flashrom.8 =================================================================== --- flashrom-programmer_help/flashrom.8 (Revision 480) +++ flashrom-programmer_help/flashrom.8 (Arbeitskopie) @@ -123,6 +123,11 @@ Please let us know if you can verify other boards to work or not work out of the box. .TP +.B "\-p, \-\-programmer <name>" +Specify the programmer device. Currently supported are: +.sp + internal (default, for onboard flash) +.TP .B "\-h, \-\-help" Show a help text and exit. .TP Index: flashrom-programmer_help/flashrom.c =================================================================== --- flashrom-programmer_help/flashrom.c (Revision 480) +++ flashrom-programmer_help/flashrom.c (Arbeitskopie) @@ -313,6 +313,7 @@ " -l | --layout <file.layout>: read rom layout from file\n" " -i | --image <name>: only flash image name from flash layout\n" " -L | --list-supported: print supported devices\n" + " -p | --programmer <name>: specify the programmer device or internal\n" " -h | --help: print this help text\n" " -R | --version: print the version (release)\n" "\n" " If no file is specified, then all that happens"

2 2

[flashrom] r481 - trunk
by svn＠coreboot.org 09 May '09

09 May '09

Author: hailfinger Date: 2009-05-09 02:27:07 +0200 (Sat, 09 May 2009) New Revision: 481 Modified: trunk/flashrom.8 trunk/flashrom.c Log: Add --programmer to help text and man page. 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/flashrom.8 =================================================================== --- trunk/flashrom.8 2009-05-08 21:25:37 UTC (rev 480) +++ trunk/flashrom.8 2009-05-09 00:27:07 UTC (rev 481) @@ -123,6 +123,11 @@ Please let us know if you can verify other boards to work or not work out of the box. .TP +.B "\-p, \-\-programmer <name>" +Specify the programmer device. Currently supported are: +.sp +.BR " internal" " (default, for in-system flashing in the mainboard)" +.TP .B "\-h, \-\-help" Show a help text and exit. .TP Modified: trunk/flashrom.c =================================================================== --- trunk/flashrom.c 2009-05-08 21:25:37 UTC (rev 480) +++ trunk/flashrom.c 2009-05-09 00:27:07 UTC (rev 481) @@ -313,6 +313,7 @@ " -l | --layout <file.layout>: read rom layout from file\n" " -i | --image <name>: only flash image name from flash layout\n" " -L | --list-supported: print supported devices\n" + " -p | --programmer <name>: specify the programmer device\n" " -h | --help: print this help text\n" " -R | --version: print the version (release)\n" "\n" " If no file is specified, then all that happens"

1 0

usbrom: development report
by Leandro Dorileo 08 May '09

08 May '09

Hi Jason The option ROM I`m working on[1] to test the libpayload USB stack has been updated, now it builds properly and can be used for any test purpose. I would like you to take a look at it and hear your comments. I used source code I took from FILO to the basic infra structure, it uses kbuild and has a copy of libpayload inside source dir. I know the focus is not an test option ROM development, but I have few things I want to change that we can reuse ideas for the final usb option ROM. Here follows a small TODO: + Remove util/kbuild and place it in a separated repository; + Remove libpayload; + Write a small shell script to checkout kbuild and libpayload before building the option ROM; [1] - http://vps.dorilex.net/cgi-bin/gitweb.cgi?p=usbrom.git;a=summary Regards... -- (°= Leandro Dorileo //\ ldorileo(a)gmail.com - http://www.dorilex.net V_/ Software is a matter of freedom.

1 0

[flashrom] r480 - branches/stuge
by svn＠coreboot.org 08 May '09

08 May '09

Author: stuge Date: 2009-05-08 23:25:37 +0200 (Fri, 08 May 2009) New Revision: 480 Modified: branches/stuge/82802ab.c Log: Block Lock register decode Signed-off-by: Peter Stuge <peter(a)stuge.se> Acked-by: Peter Stuge <peter(a)stuge.se> Modified: branches/stuge/82802ab.c =================================================================== --- branches/stuge/82802ab.c 2009-05-08 20:53:10 UTC (rev 479) +++ branches/stuge/82802ab.c 2009-05-08 21:25:37 UTC (rev 480) @@ -116,12 +116,9 @@ // clear status register chip_writeb(0x50, bios); - //printf("Erase at %p\n", bios); - // clear write protect - //printf("write protect is at %p\n", (wrprotect)); - //printf("write protect is 0x%x\n", *(wrprotect)); + printf_debug("Erasing block at %p, block locking register at %p\n", bios, wrprotect); chip_writeb(0, wrprotect); - //printf("write protect is 0x%x\n", *(wrprotect)); + printf_debug("AFTER unlock: 0x%02x\n", *wrprotect); // now start it chip_writeb(0x20, bios);

1 0

[flashrom] r479 - branches/stuge
by svn＠coreboot.org 08 May '09

08 May '09

Author: stuge Date: 2009-05-08 22:53:10 +0200 (Fri, 08 May 2009) New Revision: 479 Added: branches/stuge/TODO Log: Some memory notes from back in July. Signed-off-by: Peter Stuge <peter(a)stuge.se> Acked-by: Peter Stuge <peter(a)stuge.se> Added: branches/stuge/TODO =================================================================== --- branches/stuge/TODO (rev 0) +++ branches/stuge/TODO 2009-05-08 20:53:10 UTC (rev 479) @@ -0,0 +1,9 @@ +deferred privilege testing +chipset->bus knowledge +bus->bus bridge knowledge (lpc->spi via siochip) +bus->flashchip knowledge +dynamic probing (skip ISA) +working status callbacks +SPImaster->SPIcommand mask +SPIchip->SPIcommand +SPIchip->timing

1 0

[flashrom] r478 - / branches
by svn＠coreboot.org 08 May '09

08 May '09

Author: stuge Date: 2009-05-08 22:51:50 +0200 (Fri, 08 May 2009) New Revision: 478 Added: branches/ branches/stuge/ Log: I should have done this so long ago. Signed-off-by: Peter Stuge <peter(a)stuge.se> Acked-by: Peter Stuge <peter(a)stuge.se>

1 0

[v2] r4263 - trunk/coreboot-v2/util/cbfstool
by svn＠coreboot.org 08 May '09

08 May '09

Author: myles Date: 2009-05-08 22:07:00 +0200 (Fri, 08 May 2009) New Revision: 4263 Modified: trunk/coreboot-v2/util/cbfstool/print.c Log: Trivial clean up of print usage and parameter checking. Signed-off-by: Myles Watson <mylesgw(a)gmail.com> Acked-by: Myles Watson <mylesgw(a)gmail.com> Modified: trunk/coreboot-v2/util/cbfstool/print.c =================================================================== --- trunk/coreboot-v2/util/cbfstool/print.c 2009-05-08 19:39:15 UTC (rev 4262) +++ trunk/coreboot-v2/util/cbfstool/print.c 2009-05-08 20:07:00 UTC (rev 4263) @@ -27,8 +27,11 @@ int print_handler(struct rom *rom, int argc, char **argv) { - if (argc > 0 || argv[1] != NULL) - printf("print\t\t\t\tShow the contents of the ROM\n"); + if ( argc > 0 ) { + ERROR("print %s? print takes no arguments.\n", argv[0]); + print_usage(); + return -1; + } printf("%s: %d kB, bootblocksize %d, romsize %d, offset 0x%x\n", rom->name, rom->size / 1024, ntohl(rom->header->bootblocksize), ntohl(rom->header->romsize), ntohl(rom->header->offset));

1 0

Re: [coreboot] [flashrom] r473 - trunk
by Peter Stuge 08 May '09

08 May '09

svn(a)coreboot.org wrote: > + .read = read_memmapped, > + .read = read_memmapped, > + .read = read_memmapped, > + .read = read_memmapped, > + .read = read_memmapped, > + .read = read_memmapped, > + .read = read_memmapped, > + .read = read_memmapped, > + .read = read_memmapped, > + .read = read_memmapped, ... Just horrible. //Peter

1 0

cbfstool warnings
by Myles Watson 08 May '09

08 May '09

Since cbfstool is so simple right now, it makes sense to have -Werr in CFLAGS so that we are more careful with the code. It will be a bigger pain later. I didn't want to touch lzma so the tools directory has its own CFLAGS now. I chose to make all sizes int. They could have been unsigned int. If anyone really cares we can change it. It just needs to be consistent. I cleaned up some of the parameters (usage and checking.) There's no need to have an empty add call, etc. Signed-off-by: Myles Watson <mylesgw(a)gmail.com> Thanks, Myles

2 2

[v2] r4262 - in trunk/coreboot-v2/util/cbfstool: . tools
by svn＠coreboot.org 08 May '09

08 May '09

Author: myles Date: 2009-05-08 21:39:15 +0200 (Fri, 08 May 2009) New Revision: 4262 Modified: trunk/coreboot-v2/util/cbfstool/Makefile trunk/coreboot-v2/util/cbfstool/add.c trunk/coreboot-v2/util/cbfstool/cbfstool.c trunk/coreboot-v2/util/cbfstool/cbfstool.h trunk/coreboot-v2/util/cbfstool/create.c trunk/coreboot-v2/util/cbfstool/extract.c trunk/coreboot-v2/util/cbfstool/fs.c trunk/coreboot-v2/util/cbfstool/print.c trunk/coreboot-v2/util/cbfstool/resize.c trunk/coreboot-v2/util/cbfstool/tools/Makefile Log: Add -Werror to help us keep the code clean. Change sizes from unsigned int to int. Clean up some usage and parameter checking. Signed-off-by: Myles Watson <mylesgw(a)gmail.com> Acked-by: Ronald G. Minnich <rminnich(a)gmail.com> Modified: trunk/coreboot-v2/util/cbfstool/Makefile =================================================================== --- trunk/coreboot-v2/util/cbfstool/Makefile 2009-05-08 19:23:00 UTC (rev 4261) +++ trunk/coreboot-v2/util/cbfstool/Makefile 2009-05-08 19:39:15 UTC (rev 4262) @@ -9,7 +9,7 @@ INC=cbfstool.h cbfs.h CC=gcc -CFLAGS=-g -Wall # -W -Werror +CFLAGS=-g -Wall -W -Werror DESTDIR ?= /usr/local/bin Modified: trunk/coreboot-v2/util/cbfstool/add.c =================================================================== --- trunk/coreboot-v2/util/cbfstool/add.c 2009-05-08 19:23:00 UTC (rev 4261) +++ trunk/coreboot-v2/util/cbfstool/add.c 2009-05-08 19:39:15 UTC (rev 4262) @@ -205,25 +205,25 @@ void add_usage(void) { - printf("add [FILE] [NAME] [TYPE]\tAdd a component\n"); + printf("add FILE NAME TYPE\tAdd a component\n"); } void add_stage_usage(void) { - printf("add-stage [FILE] [NAME] [OPTIONS]\tAdd a stage to the ROM\n"); + printf("add-stage FILE NAME [OPTIONS]\tAdd a stage to the ROM\n"); } void add_payload_usage(void) { printf - ("add-payload [FILE] [NAME] [OPTIONS]\tAdd a payload to the ROM\n"); + ("add-payload FILE NAME [OPTIONS]\tAdd a payload to the ROM\n"); } int add_handler(struct rom *rom, int argc, char **argv) { unsigned int type = CBFS_COMPONENT_NULL; - if (argc < 2) { + if (argc != 3) { add_usage(); return -1; } @@ -235,15 +235,13 @@ /* There are two ways to specify the type - a string or a number */ - if (argc == 3) { - if (isdigit(*(argv[2]))) - type = strtoul(argv[2], 0, 0); + if (isdigit(*(argv[2]))) + type = strtoul(argv[2], 0, 0); + else { + ERROR("String types (%s) aren't implemented yet.\n", argv[2]); + return -1; } - if (type == CBFS_COMPONENT_NULL) - WARN("No file type was given for %s - using default\n", - argv[0]); - return add_blob(rom, argv[0], argv[1], type); } Modified: trunk/coreboot-v2/util/cbfstool/cbfstool.c =================================================================== --- trunk/coreboot-v2/util/cbfstool/cbfstool.c 2009-05-08 19:23:00 UTC (rev 4261) +++ trunk/coreboot-v2/util/cbfstool/cbfstool.c 2009-05-08 19:39:15 UTC (rev 4262) @@ -66,7 +66,7 @@ "extract", extract_handler, extract_usage}, { "print", print_handler, print_usage}, { "resize", resize_handler, resize_usage}, { -"", NULL},}; +"", NULL, NULL},}; static struct rom rom; Modified: trunk/coreboot-v2/util/cbfstool/cbfstool.h =================================================================== --- trunk/coreboot-v2/util/cbfstool/cbfstool.h 2009-05-08 19:23:00 UTC (rev 4261) +++ trunk/coreboot-v2/util/cbfstool/cbfstool.h 2009-05-08 19:39:15 UTC (rev 4262) @@ -67,15 +67,15 @@ /* fs.c */ -struct cbfs_file *rom_find(struct rom *rom, unsigned int offset); +struct cbfs_file *rom_find(struct rom *rom, int offset); struct cbfs_file *rom_find_first(struct rom *); struct cbfs_file *rom_find_next(struct rom *, struct cbfs_file *); int rom_add(struct rom *rom, const char *name, void *, int size, int type); int rom_set_header(struct rom *rom, struct cbfs_file *c, const char*name, int size, int type); -int rom_extract(struct rom *rom, const char *name, void **buf, unsigned long *size); +int rom_extract(struct rom *rom, const char *name, void **buf, int *size); int rom_remove(struct rom *rom, const char *name); -unsigned int rom_used_space(struct rom *rom); +int rom_used_space(struct rom *rom); int rom_exists(struct rom *rom); #endif Modified: trunk/coreboot-v2/util/cbfstool/create.c =================================================================== --- trunk/coreboot-v2/util/cbfstool/create.c 2009-05-08 19:23:00 UTC (rev 4261) +++ trunk/coreboot-v2/util/cbfstool/create.c 2009-05-08 19:39:15 UTC (rev 4262) @@ -24,7 +24,7 @@ void create_usage(void) { - printf("create SIZE BOOTBLOCKSIZE [ALIGN] [BOOTBLOCK]\tCreate a ROM file\n"); + printf("create SIZE BOOTBLOCKSIZE BOOTBLOCK [ALIGN]\tCreate a ROM file\n"); } int create_handler(struct rom *rom, int argc, char **argv) @@ -33,7 +33,7 @@ char *bootblock = NULL; int bootblocksize; - if (argc < 2) { + if (argc < 3) { create_usage(); return -1; } @@ -42,11 +42,10 @@ bootblocksize = get_size(argv[1]); - if (argc == 3) { - bootblock = argv[2]; - } else if (argc >= 4) { - align = strtoul(argv[2], NULL, 0); - bootblock = argv[3]; + bootblock = argv[2]; + + if (argc >= 4) { + align = strtoul(argv[3], NULL, 0); } if (size < bootblocksize) { Modified: trunk/coreboot-v2/util/cbfstool/extract.c =================================================================== --- trunk/coreboot-v2/util/cbfstool/extract.c 2009-05-08 19:23:00 UTC (rev 4261) +++ trunk/coreboot-v2/util/cbfstool/extract.c 2009-05-08 19:39:15 UTC (rev 4262) @@ -28,7 +28,7 @@ { void *buf; int fd, ret; - unsigned long size; + int size; ret = rom_extract(rom, name, &buf, &size); @@ -43,7 +43,7 @@ } if (write(fd, buf, size) != size) { - ERROR("Couldn't write %ld bytes!\n", size); + ERROR("Couldn't write %d bytes!\n", size); ret = -1; } Modified: trunk/coreboot-v2/util/cbfstool/fs.c =================================================================== --- trunk/coreboot-v2/util/cbfstool/fs.c 2009-05-08 19:23:00 UTC (rev 4261) +++ trunk/coreboot-v2/util/cbfstool/fs.c 2009-05-08 19:39:15 UTC (rev 4262) @@ -152,7 +152,7 @@ return ((struct cbfs_file *)ROM_PTR(rom, ret)); } -struct cbfs_file *rom_find(struct rom *rom, unsigned int offset) +struct cbfs_file *rom_find(struct rom *rom, int offset) { while (offset < rom->fssize) { struct cbfs_file *c = @@ -195,7 +195,7 @@ return NULL; } -unsigned int rom_used_space(struct rom *rom) +int rom_used_space(struct rom *rom) { struct cbfs_file *c = rom_find_first(rom); unsigned int ret = 0; @@ -235,7 +235,7 @@ return 0; } -int rom_extract(struct rom *rom, const char *name, void** buf, unsigned long *size ) +int rom_extract(struct rom *rom, const char *name, void** buf, int *size ) { struct cbfs_file *c = rom_find_by_name(rom, name); unsigned int csize; @@ -265,8 +265,8 @@ int rom_add(struct rom *rom, const char *name, void *buffer, int size, int type) { struct cbfs_file *c = rom_alloc(rom, size); - unsigned int offset; - unsigned int csize; + int offset; + int csize; if (rom_find_by_name(rom, name)) { ERROR("Component %s already exists in this rom\n", name); Modified: trunk/coreboot-v2/util/cbfstool/print.c =================================================================== --- trunk/coreboot-v2/util/cbfstool/print.c 2009-05-08 19:23:00 UTC (rev 4261) +++ trunk/coreboot-v2/util/cbfstool/print.c 2009-05-08 19:39:15 UTC (rev 4262) @@ -27,6 +27,9 @@ int print_handler(struct rom *rom, int argc, char **argv) { + if (argc > 0 || argv[1] != NULL) + printf("print\t\t\t\tShow the contents of the ROM\n"); + printf("%s: %d kB, bootblocksize %d, romsize %d, offset 0x%x\n", rom->name, rom->size / 1024, ntohl(rom->header->bootblocksize), ntohl(rom->header->romsize), ntohl(rom->header->offset)); printf("Alignment: %d bytes\n\n", ntohl(rom->header->align)); @@ -48,6 +51,9 @@ case CBFS_COMPONENT_OPTIONROM: strcpy(type, "optionrom"); break; + case CBFS_COMPONENT_NULL: + strcpy(type, "free"); + break; default: sprintf(type, "0x%8.8x", htonl(c->type)); break; Modified: trunk/coreboot-v2/util/cbfstool/resize.c =================================================================== --- trunk/coreboot-v2/util/cbfstool/resize.c 2009-05-08 19:23:00 UTC (rev 4261) +++ trunk/coreboot-v2/util/cbfstool/resize.c 2009-05-08 19:39:15 UTC (rev 4262) @@ -32,7 +32,8 @@ int resize_handler(struct rom *rom, int argc, char **argv) { - unsigned int size, align, offset; + unsigned int align, offset; + int size; char null = '\0'; int bootblocksize = ntohl(rom->header->bootblocksize); Modified: trunk/coreboot-v2/util/cbfstool/tools/Makefile =================================================================== --- trunk/coreboot-v2/util/cbfstool/tools/Makefile 2009-05-08 19:23:00 UTC (rev 4261) +++ trunk/coreboot-v2/util/cbfstool/tools/Makefile 2009-05-08 19:39:15 UTC (rev 4262) @@ -1,6 +1,8 @@ tobj ?= $(shell pwd) tsrc ?= $(shell pwd) +CFLAGS=-g -Wall + TARGETS += $(tobj)/cbfs-mkstage $(tobj)/cbfs-mkpayload tools: $(tobj)/cbfs-mkstage $(tobj)/cbfs-mkpayload

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
58
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

coreboot May 2009