January 2020 - U-Boot

SPL too large for firefly-rk3288 and tinker-rk3288 since 2020.01
by Guillaume Gardet 10 Jan '20

10 Jan '20

Hi, since 2020.01, SPL image is too large for rk3288 boards (at least firefly-rk3288 and tinker-rk3288), because I get respectively: [ 356s] + ./tools/mkimage -n rk3288 -d spl/u-boot-spl.bin -T rksd u-boot-spl.rksd [ 356s] Error: SPL image is too large (size 0x9800 than 0x8000) And: [ 305s] + ./tools/mkimage -n rk3288 -d spl/u-boot-spl.bin -T rksd u-boot-spl.rksd [ 305s] Error: SPL image is too large (size 0xb800 than 0x8000) This is with gcc 9.2.1 Cheers, Guillaume IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you. IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

2 4

[PATCH 13/16] tools: binman: add etype file for u-boot-lzma-img
by Weijie Gao 10 Jan '20

10 Jan '20

This patch adds etype u-boot-lzma-img for binman Signed-off-by: Weijie Gao <weijie.gao(a)mediatek.com> --- tools/binman/etype/u_boot_lzma_img.py | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 tools/binman/etype/u_boot_lzma_img.py 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..2bf3ea97b1 --- /dev/null +++ b/tools/binman/etype/u_boot_lzma_img.py @@ -0,0 +1,27 @@ +# SPDX-License-Identifier: GPL-2.0+ +# Copyright (c) 2016 Google, Inc +# Written by Simon Glass <sjg(a)chromium.org> +# +# Entry-type module for U-Boot binary +# + +from entry import Entry +from blob import Entry_blob + +class Entry_u_boot_lzma_img(Entry_blob): + """U-Boot legacy image with content LZMA compressed + + 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. + + 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

[PATCH 12/16] Makefile: add support to generate LZMA compressed u-boot image
by Weijie Gao 10 Jan '20

10 Jan '20

