From 2b139b3992f0a95bfc6631397574c59f44e3b7c6 Mon Sep 17 00:00:00 2001 From: Ilies CHERGUI Date: Sun, 17 Jan 2021 15:52:16 +0000 Subject: [PATCH 1/8] tools/fit_check_sign.c: Update usage function. Add "-c" option to set the configuration name when checking the FIT image signature. Signed-off-by: Ilies CHERGUI --- tools/fit_check_sign.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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); } From e18bf3943b081507f5040afd5c1866f2e87f0da5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= Date: Wed, 27 Jan 2021 16:29:13 +0100 Subject: [PATCH 2/8] arm: Remove #include from armv8/fwcall.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit No version information is used in armv8/fwcall.c therefore do not include version.h header file. This change prevents recompiling fwcall.o when SOURCE_DATE_EPOCH changes. Signed-off-by: Pali Rohár Reviewed-by: Simon Glass --- arch/arm/cpu/armv8/fwcall.c | 1 - 1 file changed, 1 deletion(-) 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 #include -#include #include #include #include From ec9d19be8d6cabc820e133bb36a1386adcf0b3d1 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Wed, 27 Jan 2021 21:26:43 +0100 Subject: [PATCH 3/8] cmd: load, emit error message for invalid block device The load command should not silently return to the console prompt if an invalid block device is specified and no file is loaded. Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass --- fs/fs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/fs.c b/fs/fs.c index 68a15553cc..0c8f577a79 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -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); From 7a01882eb37e7504e2450f474d0cc8db60ed26c2 Mon Sep 17 00:00:00 2001 From: Ravik Hasija Date: Wed, 27 Jan 2021 14:01:48 -0800 Subject: [PATCH 4/8] common: Kconfig.boot: Add FIT_PRINT config option Config allows to disable printing contents of fitImage to optimize boottime. Signed-off-by: Ravik Hasija Reviewed-by: Simon Glass --- common/Kconfig.boot | 6 ++++++ common/image-fit.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) 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 From f14c5ee5ab8bfac0fdbae1143170d8390867479d Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Thu, 28 Jan 2021 09:10:07 +0100 Subject: [PATCH 5/8] disk: part_dos: update partition table entries after write Fixes issues when switching from GPT to MBR partition tables. Signed-off-by: Gary Bisson Acked-by: Marek Szyprowski --- disk/part_dos.c | 6 ++++++ 1 file changed, 6 insertions(+) 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; } From 9644bd0d01e72b256a2d480999f6e1b86c6e5f34 Mon Sep 17 00:00:00 2001 From: Ramon Fried Date: Fri, 29 Jan 2021 18:18:22 +0200 Subject: [PATCH 6/8] MAINTAINERS: Add maintainer to network subsystem Add myself as co maintainer to network subsystem Acked-by: Tom Rini Acked-by: Marek Vasut Acked-by: Joe Hershberger --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) 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 +M: Ramon Fried S: Maintained T: git https://gitlab.denx.de/u-boot/custodians/u-boot-net.git F: drivers/net/ From 372497572b1102153a98bf20b833eb9d470c3805 Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Sat, 30 Jan 2021 20:12:18 -0700 Subject: [PATCH 7/8] test/py: fix runtest wrapper for pytest 6 The implementation of pytest_runtest_protocol() must call pytest_runtest_logstart() and pytest_runtest_logfinish(). This appears to be necessary even in pytest 5.2.1 judging by the default version of pytest_runtest_protocol(), but evidently some form of code reorganization in pytest only made this have a practical effect in the newer version. I'd previously been under the impression that 100% of the required work of pytest_runtest_protocol() was handled by the fact it called runtestprotocol() as its implementation. However, it appears that custom implementations do need to do a little more than this. Reported-by: Heinrich Schuchardt Signed-off-by: Stephen Warren Reviewed-by: Simon Glass --- test/py/conftest.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 From aa8544e0d16ffed53597a99883e0eb1f17818f48 Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Sun, 31 Jan 2021 16:38:35 +0800 Subject: [PATCH 8/8] azure: Add -E back for the world build script Commit dd5c954e917b ("travis/gitlab/azure: Use -W to avoid warnings check") added -W to avoid warnings check, but it mistakenly dropped -E for the world build script in the azure pipelines. This caused builds on the azure pipelines fail to report warnings. Let's add it back. Fixes: dd5c954e917b ("travis/gitlab/azure: Use -W to avoid warnings check") Signed-off-by: Bin Meng Reviewed-by: Simon Glass --- .azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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;