coreboot February 2013

coreboot@coreboot.org

27 participants
790 discussions

Patch merged into coreboot/master: 332795c cbfstool: Make endian detection functions to work without prior setup.
by gerrit＠coreboot.org 01 Feb '13

01 Feb '13

the following patch was just integrated into master: commit 332795cc5951c6d65badd2bbf3c79f6b63dbdbc2 Author: Hung-Te Lin <hungte(a)chromium.org> Date: Mon Jan 28 15:53:34 2013 +0800 cbfstool: Make endian detection functions to work without prior setup. The 'host_bigendian' variable (and functions relying on it like ntohl/htonl) requires host detection by calling static which_endian() first -- which may be easily forgotten by developers. It's now a public function in common.c and doesn't need initialization anymore. Change-Id: I13dabd1ad15d2d6657137d29138e0878040cb205 Signed-off-by: Hung-Te Lin <hungte(a)chromium.org> Reviewed-on: http://review.coreboot.org/2199 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> Build-Tested: build bot (Jenkins) at Wed Jan 30 04:04:05 2013, giving +1 Reviewed-By: Paul Menzel <paulepanter(a)users.sourceforge.net> at Wed Jan 30 11:07:22 2013, giving +2 See http://review.coreboot.org/2199 for details. -gerrit

1 0

Patch merged into coreboot/master: d723c5b clean-up for arch/armv7/Makefile.inc
by gerrit＠coreboot.org 01 Feb '13

01 Feb '13

the following patch was just integrated into master: commit d723c5b554786794217a92acb4ce0096bf924da8 Author: David Hendricks <dhendrix(a)chromium.org> Date: Thu Jan 31 17:49:22 2013 -0800 clean-up for arch/armv7/Makefile.inc This removes a few lines which are obsolete or unneeded. We may want to do something with SMP eventually (can we use it for decompression?) but for now we'll assume non-bootstrap cores are idle until the OS does something with them. Change-Id: Iff6b196e008e803bcfd00e5de07cf471bd2357ea Signed-off-by: David Hendricks <dhendrix(a)chromium.org> Reviewed-on: http://review.coreboot.org/2257 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich(a)gmail.com> Build-Tested: build bot (Jenkins) at Fri Feb 1 05:15:37 2013, giving +1 Reviewed-By: Ronald G. Minnich <rminnich(a)gmail.com> at Fri Feb 1 06:19:04 2013, giving +2 See http://review.coreboot.org/2257 for details. -gerrit

1 0

Patch merged into coreboot/master: 0a5bc7f snow: make romstage init DRAM controller and call ramstage
by gerrit＠coreboot.org 01 Feb '13

01 Feb '13

the following patch was just integrated into master: commit 0a5bc7fb474a15b77747b2007340dd7589413d8d Author: Ronald G. Minnich <rminnich(a)gmail.com> Date: Wed Jan 30 15:55:36 2013 -0800 snow: make romstage init DRAM controller and call ramstage This is a first cut at a romstage. It sets up memory, although that needs some work; and finds and loads a ramstage. Change-Id: I02a0eb48828500bf83c3c57d4bacb396e58bf9a5 Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com> Signed-off-by: David Hendricks <dhendrix(a)chromium.org> Reviewed-on: http://review.coreboot.org/2245 Tested-by: build bot (Jenkins) Build-Tested: build bot (Jenkins) at Fri Feb 1 03:47:25 2013, giving +1 Reviewed-By: Ronald G. Minnich <rminnich(a)gmail.com> at Fri Feb 1 06:17:40 2013, giving +2 See http://review.coreboot.org/2245 for details. -gerrit

1 0

Patch merged into coreboot/master: c9f26a1 exynos5250: hard-code array index for memory timings
by gerrit＠coreboot.org 01 Feb '13

01 Feb '13

the following patch was just integrated into master: commit c9f26a169d854cf682f3d9d55124dce70b84620f Author: David Hendricks <dhendrix(a)chromium.org> Date: Thu Jan 31 17:25:16 2013 -0800 exynos5250: hard-code array index for memory timings Discovering memory timings is a bit complicated due to the need to obtain and decode board config. To make things worse, the imported code makes a mess of dependencies. Hard-code the memory timings for now to get us further along (the instability won't really matter until we're loading depthcharge anyway). Change-Id: I1f341ad597db0c31ed4ae6bc703fc22b6596a803 Signed-off-by: David Hendricks <dhendrix(a)chromium.org> Reviewed-on: http://review.coreboot.org/2256 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich(a)gmail.com> Build-Tested: build bot (Jenkins) at Fri Feb 1 03:39:42 2013, giving +1 Reviewed-By: Ronald G. Minnich <rminnich(a)gmail.com> at Fri Feb 1 06:16:44 2013, giving +2 See http://review.coreboot.org/2256 for details. -gerrit

