coreboot January 2011

coreboot@coreboot.org

65 participants
299 discussions

[PATCH]Improve GPIO setup on roda/rk886ex
by Patrick Georgi 17 Jan '11

17 Jan '11

Hi, attached patch improves on GPIO setup, by turning off LEDs on boot (and various other things). It also documents what the GPIOs are used for on this board. Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com>

3 2

[PATCH] Copy final "cbfstool" binary to "build/" directory.
by Kevin O'Connor 17 Jan '11

17 Jan '11

The cbfstool program is a useful tool for the end user. It's hard to find in ./build/util/cbfstool/cbfstool, so copy it to ./build/cbfstool for the user. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- Makefile | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 52c6af8..ac6134b 100644 --- a/Makefile +++ b/Makefile @@ -164,7 +164,10 @@ $(obj)/config.h: ####################################################################### # Build the tools -CBFSTOOL:=$(objutil)/cbfstool/cbfstool +CBFSTOOL:=$(obj)/cbfstool + +$(CBFSTOOL): $(objutil)/cbfstool/cbfstool + @cp $(objutil)/cbfstool/cbfstool $(CBFSTOOL) # needed objects that every mainboard uses # Creation of these is architecture and mainboard independent -- 1.7.3.4

2 1

[PATCH] [RESEND] cbfstool "add-lzma" method
by Kevin O'Connor 16 Jan '11

16 Jan '11

