January 2020 - U-Boot

[PATCH 1/1] lib: Kconfig dependencies for seudo-random library
by Heinrich Schuchardt 30 Jan '20

30 Jan '20

drivers/rng/sandbox_rng.c requires rand() to be defined but configuration option CONFIG_CONFIG_LIB_RAND selected in drivers/rng/Kconfig does not exist. test/lib/test_aes.c requires rand() to be defined. Fix the selection criteria for choice "Pseudo-random library support type". Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- drivers/rng/Kconfig | 1 - lib/Kconfig | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/rng/Kconfig b/drivers/rng/Kconfig index 35a3bd192a..893b89d49b 100644 --- a/drivers/rng/Kconfig +++ b/drivers/rng/Kconfig @@ -9,7 +9,6 @@ config DM_RNG config RNG_SANDBOX bool "Sandbox random number generator" depends on SANDBOX && DM_RNG - select CONFIG_LIB_RAND help Enable random number generator for sandbox. This is an emulation of a rng device. diff --git a/lib/Kconfig b/lib/Kconfig index d040a87d26..ab6aff710d 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -150,7 +150,8 @@ config REGEX choice prompt "Pseudo-random library support type" - depends on NET_RANDOM_ETHADDR || RANDOM_UUID || CMD_UUID + depends on NET_RANDOM_ETHADDR || RANDOM_UUID || CMD_UUID || \ + RNG_SANDBOX || UT_LIB && AES default LIB_RAND help Select the library to provide pseudo-random number generator -- 2.24.1

3 3

[PATCH] cmd: Add command to dump drivers and compatible strings
by Sean Anderson 30 Jan '20

30 Jan '20

This adds a subcommand to dm to dump out what drivers are installed, and their compatible strings. I have found this useful in ensuring that I have the correct drivers compiled, and that I have put in the correct compatible strings. Signed-off-by Sean Anderson <seanga2(a)gmail.com> --- cmd/dm.c | 12 +++++++++++- drivers/core/dump.c | 19 +++++++++++++++++++ include/dm/util.h | 3 +++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/cmd/dm.c b/cmd/dm.c index 7b271db0bb..108707c298 100644 --- a/cmd/dm.c +++ b/cmd/dm.c @@ -40,10 +40,19 @@ static int do_dm_dump_devres(cmd_tbl_t *cmdtp, int flag, int argc, return 0; } +static int do_dm_dump_drivers(cmd_tbl_t *cmdtp, int flag, int argc, + char * const argv[]) +{ + dm_dump_drivers(); + + return 0; +} + static cmd_tbl_t test_commands[] = { U_BOOT_CMD_MKENT(tree, 0, 1, do_dm_dump_all, "", ""), U_BOOT_CMD_MKENT(uclass, 1, 1, do_dm_dump_uclass, "", ""), U_BOOT_CMD_MKENT(devres, 1, 1, do_dm_dump_devres, "", ""), + U_BOOT_CMD_MKENT(drivers, 1, 1, do_dm_dump_drivers, "", ""), }; static __maybe_unused void dm_reloc(void) @@ -84,5 +93,6 @@ U_BOOT_CMD( "Driver model low level access", "tree Dump driver model tree ('*' = activated)\n" "dm uclass Dump list of instances for each uclass\n" - "dm devres Dump list of device resources for each device" + "dm devres Dump list of device resources for each device\n" + "dm drivers Dump list of drivers and their compatible strings\n" ); diff --git a/drivers/core/dump.c b/drivers/core/dump.c index 4704049aee..e73ebeabcc 100644 --- a/drivers/core/dump.c +++ b/drivers/core/dump.c @@ -96,3 +96,22 @@ void dm_dump_uclass(void) puts("\n"); } } + +void dm_dump_drivers(void) +{ + struct driver *d = ll_entry_start(struct driver, driver); + const int n_ents = ll_entry_count(struct driver, driver); + struct driver *entry; + const struct udevice_id *match; + + puts("Driver Compatible\n"); + puts("--------------------------------\n"); + for (entry = d; entry < d + n_ents; entry++) { + for (match = entry->of_match; match->compatible; match++) + printf("%-20.20s %s\n", + match == entry->of_match ? entry->name : "", + match->compatible); + if (match == entry->of_match) + printf("%-20.20s\n", entry->name); + } +} diff --git a/include/dm/util.h b/include/dm/util.h index 348c2ace3c..0ccb3fbadf 100644 --- a/include/dm/util.h +++ b/include/dm/util.h @@ -39,6 +39,9 @@ static inline void dm_dump_devres(void) } #endif +/* Dump out a list of drivers */ +void dm_dump_drivers(void); + /** * Check if an of node should be or was bound before relocation. * -- 2.24.1

