coreboot-gerrit December 2016

coreboot-gerrit@coreboot.org

1 participants
1140 discussions

Patch set updated for coreboot: lib: add region file support
by Aaron Durbin 05 Dec '16

05 Dec '16

Aaron Durbin (adurbin(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17713 -gerrit commit edc6ba361ef5e47714832dbb61cd8a8d6266bc9b Author: Aaron Durbin <adurbin(a)chromium.org> Date: Sat Nov 19 12:36:09 2016 -0600 lib: add region file support The region file library is added to provide the underpinnings for other libraries that support appending updates when the data changes. The most recent written data is deemed the latest data associated with that "file". A good example is the MRC cache which in a follow-up patch utilizes this library. BUG=chrome-os-partner:56151 Change-Id: Ic3caf1edbb6f11dbbe27181a87b7b19d1224fffa Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> --- src/include/region_file.h | 58 ++++++ src/lib/Makefile.inc | 2 + src/lib/region_file.c | 471 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 531 insertions(+) diff --git a/src/include/region_file.h b/src/include/region_file.h new file mode 100644 index 0000000..f1809f7 --- /dev/null +++ b/src/include/region_file.h @@ -0,0 +1,58 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2016 Google Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef REGION_FILE_H +#define REGION_FILE_H + +#include <commonlib/region.h> +#include <stdint.h> + +/* + * A region file is an abstraction to allow appending updates in a + * region_device where the data returned is the most recently data + * written. It is block based so if you write 2 bytes the data + * region_device could be 16 bytes. + */ + +struct regf; + +/* + * Initialize a region file associated with a provided region device. + * Returns < 0 on error, 0 on success. + */ +int regf_init(const struct region_device *p, struct regf *f); + +/* + * Initialize region device object associated with latest update of file data. + * Returns < 0 on error, 0 on success. + */ +int regf_data(const struct regf *f, struct region_device *rdev); + +/* Update region file with latest data. Returns < 0 on error, 0 on success. */ +int regf_update_data(struct regf *f, const void *buf, size_t size); + +/* Declared here for easy object allocation. */ +struct regf { + /* Region device covering file */ + struct region_device rdev; + /* Metadata containing blocks of the data stream. */ + struct region_device metadata; + /* Blocks forming data. */ + uint16_t data_blocks[2]; + /* Current slot in metadata marking end of data. */ + int slot; +}; + +#endif /* REGION_FILE_H */ diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index 55d19d0..2d5aa57 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -87,6 +87,8 @@ romstage-$(CONFIG_PRIMITIVE_MEMTEST) += primitive_memtest.c ramstage-$(CONFIG_PRIMITIVE_MEMTEST) += primitive_memtest.c romstage-$(CONFIG_CACHE_AS_RAM) += ramtest.c romstage-$(CONFIG_GENERIC_GPIO_LIB) += gpio.c +ramstage-y += region_file.c +romstage-y += region_file.c ramstage-y += romstage_handoff.c romstage-y += romstage_handoff.c romstage-y += romstage_stack.c diff --git a/src/lib/region_file.c b/src/lib/region_file.c new file mode 100644 index 0000000..acddf0a --- /dev/null +++ b/src/lib/region_file.c @@ -0,0 +1,471 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2016 Google Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <commonlib/helpers.h> +#include <console/console.h> +#include <region_file.h> +#include <string.h> + +/* + * A region file provides generic support for appending new data + * within a storage region. The book keeping is tracked in metadata + * blocks where an offset pointer points to the last byte of a newly + * allocated byte sequence. Thus, by taking 2 block offets one can + * determine start and size of the latest update. The data does not + * have to be the same consistent size, but the data size has be small + * enough to fit a metadata block and one data write within the region. + * + * The granularity of the block offsets are 16 bytes. By using 16-bit + * block offsets a region's total size can be no larger than 1MiB. + * However, the last 32 bytes cannot be used in the 1MiB maximum region + * because one needs to put a block offset indicating last byte written. + * An unused block offset is the value 0xffff or 0xffff0 bytes. The last + * block offset that can be written is 0xfffe or 0xfffe0 byte offset. + * + * The goal of this library is to provide a simple mechanism for + * allocating blocks of data for updates. The metadata is written first + * followed by the data. That means a power event between the block offset + * write and the data write results in blocks being allocated but not + * entirely written. It's up to the user of the library to sanity check + * data stored. + */ + +#define REGF_BLOCK_SHIFT 4 +#define REGF_BLOCK_GRANULARITY (1 << REGF_BLOCK_SHIFT) +#define REGF_METADATA_BLOCK_SIZE REGF_BLOCK_GRANULARITY +#define REGF_UNALLOCATED_BLOCK 0xffff +#define REGF_UPDATES_PER_METADATA_BLOCK \ + (REGF_METADATA_BLOCK_SIZE / sizeof(uint16_t)) + +enum { + RF_ONLY_METADATA = 0, + RF_EMPTY = -1, + RF_NEED_TO_EMPTY = -2, + RF_FATAL = -3, +}; + +struct metadata_block { + uint16_t blocks[REGF_UPDATES_PER_METADATA_BLOCK]; +}; + +static size_t block_to_bytes(uint16_t offset) +{ + return (size_t)offset << REGF_BLOCK_SHIFT; +} + +static size_t bytes_to_block(size_t bytes) +{ + return bytes >> REGF_BLOCK_SHIFT; +} + +static inline int block_offset_unallocated(uint16_t offset) +{ + return offset == REGF_UNALLOCATED_BLOCK; +} + +static inline size_t regf_data_begin(const struct regf *f) +{ + return f->data_blocks[0]; +} + +static inline size_t regf_data_end(const struct regf *f) +{ + return f->data_blocks[1]; +} + +static int all_block_offsets_unallocated(const struct metadata_block *mb) +{ + size_t i; + + for (i = 0; i < ARRAY_SIZE(mb->blocks); i++) { + if (!block_offset_unallocated(mb->blocks[i])) + return 0; + } + + return 1; +} + +/* Read metadata block at block i. */ +static int read_mb(size_t i, struct metadata_block *mb, const struct regf *f) +{ + size_t offset = block_to_bytes(i); + + if (rdev_readat(&f->metadata, mb, offset, sizeof(*mb)) < 0) + return -1; + + return 0; +} + +/* Locate metadata block with the latest update */ +static int find_latest_mb(struct metadata_block *mb, size_t num_mb_blocks, + struct regf *f) +{ + size_t l = 0; + size_t r = num_mb_blocks; + + while (l + 1 < r) { + size_t mid = (l + r) / 2; + + if (read_mb(mid, mb, f) < 0) + return -1; + if (all_block_offsets_unallocated(mb)) + r = mid; + else + l = mid; + } + + /* Set the base block slot. */ + f->slot = l * REGF_UPDATES_PER_METADATA_BLOCK; + + /* Re-read metadata block with the latest update. */ + if (read_mb(l, mb, f) < 0) + return -1; + + return 0; +} + +static void find_latest_slot(struct metadata_block *mb, struct regf *f) +{ + size_t i; + + for (i = REGF_UPDATES_PER_METADATA_BLOCK - 1; i > 0; i--) { + if (!block_offset_unallocated(mb->blocks[i])) + break; + } + + f->slot += i; +} + +static int fill_data_boundaries(struct regf *f) +{ + struct region_device slots; + size_t offset; + size_t size = sizeof(f->data_blocks); + + if (f->slot == RF_ONLY_METADATA) { + size_t start = bytes_to_block(region_device_sz(&f->metadata)); + f->data_blocks[0] = start; + f->data_blocks[1] = start; + return 0; + } + + /* Sanity check the 2 slot sequence to read. If it's out of the + * metadata blocks' bounds then one needs to empty it. This is done + * to uniquely identify I/O vs data errors in the readat() below. */ + offset = (f->slot - 1) * sizeof(f->data_blocks[0]); + if (rdev_chain(&slots, &f->metadata, offset, size)) { + f->slot = RF_NEED_TO_EMPTY; + return 0; + } + + if (rdev_readat(&slots, &f->data_blocks, 0, size) < 0) { + printk(BIOS_ERR, "REGF failed to read data boundaries.\n"); + return -1; + } + + /* All used blocks should be incrementing from previous write. */ + if (regf_data_begin(f) >= regf_data_end(f)) { + printk(BIOS_ERR, "REGF data boundaries wrong. [%zd,%zd) Need to empty.\n", + regf_data_begin(f), regf_data_end(f)); + f->slot = RF_NEED_TO_EMPTY; + return 0; + } + + /* Ensure data doesn't exceed the region. */ + if (regf_data_end(f) > bytes_to_block(region_device_sz(&f->rdev))) { + printk(BIOS_ERR, "REGF data exceeds region %zd > %zd\n", + regf_data_end(f), + bytes_to_block(region_device_sz(&f->rdev))); + f->slot = RF_NEED_TO_EMPTY; + } + + return 0; +} + +int regf_init(const struct region_device *p, struct regf *f) +{ + struct metadata_block mb; + + /* Total number of metadata blocks is found by reading the first + * block offset as the metadata is allocated first. At least one + * metadata block is available. */ + + memset(f, 0, sizeof(*f)); + f->slot = RF_FATAL; + + /* Keep parent around for accessing data later. */ + if (rdev_chain(&f->rdev, p, 0, region_device_sz(p))) + return -1; + + if (rdev_readat(p, &mb, 0, sizeof(mb)) < 0) { + printk(BIOS_ERR, "REGF fail reading first metadata block.\n"); + return -1; + } + + /* No metadata has been allocated. Assume region is empty. */ + if (block_offset_unallocated(mb.blocks[0])) { + f->slot = RF_EMPTY; + return 0; + } + + /* If metadata block is 0 in size then need to empty. */ + if (mb.blocks[0] == 0) { + f->slot = RF_NEED_TO_EMPTY; + return 0; + } + + /* The region needs to be emptied as the metadata is broken. */ + if (rdev_chain(&f->metadata, p, 0, block_to_bytes(mb.blocks[0]))) { + f->slot = RF_NEED_TO_EMPTY; + return 0; + } + + /* Locate latest metadata block with latest update. */ + if (find_latest_mb(&mb, mb.blocks[0], f)) { + printk(BIOS_ERR, "REGF fail locating latest metadata block.\n"); + f->slot = RF_FATAL; + return -1; + } + + find_latest_slot(&mb, f); + + /* Fill in the data blocks marking the latest update. */ + if (fill_data_boundaries(f)) { + printk(BIOS_ERR, "REGF fail locating data boundaries.\n"); + f->slot = RF_FATAL; + return -1; + } + + return 0; +} + +int regf_data(const struct regf *f, struct region_device *rdev) +{ + + size_t offset; + size_t size; + + /* Slot indicates if any data is available. */ + if (f->slot <= RF_ONLY_METADATA) + return -1; + + offset = block_to_bytes(regf_data_begin(f)); + size = block_to_bytes(regf_data_end(f)) - offset; + + return rdev_chain(rdev, &f->rdev, offset, size); +} + +/* + * Allocate enough metadata blocks to maximize data updates. Do this in + * terms of blocks. To solve the balance of metadata vs data, 2 linear + * equations are solved in terms of blocks where 'x' is number of + * data updates and 'y' is number of metadata blocks: + * + * x = number of data updates + * y = number of metadata blocks + * T = total blocks in region + * D = data size in blocks + * M = metadata size in blocks + * A = updates accounted for in each metadata block + * + * T = D * x + M * y + * y = x / A + * ----------------- + * T = D * x + M * x / A = x * (D + M / A) + * T * A = x * (D * A + M) + * x = T * A / (D * A + M) + */ +static int allocate_metadata(struct regf *f, size_t data_blks) +{ + size_t t, m; + size_t x, y; + uint16_t tot_metadata; + const size_t a = REGF_UPDATES_PER_METADATA_BLOCK; + const size_t d = data_blks; + + t = bytes_to_block(ALIGN_DOWN(region_device_sz(&f->rdev), + REGF_BLOCK_GRANULARITY)); + m = bytes_to_block(ALIGN_UP(REGF_METADATA_BLOCK_SIZE, + REGF_BLOCK_GRANULARITY)); + + /* Ensure at least one data update can fit with 1 metadata block + * within the region. */ + if (d > t - m) + return -1; + + /* Maximize number of updates by aligning up to the number updates in + * a metadata block. May not really be able to achieve the number of + * updates in practice, but it ensures enough metadata blocks are + * allocated. */ + x = ALIGN_UP(t * a / (d * a + m), a); + + /* One data block has to fit. */ + if (x == 0) + x = 1; + + /* Now calculate how many metadata blocks are needed. */ + y = ALIGN_UP(x, a) / a; + + /* Need to commit the metadata allocation. */ + tot_metadata = m * y; + if (rdev_writeat(&f->rdev, &tot_metadata, 0, sizeof(tot_metadata)) < 0) + return -1; + + if (rdev_chain(&f->metadata, &f->rdev, 0, + block_to_bytes(tot_metadata))) + return -1; + + /* Initialize a 0 data block to start appending from. */ + f->data_blocks[0] = tot_metadata; + f->data_blocks[1] = tot_metadata; + + return 0; +} + +static int update_can_fit(const struct regf *f, size_t data_blks) +{ + size_t metadata_slots; + size_t end_blk; + + metadata_slots = region_device_sz(&f->metadata) / sizeof(uint16_t); + + /* No more slots. */ + if ((size_t)f->slot + 1 >= metadata_slots) + return 0; + + /* See where the last block lies from the current one. */ + end_blk = data_blks + regf_data_end(f); + + /* Update would have exceeded block addressing. */ + if (end_blk >= REGF_UNALLOCATED_BLOCK) + return 0; + + /* End block exceeds size of region. */ + if (end_blk > bytes_to_block(region_device_sz(&f->rdev))) + return 0; + + return 1; +} + +static int commit_data_allocation(struct regf *f, size_t data_blks) +{ + size_t offset; + + f->slot++; + + offset = f->slot * sizeof(uint16_t); + f->data_blocks[0] = regf_data_end(f); + f->data_blocks[1] = regf_data_begin(f) + data_blks; + + if (rdev_writeat(&f->metadata, &f->data_blocks[1], offset, + sizeof(f->data_blocks[1])) < 0) + return -1; + + return 0; +} + +static int commit_data(const struct regf *f, const void *buf, size_t size) +{ + size_t offset = block_to_bytes(regf_data_begin(f)); + if (rdev_writeat(&f->rdev, buf, offset, size) < 0) + return -1; + return 0; +} + +static int handle_empty(struct regf *f, size_t data_blks) +{ + if (allocate_metadata(f, data_blks)) { + printk(BIOS_ERR, "REGF metadata allocation failed: %zd data blocks %zd total blocks\n", + data_blks, bytes_to_block(region_device_sz(&f->rdev))); + return -1; + } + + f->slot = RF_ONLY_METADATA; + + return 0; +} + +static int handle_need_to_empty(struct regf *f) +{ + if (rdev_eraseat(&f->rdev, 0, region_device_sz(&f->rdev)) < 0) { + printk(BIOS_ERR, "REGF empty failed.\n"); + return -1; + } + + f->slot = RF_EMPTY; + + return 0; +} + +static int handle_update(struct regf *f, size_t blocks, const void *buf, + size_t size) +{ + if (!update_can_fit(f, blocks)) { + printk(BIOS_INFO, "REGF update can't fit. Will empty.\n"); + f->slot = RF_NEED_TO_EMPTY; + return 0; + } + + if (commit_data_allocation(f, blocks)) { + printk(BIOS_ERR, "REGF failed to commit data allocation.\n"); + return -1; + } + + if (commit_data(f, buf, size)) { + printk(BIOS_ERR, "REGF failed to commit data.\n"); + return -1; + } + + return 0; +} + +int regf_update_data(struct regf *f, const void *buf, size_t size) +{ + int ret; + size_t blocks; + + blocks = bytes_to_block(ALIGN_UP(size, REGF_BLOCK_GRANULARITY)); + + while (1) { + int prev_slot = f->slot; + + switch (f->slot) { + case RF_EMPTY: + ret = handle_empty(f, blocks); + break; + case RF_NEED_TO_EMPTY: + ret = handle_need_to_empty(f); + break; + case RF_FATAL: + ret = -1; + break; + default: + ret = handle_update(f, blocks, buf, size); + break; + } + + /* Failing case. No more updates allowed to be attempted. */ + if (ret) { + f->slot = RF_FATAL; + break; + } + + /* No more state changes and data commited. */ + if (f->slot > RF_ONLY_METADATA && prev_slot != f->slot) + break; + } + + return ret; +}

1 0

New patch to review for coreboot: util/abuild: Clean up usage
by Martin Roth 05 Dec '16

05 Dec '16

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17724 -gerrit commit 97f27d017c01699a51d1a808fef5b8069aeb9502 Author: Martin Roth <martinroth(a)google.com> Date: Mon Dec 5 09:15:33 2016 -0700 util/abuild: Clean up usage - Indent with spaces for consistency - Change lbroot to cbroot - Remove incomplete list of options from usage line - Capitalize first word of all option text Change-Id: Id5bd4db8d7e3705cbbb93895a46a3608cd1b09e2 Signed-off-by: Martin Roth <martinroth(a)google.com> --- util/abuild/abuild | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/util/abuild/abuild b/util/abuild/abuild index 85d445b..f1b5820 100755 --- a/util/abuild/abuild +++ b/util/abuild/abuild @@ -477,42 +477,42 @@ function remove_target function myhelp { cat << __END_OF_HELP -Usage: $0 [-v] [-a] [-b] [-r] [-t <vendor/board>] [-p <dir>] [lbroot] +Usage: $0 [options] [cbroot] $0 [-V|--version] $0 [-h|--help] Options:\n" - [-v|--verbose] print more messages - [-q|--quiet] print fewer messages - [-a|--all] build previously succeeded ports as well - [-r|--remove] remove output dir after build - [-d|--dir <dir>] directory containing config files - [-t|--target <vendor/board>] attempt to build target vendor/board only - [-p|--payloads <dir>] use payloads in <dir> to build images - [-V|--version] print version number and exit - [-h|--help] print this help and exit - [-J|--junit] write JUnit formatted xml log file + [-v|--verbose] Print more messages + [-q|--quiet] Print fewer messages + [-a|--all] Build previously succeeded ports as well + [-r|--remove] Remove output dir after build + [-d|--dir <dir>] Directory containing config files + [-t|--target <vendor/board>] Attempt to build target vendor/board only + [-p|--payloads <dir>] Use payloads in <dir> to build images + [-V|--version] Print version number and exit + [-h|--help] Print this help and exit + [-J|--junit] Write JUnit formatted xml log file (defaults to $XMLFILE) - [-T|--test] submit image(s) to automated test system - [-c|--cpus <numcpus>] build on <numcpus> at the same time - [-s|--silent] omit compiler calls in logs - [-y|--ccache] use ccache - [-C|--config] configure-only mode - [-l|--loglevel <num>] set loglevel - [-u|--update] update existing image - [-P|--prefix <name>] file name prefix in CBFS + [-T|--test] Submit image(s) to automated test system + [-c|--cpus <numcpus>] Build on <numcpus> at the same time + [-s|--silent] Omit compiler calls in logs + [-y|--ccache] Use ccache + [-C|--config] Configure-only mode + [-l|--loglevel <num>] Set loglevel + [-u|--update] Update existing image + [-P|--prefix <name>] File name prefix in CBFS [-B|--blobs] Allow using binary files [-z|--clean] Remove build results when finished - [-o|--outdir <path>] store build results in path - (defaults to $TARGET) + [-o|--outdir <path>] Store build results in path + (defaults to $TARGET) [-L|--clang] Use clang - [-K|--kconfig <name>] Prepend file to generated Kconfig + [-K|--kconfig <name>] Prepend file to generated Kconfig [-x|--chromeos] Build with CHROMEOS enabled Skip boards without Chrome OS support - [-X|--xmlfile <name>] set JUnit XML log file filename - [--scan-build] use clang's static analyzer - [cbroot] absolute path to coreboot sources - (defaults to $ROOT) + [-X|--xmlfile <name>] Set JUnit XML log file filename + [--scan-build] Use clang's static analyzer + [cbroot] Absolute path to coreboot sources + (defaults to $ROOT) __END_OF_HELP }

1 0

New patch to review for coreboot: util/abuild: Don't set XGCCPATH if it's in the environment
by Martin Roth 05 Dec '16

05 Dec '16

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17723 -gerrit commit 20f3cb9000c514dba5f227041ea8145053307f6f Author: Martin Roth <martinroth(a)google.com> Date: Wed Nov 30 16:38:25 2016 -0700 util/abuild: Don't set XGCCPATH if it's in the environment Change-Id: I0fa231ca3d33300a671810e994c5be54ac10a18b Signed-off-by: Martin Roth <martinroth(a)google.com> --- util/abuild/abuild | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/util/abuild/abuild b/util/abuild/abuild index 9c1af5a..85d445b 100755 --- a/util/abuild/abuild +++ b/util/abuild/abuild @@ -31,8 +31,10 @@ export KCONFIG_OVERWRITECONFIG=1 # path to payload. Should be more generic PAYLOAD=/dev/null -# path to coreboot XGCC -XGCCPATH="$(pwd)/util/crossgcc/xgcc/bin/" +# get path to coreboot XGCC if it's not already set +if [ -z "$XGCCPATH" ]; then + XGCCPATH="$TOP/util/crossgcc/xgcc/bin/" +fi # Add XGCC to the path. if [ -d "$XGCCPATH" ] && [[ ":$PATH:" != *":$XGCCPATH:"* ]]; then

1 0

New patch to review for coreboot: util/abuild: Fix or disable shellcheck warnings
by Martin Roth 05 Dec '16

05 Dec '16

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17722 -gerrit commit cb97ba64f0fab715600bc5d400999860827dece8 Author: Martin Roth <martinroth(a)google.com> Date: Wed Nov 30 16:32:20 2016 -0700 util/abuild: Fix or disable shellcheck warnings This cleans up the shellcheck warnings in abuild. Warning count: 1 Unexpected ==. 1 Use "${var:?}" to ensure this never expands to / . 1 VARIABLE appears unused. Verify it or export it. 1 Use "$@" (with quotes) to prevent whitespace problems. 2 Consider using { cmd1; cmd2; } >> file instead of individual redirects. 2 Expressions don't expand in single quotes, use double quotes for that. 3 Prefer [ p ] || [ q ] as [ p -o q ] is not well defined. 4 $/${} is unnecessary on arithmetic variables. 5 Check exit code directly with 'if mycmd;', not indirectly with $?. 5 Use cd ... || exit in case cd fails. 11 Declare and assign separately to avoid masking return values. 13 Use $(..) instead of legacy `..`. 20 Don't use variables in the printf format string. 103 Double quote to prevent globbing. Change-Id: I9c77e122435ba87ce3a4aee76b5022f7265f9ef2 Signed-off-by: Martin Roth <martinroth(a)google.com> --- util/abuild/abuild | 283 ++++++++++++++++++++++++++++------------------------- 1 file changed, 151 insertions(+), 132 deletions(-) diff --git a/util/abuild/abuild b/util/abuild/abuild index c0f8d5e..9c1af5a 100755 --- a/util/abuild/abuild +++ b/util/abuild/abuild @@ -32,7 +32,7 @@ export KCONFIG_OVERWRITECONFIG=1 PAYLOAD=/dev/null # path to coreboot XGCC -XGCCPATH="`pwd`/util/crossgcc/xgcc/bin/" +XGCCPATH="$(pwd)/util/crossgcc/xgcc/bin/" # Add XGCC to the path. if [ -d "$XGCCPATH" ] && [[ ":$PATH:" != *":$XGCCPATH:"* ]]; then @@ -77,30 +77,25 @@ quiet=false # clang mode enabled by -sb option. scanbuild=false -ARCH=`uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ - -e s/i86pc/i386/ \ - -e s/arm.*/arm/ -e s/sa110/arm/ -e s/x86_64/amd64/ \ - -e "s/Power Macintosh/ppc/"` - trap interrupt INT function interrupt { - printf "\n$0: execution interrupted manually.\n" + printf "\n%s: execution interrupted manually.\n" "$0" if [ "$mode" == "junit" ]; then - printf "$0: deleting incomplete xml output file.\n" + printf "%s: deleting incomplete xml output file.\n" "$0" fi exit 1 } function debug { - test "$verbose" == "true" && printf "$*\n" + test "$verbose" == "true" && echo "$*" } function junit { - test "$mode" == "junit" && printf "$*\n" >> $XMLFILE + test "$mode" == "junit" && echo "$*" >> "$XMLFILE" return 0 } @@ -108,9 +103,9 @@ function junitfile { test "$mode" == "junit" && { printf '<![CDATA[\n' - cat $1 + cat "$1" printf ']]>\n' - } >> $XMLFILE + } >> "$XMLFILE" } # Return mainboard descriptors. @@ -121,7 +116,7 @@ function get_mainboards { local search_space=${1-*/*} grep -h "^[[:space:]]*config\>[[:space:]]*\<BOARD_" \ - ${ROOT}/src/mainboard/${search_space}/Kconfig.name 2>/dev/null | \ + "${ROOT}/src/mainboard/${search_space}/Kconfig.name" 2>/dev/null | \ sed "s,^.*\<BOARD_$[A-Z0-9_]*$\>.*$,\1," } @@ -131,7 +126,7 @@ function mainboard_directory local MAINBOARD=$1 grep -l "^[[:space:]]*config\>[[:space:]]*\<BOARD_${MAINBOARD}\>" \ - ${ROOT}/src/mainboard/*/*/Kconfig.name | \ + "${ROOT}/src/mainboard/*/*/Kconfig.name" | \ sed "s:^$ROOT/src/mainboard/$.*$/Kconfig.name$:\1:" } @@ -139,15 +134,16 @@ function mainboard_directory function mainboard_vendor { local MAINBOARD=$1 + local kconfig_file - local kconfig_file=$( \ + kconfig_file=$( \ grep -l "^[[:space:]]*config\>[[:space:]]*\<BOARD_${MAINBOARD}\>" \ - ${ROOT}/src/mainboard/*/*/Kconfig.name | \ + "${ROOT}/src/mainboard/*/*/Kconfig.name" | \ sed "s:^$${ROOT}/src/mainboard/.*$/.*/$Kconfig.name$$:\1/\2:" ) if [ ! -f "$kconfig_file" ]; then exit 1 fi - grep "^[[:space:]]*config\>[[:space:]]*\<VENDOR_" $kconfig_file | \ + grep "^[[:space:]]*config\>[[:space:]]*\<VENDOR_" "$kconfig_file" | \ sed "s,^.*\<VENDOR_$[A-Z0-9_]*$\>.*$,\1," } @@ -157,16 +153,18 @@ function mainboard_vendor # If a directory contains multiple boards, returns them all. function normalize_target { - local targets=$(get_mainboards $1) + local targets + + targets=$(get_mainboards "$1") if [ -n "$targets" ]; then - echo $targets + echo "$targets" return fi - local targets=$(echo $1 | tr ',' ' ') + targets=$(echo "$1" | tr ',' ' ') for i in $targets; do - if [ -n "$(mainboard_directory $i)" ]; then - echo $i + if [ -n "$(mainboard_directory "$i")" ]; then + echo "$i" else echo "$i is not a valid target" >&2 exit 1 @@ -174,35 +172,38 @@ function normalize_target done } +# shellcheck disable=SC2129 function create_config { local BUILD_NAME=$1 local build_dir=$2 + local board_srcdir + local defconfig_file - local config_file=${build_dir}/config.build - local board_srcdir=$(mainboard_directory ${BUILD_NAME}) - local defconfig_file=${build_dir}/config.$(echo "${BUILD_NAME}" | tr '[:upper:]' '[:lower:]').default + local config_file="${build_dir}/config.build" + board_srcdir="$(mainboard_directory "${BUILD_NAME}")" + defconfig_file=${build_dir}/config.$(echo "${BUILD_NAME}" | tr '[:upper:]' '[:lower:]').default - mkdir -p ${build_dir} - mkdir -p $TARGET/sharedutils + mkdir -p "${build_dir}" + mkdir -p "$TARGET/sharedutils" - if [ "$quiet" == "false" ]; then printf " Creating config file for $BUILD_NAME... \n"; fi - printf "CONFIG_VENDOR_$(mainboard_vendor ${BUILD_NAME})=y\n" > ${config_file} - printf "CONFIG_BOARD_${BUILD_NAME}=y\n" >> ${config_file} - grep "select[\t ]*ARCH" ${ROOT}/src/mainboard/${board_srcdir}/Kconfig | \ - sed "s,^.*$ARCH_.*$[^A-Z0-9_]*,CONFIG_\1=y," >> ${config_file} - printf "CONFIG_MAINBOARD_DIR=\"${board_srcdir}\"\n" >> ${config_file} + if [ "$quiet" == "false" ]; then echo " Creating config file for $BUILD_NAME..."; fi + echo "CONFIG_VENDOR_$(mainboard_vendor "${BUILD_NAME}")=y" > "${config_file}" + echo "CONFIG_BOARD_${BUILD_NAME}=y" >> "${config_file}" + grep "select[\t ]*ARCH" "${ROOT}/src/mainboard/${board_srcdir}/Kconfig" | \ + sed "s,^.*$ARCH_.*$[^A-Z0-9_]*,CONFIG_\1=y," >> "${config_file}" + echo "CONFIG_MAINBOARD_DIR=\"${board_srcdir}\"" >> "${config_file}" update_config "$BUILD_NAME" "$build_dir" "$config_file" ret=$? if [ $ret -eq 0 ]; then - if [ "$quiet" == "false" ]; then printf " $BUILD_NAME config created.\n"; fi + if [ "$quiet" == "false" ]; then echo " $BUILD_NAME config created."; fi return 0 else # Does this ever happen? - if [ "$quiet" == "false" ]; then printf "$BUILD_NAME config creation FAILED!\nLog excerpt:\n"; fi - tail -n $CONTEXT $build_dir/config.log 2> /dev/null || tail -$CONTEXT $build_dir/config.log + if [ "$quiet" == "false" ]; then printf "%s config creation FAILED!\nLog excerpt:\n" "$BUILD_NAME"; fi + tail -n $CONTEXT "$build_dir/config.log" 2> /dev/null || tail -$CONTEXT "$build_dir/config.log" return 1 fi } @@ -213,6 +214,7 @@ function update_config local build_dir=$2 local config_file=$3 + local PAYLOAD # get a working payload for the board if we have one. # the --payload option expects a directory containing # a shell script payload.sh @@ -220,14 +222,15 @@ function update_config # the script returns an absolute path to the payload binary. if [ -f "$payloads/payload.sh" ]; then - local PAYLOAD=$(sh "$payloads/payload.sh" "$BUILD_NAME") - if [ $? -gt 0 ]; then + PAYLOAD=$(sh "$payloads/payload.sh" "$BUILD_NAME") + local PAYLOAD_OK=$? + if [ $PAYLOAD_OK -gt 0 ]; then echo "problem with payload" exit 1 fi if [ "$quiet" == "false" ]; then printf "Using payload %s\n" "$PAYLOAD"; fi elif [ "$payloads" = "none" ]; then - local PAYLOAD=none + PAYLOAD=none fi if [ "$PAYLOAD" = "none" ]; then @@ -256,8 +259,9 @@ function update_config echo "$configoptions" >> "${config_file}" # shellcheck disable=SC2086 - $MAKE olddefconfig $silent "DOTCONFIG=${config_file}" "obj=${build_dir}" "objutil=$TARGET/sharedutils" &> "${build_dir}/config.log" - if [ $? -eq 0 ]; then + $MAKE olddefconfig $silent "DOTCONFIG=${config_file}" "obj=${build_dir}" "objutil=$TARGET/sharedutils" &> "${build_dir}/config.log" ; \ + CONFIG_OK=$? + if [ $CONFIG_OK -eq 0 ]; then $MAKE savedefconfig "$silent" DEFCONFIG="${defconfig_file}" DOTCONFIG="${config_file}" obj="${build_dir}" objutil="$TARGET/sharedutils" &> "${build_dir}/config.log" return 0 else @@ -265,6 +269,7 @@ function update_config fi } +# shellcheck disable=SC2129 function create_buildenv { local BUILD_NAME=$1 @@ -282,18 +287,18 @@ function create_buildenv # Allow simple "make" in the target directory local MAKEFILE=$TARGET/${BUILD_NAME}/Makefile - echo "# autogenerated" > $MAKEFILE - echo "TOP=$ROOT" >> $MAKEFILE - echo "BUILD=$TARGET" >> $MAKEFILE - echo "OBJ=\$(BUILD)/${MAINBOARD}" >> $MAKEFILE - echo "OBJUTIL=\$(BUILD)/sharedutils" >> $MAKEFILE - echo "all:" >> $MAKEFILE - echo " @cp -a config.h config.h.bak" >> $MAKEFILE - echo " @cd \$(TOP); \$(MAKE) oldconfig DOTCONFIG=\$(OBJ)/config.build objutil=\$(OBJUTIL) obj=\$(OBJ)" >> $MAKEFILE - echo " @tail -n+6 config.h > config.new; tail -n+6 config.h.bak > config.old" >> $MAKEFILE - echo " @cmp -s config.new config.old && cp -a config.h.bak config.h || echo \"Config file changed\"" >> $MAKEFILE - echo " @rm config.h.bak config.new config.old" >> $MAKEFILE - echo " @cd \$(TOP); \$(MAKE) DOTCONFIG=\$(OBJ)/config.build objutil=\$(OBJUTIL) obj=\$(OBJ)" >> $MAKEFILE + echo "# autogenerated" > "$MAKEFILE" + echo "TOP=$ROOT" >> "$MAKEFILE" + echo "BUILD=$TARGET" >> "$MAKEFILE" + echo "OBJ=\$(BUILD)/${MAINBOARD}" >> "$MAKEFILE" + echo "OBJUTIL=\$(BUILD)/sharedutils" >> "$MAKEFILE" + echo "all:" >> "$MAKEFILE" + echo " @cp -a config.h config.h.bak" >> "$MAKEFILE" + echo " @cd \$(TOP); \$(MAKE) oldconfig DOTCONFIG=\$(OBJ)/config.build objutil=\$(OBJUTIL) obj=\$(OBJ)" >> "$MAKEFILE" + echo " @tail -n+6 config.h > config.new; tail -n+6 config.h.bak > config.old" >> "$MAKEFILE" + echo " @cmp -s config.new config.old && cp -a config.h.bak config.h || echo \"Config file changed\"" >> "$MAKEFILE" + echo " @rm config.h.bak config.new config.old" >> "$MAKEFILE" + echo " @cd \$(TOP); \$(MAKE) DOTCONFIG=\$(OBJ)/config.build objutil=\$(OBJUTIL) obj=\$(OBJ)" >> "$MAKEFILE" return $ret } @@ -302,41 +307,41 @@ function compile_target { local BUILD_NAME=$1 - if [ "$quiet" == "false" ]; then printf " Compiling $MAINBOARD image$cpuconfig...\n"; fi + if [ "$quiet" == "false" ]; then echo " Compiling $MAINBOARD image$cpuconfig..."; fi CURR=$( pwd ) #stime=`perl -e 'print time();' 2>/dev/null || date +%s` - eval $BUILDPREFIX $MAKE $silent DOTCONFIG=${build_dir}/config.build obj=${build_dir} objutil=$TARGET/sharedutils \ - &> ${build_dir}/make.log - ret=$? - cp .xcompile ${build_dir}/xcompile.build - cd ${build_dir} - - etime=`perl -e 'print time();' 2>/dev/null || date +%s` - duration=$(( $etime - $stime )) + # shellcheck disable=SC2086 + eval $BUILDPREFIX $MAKE $silent DOTCONFIG="${build_dir}/config.build" obj="${build_dir}" objutil="$TARGET/sharedutils" \ + &> "${build_dir}/make.log" ; \ + MAKE_FAILED=$? + cp .xcompile "${build_dir}/xcompile.build" + cd "${build_dir}" || return $? + + etime=$(perl -e 'print time();' 2>/dev/null || date +%s) + duration=$(( etime - stime )) junit " <testcase classname='board${testclass/#/.}' name='$BUILD_NAME' time='$duration' >" - if [ $ret -eq 0 ]; then + if [ $MAKE_FAILED -eq 0 ]; then junit "<system-out>" junitfile make.log junit "</system-out>" printf "ok\n" > compile.status - printf "$BUILD_NAME built successfully. (took ${duration}s)\n" + printf "%s built successfully. (took %ss)\n" "$BUILD_NAME" "${duration}" else - ret=1 junit "<failure type='BuildFailed'>" junitfile make.log junit "</failure>" printf "failed\n" > compile.status - printf "$BUILD_NAME build FAILED after ${duration}s!\nLog excerpt:\n" + printf "%s build FAILED after %ss!\nLog excerpt:\n" "$BUILD_NAME" "${duration}" tail -n $CONTEXT make.log 2> /dev/null || tail -$CONTEXT make.log failed=1 fi - cd $CURR - if [ $clean_work = "true" ]; then - rm -rf ${build_dir} + cd "$CURR" || return $? + if [ "$clean_work" = "true" ]; then + rm -rf "${build_dir}" fi - return $ret + return $MAKE_FAILED } function build_config @@ -345,11 +350,13 @@ function build_config local build_dir=$2 local BUILD_NAME=$3 local config_file=$4 + local board_srcdir + local ret - local board_srcdir=$(mainboard_directory "${MAINBOARD}") + board_srcdir=$(mainboard_directory "${MAINBOARD}") - if [ "$(cat "${build_dir}/compile.status" 2>/dev/null)" = "ok" -a \ - "$buildall" = "false" ]; then + if [ "$(cat "${build_dir}/compile.status" 2>/dev/null)" = "ok" ] && \ + [ "$buildall" = "false" ]; then echo "Skipping $BUILD_NAME; (already successful)" return fi @@ -369,19 +376,20 @@ function build_config if [ "$quiet" == "false" ]; then echo "Building $BUILD_NAME"; fi mkdir -p "$TARGET/${BUILD_NAME}" "$TARGET/abuild" - ABSPATH="$(cd "$TARGET/abuild"; pwd)" + ABSPATH="$(cd "$TARGET/abuild" && pwd)" XMLFILE="$ABSPATH/${BUILD_NAME}.xml" rm -f "${XMLFILE}" stime=$(perl -e 'print time();' 2>/dev/null || date +%s) create_buildenv "$BUILD_NAME" "$build_dir" "$config_file" - if [ $? -ne 0 ]; then + local BUILDENV_CREATED=$? + if [ $BUILDENV_CREATED -ne 0 ]; then junit "<failure type='BuildFailed'>" junitfile "$build_dir/config.log" junit "</failure>" printf "failed\n" > compile.status - printf "$BUILD_NAME build configuration FAILED!\nLog excerpt:\n" + printf "%s build configuration FAILED!\nLog excerpt:\n" "$BUILD_NAME" tail -n $CONTEXT "$build_dir/config.log" 2> /dev/null || tail -$CONTEXT "$build_dir/config.log" junit "</testcase>" @@ -389,25 +397,26 @@ function build_config fi - required_arches=`egrep "^CONFIG_ARCH_(BOOTBLOCK|R.MSTAGE|VERSTAGE)" $TARGET/${BUILD_NAME}/config.build | \ - sed "s,^CONFIG_ARCH_[^_]*_$[^=]*$=.*$,\1," |sort -u |tr 'A-Z\n\r' 'a-z '` - missing_arches=`printf 'include .xcompile\nall: ; @echo $(foreach arch,'"$required_arches"',$(if $(filter $(arch),$(SUBARCH_SUPPORTED)),,$(arch)))' | make --no-print-directory -f -` + required_arches=$(egrep "^CONFIG_ARCH_(BOOTBLOCK|R.MSTAGE|VERSTAGE)" "$TARGET/${BUILD_NAME}/config.build" | \ + sed "s,^CONFIG_ARCH_[^_]*_$[^=]*$=.*$,\1," |sort -u |tr 'A-Z\n\r' 'a-z ') + # shellcheck disable=SC2016,SC2059 + missing_arches=$(printf 'include .xcompile\nall: ; @echo $(foreach arch,'"$required_arches"',$(if $(filter $(arch),$(SUBARCH_SUPPORTED)),,$(arch)))' | make --no-print-directory -f -) if [ -n "$missing_arches" ]; then - printf "skipping $BUILD_NAME because we're missing compilers for ($missing_arches)\n" + printf "skipping %s because we're missing compilers for (%s)\n" "$BUILD_NAME" "$missing_arches" return fi - if [ $? -eq 0 -a $configureonly -eq 0 ]; then + if [ $BUILDENV_CREATED -eq 0 ] && [ $configureonly -eq 0 ]; then BUILDPREFIX= if [ "$scanbuild" = "true" ]; then scanbuild_out=$TARGET/${BUILD_NAME}-scanbuild - rm -rf ${scanbuild_out} + rm -rf "${scanbuild_out}" BUILDPREFIX="scan-build -o ${scanbuild_out}tmp" fi - compile_target ${BUILD_NAME} + compile_target "${BUILD_NAME}" if [ "$scanbuild" = "true" ]; then - mv ${scanbuild_out}tmp/* ${scanbuild_out} - rmdir ${scanbuild_out}tmp + mv "${scanbuild_out}"tmp/* "${scanbuild_out}" + rmdir "${scanbuild_out}tmp" fi fi @@ -418,11 +427,12 @@ function build_config function build_target { local MAINBOARD=$1 - local MAINBOARD_LC=$(echo "$MAINBOARD" | tr '[:upper:]' '[:lower:]') + local MAINBOARD_LC + MAINBOARD_LC=$(echo "$MAINBOARD" | tr '[:upper:]' '[:lower:]') # look for config files in the config directory that match the boardname if [ -n "$( find "$configdir" -maxdepth 1 -name "config.${MAINBOARD_LC}*" -print -quit )" ]; then - for config in "$configdir"/config."${MAINBOARD_LC}"*; do + for config in "$configdir/config.${MAINBOARD_LC}"*; do BUILD_NAME="${config##*/}" BUILD_NAME="${BUILD_NAME##config.}" BUILD_NAME=$(echo "${BUILD_NAME}" | tr '[:lower:]' '[:upper:]') @@ -457,7 +467,7 @@ function remove_target fi echo "Removing build dir for $BUILD_NAME..." - rm -rf "$TARGET/${BUILD_NAME}" + rm -rf "${TARGET:?}/${BUILD_NAME}" return } @@ -528,7 +538,7 @@ verbose=false test -f util/sconfig/sconfig.l && ROOT=$( pwd ) test -f ../util/sconfig/sconfig.l && ROOT=$( cd ..; pwd ) -test "$ROOT" = "" && ROOT=$( cd ../..; pwd ) +test "$ROOT" = "" && ROOT=$( cd ../.. && pwd ) # Look if we have getopt. If not, build it. export PATH=$PATH:util/abuild @@ -538,18 +548,22 @@ getopt - > /dev/null 2>/dev/null || gcc -o util/abuild/getopt util/abuild/getopt cmdline="$* -c 1" # parse parameters.. try to find out whether we're running GNU getopt -getoptbrand="`getopt -V`" +getoptbrand="$(getopt -V)" + +# shellcheck disable=SC2086 if [ "${getoptbrand:0:6}" == "getopt" ]; then # Detected GNU getopt that supports long options. - args=`getopt -l version,verbose,quiet,help,all,target:,payloads:,cpus:,silent,junit,config,loglevel:,remove,prefix:,update,scan-build,ccache,blobs,clang,clean,outdir:,chromeos,xmlfile:,kconfig:,dir: -o Vvqhat:p:c:sJCl:rP:uyBLzo:xX:K:d: -- "$@"` || exit 1 + args=$(getopt -l version,verbose,quiet,help,all,target:,payloads:,cpus:,silent,junit,config,loglevel:,remove,prefix:,update,scan-build,ccache,blobs,clang,clean,outdir:,chromeos,xmlfile:,kconfig:,dir: -o Vvqhat:p:c:sJCl:rP:uyBLzo:xX:K:d: -- "$@") || exit 1 eval set -- $args + retval=$? else # Detected non-GNU getopt - args=`getopt Vvqhat:p:c:sJCl:rP:uyBLzo:xX:K:d: $*` + args=$(getopt Vvqhat:p:c:sJCl:rP:uyBLzo:xX:K:d: "$@") set -- $args + retval=$? fi -if [ $? != 0 ]; then +if [ $retval != 0 ]; then myhelp exit 1 fi @@ -562,7 +576,7 @@ configoptions="" unset testclass while true ; do case "$1" in - -J|--junit) shift; mode=junit; rm -f $XMLFILE ;; + -J|--junit) shift; mode=junit; rm -f "$XMLFILE" ;; -t|--target) shift; target="$1"; shift;; -a|--all) shift; buildall=true;; -d|--dir) shift; configdir="$1"; shift;; @@ -577,7 +591,7 @@ while true ; do cpus=$1 test "$MAKEFLAGS" == "-j max" && export MAKEFLAGS="-j" && cpuconfig=" in parallel" test "$1" == "1" && cpuconfig=" on 1 cpu" - expr "$1" : '-\?[0-9]\+$' > /dev/null && test 0$1 -gt 1 && cpuconfig=" on $1 cpus in parallel" + expr "$1" : '-\?[0-9]\+$' > /dev/null && test "0$1" -gt 1 && cpuconfig=" on $1 cpus in parallel" shift;; -s|--silent) shift; silent="-s";; --scan-build) shift @@ -625,7 +639,7 @@ while true ; do ;; -X|--xmlfile) shift; XMLFILE=$1; REAL_XMLFILE=$1; shift;; -K|--kconfig) shift - testclass=="$(basename $1 | tr '.' '_' )" + testclass="$(basename "$1" | tr '.' '_' )" customizing="${customizing}, $1 config" configoptions="$(cat "$1")${configoptions}\n" shift;; @@ -635,12 +649,12 @@ while true ; do esac done -if [ -z "$TARGET" -o "$TARGET" = "/" ]; then +if [ -z "$TARGET" ] || [ "$TARGET" = "/" ]; then echo "Please specify a valid, non-root build directory." exit 1 fi -customizing=`echo $customizing |cut -c3-` +customizing=$(echo "$customizing" | cut -c3-) if [ "$customizing" = "" ]; then customizing="default configuration" fi @@ -664,44 +678,48 @@ build_targets() { local targets=${*-$(get_mainboards)} for MAINBOARD in $targets; do - build_target ${MAINBOARD} + build_target "${MAINBOARD}" done } else build_targets() { + local ABSPATH + local stime + local etime + local targets=${*-$(get_mainboards)} # seed shared utils - TMPCFG=`mktemp` - printf "$configoptions" > $TMPCFG - $MAKE -j $cpus DOTCONFIG=$TMPCFG obj=$TARGET/temp objutil=$TARGET/sharedutils allnoconfig - printf "$configoptions" >> $TMPCFG - yes "" 2>/dev/null | $MAKE -j $cpus DOTCONFIG=$TMPCFG obj=$TARGET/temp objutil=$TARGET/sharedutils oldconfig 2>/dev/null |head > /dev/null + TMPCFG=$(mktemp) + printf "%s" "$configoptions" > "$TMPCFG" + $MAKE -j "$cpus" DOTCONFIG="$TMPCFG" obj="$TARGET/temp" objutil="$TARGET/sharedutils" allnoconfig + printf "%s" "$configoptions" >> "$TMPCFG" + yes "" 2>/dev/null | $MAKE -j "$cpus" DOTCONFIG="$TMPCFG" obj="$TARGET/temp" objutil="$TARGET/sharedutils" oldconfig 2>/dev/null |head > /dev/null BUILDPREFIX= if [ "$scanbuild" = "true" ]; then scanbuild_out=$TARGET/sharedutils-scanbuild - rm -rf ${scanbuild_out} + rm -rf "${scanbuild_out}" BUILDPREFIX="scan-build -o ${scanbuild_out}tmp" fi - mkdir -p $TARGET/abuild - local ABSPATH=`cd $TARGET/abuild; pwd` - local XMLFILE=$ABSPATH/__util.xml - rm -f ${XMLFILE} - local stime=`perl -e 'print time();' 2>/dev/null || date +%s` - $BUILDPREFIX $MAKE -j $cpus DOTCONFIG=$TMPCFG obj=$TARGET/temp objutil=$TARGET/sharedutils tools > $TARGET/sharedutils/make.log 2>&1 + mkdir -p "$TARGET/abuild" + ABSPATH="$(cd "$TARGET/abuild" && pwd)" + local XMLFILE="$ABSPATH/__util.xml" + rm -f "${XMLFILE}" + stime=$(perl -e 'print time();' 2>/dev/null || date +%s) + $BUILDPREFIX $MAKE -j "$cpus" DOTCONFIG="$TMPCFG" obj="$TARGET/temp" objutil="$TARGET/sharedutils" tools > "$TARGET/sharedutils/make.log" 2>&1 local ret=$? - local etime=`perl -e 'print time();' 2>/dev/null || date +%s` - local duration=$(( $etime - $stime )) + etime=$(perl -e 'print time();' 2>/dev/null || date +%s) + local duration=$(( etime - stime )) junit " <testcase classname='util' name='all' time='$duration' >" if [ $ret -eq 0 ]; then junit "<system-out>" - junitfile $TARGET/sharedutils/make.log + junitfile "$TARGET/sharedutils/make.log" junit "</system-out>" junit "</testcase>" else junit "<failure type='BuildFailed'>" - junitfile $TARGET/sharedutils/make.log + junitfile "$TARGET/sharedutils/make.log" junit "</failure>" junit "</testcase>" return @@ -711,11 +729,12 @@ build_targets() fi if [ "$scanbuild" = "true" ]; then - mv ${scanbuild_out}tmp/* ${scanbuild_out} - rmdir ${scanbuild_out}tmp + mv "${scanbuild_out}tmp/"* "${scanbuild_out}" + rmdir "${scanbuild_out}tmp" fi - rm -rf $TARGET/temp $TMPCFG - echo $targets | xargs -P ${cpus:-0} -n 1 $0 $cmdline -t + rm -rf "$TARGET/temp" "$TMPCFG" + # shellcheck disable=SC2086 + echo $targets | xargs -P ${cpus:-0} -n 1 "$0" $cmdline -t } fi @@ -728,33 +747,33 @@ junit '<testsuite>' if [ "$target" != "" ]; then # build a single board - MAINBOARD=$(normalize_target ${target}) + MAINBOARD=$(normalize_target "${target}") if [ -z "${MAINBOARD}" ]; then - printf "No such target: $target\n" + printf "No such target: %s\n" "$target" exit 1 fi - build_srcdir=$(mainboard_directory ${MAINBOARD}) - if [ "$(echo ${MAINBOARD} | wc -w)" -gt 1 ]; then - build_targets ${MAINBOARD} - elif [ ! -r $ROOT/src/mainboard/${build_srcdir} ]; then - printf "No such target: ${MAINBOARD}\n" + build_srcdir="$(mainboard_directory "${MAINBOARD}")" + if [ "$(echo "${MAINBOARD}" | wc -w)" -gt 1 ]; then + build_targets "${MAINBOARD}" + elif [ ! -r "$ROOT/src/mainboard/${build_srcdir}" ]; then + echo "No such target: ${MAINBOARD}" exit 1 else - build_target ${MAINBOARD} + build_target "${MAINBOARD}" test "$mode" != "text" && \ - test -f $TARGET/abuild/${MAINBOARD}.xml && \ - cat $TARGET/abuild/${MAINBOARD}.xml >> $REAL_XMLFILE + test -f "$TARGET/abuild/${MAINBOARD}.xml" && \ + cat "$TARGET/abuild/${MAINBOARD}.xml" >> "$REAL_XMLFILE" XMLFILE=$REAL_XMLFILE fi else build_targets - rm -f $REAL_XMLFILE - XMLFILE=$REAL_XMLFILE + rm -f "$REAL_XMLFILE" + XMLFILE="$REAL_XMLFILE" junit '<?xml version="1.0" encoding="utf-8"?>' junit '<testsuite>' if [ "$mode" != "text" ]; then for xmlfile in $TARGET/abuild/*_*.xml; do - cat $xmlfile >> $REAL_XMLFILE + cat "$xmlfile" >> "$REAL_XMLFILE" done fi XMLFILE=$REAL_XMLFILE

1 0

Patch set updated for coreboot: rockchip/rk3399: sdram: use register to calculate sdram sizes
by Martin Roth 05 Dec '16

05 Dec '16

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17629 -gerrit commit 3c446a1669a66dbc9c17a265d2042db0f717e0ec Author: Lin Huang <hl(a)rock-chips.com> Date: Tue Nov 15 11:40:58 2016 +0800 rockchip/rk3399: sdram: use register to calculate sdram sizes We may support different sdram sizes on one board in future, so we need to calculate sdram sizes from sdram drvier. BRANCH=None BUG=None TEST=boot kevin Change-Id: I43e8f164ecdb768c051464b4dbc7d890df8055d0 Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> Original-Commit-Id: 3c4d8b3cb647b2f9cebc416c298817c16d49330e Original-Change-Id: I95d5ef34de9d79ebca3600dc7a4b9e14449606ff Original-Signed-off-by: Lin Huang <hl(a)rock-chips.com> Original-Reviewed-on: https://chromium-review.googlesource.com/411600 Original-Reviewed-by: Julius Werner <jwerner(a)chromium.org> --- src/mainboard/google/gru/Kconfig | 4 ---- src/mainboard/google/gru/romstage.c | 6 ++---- src/soc/rockchip/rk3399/sdram.c | 38 ++++++++++++++++++++++++++++++++++++- src/soc/rockchip/rk3399/soc.c | 4 ++-- 4 files changed, 41 insertions(+), 11 deletions(-) diff --git a/src/mainboard/google/gru/Kconfig b/src/mainboard/google/gru/Kconfig index 57b1762..f07bc82 100644 --- a/src/mainboard/google/gru/Kconfig +++ b/src/mainboard/google/gru/Kconfig @@ -60,10 +60,6 @@ config MAINBOARD_VENDOR string default "Google" -config DRAM_SIZE_MB - int - default 4096 - config EC_GOOGLE_CHROMEEC_SPI_BUS hex default 0x5 diff --git a/src/mainboard/google/gru/romstage.c b/src/mainboard/google/gru/romstage.c index 55ed79a..7f84a2a 100644 --- a/src/mainboard/google/gru/romstage.c +++ b/src/mainboard/google/gru/romstage.c @@ -33,9 +33,6 @@ #include "pwm_regulator.h" -static const uint64_t dram_size = - (uint64_t)min((uint64_t)CONFIG_DRAM_SIZE_MB * MiB, MAX_DRAM_ADDRESS); - static void init_dvs_outputs(void) { pwm_regulator_configure(PWM_REGULATOR_GPU, 900); @@ -66,7 +63,8 @@ void main(void) sdram_init(get_sdram_config()); - mmu_config_range((void *)0, (uintptr_t)dram_size, CACHED_MEM); + mmu_config_range((void *)0, (uintptr_t)sdram_size_mb() * MiB, + CACHED_MEM); mmu_config_range(_dma_coherent, _dma_coherent_size, UNCACHED_MEM); cbmem_initialize_empty(); run_ramstage(); diff --git a/src/soc/rockchip/rk3399/sdram.c b/src/soc/rockchip/rk3399/sdram.c index 4ea31dd..5bbf89f 100644 --- a/src/soc/rockchip/rk3399/sdram.c +++ b/src/soc/rockchip/rk3399/sdram.c @@ -1031,5 +1031,41 @@ void sdram_init(const struct rk3399_sdram_params *sdram_params) size_t sdram_size_mb(void) { - return CONFIG_DRAM_SIZE_MB; + u32 rank, col, bk, cs0_row, cs1_row, bw, row_3_4; + size_t chipsize_mb = 0; + static size_t size_mb = 0; + u32 ch; + + if (!size_mb) { + u32 sys_reg = read32(&rk3399_pmugrf->os_reg2); + u32 ch_num = SYS_REG_DEC_NUM_CH(sys_reg); + + for (ch = 0; ch < ch_num; ch++) { + rank = SYS_REG_DEC_RANK(sys_reg, ch); + col = SYS_REG_DEC_COL(sys_reg, ch); + bk = SYS_REG_DEC_BK(sys_reg, ch); + cs0_row = SYS_REG_DEC_CS0_ROW(sys_reg, ch); + cs1_row = SYS_REG_DEC_CS1_ROW(sys_reg, ch); + bw = SYS_REG_DEC_BW(sys_reg, ch); + row_3_4 = SYS_REG_DEC_ROW_3_4(sys_reg, ch); + + chipsize_mb = (1 << (cs0_row + col + bk + bw - 20)); + + if (rank > 1) + chipsize_mb += chipsize_mb >> + (cs0_row - cs1_row); + if (row_3_4) + chipsize_mb = chipsize_mb * 3 / 4; + size_mb += chipsize_mb; + } + + /* + * we use the 0x00000000~0xf7ffffff space + * since 0xf8000000~0xffffffff is soc register space + * so we reserve it + */ + size_mb = MIN(size_mb, 0xf8000000/MiB); + } + + return size_mb; } diff --git a/src/soc/rockchip/rk3399/soc.c b/src/soc/rockchip/rk3399/soc.c index e34ca09..4418a27 100644 --- a/src/soc/rockchip/rk3399/soc.c +++ b/src/soc/rockchip/rk3399/soc.c @@ -20,6 +20,7 @@ #include <soc/addressmap.h> #include <soc/clock.h> #include <soc/display.h> +#include <soc/sdram.h> #include <stddef.h> #include <stdlib.h> #include <string.h> @@ -27,8 +28,7 @@ static void soc_read_resources(device_t dev) { - ram_resource(dev, 0, (uintptr_t)_dram / KiB, - min(CONFIG_DRAM_SIZE_MB * KiB, MAX_DRAM_ADDRESS / KiB)); + ram_resource(dev, 0, (uintptr_t)_dram / KiB, sdram_size_mb() * KiB); } static void soc_init(device_t dev)

1 0

Patch merged into coreboot/master: mainboard & southbridge: Clear files that are just headers
by gerrit＠coreboot.org 05 Dec '16

05 Dec '16

the following patch was just integrated into master: commit d3d1f13599a042bfd7ecb5f11f5a8a76853b7f88 Author: Martin Roth <martinroth(a)google.com> Date: Wed Nov 30 08:51:27 2016 -0700 mainboard & southbridge: Clear files that are just headers These headers & comments indicating a lack of functionality don't help anything. We discourage copyrights and licenses on empty files, so just clear these. Change-Id: Id2ab060a2726cac6ab047d49a6e6b153f52ffe6d Signed-off-by: Martin Roth <martinroth(a)google.com> Reviewed-on: https://review.coreboot.org/17657 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber <nico.h(a)gmx.de> See https://review.coreboot.org/17657 for details. -gerrit

1 0

Patch merged into coreboot/master: Add/Combine Haswell Chromebooks using variant board scheme
by gerrit＠coreboot.org 05 Dec '16

05 Dec '16

the following patch was just integrated into master: commit c12e5ae1a5d809a4b74774d28a1c231591400bd3 Author: Matt DeVillier <matt.devillier(a)gmail.com> Date: Sun Nov 27 02:19:02 2016 -0600 Add/Combine Haswell Chromebooks using variant board scheme Combine existing boards google/falco and google/peppy with new ChromeOS devices leon and wolf, using their common reference board (slippy) as a base. Chromium sources used: firmware-falco_peppy-4389.81.B d7703cac [falco: Add support for Samsung...] firmware-leon-4389.61.B ea1bf55 [haswell: Enable 2x Refresh Mode] firmware-wolf-4389.24.B 7c5a9c2 [Wolf: haswell: Add small delay before...] Additionally, some minor cleanup/changes were made: - I2C devices set to use ACPI (vs PCI) mode - I2C device ACPI entries adjusted as per above - I2C devices set to use level (vs edge) interrupt triggering - XHCI finalization enabled in devicetree - HDA verb entries use simplified macro entry format Existing google/falco and google/peppy boards will be removed in a subsequent commit. Variant setup modeled after google/beltino Change-Id: I087df5f98c1bb4ddd0ab24ee9ff786a9d38d87be Signed-off-by: Matt DeVillier <matt.devillier(a)gmail.com> Reviewed-on: https://review.coreboot.org/17621 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth <martinroth(a)google.com> See https://review.coreboot.org/17621 for details. -gerrit

1 0

Patch merged into coreboot/master: Remove boards google/falco and google/peppy
by gerrit＠coreboot.org 05 Dec '16

05 Dec '16

the following patch was just integrated into master: commit b5a74d6ca21139ddcb9a613f810338b6e97f27b9 Author: Matt DeVillier <matt.devillier(a)gmail.com> Date: Sun Nov 27 02:21:07 2016 -0600 Remove boards google/falco and google/peppy No need for these boards to exist separately once included as variants under google/slippy Change-Id: I52a476ceaadf50487d6fe21e796d7844f946d8b3 Signed-off-by: Matt DeVillier <matt.devillier(a)gmail.com> Reviewed-on: https://review.coreboot.org/17622 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth <martinroth(a)google.com> Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> See https://review.coreboot.org/17622 for details. -gerrit

1 0

Patch merged into coreboot/master: rockchip/rk3399: display: Update edp initialization retry
by gerrit＠coreboot.org 05 Dec '16

05 Dec '16

the following patch was just integrated into master: commit e4b9af15d8775b602020ccadbfc138378fbc7c1e Author: Martin Roth <martinroth(a)google.com> Date: Tue Nov 29 10:50:52 2016 -0700 rockchip/rk3399: display: Update edp initialization retry Follow on patch to clean up the previous retry code. Previous patches: coreboot commit 079b5c65 (rockchip/rk3399: display: Retry edp initialization if it fails) cros commit 28c57a6e (rockchip/rk3399: display: retry edp initialization if edp initial fail) - Reduce the jumping around via goto statements - Break the retry code out into a separate function that also prints the error messages. BRANCH=gru BUG=chrome-os-partner:60150 TEST=Rebuild Kevin and Gru Change-Id: I3b6cf572073e4dcac83da09621bafde179af2613 Signed-off-by: Martin Roth <martinroth(a)google.com> Reviewed-on: https://review.coreboot.org/17642 Tested-by: build bot (Jenkins) Reviewed-by: Julius Werner <jwerner(a)chromium.org> See https://review.coreboot.org/17642 for details. -gerrit

1 0

Patch merged into coreboot/master: nb/intel/sandybridge/raminit: Split raminit.c
by gerrit＠coreboot.org 05 Dec '16

05 Dec '16

the following patch was just integrated into master: commit fd5fa2ad1fb1f3525deab9213bed2c38e083342d Author: Patrick Rudolph <siro(a)das-labor.org> Date: Fri Nov 11 18:22:33 2016 +0100 nb/intel/sandybridge/raminit: Split raminit.c Split raminit.c into smaller parts. Move all functions that will be used by chip-specific code into raminit_common.c. The chip-specific changes includes new configuration values for IvyBridge and 100Mhz reference clock support, including new frequencies. No functionality is changed. Tested on Lenovo T420. Change-Id: If7bb5949f4b771430f3dba1b754ad241a7e8426b Signed-off-by: Patrick Rudolph <siro(a)das-labor.org> Reviewed-on: https://review.coreboot.org/17604 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth <martinroth(a)google.com> See https://review.coreboot.org/17604 for details. -gerrit

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit December 2016