This patch adds support for generating LZMA compressed u-boot image. The compressed image can be used for SPL to reduce the size of the u-boot binary. Signed-off-by: Weijie Gao <weijie.gao(a)mediatek.com> --- Makefile | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Makefile b/Makefile index e20a206239..37bfc0e711 100644 --- a/Makefile +++ b/Makefile @@ -951,6 +951,9 @@ append = cat $(filter-out $< $(PHONY), $^) >> $@ quiet_cmd_pad_cat = CAT $@ cmd_pad_cat = $(cmd_objcopy) && $(append) || rm -f $@ +quiet_cmd_lzma = LZMA $@ +cmd_lzma = lzma -c -z -k -9 $< > $@ + cfg: u-boot.cfg quiet_cmd_cfgcheck = CFGCHK $2 @@ -1332,6 +1335,16 @@ else UBOOT_BIN := u-boot.bin endif +MKIMAGEFLAGS_u-boot-lzma.img = -A $(ARCH) -T standalone -C lzma -O u-boot \ + -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \ + -n "U-Boot $(UBOOTRELEASE) for $(BOARD) board" + +u-boot.bin.lzma: u-boot.bin FORCE + $(call if_changed,lzma) + +u-boot-lzma.img: u-boot.bin.lzma FORCE + $(call if_changed,mkimage) + u-boot-dtb.img u-boot.img u-boot.kwb u-boot.pbl u-boot-ivt.img: \ $(if $(CONFIG_SPL_LOAD_FIT),u-boot-nodtb.bin \ $(if $(CONFIG_OF_SEPARATE)$(CONFIG_OF_EMBED)$(CONFIG_OF_HOSTFILE),dts/dt.dtb) \ -- 2.17.1

2 1

[PATCH 07/16] sysreset: add reset controller based reboot driver
by Weijie Gao 10 Jan '20

10 Jan '20

Some chips provide their sysreset function in reset controller, which is normally a bit written to 1 to perform the sysreset. This patch adds a new sysreset driver to take advantage of it. Signed-off-by: Weijie Gao <weijie.gao(a)mediatek.com> --- drivers/sysreset/Kconfig | 6 ++++ drivers/sysreset/Makefile | 1 + drivers/sysreset/sysreset_resetctl.c | 48 ++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 drivers/sysreset/sysreset_resetctl.c diff --git a/drivers/sysreset/Kconfig b/drivers/sysreset/Kconfig index f09e138bb8..4be7433404 100644 --- a/drivers/sysreset/Kconfig +++ b/drivers/sysreset/Kconfig @@ -101,6 +101,12 @@ config SYSRESET_WATCHDOG help Reboot support for generic watchdog reset. +config SYSRESET_RESETCTL + bool "Enable support for reset controller reboot driver" + select DM_RESET + help + Reboot support using generic reset controller. + config SYSRESET_X86 bool "Enable support for x86 processor reboot driver" depends on X86 diff --git a/drivers/sysreset/Makefile b/drivers/sysreset/Makefile index 51af68fad3..3ed4bab9e3 100644 --- a/drivers/sysreset/Makefile +++ b/drivers/sysreset/Makefile @@ -16,5 +16,6 @@ obj-$(CONFIG_SYSRESET_SOCFPGA_S10) += sysreset_socfpga_s10.o obj-$(CONFIG_SYSRESET_TI_SCI) += sysreset-ti-sci.o obj-$(CONFIG_SYSRESET_SYSCON) += sysreset_syscon.o obj-$(CONFIG_SYSRESET_WATCHDOG) += sysreset_watchdog.o +obj-$(CONFIG_SYSRESET_RESETCTL) += sysreset_resetctl.o obj-$(CONFIG_$(SPL_TPL_)SYSRESET_X86) += sysreset_x86.o obj-$(CONFIG_TARGET_XTFPGA) += sysreset_xtfpga.o diff --git a/drivers/sysreset/sysreset_resetctl.c b/drivers/sysreset/sysreset_resetctl.c new file mode 100644 index 0000000000..b8203ba605 --- /dev/null +++ b/drivers/sysreset/sysreset_resetctl.c @@ -0,0 +1,48 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2020 MediaTek Inc. + * + * Author: Weijie Gao <weijie.gao(a)mediatek.com> + */ + +#include <common.h> +#include <dm.h> +#include <errno.h> +#include <sysreset.h> +#include <reset.h> + +struct resetctl_reboot_priv { + struct reset_ctl_bulk resets; +}; + +static int resetctl_reboot_request(struct udevice *dev, enum sysreset_t type) +{ + struct resetctl_reboot_priv *priv = dev_get_priv(dev); + + return reset_assert_bulk(&priv->resets); +} + +static struct sysreset_ops resetctl_reboot_ops = { + .request = resetctl_reboot_request, +}; + +int resetctl_reboot_probe(struct udevice *dev) +{ + struct resetctl_reboot_priv *priv = dev_get_priv(dev); + + return reset_get_bulk(dev, &priv->resets); +} + +static const struct udevice_id resetctl_reboot_ids[] = { + { .compatible = "resetctl-reboot" }, + { } +}; + +U_BOOT_DRIVER(resetctl_reboot) = { + .id = UCLASS_SYSRESET, + .name = "resetctl_reboot", + .of_match = resetctl_reboot_ids, + .ops = &resetctl_reboot_ops, + .priv_auto_alloc_size = sizeof(struct resetctl_reboot_priv), + .probe = resetctl_reboot_probe, +}; -- 2.17.1

2 1

[U-Boot] [PATCH v2 00/14] dm: add support of new binding in gpio and pincontrol
by Patrick Delaunay 10 Jan '20

10 Jan '20

Hi, I create this patchset to prepare alignment of stm32mp157c-ev1 device-tree with the linux kernel v5.4. One node for touch screen support use the IRQ line configuration using the new kernel binding introduced by the linux kernel commit ede033e1e863c from v5.1 ('dt-bindings: gpio: document the new pull-up/pull-down flags') https://github.com/torvalds/linux/commit/ede033e1e863c gt9147: goodix_ts@5d { compatible = "goodix,gt9147"; reg = <0x5d>; status = "okay"; irq-gpios = <&stmfx_pinctrl 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; irq-flags = <IRQ_TYPE_EDGE_RISING>; }; In Linux Kernel, the GPIO configuration (pull down/up) are now managed by GPIO lib but they are not yet supported by U-boot in uclass GPIO or pincontrol (when used by gpio-hog). This serie adds the support of theses new defines (with ops get_config/set_config) added in kernel GPIO binding and adds the test in sandbox. NB: In a second phase, the removed set_open_drain/get_open_drain API could be replaced by the new ops get_config/set_config. I also align the gpio binding file with the version from the latest kernel v5.3 (I don't think I remove any U-Boot specific part with this patch) I move the added information on gpio hog code in a new file doc/README.gpio. To have functional test, I convert pinctrl-generic to livetree otherwise the pins are not correctly configured in sandbox, when CONFIG_OF_LIVE is activated. For the test on gpio I add information for pin configuration in output of the command "pinmux status" with a simple pincontrol driver associated to GPIO driver. NB: after rebase on master branch, the sandbox test "ut dm power_domain" is failing; it was not the case for v2019.10. => ut dm power_domain Test: dm_test_power_domain: power-domain.c ../test/dm/test-main.c:73, dm_test_destroy(): 0 == uclass_destroy(uc): Expected 0, got -22 ../test/dm/test-main.c:108, dm_do_test(): 0 == dm_test_destroy(uts): Expected 0, got 1 ../test/dm/test-main.c:170, dm_test_main(): 0 == dm_do_test(uts, test, 1): Expected 0, got 1 I think it is linked to commit 52edfed65de9 ("dm: core: device: switch off power domain after device removal") After some investigation : 1/ pincontrol is remove in uclass_destroy(0) 2/ power domain is removed in uclass_destroy(0) 3/ device_chld_unbind() dev_power_domain_off -> probe power domain (again) --> pinctrl_select_state() in device_probe() ---> pincontrol is probed (again) 4/ at the end of dev_power_domain_off() function the power domain is unbind in dev_power_domain_off device_remove(pd.dev, DM_REMOVE_NORMAL); So power domain driver is correctly removed but it is not the case for the pincontrol driver and that cause the issue. The problem occurs after my serie only because I introduce a second pincontrol driver for sandbox, so the dynamic changes but my serie is not the root cause of the issue, it should be investigated by power domain users. Workaround to allow test execution: "dm: core: device: don't probe pinctrl for power domain" My working branch: https://github.com/patrickdelaunay/u-boot/tree/dm CI-Travis build: https://travis-ci.org/patrickdelaunay/u-boot/builds/616716294 Issue for tbs2910 board not reproduced locally with buildman +u-boot.imx exceeds file size limit: 1405+ limit: 0x5fc00 bytes 1406+ actual: 0x60c00 bytes 1407+ excess: 0x1000 bytes Regards Patrick Delaunay Changes in v2: - use the dev_ API instead of ofnode_ function. - Identify property with a new struct ofprop as proposed by Simon Glass - Add dev_ iterate functions - Change dev_ functions in pinctrl-generic - remove the unused GPIOD_REQUESTED - remove the open_drain API and ops - add gpio descriptor initialization helper - change the proposed ops for pin config to set_dir_flags/get_dir_flags - reused the existing API dm_gpio_set_dir_flags/dm_gpio_set_dir - add a new API dm_gpio_get_dir_flags - simplify sandbox GPIO driver: save dir_flags (GPIOD_...) and remove internal flags (GPIOF_...); the previous path "gpio: sandbox: cleanup flag support" is no more needed - add unitary test in dm_test_gpio for set_dir_flags - add some function check in dm_test_gpio_phandles - dm_test_gpio_pin_config change to dm_test_gpio_get_dir_flags - Adapt sandbox_pinctrl_gpio driver with the saved dir_flags in sandbox gpio driver - rebase on v2020.01-rc3 Patrick Delaunay (14): dm: pinctrl: convert pinctrl-single to livetree dm: core: add ofnode and dev function to iterate on node property dm: pinctrl: migrate pinctrl-generic to livetree dt-bindings: gpio: document the new pull-up/pull-down flags gpio: remove GPIOD_REQUESTED gpio: remove the open_drain API and ops gpio: add gpio descriptor initialization helper gpio: add ops for configuration with dir flags dt-bindings: gpio: alignment with kernel v5.3 pinctrl: sandbox: Add mux information in get_pin_muxing test: dm: update test for pins configuration in pinctrl node gpio: sandbox: cleanup binding support test: dm: update test for pins configuration in gpio test: pinmux: add pincontrol-gpio for pin configuration arch/sandbox/dts/test.dts | 85 +++++-- arch/sandbox/include/asm/gpio.h | 38 +-- doc/README.gpio | 42 ++++ doc/device-tree-bindings/gpio/gpio.txt | 304 ++++++++++++---------- drivers/core/of_access.c | 32 +++ drivers/core/ofnode.c | 48 ++++ drivers/core/read.c | 16 ++ drivers/gpio/gpio-uclass.c | 192 ++++++++++---- drivers/gpio/mpc8xxx_gpio.c | 22 -- drivers/gpio/sandbox.c | 321 +++++++++++++++++++----- drivers/pinctrl/pinctrl-generic.c | 30 +-- drivers/pinctrl/pinctrl-sandbox.c | 44 +++- drivers/pinctrl/pinctrl-single.c | 27 +- include/asm-generic/gpio.h | 104 ++++---- include/dm/of_access.h | 40 +++ include/dm/ofnode.h | 63 ++++- include/dm/read.h | 67 +++++ include/dt-bindings/gpio/gpio.h | 6 + include/dt-bindings/gpio/sandbox-gpio.h | 24 ++ test/dm/gpio.c | 69 ++++- test/dm/test-fdt.c | 2 +- test/py/tests/test_pinmux.py | 38 ++- 22 files changed, 1216 insertions(+), 398 deletions(-) create mode 100644 doc/README.gpio create mode 100644 include/dt-bindings/gpio/sandbox-gpio.h -- 2.17.1

3 26

[PATCH V2 1/2] tpm: add a helper to iterate on all tpm devices
by Philippe Reynes 10 Jan '20

10 Jan '20

This add a helper for_each_tpm_device that run through all the tpm (1.x and 2.0) devices. Signed-off-by: Philippe Reynes <philippe.reynes(a)softathome.com> --- include/tpm-common.h | 6 ++++++ 1 file changed, 6 insertions(+) Changelog: v2: - new patch, add an helper for tpm device (idea from Miquel) diff --git a/include/tpm-common.h b/include/tpm-common.h index f9c2ca2..5b33f47 100644 --- a/include/tpm-common.h +++ b/include/tpm-common.h @@ -293,4 +293,10 @@ static inline cmd_tbl_t *get_tpm2_commands(unsigned int *size) */ enum tpm_version tpm_get_version(struct udevice *dev); +/* Iterate on all TPM devices */ +#define for_each_tpm_device(dev) \ + for (uclass_first_device(UCLASS_TPM, &(dev)); \ + (dev); \ + uclass_next_device(&(dev))) + #endif /* __TPM_COMMON_H */ -- 2.7.4

3 5

[PATCH] arm: dts: k3-am654-r5-base-board: Fix power-domains for wkup_vtm0
by Lokesh Vutla 10 Jan '20

10 Jan '20

wkup_vtm populates only 1 power-domain cell in it's node. But the power-domain cell are defined as 2. Due to this the following warning comes during build: arch/arm/dts/k3-am654-r5-base-board.dtb: Warning (power_domains_property): /interconnect@100000/interconnect@28380000/interconnect@42040000/ wkup_vtm@42050000:power-domains: property size (8) too small for cell size 2 Fix this by updating the power-domain cells. Fixes: cfa6bd549c ("arm: dts: k3-am654-r5-base-board: Add VTM node") Signed-off-by: Lokesh Vutla <lokeshvutla(a)ti.com> --- arch/arm/dts/k3-am654-r5-base-board.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/dts/k3-am654-r5-base-board.dts b/arch/arm/dts/k3-am654-r5-base-board.dts index 5c110ef9dd..5d5689d284 100644 --- a/arch/arm/dts/k3-am654-r5-base-board.dts +++ b/arch/arm/dts/k3-am654-r5-base-board.dts @@ -100,7 +100,7 @@ wkup_vtm0: wkup_vtm@42050000 { compatible = "ti,am654-vtm", "ti,am654-avs"; reg = <0x42050000 0x25c>; - power-domains = <&k3_pds 80>; + power-domains = <&k3_pds 80 TI_SCI_PD_EXCLUSIVE>; #thermal-sensor-cells = <1>; }; -- 2.23.0

2 1

[PATCH] binman: fix default filename of u-boot-with-ucode-ptr in documentation
by Masahiro Yamada 10 Jan '20

10 Jan '20

The suffix should be ".bin" instead of ".dtb" . Signed-off-by: Masahiro Yamada <masahiroy(a)kernel.org> Reviewed-by: Bin Meng <bmeng.cn(a)gmail.com> --- tools/binman/README.entries | 2 +- tools/binman/etype/u_boot_with_ucode_ptr.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/binman/README.entries b/tools/binman/README.entries index 1099433521..26050da770 100644 --- a/tools/binman/README.entries +++ b/tools/binman/README.entries @@ -971,7 +971,7 @@ Entry: u-boot-with-ucode-ptr: U-Boot with embedded microcode pointer -------------------------------------------------------------------- Properties / Entry arguments: - - filename: Filename of u-boot-nodtb.dtb (default 'u-boot-nodtb.dtb') + - filename: Filename of u-boot-nodtb.bin (default 'u-boot-nodtb.bin') - optional-ucode: boolean property to make microcode optional. If the u-boot.bin image does not include microcode, no error will be generated. diff --git a/tools/binman/etype/u_boot_with_ucode_ptr.py b/tools/binman/etype/u_boot_with_ucode_ptr.py index cb7dbc68db..960a5efeb4 100644 --- a/tools/binman/etype/u_boot_with_ucode_ptr.py +++ b/tools/binman/etype/u_boot_with_ucode_ptr.py @@ -18,7 +18,7 @@ class Entry_u_boot_with_ucode_ptr(Entry_blob): """U-Boot with embedded microcode pointer Properties / Entry arguments: - - filename: Filename of u-boot-nodtb.dtb (default 'u-boot-nodtb.dtb') + - filename: Filename of u-boot-nodtb.bin (default 'u-boot-nodtb.bin') - optional-ucode: boolean property to make microcode optional. If the u-boot.bin image does not include microcode, no error will be generated. -- 2.17.1

3 2

[PATCH] dm: Add a debug message when devices are skipped pre-reloc
by Sean Anderson 10 Jan '20

10 Jan '20

This adds a message to lists_bind_fdt when it skips initializing a device pre-relocation. I've had a couple errors where a device didn't initialize properly because one of its dependencies was missing. Signed-off-by: Sean Anderson <seanga2(a)gmail.com> --- drivers/core/lists.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/core/lists.c b/drivers/core/lists.c index 4681b3e5dd..68204c303f 100644 --- a/drivers/core/lists.c +++ b/drivers/core/lists.c @@ -176,8 +176,10 @@ int lists_bind_fdt(struct udevice *parent, ofnode node, struct udevice **devp, if (pre_reloc_only) { if (!dm_ofnode_pre_reloc(node) && - !(entry->flags & DM_FLAG_PRE_RELOC)) + !(entry->flags & DM_FLAG_PRE_RELOC)) { + log_debug("Skipping device pre-relocation\n"); return 0; + } } log_debug(" - found match at '%s': '%s' matches '%s'\n", -- 2.24.1

4 3

[PATCH] Include missing headers for fdt_support.h
by Sean Anderson 10 Jan '20

10 Jan '20

fdt_support.h is missing declarations for bd_t. Including asm/u-boot.h pulls in the definition. Signed-off-by: Sean Anderson <seanga2(a)gmail.com> --- include/fdt_support.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/fdt_support.h b/include/fdt_support.h index 2286ea7793..3f4bc643d4 100644 --- a/include/fdt_support.h +++ b/include/fdt_support.h @@ -9,6 +9,7 @@ #ifdef CONFIG_OF_LIBFDT +#include <asm/u-boot.h> #include <linux/libfdt.h> u32 fdt_getprop_u32_default_node(const void *fdt, int off, int cell, -- 2.23.0

2 1