December 2019 - U-Boot

[PATCH] cmd_ut: add a parameter prefix to the function cmd_ut_category
by Philippe Reynes 08 Jan '20

08 Jan '20

There is black magic in the file conftest.py that list all the test unit. Then, all those test unit are called in pytest. This call is done with the end of the name (for example checksum if the full name is bloblist_test_checksum). The result is that only test for dm are really executed. by pytest, all others tests are listed but never executed. This behaviour happens because the dm test unit only check the end of the name and others tests checks the full name. To fix this issue, I've added a prefix to the function cmd_ut_category, and this prefix is removed when looking for the unit test. Signed-off-by: Philippe Reynes <philippe.reynes(a)softathome.com> --- include/test/suites.h | 4 +++- test/bloblist.c | 3 ++- test/cmd_ut.c | 12 ++++++++++-- test/compression.c | 3 ++- test/env/cmd_ut_env.c | 3 ++- test/lib/cmd_ut_lib.c | 2 +- test/optee/cmd_ut_optee.c | 6 +++--- test/overlay/cmd_ut_overlay.c | 2 +- test/unicode_ut.c | 3 ++- 9 files changed, 26 insertions(+), 12 deletions(-) diff --git a/include/test/suites.h b/include/test/suites.h index 20970f0..0748185 100644 --- a/include/test/suites.h +++ b/include/test/suites.h @@ -13,6 +13,7 @@ struct unit_test; * cmd_ut_category() - Run a category of unit tests * * @name: Category name + * @prefix: Prefix of test name * @tests: List of tests to run * @n_ents: Number of tests in @tests * @argc: Argument count provided. Must be >= 1. If this is 1 then all @@ -20,7 +21,8 @@ struct unit_test; * @argv: Arguments: argv[1] is the test to run (if @argc >= 2) * @return 0 if OK, CMD_RET_FAILURE on failure */ -int cmd_ut_category(const char *name, struct unit_test *tests, int n_ents, +int cmd_ut_category(const char *name, const char *prefix, + struct unit_test *tests, int n_ents, int argc, char * const argv[]); int do_ut_bloblist(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]); diff --git a/test/bloblist.c b/test/bloblist.c index 89bdb01..d0f7296 100644 --- a/test/bloblist.c +++ b/test/bloblist.c @@ -183,5 +183,6 @@ int do_ut_bloblist(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) bloblist_test); const int n_ents = ll_entry_count(struct unit_test, bloblist_test); - return cmd_ut_category("bloblist", tests, n_ents, argc, argv); + return cmd_ut_category("bloblist", "bloblist_test_", + tests, n_ents, argc, argv); } diff --git a/test/cmd_ut.c b/test/cmd_ut.c index 2781f8b..400719e 100644 --- a/test/cmd_ut.c +++ b/test/cmd_ut.c @@ -11,17 +11,25 @@ static int do_ut_all(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); -int cmd_ut_category(const char *name, struct unit_test *tests, int n_ents, +int cmd_ut_category(const char *name, const char *prefix, + struct unit_test *tests, int n_ents, int argc, char * const argv[]) { struct unit_test_state uts = { .fail_count = 0 }; struct unit_test *test; + int prefix_len = prefix ? strlen(prefix) : 0; if (argc == 1) printf("Running %d %s tests\n", n_ents, name); for (test = tests; test < tests + n_ents; test++) { - if (argc > 1 && strcmp(argv[1], test->name)) + const char *test_name = test->name; + + /* Remove the prefix */ + if (!strncmp(test_name, prefix, prefix_len)) + test_name += prefix_len; + + if (argc > 1 && strcmp(argv[1], test_name)) continue; printf("Test: %s\n", test->name); diff --git a/test/compression.c b/test/compression.c index 48dccc0..cf040d7 100644 --- a/test/compression.c +++ b/test/compression.c @@ -540,5 +540,6 @@ int do_ut_compression(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) compression_test); const int n_ents = ll_entry_count(struct unit_test, compression_test); - return cmd_ut_category("compression", tests, n_ents, argc, argv); + return cmd_ut_category("compression", "compression_test_", + tests, n_ents, argc, argv); } diff --git a/test/env/cmd_ut_env.c b/test/env/cmd_ut_env.c index 54041a0..ad67dbe 100644 --- a/test/env/cmd_ut_env.c +++ b/test/env/cmd_ut_env.c @@ -15,5 +15,6 @@ int do_ut_env(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) struct unit_test *tests = ll_entry_start(struct unit_test, env_test); const int n_ents = ll_entry_count(struct unit_test, env_test); - return cmd_ut_category("environment", tests, n_ents, argc, argv); + return cmd_ut_category("environment", "env_test_", + tests, n_ents, argc, argv); } diff --git a/test/lib/cmd_ut_lib.c b/test/lib/cmd_ut_lib.c index eb90e53..c73e8d7 100644 --- a/test/lib/cmd_ut_lib.c +++ b/test/lib/cmd_ut_lib.c @@ -16,5 +16,5 @@ int do_ut_lib(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) struct unit_test *tests = ll_entry_start(struct unit_test, lib_test); const int n_ents = ll_entry_count(struct unit_test, lib_test); - return cmd_ut_category("lib", tests, n_ents, argc, argv); + return cmd_ut_category("lib", "lib_test_", tests, n_ents, argc, argv); } diff --git a/test/optee/cmd_ut_optee.c b/test/optee/cmd_ut_optee.c index 670682f..0927103 100644 --- a/test/optee/cmd_ut_optee.c +++ b/test/optee/cmd_ut_optee.c @@ -129,20 +129,20 @@ int do_ut_optee(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) ut_assertok(optee_copy_fdt_nodes(fdt_no_optee, fdt)); expect_success = false; - ret = cmd_ut_category("optee", tests, n_ents, argc, argv); + ret = cmd_ut_category("optee", "", tests, n_ents, argc, argv); /* (2) Try to copy optee nodes from prefilled dt */ ut_assertok(optee_copy_fdt_nodes(fdt_optee, fdt)); expect_success = true; - ret = cmd_ut_category("optee", tests, n_ents, argc, argv); + ret = cmd_ut_category("optee", "", tests, n_ents, argc, argv); /* (3) Try to copy OP-TEE nodes into a already filled DT */ ut_assertok(fdt_open_into(fdt_optee, fdt, FDT_COPY_SIZE)); ut_assertok(optee_copy_fdt_nodes(fdt_optee, fdt)); expect_success = true; - ret = cmd_ut_category("optee", tests, n_ents, argc, argv); + ret = cmd_ut_category("optee", "", tests, n_ents, argc, argv); free(fdt); return ret; diff --git a/test/overlay/cmd_ut_overlay.c b/test/overlay/cmd_ut_overlay.c index fc2491d..d0083fd6b 100644 --- a/test/overlay/cmd_ut_overlay.c +++ b/test/overlay/cmd_ut_overlay.c @@ -272,7 +272,7 @@ int do_ut_overlay(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) /* Apply the stacked overlay */ ut_assertok(fdt_overlay_apply(fdt, fdt_overlay_stacked_copy)); - ret = cmd_ut_category("overlay", tests, n_ents, argc, argv); + ret = cmd_ut_category("overlay", "", tests, n_ents, argc, argv); free(fdt_overlay_stacked_copy); err3: diff --git a/test/unicode_ut.c b/test/unicode_ut.c index 8875cdc..47532a6 100644 --- a/test/unicode_ut.c +++ b/test/unicode_ut.c @@ -585,5 +585,6 @@ int do_ut_unicode(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) struct unit_test *tests = ll_entry_start(struct unit_test, unicode_test); const int n_ents = ll_entry_count(struct unit_test, unicode_test); - return cmd_ut_category("Unicode", tests, n_ents, argc, argv); + return cmd_ut_category("Unicode", "unicode_test_", + tests, n_ents, argc, argv); } -- 2.7.4