2 1

[PATCH v2 18/21] tools: binman: add etype file for u-boot-lzma-img
by Weijie Gao 30 Jan '20

30 Jan '20

This patch adds etype u-boot-lzma-img for binman. README.entries is also updated. Signed-off-by: Weijie Gao <weijie.gao(a)mediatek.com> --- Changes since v1: updated README.entries, modified copyright and description. --- tools/binman/README.entries | 15 ++++++++++++++ tools/binman/etype/u_boot_lzma_img.py | 28 +++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 tools/binman/etype/u_boot_lzma_img.py diff --git a/tools/binman/README.entries b/tools/binman/README.entries index 6a816bba6b..0aea9b8f6d 100644 --- a/tools/binman/README.entries +++ b/tools/binman/README.entries @@ -747,6 +747,21 @@ applications. +Entry: u-boot-lzma-img: U-Boot legacy image with contents compressed by LZMA +---------------------------------------------------------------------------- + +Properties / Entry arguments: + - filename: Filename of u-boot-lzma.img (default 'u-boot-lzma.img') + +This is the U-Boot binary as a packaged image, in legacy format. It has a +header which allows it to be loaded at the correct address for execution. +Its contents are compressed by LZMA. + +You should use FIT (Flat Image Tree) instead of the legacy image for new +applications. + + + Entry: u-boot-nodtb: U-Boot flat binary without device tree appended -------------------------------------------------------------------- diff --git a/tools/binman/etype/u_boot_lzma_img.py b/tools/binman/etype/u_boot_lzma_img.py new file mode 100644 index 0000000000..966d6a46da --- /dev/null +++ b/tools/binman/etype/u_boot_lzma_img.py @@ -0,0 +1,28 @@ +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2020 MediaTek Inc. All Rights Reserved. +# Author: Weijie Gao <weijie.gao(a)mediatek.com> +# +# Entry-type module for U-Boot legacy image with contents compressed by LZMA +# + +from entry import Entry +from blob import Entry_blob + +class Entry_u_boot_lzma_img(Entry_blob): + """U-Boot legacy image with contents compressed by LZMA + + Properties / Entry arguments: + - filename: Filename of u-boot-lzma.img (default 'u-boot-lzma.img') + + This is the U-Boot binary as a packaged image, in legacy format. It has a + header which allows it to be loaded at the correct address for execution. + Its contents are compressed by LZMA. + + You should use FIT (Flat Image Tree) instead of the legacy image for new + applications. + """ + def __init__(self, section, etype, node): + Entry_blob.__init__(self, section, etype, node) + + def GetDefaultFilename(self): + return 'u-boot-lzma.img' -- 2.17.1

2 1

[U-Boot] [PATCH] gpio: search for gpio label if gpio is not found through bank name
by Heiko Schocher 30 Jan '20

30 Jan '20

dm_gpio_lookup_name() searches for a gpio through the bank name. But we have also gpio labels, and it makes sense to search for a gpio also in the labels we have defined, if no gpio is found through the bank name definition. This is useful for example if you have a wp pin on different gpios on different board versions. If dm_gpio_lookup_name() searches also for the gpio labels, you can give the gpio an unique label name and search for this label, and do not need to differ between board revisions. Signed-off-by: Heiko Schocher <hs(a)denx.de> --- Example on the aristainetos board: => gpio clear wp_spi_nor.gpio-hog gpio: pin wp_spi_nor.gpio-hog (gpio 47) value is 0 => before this patch, you need to know where your pin is: => gpio clear GPIO2_15 gpio: pin GPIO2_15 (gpio 47) value is 0 => travis build: https://travis-ci.org/hsdenx/u-boot-test/builds/604290746 drivers/gpio/gpio-uclass.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c index 90fbed455b..755744bc00 100644 --- a/drivers/gpio/gpio-uclass.c +++ b/drivers/gpio/gpio-uclass.c @@ -79,6 +79,26 @@ int dm_gpio_lookup_name(const char *name, struct gpio_desc *desc) if (!strncasecmp(name, uc_priv->bank_name, len)) { if (!strict_strtoul(name + len, 10, &offset)) break; + } else { + /* + * if we did not found a gpio through its bank + * name, we search for a valid gpio label. + */ + bool found = 0; + + len = strlen(name); + for (offset = 0; offset < uc_priv->gpio_count; + offset++) { + if (!uc_priv->name[offset]) + continue; + if (!strncmp(name, uc_priv->name[offset], + len)) { + found = 1; + break; + } + } + if (found) + break; } } -- 2.21.0