1 0

Patch merged into coreboot/master: ea60473 exynos5250: #define the dram controller interleaving size
by gerrit＠coreboot.org 01 Feb '13

01 Feb '13

the following patch was just integrated into master: commit ea60473b9dea41571e1eac9afe93f712d66e557a Author: David Hendricks <dhendrix(a)chromium.org> Date: Thu Jan 31 17:22:50 2013 -0800 exynos5250: #define the dram controller interleaving size Change-Id: Iab184aa85be68b6ca5107d278d2fe821e5b2e611 Signed-off-by: David Hendricks <dhendrix(a)chromium.org> Reviewed-on: http://review.coreboot.org/2255 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich(a)gmail.com> Build-Tested: build bot (Jenkins) at Fri Feb 1 03:10:28 2013, giving +1 Reviewed-By: Ronald G. Minnich <rminnich(a)gmail.com> at Fri Feb 1 06:16:23 2013, giving +2 See http://review.coreboot.org/2255 for details. -gerrit

1 0

Patch merged into coreboot/master: d51557a lib: Prevent unaligned memory access and fix endianess in LZMA decode library.
by gerrit＠coreboot.org 01 Feb '13

01 Feb '13

the following patch was just integrated into master: commit d51557ade2a9f29cbb4e0f38d5a4920b42486168 Author: Hung-Te Lin <hungte(a)chromium.org> Date: Thu Jan 31 12:14:46 2013 +0800 lib: Prevent unaligned memory access and fix endianess in LZMA decode library. LZMA decode library used to retrieve output size by: outSize = *(UInt32 *)(src + LZMA_PROPERTIES_SIZE); 'src' is aligned but LZMA_PROPERTIES_SIZE may refer to an unaligned address like src+5, and using that as integer pointer may fail on platforms like ARM. Also this will fail on systems using big-endian (outSize was encoded in little-endian). To fix this, reconstruct outSize in little-endian way. Change-Id: If678e735cb270c3e5e29f36f1fad318096bf7d59 Signed-off-by: Hung-Te Lin <hungte(a)chromium.org> Reviewed-on: http://review.coreboot.org/2246 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich(a)gmail.com> Build-Tested: build bot (Jenkins) at Fri Feb 1 05:57:55 2013, giving +1 Reviewed-By: Ronald G. Minnich <rminnich(a)gmail.com> at Fri Feb 1 06:15:49 2013, giving +2 See http://review.coreboot.org/2246 for details. -gerrit

1 0

Patch merged into coreboot/master: 05dccae cbfstool: move flat-binary parsing to cbfs-mkpayload.
by gerrit＠coreboot.org 01 Feb '13

01 Feb '13

the following patch was just integrated into master: commit 05dccae75df4ed0c6a75867a89cf1a4055507e28 Author: Hung-Te Lin <hungte(a)chromium.org> Date: Mon Jan 28 15:04:30 2013 +0800 cbfstool: move flat-binary parsing to cbfs-mkpayload. The ELF parsing and payload building in add-flat-binary command should be isolated just like mkpayload and mkstage. Since the add-flat-binary command creates a payload in the end , move payload processing to cbfs-mkpayload.c. To test: cbfstool coreboot.rom add-flat-binary -f u-boot.bin -n fallback/payload \ -l 0x100000 -e 0x100020 To verify, get output from "cbfstool coreboot.rom print -v": fallback/payload 0x73ccc0 payload 124920 INFO: code (no compression, offset: 0x38, load: 0x1110000, length:..) Change-Id: Ia7bd2e6160507c0a1e8e20bc1d08397ce9826e0d Signed-off-by: Hung-Te Lin <hungte(a)chromium.org> Reviewed-on: http://review.coreboot.org/2197 Tested-by: build bot (Jenkins) Reviewed-by: David Hendricks <dhendrix(a)chromium.org> Build-Tested: build bot (Jenkins) at Fri Feb 1 06:05:28 2013, giving +1 Reviewed-By: David Hendricks <dhendrix(a)chromium.org> at Fri Feb 1 06:06:41 2013, giving +2 See http://review.coreboot.org/2197 for details. -gerrit

1 0

Patch set updated for coreboot: 0d880b1 cbfstool: move flat-binary parsing to cbfs-mkpayload.
by David Hendricks 01 Feb '13

01 Feb '13