3 2

[RFT][PATCH v1 0/2] Fix CONFIG_SYS_UBOOT_START default value
by Patrice Chotard 08 Jan '20

08 Jan '20

This series fixes a regression introduced by d3e97b53c1f2 ("spl: fix entry_point equal to load_addr") which breaks some board boot (at least STM32MP15 in basic configuration) If CONFIG_SYS_UBOOT_START is not set, it's set to CONFIG_SYS_TEXT_BASE by default. This allows also to clean include/configs board files in which CONFIG_SYS_UBOOT_START is already set to CONFIG_SYS_TEXT_BASE. Patrice Chotard (2): Makefile: Fix CONFIG_SYS_UBOOT_START default value treewide: Remove CONFIG_SYS_UBOOT_START from configs board files Makefile | 2 +- include/configs/gardena-smart-gateway-at91sam.h | 1 - include/configs/ls1046a_common.h | 1 - include/configs/mccmon6.h | 1 - include/configs/microblaze-generic.h | 2 -- include/configs/mt7623.h | 1 - include/configs/mt7629.h | 1 - include/configs/mt8518.h | 1 - include/configs/omap3_cairo.h | 1 - include/configs/pumpkin.h | 1 - include/configs/tegra-common.h | 1 - include/configs/x600.h | 1 - include/configs/xilinx_zynqmp_r5.h | 2 -- include/configs/zynq-common.h | 2 -- 14 files changed, 1 insertion(+), 17 deletions(-) -- 2.17.1