2 3

[PATCH v2 0/4] Insure 16 alignment of reserved memory in board_f.c
by Patrick Delaunay 30 Jan '20

30 Jan '20

Hi, It is a V2, rebased on master branch, for the untitled serie http://patchwork.ozlabs.org/project/uboot/list/?series=152226 This serie now include the previous patch: [U-Boot,v3] board_f.c: Insure gd->new_bootstage alignment http://patchwork.ozlabs.org/patch/1201452/ After this first correction, I remove the stm32mp1 workaround as the issue of bootstage alignment is solved. The 4th patch is a complete solution to alignment (proposed in comment 5 of http://patchwork.ozlabs.org/patch/1201452/#2327366) I always align the reserved memory to 16 bytes with a new function reserve_sp(). This patch causes an issue on ARM 32 bits, as the relocated gd pointer is not initialized with gd->new_gd as expected in reserve_global_data() but is hard-coded with relocated gd = gd->bd - GD_SIZE {with GD_SIZE = sizeof(struct global_data)} This issue is solved with the 3rd patch of the serie arm: set the relocated gd with gd->new_gd Only tested on STM32MP157C-EV1 board (ARM32 architecture). Changes in v2: - import: [U-Boot,v3] board_f.c: Insure gd->new_bootstage alignment Patrice Chotard (1): board_f.c: Insure gd->new_bootstage alignment Patrick Delaunay (3): Revert "stm32mp1: remove the imply BOOTSTAGE" arm: set the relocated gd with gd->new_gd board_f.c: Insure 16 alignment of start_addr_sp and reserved memory arch/arm/lib/crt0.S | 3 +-- arch/arm/mach-stm32mp/Kconfig | 2 ++ common/board_f.c | 27 ++++++++++++++++++--------- 3 files changed, 21 insertions(+), 11 deletions(-) -- 2.17.1

4 10

[PATCH v6 0/6] rockchip: Add Binman support
by Jagan Teki 30 Jan '20

30 Jan '20

This is v6 set for Binman support in rockchip, [1] here is previous patchset. This series add single boot image with binman for arm32 and pad_cat for arm64 rockchip platforms both TPL + SPL and SPL-alone targets. Changes for v6: - drop idbloader.img filename change patch - update rockchip.rst to include, rockchip TPL, SPI boot as TODO Changes for v5: - collect kever review tag - drop idbloader.img from clean target Changes for v4: - support all rockchip platforms - add new patches for dtsi changes - update documentation - format proper commit message - rebase on master Changes for v3: - rebase on master - add binman for rk3288, rk3328, rk3368, rk3399 - added rst documentation for rockchip Changes for v2: - Add few clean target patches - update bl31.elf env handling code, with logging - support puma itb, via BL31 and PMUM0 env - enable BUILD_TARGET for ROCKCHIP_RK3399 [1] https://patchwork.ozlabs.org/cover/1216263/ Any inputs? Jagan. Jagan Teki (6): Makefile: Add rockchip image type Makefile: rockchip: Suffix platform type with tpl name Makefile: rockchip: Support SPL-alone mkimage arm: dts: rk3036: Add rk3036-u-boot.dtsi rockchip: Add Single boot image (with binman, pad_cat) doc: boards: Add rockchip documentation Makefile | 36 ++++++-- arch/arm/Kconfig | 1 + arch/arm/dts/rk3036-sdk-u-boot.dtsi | 2 + arch/arm/dts/rk3036-u-boot.dtsi | 6 ++ arch/arm/dts/rk3288-u-boot.dtsi | 2 + arch/arm/dts/rockchip-u-boot.dtsi | 21 +++++ doc/board/rockchip/index.rst | 10 +++ doc/board/rockchip/rockchip.rst | 130 ++++++++++++++++++++++++++++ include/configs/rockchip-common.h | 3 + 9 files changed, 206 insertions(+), 5 deletions(-) create mode 100644 arch/arm/dts/rk3036-u-boot.dtsi create mode 100644 arch/arm/dts/rockchip-u-boot.dtsi create mode 100644 doc/board/rockchip/index.rst create mode 100644 doc/board/rockchip/rockchip.rst -- 2.18.0.321.gffc6fa0e3

5 18

[PATCH] power: regulator: tps62360_regulator: Convert ofdata_to_platdata to the missing probe
by Keerthy 30 Jan '20

