diff options
| -rw-r--r-- | .azure-pipelines.yml | 2 | ||||
| -rw-r--r-- | MAINTAINERS | 1 | ||||
| -rw-r--r-- | arch/arm/cpu/armv8/fwcall.c | 1 | ||||
| -rw-r--r-- | common/Kconfig.boot | 6 | ||||
| -rw-r--r-- | common/image-fit.c | 4 | ||||
| -rw-r--r-- | disk/part_dos.c | 6 | ||||
| -rw-r--r-- | fs/fs.c | 4 | ||||
| -rw-r--r-- | test/py/conftest.py | 5 | ||||
| -rw-r--r-- | tools/fit_check_sign.c | 5 |
9 files changed, 26 insertions, 8 deletions
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 7a3eb78a5e..a6279427e1 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -458,7 +458,7 @@ jobs: cat << "EOF" >> build.sh if [[ "${BUILDMAN}" != "" ]]; then ret=0; - tools/buildman/buildman -o /tmp -P -W ${BUILDMAN} ${OVERRIDE} || ret=$?; + tools/buildman/buildman -o /tmp -P -E -W ${BUILDMAN} ${OVERRIDE} || ret=$?; if [[ $ret -ne 0 ]]; then tools/buildman/buildman -o /tmp -seP ${BUILDMAN}; exit $ret; diff --git a/MAINTAINERS b/MAINTAINERS index 6d8c467410..b82b7adbeb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -893,6 +893,7 @@ F: arch/nds32/ NETWORK M: Joe Hershberger <joe.hershberger@ni.com> +M: Ramon Fried <rfried.dev@gmail.com> S: Maintained T: git https://gitlab.denx.de/u-boot/custodians/u-boot-net.git F: drivers/net/ diff --git a/arch/arm/cpu/armv8/fwcall.c b/arch/arm/cpu/armv8/fwcall.c index b29bc30fc2..16914dc1ee 100644 --- a/arch/arm/cpu/armv8/fwcall.c +++ b/arch/arm/cpu/armv8/fwcall.c @@ -7,7 +7,6 @@ #include <asm-offsets.h> #include <config.h> -#include <version.h> #include <asm/cache.h> #include <asm/macro.h> #include <asm/psci.h> diff --git a/common/Kconfig.boot b/common/Kconfig.boot index 4525a12ab4..5eaabdfc27 100644 --- a/common/Kconfig.boot +++ b/common/Kconfig.boot @@ -140,6 +140,12 @@ config FIT_IMAGE_POST_PROCESS injected into the FIT creation (i.e. the blobs would have been pre- processed before being added to the FIT image). +config FIT_PRINT + bool "Support FIT printing" + default y + help + Support printing the content of the fitImage in a verbose manner. + if SPL config SPL_FIT diff --git a/common/image-fit.c b/common/image-fit.c index 8660c3fd81..33210ef3c0 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -162,7 +162,7 @@ int fit_get_subimage_count(const void *fit, int images_noffset) return count; } -#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_FIT_PRINT) +#if CONFIG_IS_ENABLED(FIT_PRINT) || CONFIG_IS_ENABLED(SPL_FIT_PRINT) /** * fit_image_print_data() - prints out the hash node details * @fit: pointer to the FIT format image header @@ -570,7 +570,7 @@ void fit_image_print(const void *fit, int image_noffset, const char *p) #else void fit_print_contents(const void *fit) { } void fit_image_print(const void *fit, int image_noffset, const char *p) { } -#endif /* !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_FIT_PRINT) */ +#endif /* CONFIG_IS_ENABLED(FIR_PRINT) || CONFIG_IS_ENABLED(SPL_FIT_PRINT) */ /** * fit_get_desc - get node description property diff --git a/disk/part_dos.c b/disk/part_dos.c index f431925745..60addc6e00 100644 --- a/disk/part_dos.c +++ b/disk/part_dos.c @@ -423,6 +423,9 @@ int write_mbr_partitions(struct blk_desc *dev, ext_part_sect = next_ebr; } + /* Update the partition table entries*/ + part_init(dev_desc); + return 0; } @@ -499,6 +502,9 @@ int write_mbr_sector(struct blk_desc *dev_desc, void *buf) return 1; } + /* Update the partition table entries*/ + part_init(dev_desc); + return 0; } @@ -710,8 +710,10 @@ int do_load(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[], if (argc > 7) return CMD_RET_USAGE; - if (fs_set_blk_dev(argv[1], (argc >= 3) ? argv[2] : NULL, fstype)) + if (fs_set_blk_dev(argv[1], (argc >= 3) ? argv[2] : NULL, fstype)) { + log_err("Can't set block device\n"); return 1; + } if (argc >= 4) { addr = simple_strtoul(argv[3], &ep, 16); diff --git a/test/py/conftest.py b/test/py/conftest.py index dc92c0be32..9bfd926345 100644 --- a/test/py/conftest.py +++ b/test/py/conftest.py @@ -554,7 +554,10 @@ def pytest_runtest_protocol(item, nextitem): """ log.get_and_reset_warning() + ihook = item.ihook + ihook.pytest_runtest_logstart(nodeid=item.nodeid, location=item.location) reports = runtestprotocol(item, nextitem=nextitem) + ihook.pytest_runtest_logfinish(nodeid=item.nodeid, location=item.location) was_warning = log.get_and_reset_warning() # In pytest 3, runtestprotocol() may not call pytest_runtest_setup() if @@ -623,4 +626,4 @@ def pytest_runtest_protocol(item, nextitem): if failure_cleanup: console.cleanup_spawn() - return reports + return True diff --git a/tools/fit_check_sign.c b/tools/fit_check_sign.c index 9375d5cf72..5573842d25 100644 --- a/tools/fit_check_sign.c +++ b/tools/fit_check_sign.c @@ -25,9 +25,10 @@ void usage(char *cmdname) { - fprintf(stderr, "Usage: %s -f fit file -k key file\n" + fprintf(stderr, "Usage: %s -f fit file -k key file -c config name\n" " -f ==> set fit file which should be checked'\n" - " -k ==> set key file which contains the key'\n", + " -k ==> set key file which contains the key'\n" + " -c ==> set the configuration name'\n", cmdname); exit(EXIT_FAILURE); } |