4 6

[PATCH] cmd/Kconfig: Add more dependencies to OSE bootm support
by Tom Rini 08 Jan '20

08 Jan '20

Per Enea OSE documentation, it supports some classes of ARM, PowerPC and X86. Limit the option to those platforms. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- cmd/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/Kconfig b/cmd/Kconfig index a2b9e19bbe6d..9f791e90dc90 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -286,6 +286,7 @@ config BOOTM_OPENRTOS config BOOTM_OSE bool "Support booting Enea OSE images" + depends on (ARM && (ARM64 || CPU_V7A || CPU_V7R) || SANDBOX || PPC || X86) depends on CMD_BOOTM help Support booting Enea OSE images via the bootm command. -- 2.17.1

1 1

[U-Boot] [PATCH] bdinfo: show multi_dtb_fit
by Heiko Schocher 08 Jan '20

08 Jan '20

if MULTI_DTB_FIT is enabled it is helpful to display the value of gd->multi_dtb_fit in bdinfo. Signed-off-by: Heiko Schocher <hs(a)denx.de> --- travis build: https://travis-ci.org/hsdenx/u-boot-test/builds/609100901 cmd/bdinfo.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index ae6006f85f..e12c96b767 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -347,6 +347,9 @@ static int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, #if CONFIG_VAL(SYS_MALLOC_F_LEN) printf("Early malloc usage: %lx / %x\n", gd->malloc_ptr, CONFIG_VAL(SYS_MALLOC_F_LEN)); +#endif +#if CONFIG_IS_ENABLED(MULTI_DTB_FIT) + print_num("multi_dtb_fit", (ulong)gd->multi_dtb_fit); #endif if (gd->fdt_blob) print_num("fdt_blob", (ulong)gd->fdt_blob); -- 2.21.0

3 2

[U-Boot] [PATCH] power: regulator: support off-on-delay-us
by Peng Fan 08 Jan '20

08 Jan '20

off-on-delay-us has been supported by Linux, so let's use it. Signed-off-by: Peng Fan <peng.fan(a)nxp.com> --- V1: Linux Tree: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/… drivers/power/regulator/regulator_common.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/power/regulator/regulator_common.c b/drivers/power/regulator/regulator_common.c index 2041086567..939efb2c0d 100644 --- a/drivers/power/regulator/regulator_common.c +++ b/drivers/power/regulator/regulator_common.c @@ -37,7 +37,11 @@ int regulator_common_ofdata_to_platdata(struct udevice *dev, dev_pdata->startup_delay_us = dev_read_u32_default(dev, "startup-delay-us", 0); dev_pdata->off_on_delay_us = + dev_read_u32_default(dev, "off-on-delay-us", 0); + if (!dev_pdata->off_on_delay_us) { + dev_pdata->off_on_delay_us = dev_read_u32_default(dev, "u-boot,off-on-delay-us", 0); + } return 0; } -- 2.16.4