30 Jan '20

commit 29f7d05a347a ("dm: core: Move ofdata_to_platdata() call earlier") introduces changes in the order of device_probe execution. ofdata_to_platdata now comes before the probe function which resulted in a deadlock and caused boot hang on AM6 devices. Deadlock sequence: tps62360_regulator_ofdata_to_platdata --> i2c_get_chip --> device_probe(tps62360) --> tps62360_regulator_ofdata_to_platdata Hence convert ofdata_to_platdata to the missing probe function to fix the hang. Fixes: 22e8f18980d6 ("power: regulator: tps6236x: add support for tps6236x regulators") Signed-off-by: Keerthy <j-keerthy(a)ti.com> --- drivers/power/regulator/tps62360_regulator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/power/regulator/tps62360_regulator.c b/drivers/power/regulator/tps62360_regulator.c index 3b123f503c..2c076c0db5 100644 --- a/drivers/power/regulator/tps62360_regulator.c +++ b/drivers/power/regulator/tps62360_regulator.c @@ -77,7 +77,7 @@ static int tps62360_regulator_get_value(struct udevice *dev) return (u32)regval * TPS62360_VSEL_STEPSIZE + pdata->config->vmin; } -static int tps62360_regulator_ofdata_to_platdata(struct udevice *dev) +static int tps62360_regulator_probe(struct udevice *dev) { struct tps62360_regulator_pdata *pdata = dev_get_platdata(dev); u8 vsel0; @@ -119,5 +119,5 @@ U_BOOT_DRIVER(tps62360_regulator) = { .ops = &tps62360_regulator_ops, .of_match = tps62360_regulator_ids, .platdata_auto_alloc_size = sizeof(struct tps62360_regulator_pdata), - .ofdata_to_platdata = tps62360_regulator_ofdata_to_platdata, + .probe = tps62360_regulator_probe, }; -- 2.17.1

3 2

gpio: return from do_gpio()
by Alex Nemirovsky 30 Jan '20

30 Jan '20

Hello Simon, We would like to get clarification on the expected return of do_gpio()? Should it be returning function execution status or the value of the GPIO? Thanks Alex

2 1

[PATCH 0/3]
by Patrick Delaunay 30 Jan '20

30 Jan '20

Hi, This serie depends on http://patchwork.ozlabs.org/patch/1201452/ [U-Boot,v3] board_f.c: Insure gd->new_bootstage alignment reserve_sp It should be applied only after this patch. First I remove the stm32mp1 workaround as the issue of bootstage alignment is solved. The 3rd patch is a complete solution (proposed in comment 5 of previous patch http://patchwork.ozlabs.org/patch/1201452/#2327366) always align the reserved memory to 16 bytes with a new function reserve_sp() This patch causes an issue on ARM 32 bits, as relocated gd pointer is not initialized with gd->new_gd as expected in reserve_global_data() but is hardcoded with relocated gd = gd->bd - GD_SIZE {GD_SIZE = sizeof(struct global_data)} This issue is solved with the second patch of the serie arm: set the relocated gd with gd->new_gd Only tested on STM32MP157C-EV1 board. Patrick Delaunay (3): Revert "stm32mp1: remove the imply BOOTSTAGE" arm: set the relocated gd with gd->new_gd board_f.c: Insure 16 alignment of start_addr_sp and reserved memory arch/arm/lib/crt0.S | 3 +-- arch/arm/mach-stm32mp/Kconfig | 2 ++ common/board_f.c | 32 ++++++++++++++++++-------------- 3 files changed, 21 insertions(+), 16 deletions(-) -- 2.17.1

4 7

[PATCH 1/2] Kconfig: add btrfs to distro boot
by matthias.bgg＠kernel.org 30 Jan '20

30 Jan '20

From: Matthias Brugger <mbrugger(a)suse.com> Some distributions use btrfs as the default file system. Enable btrfs support by default when using distro boot. Signed-off-by: Matthias Brugger <mbrugger(a)suse.com> --- Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/Kconfig b/Kconfig index 99cc56f3c2..ced0e3021e 100644 --- a/Kconfig +++ b/Kconfig @@ -79,6 +79,7 @@ config DISTRO_DEFAULTS select CMDLINE_EDITING select CMD_BOOTI if ARM64 select CMD_BOOTZ if ARM && !ARM64 + select CMD_BTRFS select CMD_DHCP if CMD_NET select CMD_ENV_EXISTS select CMD_EXT2 -- 2.24.0

2 3