coreboot-gerrit August 2015

coreboot-gerrit@coreboot.org

1 participants
814 discussions

New patch to review for coreboot: cbfstool: cbfs_add_entry() doesn't need to know filename or type
by Patrick Georgi 25 Aug '15

25 Aug '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11327 -gerrit commit 21dc127d726ab2cb883623390814c68201b6482b Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Tue Aug 25 13:53:42 2015 +0200 cbfstool: cbfs_add_entry() doesn't need to know filename or type They're passed as part of the header now. Change-Id: I7cd6296adac1fa72e0708b89c7009552e272f656 Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- util/cbfstool/cbfs_image.c | 9 +++------ util/cbfstool/cbfs_image.h | 2 +- util/cbfstool/cbfstool.c | 4 ++-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index 8297cf1..7066b99 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -532,24 +532,21 @@ static int cbfs_add_entry_at(struct cbfs_image *image, } int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer, - const char *name, uint32_t type, uint32_t content_offset, + uint32_t content_offset, void *header, uint32_t header_size) { assert(image); assert(buffer); assert(buffer->data); - assert(name); - type = type; assert(!IS_TOP_ALIGNED_ADDRESS(content_offset)); + const char *name = ((struct cbfs_file *)header)->filename; + uint32_t entry_type; uint32_t addr, addr_next; struct cbfs_file *entry, *next; uint32_t need_size; - if (header_size == 0) - header_size = cbfs_calculate_file_header_size(name); - need_size = header_size + buffer->size; DEBUG("cbfs_add_entry('%s'@0x%x) => need_size = %u+%zu=%u\n", name, content_offset, header_size, buffer->size, need_size); diff --git a/util/cbfstool/cbfs_image.h b/util/cbfstool/cbfs_image.h index c1df911..02c4a2d 100644 --- a/util/cbfstool/cbfs_image.h +++ b/util/cbfstool/cbfs_image.h @@ -93,7 +93,7 @@ int cbfs_export_entry(struct cbfs_image *image, const char *entry_name, * Never pass this function a top-aligned address: convert it to an offset. * Returns 0 on success, otherwise non-zero. */ int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer, - const char *name, uint32_t type, uint32_t content_offset, + uint32_t content_offset, void *header, uint32_t header_size); /* Removes an entry from CBFS image. Returns 0 on success, otherwise non-zero. */ diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index 3f97e04..36383b1 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -154,7 +154,7 @@ static int cbfs_add_integer_component(const char *name, struct cbfs_file *header = cbfs_create_file_header(CBFS_COMPONENT_RAW, buffer.size, name); uint32_t header_size = cbfs_calculate_file_header_size(name); - if (cbfs_add_entry(&image, &buffer, name, CBFS_COMPONENT_RAW, + if (cbfs_add_entry(&image, &buffer, offset, header, header_size) != 0) { ERROR("Failed to add %llu into ROM image as '%s'.\n", (long long unsigned)u64val, name); @@ -219,7 +219,7 @@ static int cbfs_add_component(const char *filename, offset = convert_to_from_top_aligned(param.image_region, -offset); - if (cbfs_add_entry(&image, &buffer, name, type, offset, + if (cbfs_add_entry(&image, &buffer, offset, header, header_size) != 0) { ERROR("Failed to add '%s' into ROM image.\n", filename);

1 0

New patch to review for coreboot: cbfstool: move cbfs_file header creation further up the call chain
by Patrick Georgi 25 Aug '15