2 1

[U-Boot] [PATCH v2 0/6] remoteproc: add elf resource table loader
by Fabien Dessenne 08 Jan '20

08 Jan '20

Add some helpers that can be called by the drivers to load the firmware resource table from an elf32 / elf64 image. The stm32 remoteproc driver makes use of it, to load the resource table before the elf image itself. Changes since v1: -Do not fixup the DeviceTree to track the stm32 coprocessor state. Instead of this, use a dedicated register. Fabien Dessenne (6): remoteproc: elf_loader: Add elf resource table load support stm32mp1: declare backup registers for coprocessor stm32mp1: reset coprocessor status at cold boot remoteproc: stm32: track the coprocessor state in a backup register stm32mp1: remove copro_state environment variable remoteproc: stm32: load resource table from firmware arch/arm/mach-stm32mp/cpu.c | 7 + arch/arm/mach-stm32mp/include/mach/stm32.h | 9 + board/st/stm32mp1/stm32mp1.c | 4 +- drivers/remoteproc/rproc-elf-loader.c | 269 +++++++++++++++++++++++++++++ drivers/remoteproc/stm32_copro.c | 27 ++- include/remoteproc.h | 70 ++++++++ test/dm/remoteproc.c | 91 ++++++++-- 7 files changed, 454 insertions(+), 23 deletions(-) -- 2.7.4

4 19

[U-Boot] [PATCH PATCH v6 00/13] Add support for applications of overlays in SPL
by Jean-Jacques Hiblot 08 Jan '20

08 Jan '20

The purpose of this series is to provide the SPL with ability to apply overlays for u-boot. Our use-case is the support of the daughter boards of the AM65x and J721e EVMs. In Linux, each board is supported by a unique overlay. The presence of the boards is detected at runtime, and some useful features (like USB) are implemented on those daughter boards. Instead of providing multiple dtbs and fall in a combinatorial pit, we propose to use DT overlays. On arm, if overlay are supported, this series increases the size of the SPL by 3.2 kB. Travis build : https://travis-ci.org/jjhiblot/u-boot/builds/600742163 Changes in v6: - Instead of matching a overlay by the name of it's node. Try to match it first with the description, and then with the node's name. This allows to use makeimg to add the overlays to u-boot.img and not use a custom SPL_FIT_GENERATOR script Changes in v5: - Do not allocate the buffer if not needed (no overlay). - Add a Kconfig option for the buffer size - board_get_fit_loadable() returns an error code instead of a NULL string in case of failure -reword commit log Changes in v4: - use CONFIG_IS_ENABLED() instead of #idef - make sure that the temp buffer is freed in all cases - Use the board driver infrastructure to get the image names from the board code. - Remove a patch that passed the board name to the FIT generator. If needed the generator can get it from elsewhere - Add a fix to not load the firmware twice (once as a firmware and once as a loadable) Changes in v3: - Add a new config option: SPL_LOAD_FIT_APPLY_OVERLAY. By default, it is not selected. - removed the RFC prefix. This work will be needed soon by TI's AM65x platform. and can probably benefit other modular platforms - removed the last patch that provided an example of how to use this with on a DRA76. - removed the patch that made u-boot.img a symlink to u-boot.itb because it breaks the build of many platforms (because files required to build the ITB are missing) - removed the patch to reduce the footprint of the am335x SPL. (already merged) - Made the boot flow more permissive (don't fail immediately if an overlay is not present) and more verbose when an error occures - handle the dependencies of the FIT generation in a more generic way - use a dedicated kconfig option to enable the application of the overlays by the SPL. Changes in v2: - depend on SPL_DM - update the commit log - reworked board_fit_get_additionnal_images() and how it used in spl_fit.c - removed dtbo generation from dtso files and use .dts extension for the overlays - add dynamic allocation usage in a separate patch - defconfig change for the am335x_evm Jean-Jacques Hiblot (12): spl: fit: don't load the firmware twice spl: fit: Make room in the FDT before applying overlays spl: fit: allocate a temporary buffer to load the overlays spl: fit: Do not fail immediately if an overlay is not available spl: fit: be more verbose when an error occurs when applying the overlays Makefile.lib: include /__symbols__ in dtb if SPL_LOAD_FIT_APPLY_OVERLAY is enabled spl: fit: constify the output parameter of spl_fit_get_image_name() drivers: board: Make the board drivers available in SPL drivers: board: Add get_fit_loadable() include: board: provide empty stubs when the BOARD option is not selected dts: Add support for adding DT overlays in u-boot.img spl: fit: Allow the board to tell if more images must be loaded from FIT Michal Simek (1): spl: fit: Add support for applying DT overlay Kconfig | 18 +++++ Makefile | 3 +- common/spl/spl_fit.c | 151 ++++++++++++++++++++++++++++++++--- drivers/Makefile | 2 +- drivers/board/Kconfig | 3 + drivers/board/Makefile | 2 +- drivers/board/board-uclass.c | 11 +++ dts/Kconfig | 8 ++ include/board.h | 74 +++++++++++++++++ scripts/Makefile.lib | 4 + 10 files changed, 263 insertions(+), 13 deletions(-) -- 2.17.1