David Hendricks (dhendrix(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2197 -gerrit commit 0d880b12ba4b3f486986f9890d145d75a2afc2e6 Author: Hung-Te Lin <hungte(a)chromium.org> Date: Mon Jan 28 15:04:30 2013 +0800 cbfstool: move flat-binary parsing to cbfs-mkpayload. The ELF parsing and payload building in add-flat-binary command should be isolated just like mkpayload and mkstage. Since the add-flat-binary command creates a payload in the end , move payload processing to cbfs-mkpayload.c. To test: cbfstool coreboot.rom add-flat-binary -f u-boot.bin -n fallback/payload \ -l 0x100000 -e 0x100020 To verify, get output from "cbfstool coreboot.rom print -v": fallback/payload 0x73ccc0 payload 124920 INFO: code (no compression, offset: 0x38, load: 0x1110000, length:..) Change-Id: Ia7bd2e6160507c0a1e8e20bc1d08397ce9826e0d Signed-off-by: Hung-Te Lin <hungte(a)chromium.org> --- util/cbfstool/cbfs-mkpayload.c | 53 +++++++++++++++++++++++++++++++++++++++ util/cbfstool/cbfstool.c | 57 ++++++++++-------------------------------- util/cbfstool/common.h | 5 ++++ 3 files changed, 71 insertions(+), 44 deletions(-) diff --git a/util/cbfstool/cbfs-mkpayload.c b/util/cbfstool/cbfs-mkpayload.c index da04a75..060e9ee 100644 --- a/util/cbfstool/cbfs-mkpayload.c +++ b/util/cbfstool/cbfs-mkpayload.c @@ -202,3 +202,56 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output, err: return -1; } + +int parse_flat_binary_to_payload(unsigned char *input, unsigned char **output, + int32_t input_size, + uint32_t loadaddress, + uint32_t entrypoint, + comp_algo algo) +{ + comp_func_ptr compress; + unsigned char *payload; + struct cbfs_payload_segment *segs; + int doffset, len = 0; + + compress = compression_function(algo); + if (!compress) + return -1; + + DEBUG("start: parse_flat_binary_to_payload\n"); + + /* FIXME compressed file size might be bigger than original file and + * causing buffer overflow. */ + payload = calloc((2 * sizeof(struct cbfs_payload_segment)) + input_size, 1); + if (payload == NULL) { + ERROR("Could not allocate memory.\n"); + return -1; + } + + segs = (struct cbfs_payload_segment *)payload; + doffset = (2 * sizeof(*segs)); + + /* Prepare code segment */ + segs[0].type = PAYLOAD_SEGMENT_CODE; + segs[0].load_addr = htonll(loadaddress); + segs[0].mem_len = htonl(input_size); + segs[0].offset = htonl(doffset); + + compress((char*)input, input_size, (char*)payload + doffset, &len); + segs[0].compression = htonl(algo); + segs[0].len = htonl(len); + + if ((unsigned int)len >= input_size) { + WARN("Compressing data would make it bigger - disabled.\n"); + segs[0].compression = 0; + segs[0].len = htonl(input_size); + memcpy(payload + doffset, input, input_size); + } + + /* prepare entry point segment */ + segs[1].type = PAYLOAD_SEGMENT_ENTRY; + segs[1].load_addr = htonll(entrypoint); + *output = payload; + + return doffset + ntohl(segs[0].len); +} diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index 2857264..1ad270b 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -234,12 +234,8 @@ static int cbfs_add_stage(void) static int cbfs_add_flat_binary(void) { uint32_t filesize = 0; - uint32_t final_size; void *rom, *filedata, *cbfsfile; unsigned char *payload; - comp_func_ptr compress; - struct cbfs_payload_segment *segs; - int doffset, len = 0; if (!param.filename) { ERROR("You need to specify -f/--filename.\n"); @@ -263,10 +259,6 @@ static int cbfs_add_flat_binary(void) return 1; } - compress = compression_function(param.algo); - if (!compress) - return 1; - rom = loadrom(param.cbfs_name); if (rom == NULL) { ERROR("Could not load ROM image '%s'.\n", @@ -282,47 +274,24 @@ static int cbfs_add_flat_binary(void) return 1; } - /* FIXME compressed file size might be bigger than original file */ - payload = calloc((2 * sizeof(struct cbfs_payload_segment)) + filesize, 1); - if (payload == NULL) { - ERROR("Could not allocate memory.\n"); - free(filedata); + filesize = parse_flat_binary_to_payload(filedata, &payload, + filesize, + param.loadaddress, + param.entrypoint, + param.algo); + free(filedata); + + if ((int)filesize <= 0) { + ERROR("Adding payload '%s' failed.\n", + param.filename); free(rom); return 1; } + cbfsfile = create_cbfs_file(param.name, payload, &filesize, + CBFS_COMPONENT_PAYLOAD, &param.baseaddress); - segs = (struct cbfs_payload_segment *)payload; - doffset = (2 * sizeof(struct cbfs_payload_segment)); - - /* Prepare code segment */ - segs[0].type = PAYLOAD_SEGMENT_CODE; - segs[0].load_addr = (uint64_t)htonll(param.loadaddress); - segs[0].mem_len = (uint32_t)htonl(filesize); - segs[0].offset = (uint32_t)htonl(doffset); - - compress(filedata, filesize, (char *)(payload + doffset), &len); - segs[0].compression = htonl(param.algo); - segs[0].len = htonl(len); - - if ((unsigned int)len >= filesize) { - segs[0].compression = 0; - segs[0].len = htonl(filesize); - memcpy((char *)(payload + doffset), filedata, filesize); - } - - /* prepare entry point segment */ - segs[1].type = PAYLOAD_SEGMENT_ENTRY; - segs[1].load_addr = (uint64_t)htonll(param.entrypoint); - - final_size = doffset + ntohl(segs[0].len); - cbfsfile = - create_cbfs_file(param.name, payload, &final_size, - CBFS_COMPONENT_PAYLOAD, &param.baseaddress); - - free(filedata); free(payload); - - if (add_file_to_cbfs(cbfsfile, final_size, param.baseaddress)) { + if (add_file_to_cbfs(cbfsfile, filesize, param.baseaddress)) { ERROR("Adding payload '%s' failed.\n", param.filename); free(cbfsfile); diff --git a/util/cbfstool/common.h b/util/cbfstool/common.h index bb18ee1..bd5ef65 100644 --- a/util/cbfstool/common.h +++ b/util/cbfstool/common.h @@ -72,8 +72,13 @@ comp_func_ptr compression_function(comp_algo algo); uint64_t intfiletype(const char *name); +/* cbfs-mkpayload.c */ int parse_elf_to_payload(unsigned char *input, unsigned char **output, comp_algo algo); +int parse_flat_binary_to_payload(unsigned char *input, unsigned char **output, + int32_t input_size, uint32_t loadaddress, + uint32_t entrypoint, comp_algo algo); +/* cbfs-mkstage.c */ int parse_elf_to_stage(unsigned char *input, unsigned char **output, comp_algo algo, uint32_t * location);

1 0

Patch merged into coreboot/master: 4d87d4e cbfstool: Add -v (verbose) output.
by gerrit＠coreboot.org 01 Feb '13

01 Feb '13

the following patch was just integrated into master: commit 4d87d4e09b38d152425f060f088f3a44b7dacfcb Author: Hung-Te Lin <hungte(a)chromium.org> Date: Mon Jan 28 14:39:43 2013 +0800 cbfstool: Add -v (verbose) output. Add -v (verbose) to every command, and allow printing debug messages. Revise logging and debugging functions (fprintf(stderr,...), dprintf...) and verbose message printing with following macros: ERROR(xxx): E: xxx WARN(xxx) W: xxx LOG(xxx) xxx INFO(...) INFO: xxx (only when runs with -v ) DEBUG(...) DEBUG: xxx (only when runs with more than one -v) Example: cbfstool coreboot.rom print -v cbfstool coreboot.rom add -f file -n file -t raw -v -v Normal output (especially for parsing) should use printf, not any of these macros (see usage() and cbfs_locate(), cbfs_print_directory() for example). Change-Id: I167617da1a6eea2b07075b0eb38e3c9d85ea75dc Signed-off-by: Hung-Te Lin <hungte(a)chromium.org> Reviewed-on: http://review.coreboot.org/2196 Tested-by: build bot (Jenkins) Reviewed-by: David Hendricks <dhendrix(a)chromium.org> Build-Tested: build bot (Jenkins) at Wed Jan 30 03:50:11 2013, giving +1 Reviewed-By: David Hendricks <dhendrix(a)chromium.org> at Fri Feb 1 05:50:32 2013, giving +2 See http://review.coreboot.org/2196 for details. -gerrit

1 0

Re: [coreboot] Different Google copyright notices: »The Chromium OS Authors. ?«
by ron minnich 01 Feb '13

01 Feb '13

On Thu, Jan 31, 2013 at 6:09 PM, Hung-Te Lin <hungte(a)chromium.org> wrote: > For same reason, for new commits we can be more careful to use latest > correct copyright string, but it seems no harm to keep old files as-is. What > do you think? don't change old strings. thanks ron

1 0

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 February 2013