This is a resend of a patch I sent last year. Current distros ship a version of lzma that does not set the "size" property of the compressed archive. This makes files compressed via the system version of lzma unusable for coreboot and seabios. This patch adds a helper to cbfstool so users can easily add compressed "raw" files. -Kevin --------------------------- patch ----------------------- Enhance cbfstool so that it can support "cbfstool ROM add-lzma FILE NAME" calls. This is useful for callers that wish to add an lzma compressed raw file. Right now, SeaBIOS supports lzma raw files for things like floppy images. Today, adding one of these files requires a two step process - for example: $ lzma -zc /path/to/myfloppy.img > myfloppy.img.lzma $ cbfstool coreboot.rom add myfloppy.img.lzma floppyimg/MyFloppy.lzma raw Unfortunately, various versions of "lzma" are quirky and the above can be troublesome. With this patch, a user need only execute: $ cbfstool coreboot.rom add-lzma myfloppy.img floppyimg/MyFloppy.lzma Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- util/cbfstool/cbfs.h | 1 + util/cbfstool/cbfstool.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++ util/cbfstool/common.c | 1 + 3 files changed, 73 insertions(+), 0 deletions(-) diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h index 6fb9edd..44c1fa0 100644 --- a/util/cbfstool/cbfs.h +++ b/util/cbfstool/cbfs.h @@ -73,6 +73,7 @@ struct cbfs_payload { #define CBFS_COMPONENT_OPTIONROM 0x30 #define CBFS_COMPONENT_BOOTSPLASH 0x40 #define CBFS_COMPONENT_RAW 0x50 +#define CBFS_COMPONENT_LZMA_RAW 0x40000050 #define CBFS_COMPONENT_VSA 0x51 #define CBFS_COMPONENT_MBI 0x52 #define CBFS_COMPONENT_MICROCODE 0x53 diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index 507edc2..d437994 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA */ +#include <stdlib.h> #include <stdio.h> #include <string.h> #include "common.h" @@ -27,6 +28,7 @@ typedef enum { CMD_ADD, CMD_ADD_PAYLOAD, CMD_ADD_STAGE, + CMD_ADD_LZMA, CMD_CREATE, CMD_LOCATE, CMD_PRINT, @@ -187,6 +189,73 @@ static int cbfs_add_stage(int argc, char **argv) return 0; } +static int cbfs_add_lzma(int argc, char **argv) +{ + char *romname = argv[1]; + char *cmd = argv[2]; + void *rom = loadrom(romname); + + if (rom == NULL) { + printf("Could not load ROM image '%s'.\n", romname); + return 1; + } + + if (argc < 5) { + printf("not enough arguments to '%s'.\n", cmd); + return 1; + } + + char *filename = argv[3]; + char *cbfsname = argv[4]; + + uint32_t filesize = 0; + void *filedata = loadfile(filename, &filesize, 0, SEEK_SET); + if (filedata == NULL) { + printf("Could not load file '%s'.\n", filename); + return 1; + } + + uint32_t base = 0; + void *cbfsfile = NULL; + + uint32_t type = CBFS_COMPONENT_LZMA_RAW; + if (argc > 5) { + if (intfiletype(argv[5]) != ((uint64_t) - 1)) + type = intfiletype(argv[5]); + else + type = strtoul(argv[5], NULL, 0); + } + if (argc > 6) { + base = strtoul(argv[6], NULL, 0); + } + uint32_t compresssize = filesize; + void *compressed_data; + for (;;) { + compressed_data = malloc(compresssize); + if (! compressed_data) { + printf("Could not allocate %d space\n", compresssize); + return 1; + } + uint32_t actualsize = compresssize; + extern void do_lzma_compress(char *in, int in_len, + char *out, int *out_len); + do_lzma_compress(filedata, filesize, compressed_data, + &compresssize); + if (compresssize <= actualsize) + break; + // Try again with required size. + free(compressed_data); + } + + cbfsfile = create_cbfs_file(cbfsname, compressed_data, + &compresssize, type, &base); + if (add_file_to_cbfs(cbfsfile, compresssize, base)) + return 1; + if (writerom(romname, rom, romsize)) + return 1; + return 0; +} + static int cbfs_create(int argc, char **argv) { char *romname = argv[1]; @@ -269,6 +338,7 @@ struct command commands[] = { {CMD_ADD, "add", cbfs_add}, {CMD_ADD_PAYLOAD, "add-payload", cbfs_add_payload}, {CMD_ADD_STAGE, "add-stage", cbfs_add_stage}, + {CMD_ADD_LZMA, "add-lzma", cbfs_add_lzma}, {CMD_CREATE, "create", cbfs_create}, {CMD_LOCATE, "locate", cbfs_locate}, {CMD_PRINT, "print", cbfs_print}, @@ -286,6 +356,7 @@ void usage(void) " add FILE NAME TYPE [base address] Add a component\n" " add-payload FILE NAME [COMP] [base] Add a payload to the ROM\n" " add-stage FILE NAME [COMP] [base] Add a stage to the ROM\n" + " add-lzma FILE NAME [TYPE] [base] Lzma compress and add\n" " create SIZE BOOTBLOCK [ALIGN] Create a ROM file\n" " locate FILE NAME ALIGN Find a place for a file of that size\n" " print Show the contents of the ROM\n" diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c index 0fb0200..788d843 100644 --- a/util/cbfstool/common.c +++ b/util/cbfstool/common.c @@ -142,6 +142,7 @@ struct filetypes_t { {CBFS_COMPONENT_OPTIONROM, "optionrom"}, {CBFS_COMPONENT_BOOTSPLASH, "bootsplash"}, {CBFS_COMPONENT_RAW, "raw"}, + {CBFS_COMPONENT_LZMA_RAW, "lzma-raw"}, {CBFS_COMPONENT_VSA, "vsa"}, {CBFS_COMPONENT_MBI, "mbi"}, {CBFS_COMPONENT_MICROCODE, "microcode"}, -- 1.7.3.4

2 1

build service results for r6257
by repository service 16 Jan '11

16 Jan '11

Dear coreboot readers! This is the automatic build system of coreboot. The developer "ruik" checked in revision 6257 to the coreboot repository. This caused the following changes: Change Log: Ooops lets see if this extra comment removal fixes this. Signed-off-by: Rudolf Marek <r.marek(a)assembler.cz> Acked-by: Rudolf Marek <r.marek(a)assembler.cz> Build Log: Compilation of asrock:939a785gmh has been fixed If something broke during this checkin please be a pain in ruik's neck until the issue is fixed. If this issue is not fixed within 24h the revision should be backed out. Best regards, coreboot automatic build system

1 0

[commit] r6257 - trunk/src/mainboard/asrock/939a785gmh
by repository service 16 Jan '11

16 Jan '11

Author: ruik Date: Sun Jan 16 18:15:36 2011 New Revision: 6257 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6257 Log: Ooops lets see if this extra comment removal fixes this. Signed-off-by: Rudolf Marek <r.marek(a)assembler.cz> Acked-by: Rudolf Marek <r.marek(a)assembler.cz> Modified: trunk/src/mainboard/asrock/939a785gmh/romstage.c Modified: trunk/src/mainboard/asrock/939a785gmh/romstage.c ============================================================================== --- trunk/src/mainboard/asrock/939a785gmh/romstage.c Sun Jan 16 17:23:51 2011 (r6256) +++ trunk/src/mainboard/asrock/939a785gmh/romstage.c Sun Jan 16 18:15:36 2011 (r6257) @@ -94,7 +94,7 @@ GPI21 - unknown input (NC?) GPI22 - unknown input (NC?) GPO23 - mgpuV bit0 - GP24-27 - PS/2 mouse/keyb (only keyb is connected use flip interface for mouse)*/ + GP24-27 - PS/2 mouse/keyb (only keyb is connected use flip interface for mouse) */ pnp_write_config(GPIO2345_DEV, 0x30, 0x07); /* Enable GPIO 2,3,4. */ pnp_write_config(GPIO2345_DEV, 0xe3, 0xf6); /* dir of GPIO2 11110110*/

1 0

build service results for r6256
by repository service 16 Jan '11

16 Jan '11

Dear coreboot readers! This is the automatic build system of coreboot. The developer "ruik" checked in revision 6256 to the coreboot repository. This caused the following changes: Change Log: Trivial, cleanup of GPIO comments. Signed-off-by: Rudolf Marek <r.marek(a)assembler.cz> Acked-by: Rudolf Marek <r.marek(a)assembler.cz> Build Log: Compilation of asrock:939a785gmh has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=6256&device=939a785gmh&ven… If something broke during this checkin please be a pain in ruik's neck until the issue is fixed. If this issue is not fixed within 24h the revision should be backed out. Best regards, coreboot automatic build system

1 0

[commit] r6256 - trunk/src/mainboard/asrock/939a785gmh
by repository service 16 Jan '11

16 Jan '11

Author: ruik Date: Sun Jan 16 17:23:51 2011 New Revision: 6256 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6256 Log: Trivial, cleanup of GPIO comments. Signed-off-by: Rudolf Marek <r.marek(a)assembler.cz> Acked-by: Rudolf Marek <r.marek(a)assembler.cz> Modified: trunk/src/mainboard/asrock/939a785gmh/romstage.c Modified: trunk/src/mainboard/asrock/939a785gmh/romstage.c ============================================================================== --- trunk/src/mainboard/asrock/939a785gmh/romstage.c Fri Jan 14 09:36:34 2011 (r6255) +++ trunk/src/mainboard/asrock/939a785gmh/romstage.c Sun Jan 16 17:23:51 2011 (r6256) @@ -78,7 +78,7 @@ pnp_enter_ext_func_mode(GPIO2345_DEV); pnp_set_logical_device(GPIO2345_DEV); - /* Pin 119 ~ 120 GP21, GP20 */ + /* Pin 119 ~ 120 is GP21, GP20 */ reg = pnp_read_config(GPIO2345_DEV, 0x29); pnp_write_config(GPIO2345_DEV, 0x29, (reg | 2)); @@ -90,28 +90,39 @@ pnp_write_config(GPIO2345_DEV, 0x2c, 0x1); pnp_write_config(GPIO2345_DEV, 0x2d, 0x1); -//idx 30 e0 e1 e2 e3 e4 e5 e6 e7 e8 e9 f0 f1 f2 f3 f4 f5 f6 f7 fe -//val 07 XX XX XX f6 0e 00 00 00 00 ff d6 96 00 40 d0 83 00 00 07 - -//GPO20 - 1 = 1.82 0 = 1.92 sideport voltage -//mGPUV GPO40 | GPO41 | GPIO23 - 000 - 1.45V step 0.05 -- 111 - 1.10V -//DDR voltage 44 45 46 - - /* GPO20 - sideport voltage GPO23 - mgpuV */ + /* GPO20 - sideport voltage 1 = 1.82 0 = 1.92 + GPI21 - unknown input (NC?) + GPI22 - unknown input (NC?) + GPO23 - mgpuV bit0 + GP24-27 - PS/2 mouse/keyb (only keyb is connected use flip interface for mouse)*/ + */ pnp_write_config(GPIO2345_DEV, 0x30, 0x07); /* Enable GPIO 2,3,4. */ pnp_write_config(GPIO2345_DEV, 0xe3, 0xf6); /* dir of GPIO2 11110110*/ pnp_write_config(GPIO2345_DEV, 0xe4, 0x0e); /* data */ pnp_write_config(GPIO2345_DEV, 0xe5, 0x00); /* No inversion */ - /* GPO30 GPO33 GPO35 */ - //GPO35 - loadline control 0 - enabled - //GPIO30 - unknown - //GPIO33 - unknown + /* GPIO30 - unknown output, set to 0 + GPI31 - unknown input NC? + GPI32 - unknown input NC? + GPIO33 - unknown output, set to 0. + GPI34 - unknown input NC? + GPO35 - loadline control 1 = enabled (2 phase clock) 0 = disabled 4 phase clock + GPIO36 - input = HT voltage 1.30V output (low) = HT voltage 1.35V + GP37 - unknown input NC? */ + pnp_write_config(GPIO2345_DEV, 0xf0, 0xd6); /* dir of GPIO3 11010110*/ pnp_write_config(GPIO2345_DEV, 0xf1, 0x96); /* data */ pnp_write_config(GPIO2345_DEV, 0xf2, 0x00); /* No inversion */ - /* GPO40 GPO41 GPO42 GPO43 PO45 */ + /* GPO40 - mgpuV bit2 + GPO41 - mgpuV bit1 + GPO42 - IRTX + GPO43 - IRRX + GPIO44 - memory voltage bit2 (input/outputlow) + GPIO45 - memory voltage bit1 (2.60 (000) - 2.95 (111)) + GPIO46 - memory voltage bit0 + GPIO47 - unknown input? */ + pnp_write_config(GPIO2345_DEV, 0xf4, 0xd0); /* dir of GPIO4 11010000 */ pnp_write_config(GPIO2345_DEV, 0xf5, 0x83); /* data */ pnp_write_config(GPIO2345_DEV, 0xf6, 0x00); /* No inversion */

1 0

Re: [coreboot] abuild error
by Nils 15 Jan '11

15 Jan '11

OK i have done some more hours of building and testing. After i do buildgcc there is no .xcompile file. After doing make menuconfig i have the following .xcompile file: |nils@debian:~/coreboot_6255$ cat .xcompile |# elf32-i386 toolchain |AS:=/home/nils/coreboot_6255/util/crossgcc/xgcc/bin/i386-elf-as |CC:=/home/nils/coreboot_6255/util/crossgcc/xgcc/bin/i386-elf-gcc -Wa,--divide |-fno-stack-protector -Wl,--build-id=none |CPP:=/home/nils/coreboot_6255/util/crossgcc/xgcc/bin/i386-elf-cpp |AR:=/home/nils/coreboot_6255/util/crossgcc/xgcc/bin/i386-elf-ar |LD:=/home/nils/coreboot_6255/util/crossgcc/xgcc/bin/i386-elf-ld |STRIP:=/home/nils/coreboot_6255/util/crossgcc/xgcc/bin/i386-elf-strip |NM:=/home/nils/coreboot_6255/util/crossgcc/xgcc/bin/i386-elf-nm |OBJCOPY:=/home/nils/coreboot_6255/util/crossgcc/xgcc/bin/i386-elf-objcopy |OBJDUMP:=/home/nils/coreboot_6255/util/crossgcc/xgcc/bin/i386-elf-objdump | |# native toolchain |HOSTCC:=gcc After that i do make and get: -----------------------------------------------------------------8<------------------------------------------------ |Resolving deltas: 100% (4653/4653), done. |Branch 0.6.1-stable set up to track remote branch 0.6.1-stable from origin. |Switched to a new branch '0.6.1-stable' |/bin/sh: -Wa,--divide: not found | Compiling whole program out/ccode.16.s | Compiling to assembler out/asm-offsets.s | Generating offset file out/asm-offsets.h | Compiling (16bit) out/code16.o | Compiling whole program out/ccode32flat.o |src/coreboot.c: In function 'ulzma': |src/coreboot.c:329:9: warning: format '%d' expects type 'int', but argument 3 |has type 'long unsigned int' | Compiling whole program out/code32seg.o | Building ld scripts (version "0.6.1.2-20110115_210950-debian") |Fixed space: 0xe05b-0x10000 total: 8101 slack: 2 Percent slack: 0.0% |16bit size: 38896 |32bit segmented size: 2416 |32bit flat size: 51456 | Linking out/rom16.o | Stripping out/rom16.strip.o | Linking out/rom32seg.o | Stripping out/rom32seg.strip.o | Linking out/rom.o | Prepping out/bios.bin |Total size: 92768 Free space: 38304 Percent used: 70.8% (128KiB rom) | CBFS coreboot.rom | PAYLOAD SeaBIOS (internal, compression: LZMA) |Could not add the file to CBFS, it's probably too big. |File size: 46873 bytes (45 KB). |make: *** [build/coreboot.rom] Fout 1 After that i still have the same .xcompile file so the crossgcc should been used by make, right? But doesn't the " Building ld scripts (version "0.6.1.2-20110115_210950- debian") " tell us otherwise? And why does no one else gets this much to big payload size? Also when i do a abuild the .xcompile file is removed and no new one is added. Does that mean that abuild is never using the crosscompiler ? This is still very confusing to me. What is the pro's opinion? Thanks, Nils.

1 0

Re: [coreboot] abuild error
by Nils 15 Jan '11

15 Jan '11

OK i spent the whole evening experimenting with crossgcc again but i don't get it running. >> How can i check if the crosscompiler is used? > >cat .xcompile That doesn't find anything when executed in my topmost coreboot directory. I have tried : cd /util/crossgcc ./buildgcc this builds xgcc in coreboot/util/crossgcc no .xcompile i have tried: in coreboot dir /home/nils/coreboot/util/crossgcc/buildgcc this builds xgcc in coreboot dir but no .xcompile I could not find any documentation on how to use this. It would be nice if someone could shed some light on this. Thanks, Nils.

2 1

Re: [coreboot] abuild error
by Nils 14 Jan '11

14 Jan '11

Hi Stefan, You wrote: >It doesn't occur with the coreboot toolchain iirc though I did a fresh unmoddified checkout on r6255. Then i did buildgcc. The downloading/building of this beast takes more than an hour on my old laptop. :) Then i got the same result: nils@debian:~/coreboot_6255$ util/abuild/abuild -t technologic/ts5300 Building technologic/ts5300; i386: ok Creating config file... ok; Compiling image on 1 cpu .. FAILED after 20s! Log excerpt: /bin/sh: -Wa,--divide: not found CBFS coreboot.rom PAYLOAD SeaBIOS (internal, compression: LZMA) Could not add the file to CBFS, it's probably too big. File size: 46848 bytes (45 KB). make: *** [coreboot-builds/technologic_ts5300/coreboot.rom] Fout 1 The "-Wa,--divide: not found" error is from the old stable version of SeaBios that is used by Coreboot. This is already taken care of by Kevin in trunk. How can i check if the crosscompiler is used? Thanks, Nils.

2 1

← Newer
1
...
19
20
21
22
23
24
25
...
30
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 January 2011