3 32

[U-Boot] [PATCH 1/3] tools: dumpimage: Provide more feedback on internal errors
by Andrew F. Davis 08 Jan '20

08 Jan '20

The dumpimage utility errors out in a number of places without providing sufficient feedback to allow the user to easily determine what has gone wrong. Add additional error messages to make the cause of the failure more obvious. Signed-off-by: Andrew F. Davis <afd(a)ti.com> --- tools/dumpimage.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/tools/dumpimage.c b/tools/dumpimage.c index ee3d41dda4..d5f893daf1 100644 --- a/tools/dumpimage.c +++ b/tools/dumpimage.c @@ -35,14 +35,23 @@ static int dumpimage_extract_subimage(struct image_type_params *tparams, if (tparams->verify_header) { retval = tparams->verify_header((unsigned char *)ptr, sbuf->st_size, &params); - if (retval != 0) + if (retval != 0) { + fprintf(stderr, "%s: failed to verify header of %s\n", + params.cmdname, tparams->name); return -1; + } + /* * Extract the file from the image * if verify is successful */ if (tparams->extract_subimage) { retval = tparams->extract_subimage(ptr, &params); + if (retval != 0) { + fprintf(stderr, "%s: extract_subimage failed for %s\n", + params.cmdname, tparams->name); + return -3; + } } else { fprintf(stderr, "%s: extract_subimage undefined for %s\n", @@ -175,6 +184,9 @@ int main(int argc, char **argv) * image type. Returns the error code if not matched */ retval = dumpimage_extract_subimage(tparams, ptr, &sbuf); + if (retval) + fprintf(stderr, "%s: Can't extract subimage from %s\n", + params.cmdname, params.imagefile); } else { /* * Print the image information for matched image type -- 2.17.1

3 10

[PATCH v1 0/1] MIPS: allow override of get_tbclk()
by Alex Nemirovsky 08 Jan '20

08 Jan '20

Allow SoC or board layers with reconfigurable cpu clocks capabilties to do implementation specific lookups and service get_tbclk() requests. Alex Nemirovsky (1): MIPS: allow override of get_tbclk() arch/mips/cpu/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4

2 2

[PATCH v1 0/1] MIPS: allow override of flush_dcache_range()
by Alex Nemirovsky 08 Jan '20

08 Jan '20

Useful in custom HW designs which have a need to flush dcache range in a completely non standard way. Alex Nemirovsky (1): MIPS: allow override of flush_dcache_range() arch/mips/lib/cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4

2 2