25 Aug '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11326 -gerrit commit 1fc1df5b6c5cf2c4ee5952ff61b08dea9369901b Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Tue Aug 25 13:48:10 2015 +0200 cbfstool: move cbfs_file header creation further up the call chain The header is now created before the "converters" are run. Adding new capabilities (and fields to the header) will happen there, so we're close. Change-Id: I0556df724bd93816b435efff7d931293dbed918f Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- util/cbfstool/cbfs_image.c | 8 ++------ util/cbfstool/cbfs_image.h | 2 +- util/cbfstool/cbfstool.c | 12 ++++++++++-- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index 84f4be6..8297cf1 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -533,12 +533,13 @@ static int cbfs_add_entry_at(struct cbfs_image *image, int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer, const char *name, uint32_t type, uint32_t content_offset, - uint32_t header_size) + void *header, uint32_t header_size) { assert(image); assert(buffer); assert(buffer->data); assert(name); + type = type; assert(!IS_TOP_ALIGNED_ADDRESS(content_offset)); uint32_t entry_type; @@ -607,16 +608,11 @@ int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer, DEBUG("section 0x%x+0x%x for content_offset 0x%x.\n", addr, addr_next - addr, content_offset); - struct cbfs_file *header = - cbfs_create_file_header(type, buffer->size, name); - if (cbfs_add_entry_at(image, entry, buffer->data, content_offset, header, header_size) == 0) { - free(header); return 0; } - free(header); break; } diff --git a/util/cbfstool/cbfs_image.h b/util/cbfstool/cbfs_image.h index 432ea72..c1df911 100644 --- a/util/cbfstool/cbfs_image.h +++ b/util/cbfstool/cbfs_image.h @@ -94,7 +94,7 @@ int cbfs_export_entry(struct cbfs_image *image, const char *entry_name, * Returns 0 on success, otherwise non-zero. */ int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer, const char *name, uint32_t type, uint32_t content_offset, - uint32_t header_size); + void *header, uint32_t header_size); /* Removes an entry from CBFS image. Returns 0 on success, otherwise non-zero. */ int cbfs_remove_entry(struct cbfs_image *image, const char *name); diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index 12b3aad..3f97e04 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -151,8 +151,11 @@ static int cbfs_add_integer_component(const char *name, offset = convert_to_from_top_aligned(param.image_region, -offset); + struct cbfs_file *header = + cbfs_create_file_header(CBFS_COMPONENT_RAW, buffer.size, name); + uint32_t header_size = cbfs_calculate_file_header_size(name); if (cbfs_add_entry(&image, &buffer, name, CBFS_COMPONENT_RAW, - offset, 0) != 0) { + offset, header, header_size) != 0) { ERROR("Failed to add %llu into ROM image as '%s'.\n", (long long unsigned)u64val, name); goto done; @@ -202,6 +205,8 @@ static int cbfs_add_component(const char *filename, return 1; } + struct cbfs_file *header = + cbfs_create_file_header(type, buffer.size, name); uint32_t header_size = cbfs_calculate_file_header_size(name); if (convert && convert(&buffer, &offset, header) != 0) { @@ -214,13 +219,16 @@ static int cbfs_add_component(const char *filename, offset = convert_to_from_top_aligned(param.image_region, -offset); - if (cbfs_add_entry(&image, &buffer, name, type, offset, header_size) + if (cbfs_add_entry(&image, &buffer, name, type, offset, + header, header_size) != 0) { ERROR("Failed to add '%s' into ROM image.\n", filename); + free(header); buffer_delete(&buffer); return 1; } + free(header); buffer_delete(&buffer); return 0; }

1 0

New patch to review for coreboot: cbfstool: pass cbfs_file header into "compress" functions
by Patrick Georgi 25 Aug '15

25 Aug '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11325 -gerrit commit 641ce96372a4fa310b6a6c12a3a8d71301b41ef0 Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Tue Aug 25 15:53:52 2015 +0200 cbfstool: pass cbfs_file header into "compress" functions These functions can do all kinds of things, such as converting an ELF image into SELF, or (in the future) compress or checksum entire files. This may require changing or adding fields to the header, so they need to have access to it. The header_size parameter that was provided (but never used) is equivalent to cbfs_file's offset field. Change-Id: I7c10ab15f3dff4412461103e9763a1d78b7be7bb Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- util/cbfstool/cbfstool.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index bf51956..12b3aad 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -116,7 +116,7 @@ static unsigned convert_to_from_top_aligned(const struct buffer *region, } typedef int (*convert_buffer_t)(struct buffer *buffer, uint32_t *offset, - uint32_t *header_size); + void *header); static int cbfs_add_integer_component(const char *name, uint64_t u64val, @@ -204,7 +204,7 @@ static int cbfs_add_component(const char *filename, uint32_t header_size = cbfs_calculate_file_header_size(name); - if (convert && convert(&buffer, &offset, &header_size) != 0) { + if (convert && convert(&buffer, &offset, header) != 0) { ERROR("Failed to parse file '%s'.\n", filename); buffer_delete(&buffer); return 1; @@ -226,7 +226,7 @@ static int cbfs_add_component(const char *filename, } static int cbfstool_convert_mkstage(struct buffer *buffer, uint32_t *offset, - unused uint32_t *header_size) + void *header) { struct buffer output; int ret; @@ -237,11 +237,12 @@ static int cbfstool_convert_mkstage(struct buffer *buffer, uint32_t *offset, buffer_delete(buffer); // direct assign, no dupe. memcpy(buffer, &output, sizeof(*buffer)); + ((struct cbfs_file *)header)->len = htonl(output.size); return 0; } static int cbfstool_convert_mkpayload(struct buffer *buffer, - unused uint32_t *offset, unused uint32_t *header_size) + unused uint32_t *offset, void *header) { struct buffer output; int ret; @@ -267,11 +268,12 @@ static int cbfstool_convert_mkpayload(struct buffer *buffer, buffer_delete(buffer); // direct assign, no dupe. memcpy(buffer, &output, sizeof(*buffer)); + ((struct cbfs_file *)header)->len = htonl(output.size); return 0; } static int cbfstool_convert_mkflatpayload(struct buffer *buffer, - unused uint32_t *offset, unused uint32_t *header_size) + unused uint32_t *offset, void *header) { struct buffer output; if (parse_flat_binary_to_payload(buffer, &output, @@ -283,6 +285,7 @@ static int cbfstool_convert_mkflatpayload(struct buffer *buffer, buffer_delete(buffer); // direct assign, no dupe. memcpy(buffer, &output, sizeof(*buffer)); + ((struct cbfs_file *)header)->len = htonl(output.size); return 0; }

1 0

New patch to review for coreboot: cbfstool: drop size argument to cbfs_add_entry_at
by Patrick Georgi 25 Aug '15

25 Aug '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11324 -gerrit commit 8c97dd6b76c2c20da19d2731e11168d48fc1ab00 Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Tue Aug 25 13:16:04 2015 +0200 cbfstool: drop size argument to cbfs_add_entry_at It's sole use was comparing it to the header's "len" field. Change-Id: Ic3657a709dee0d2b9288373757345a1a56124f37 Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- util/cbfstool/cbfs_image.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index acf68ce..84f4be6 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -455,7 +455,6 @@ int cbfs_image_delete(struct cbfs_image *image) /* Tries to add an entry with its data (CBFS_SUBHEADER) at given offset. */ static int cbfs_add_entry_at(struct cbfs_image *image, struct cbfs_file *entry, - uint32_t size, const void *data, uint32_t content_offset, const void *header_data, @@ -502,13 +501,12 @@ static int cbfs_add_entry_at(struct cbfs_image *image, } // Ready to fill data into entry. - assert(ntohl(entry->len) == size); DEBUG("content_offset: 0x%x, entry location: %x\n", content_offset, (int)((char*)CBFS_SUBHEADER(entry) - image->buffer.data)); assert((char*)CBFS_SUBHEADER(entry) - image->buffer.data == (ptrdiff_t)content_offset); - memcpy(CBFS_SUBHEADER(entry), data, size); + memcpy(CBFS_SUBHEADER(entry), data, ntohl(entry->len)); if (verbose > 1) cbfs_print_entry_info(image, entry, stderr); // Process buffer AFTER entry. @@ -612,7 +610,7 @@ int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer, struct cbfs_file *header = cbfs_create_file_header(type, buffer->size, name); - if (cbfs_add_entry_at(image, entry, buffer->size, + if (cbfs_add_entry_at(image, entry, buffer->data, content_offset, header, header_size) == 0) { free(header);

1 0

New patch to review for coreboot: cbfstool: cut down on the debug output
by Patrick Georgi 25 Aug '15

25 Aug '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11323 -gerrit commit 02c6a52c91cb9abc60a85ec8b792ce60568cc15d Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Tue Aug 25 13:11:28 2015 +0200 cbfstool: cut down on the debug output Change-Id: I9a0aad42e4eb67a07c939d7cfa0d2d80838412bb Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- util/cbfstool/cbfs_image.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index a08bb2f..acf68ce 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -495,12 +495,10 @@ static int cbfs_add_entry_at(struct cbfs_image *image, * to file data. */ DEBUG("|..|header|content|... <use offset to create entry>\n"); - DEBUG("before: offset=0x%x, len=0x%x\n", - ntohl(entry->offset), ntohl(entry->len)); + DEBUG("before: offset=0x%x\n", ntohl(entry->offset)); // TODO reset expanded name buffer to 0xFF. entry->offset = htonl(ntohl(entry->offset) + len); - DEBUG("after: offset=0x%x, len=0x%x\n", - ntohl(entry->offset), ntohl(entry->len)); + DEBUG("after: offset=0x%x\n", ntohl(entry->len)); } // Ready to fill data into entry.

1 0

New patch to review for coreboot: cbfstool: Don't patch cbfs_file->len, it's already set correctly
by Patrick Georgi 25 Aug '15

25 Aug '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11322 -gerrit commit 5897ac4d8aca1131f4165c3a64cfc212aa88c80b Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Tue Aug 25 13:00:04 2015 +0200 cbfstool: Don't patch cbfs_file->len, it's already set correctly ->len used to be set to the file data length plus the size of the padding used for the cbfs_file header. This isn't the case anymore, so no patching of this field is necessary anymore. ->offset still needs to be patched in that case because its final value can only be determined when the file's actual location is known. Change-Id: I1037885f81b4ed3b68898dd7d0e515cf7a9c90a8 Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- util/cbfstool/cbfs_image.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index 8662158..a08bb2f 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -487,15 +487,18 @@ static int cbfs_add_entry_at(struct cbfs_image *image, addr = cbfs_get_entry_addr(image, entry); } - len = size + (content_offset - addr - header_size); + len = content_offset - addr - header_size; memcpy(entry, header_data, header_size); - if (len != size) { + if (len != 0) { + /* the header moved backwards a bit to accomodate cbfs_file + * alignment requirements, so patch up ->offset to still point + * to file data. + */ DEBUG("|..|header|content|... <use offset to create entry>\n"); DEBUG("before: offset=0x%x, len=0x%x\n", ntohl(entry->offset), ntohl(entry->len)); // TODO reset expanded name buffer to 0xFF. - entry->offset = htonl(ntohl(entry->offset) + (len - size)); - entry->len = htonl(size); + entry->offset = htonl(ntohl(entry->offset) + len); DEBUG("after: offset=0x%x, len=0x%x\n", ntohl(entry->offset), ntohl(entry->len)); }

1 0

New patch to review for coreboot: cbfstool: drop unused arguments in internal function
by Patrick Georgi 25 Aug '15

25 Aug '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11321 -gerrit commit d50b169cac5c9c52c98aaee3e78fa6730788e925 Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Tue Aug 25 12:59:45 2015 +0200 cbfstool: drop unused arguments in internal function Change-Id: Ie4edc5f9c96ffba7dcf8b974c56851658b9538e4 Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- util/cbfstool/cbfs_image.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index 525547d..8662158 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -456,8 +456,6 @@ int cbfs_image_delete(struct cbfs_image *image) static int cbfs_add_entry_at(struct cbfs_image *image, struct cbfs_file *entry, uint32_t size, - const char *name unused, - uint32_t type unused, const void *data, uint32_t content_offset, const void *header_data, @@ -613,7 +611,7 @@ int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer, struct cbfs_file *header = cbfs_create_file_header(type, buffer->size, name); - if (cbfs_add_entry_at(image, entry, buffer->size, name, type, + if (cbfs_add_entry_at(image, entry, buffer->size, buffer->data, content_offset, header, header_size) == 0) { free(header);

1 0

New patch to review for coreboot: cbfstool: start moving cbfs_file header creation up the call chain
by Patrick Georgi 25 Aug '15

25 Aug '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11320 -gerrit commit 2e4974da46f54874ea5147ddb9de9445eee2b79c Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Tue Aug 25 12:55:33 2015 +0200 cbfstool: start moving cbfs_file header creation up the call chain Up to now cbfstool creates the cbfs_file header at the latest possible time, which is unsuitable when the idea is to add further fields to it that need to be configured earlier. Thus, have it ripple up the call chain. Change-Id: I7c160681c31818bc550ed2098008146043d0ee01 Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- util/cbfstool/cbfs_image.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index 0fb780d..525547d 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -456,10 +456,11 @@ int cbfs_image_delete(struct cbfs_image *image) static int cbfs_add_entry_at(struct cbfs_image *image, struct cbfs_file *entry, uint32_t size, - const char *name, - uint32_t type, + const char *name unused, + uint32_t type unused, const void *data, uint32_t content_offset, + const void *header_data, uint32_t header_size) { struct cbfs_file *next = cbfs_find_next_entry(image, entry); @@ -489,7 +490,7 @@ static int cbfs_add_entry_at(struct cbfs_image *image, } len = size + (content_offset - addr - header_size); - cbfs_create_empty_entry(entry, type, len, name); + memcpy(entry, header_data, header_size); if (len != size) { DEBUG("|..|header|content|... <use offset to create entry>\n"); DEBUG("before: offset=0x%x, len=0x%x\n", @@ -609,11 +610,16 @@ int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer, DEBUG("section 0x%x+0x%x for content_offset 0x%x.\n", addr, addr_next - addr, content_offset); + struct cbfs_file *header = + cbfs_create_file_header(type, buffer->size, name); + if (cbfs_add_entry_at(image, entry, buffer->size, name, type, - buffer->data, content_offset, + buffer->data, content_offset, header, header_size) == 0) { + free(header); return 0; } + free(header); break; }

1 0

New patch to review for coreboot: cbfstool: more descriptive variable name
by Patrick Georgi 25 Aug '15

25 Aug '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11319 -gerrit commit b8b9e82c0c8d63166aedb2da89e1fac1fc5446e2 Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Tue Aug 25 12:24:49 2015 +0200 cbfstool: more descriptive variable name "target", for what? It's the offset where the file header of the currently added file will be located, name it as such. Change-Id: I382f08f81991faf660e217566849773d9a7ec227 Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- util/cbfstool/cbfs_image.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index 7d6239a..0fb780d 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -466,22 +466,22 @@ static int cbfs_add_entry_at(struct cbfs_image *image, uint32_t addr = cbfs_get_entry_addr(image, entry), addr_next = cbfs_get_entry_addr(image, next); uint32_t min_entry_size = cbfs_calculate_file_header_size(""); - uint32_t len, target; + uint32_t len, header_offset; uint32_t align = image->has_header ? image->header.align : CBFS_ENTRY_ALIGNMENT; - target = content_offset - header_size; - if (target % align) - target -= target % align; - if (target < addr) { + header_offset = content_offset - header_size; + if (header_offset % align) + header_offset -= header_offset % align; + if (header_offset < addr) { ERROR("No space to hold cbfs_file header."); return -1; } // Process buffer BEFORE content_offset. - if (target - addr > min_entry_size) { + if (header_offset - addr > min_entry_size) { DEBUG("|min|...|header|content|... <create new entry>\n"); - len = target - addr - min_entry_size; + len = header_offset - addr - min_entry_size; cbfs_create_empty_entry(entry, CBFS_COMPONENT_NULL, len, ""); if (verbose > 1) cbfs_print_entry_info(image, entry, stderr); entry = cbfs_find_next_entry(image, entry);

1 0

Patch set updated for coreboot: buildgcc: Move a bunch of code into a function
by Zheng Bao 25 Aug '15

25 Aug '15

Zheng Bao (zheng.bao(a)amd.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11318 -gerrit commit f49d1c01cf799e395a0efe5a157b5fb5b0606e75 Author: zbao <fishbaozi(a)gmail.com> Date: Mon Aug 24 22:08:36 2015 -0400 buildgcc: Move a bunch of code into a function Refactor the code to be better understandable. Change-Id: Ia815a27f7cc83c226a32e87485d712a5fbf4168e Signed-off-by: Zheng Bao <zheng.bao(a)amd.com> Signed-off-by: Zheng Bao <fishbaozi(a)gmail.com> --- util/crossgcc/buildgcc | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index d645a53..f39c4b6 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -174,6 +174,18 @@ searchtool() false } +check_sum() { + test -z "$CHECKSUM" || \ + test "$(cat sum/$1.cksum 2>/dev/null | sed -e 's@.*$[0-9a-f]\{40,\}$.*@\1@')" = \ + "$($CHECKSUM tarballs/$1 2>/dev/null | sed -e 's@.*$[0-9a-f]\{40,\}$.*@\1@')" +} + +compute_sum() { + test ! -f sum/$1.cksum && test -f tarballs/$1 && \ + (test -z "$CHECKSUM" || $CHECKSUM tarballs/$1 > sum/$1.cksum ) && \ + printf "(checksum created. ${RED}Note. Please upload sum/$1.cksum if the corresponding archive is upgraded.)${NC}" +} + download() { package=$1 archive="$(eval echo \$$package"_ARCHIVE")" @@ -181,21 +193,13 @@ download() { FILE=$(basename $archive) printf " * $FILE " - test -f tarballs/$FILE && \ - ( test -z "$CHECKSUM" || \ - test "$(cat sum/$FILE.cksum 2>/dev/null | \ - sed -e 's,.*$[0-9a-f]\{40\}$.*,\1,')" = \ - "$($CHECKSUM tarballs/$FILE 2>/dev/null | \ - sed -e 's,.*$[0-9a-f]\{40\}$.*,\1,')" ) && \ - printf "(cached)" || ( + test -f tarballs/$FILE && check_sum $FILE && printf "(cached)" || ( printf "(downloading from $archive)" rm -f tarballs/$FILE cd tarballs wget --no-check-certificate -q $archive cd .. - test ! -f sum/$FILE.cksum && test -f tarballs/$FILE && \ - (test -z "$CHECKSUM" || $CHECKSUM tarballs/$FILE > sum/$FILE.cksum ) && \ - printf "(checksum created. ${RED}Note. Please upload sum/$FILE.cksum if the corresponding archive is upgraded.${NC})" + compute_sum $FILE ) if [ ! -f tarballs/$FILE ]; then printf "\n${RED}Failed to download $FILE.${NC}\n"

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
82
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit August 2015