January 2021 - U-Boot

Pull request for documentation tag doc-2021-04-rc1
by Heinrich Schuchardt 18 Jan '21

18 Jan '21

Dear Tom, The following changes since commit b0db69b4e1e1bf1109bd9d4a5185cbd4058f4a8b: dm: fix build errors generated by last merges (2021-01-15 13:12:38 -0500) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-efi.git tags/doc-2021-04-rc1 for you to fetch changes up to dd9abfec13884df0d9d30a6f79ffe80eeed9ac8c: doc: sifive: fu540: fix heading levels (2021-01-16 11:17:20 +0100) ---------------------------------------------------------------- Pull request for documentation tag doc-2021-04-rc1 * document man-page base command * move README.fdt-overlays to HTML documentation * add synopsis for pstore command ---------------------------------------------------------------- Heinrich Schuchardt (5): doc: man-page base command doc: add synopsis for pstore command doc: board: fix README.b4860qds doc: move README.fdt-overlays to HTML documentation doc: sifive: fu540: fix heading levels doc/README.fdt-overlays | 114 --------------------------------- doc/board/freescale/b4860qds.rst | 4 +- doc/board/sifive/fu540.rst | 19 +++--- doc/usage/base.rst | 23 +++++++ doc/usage/fdt_overlays.rst | 134 +++++++++++++++++++++++++++++++++++++++ doc/usage/index.rst | 3 + doc/usage/pstore.rst | 11 +++- 7 files changed, 183 insertions(+), 125 deletions(-) delete mode 100644 doc/README.fdt-overlays create mode 100644 doc/usage/base.rst create mode 100644 doc/usage/fdt_overlays.rst

2 1

[PATCH 0/7] Various minor fixes
by Simon Glass 18 Jan '21

18 Jan '21

This series collects a few minor fixes and improvements that have been hanging around in a branch for a while. Simon Glass (7): spl: Drop duplicate 'Jumping to U-Boot' message binman: Indicate how to make binman verbose doc: Add a note about how to produce 'md' output using hexdump s5p4418_nanopi2: Bring in some dead code sandbox: Avoid using malloc() for system state sandbox: Write out bloblist when existing bootm: Fix duplicate debugging in bootm_process_cmdline() Makefile | 1 + README | 4 ++++ arch/arm/mach-nexell/Makefile | 2 +- arch/arm/mach-nexell/cmd_boot_linux.c | 14 ++++++++------ arch/sandbox/cpu/state.c | 21 +++++++++++++-------- common/bootm.c | 2 +- common/spl/spl.c | 1 - tools/binman/README | 4 +++- 8 files changed, 31 insertions(+), 18 deletions(-) -- 2.30.0.284.gd98b1dd5eaa7-goog

3 9

[PATCH] arm64: a37xx: pci: Fix printing debug messages
by Pali Rohár 18 Jan '21

18 Jan '21

Value pcie->dev in function pcie_advk_probe() is not initialized yet so use dev as argument for dev_dbg()/dev_warn(). Function pcie_advk_wait_pio() itself prints error message on failure so do not print duplicate error message in caller. Signed-off-by: Pali Rohár <pali(a)kernel.org> --- drivers/pci/pci-aardvark.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/pci/pci-aardvark.c b/drivers/pci/pci-aardvark.c index 1534efb88e..8713b88461 100644 --- a/drivers/pci/pci-aardvark.c +++ b/drivers/pci/pci-aardvark.c @@ -448,7 +448,6 @@ static int pcie_advk_write_config(struct udevice *bus, pci_dev_t bdf, advk_writel(pcie, 1, PIO_START); if (!pcie_advk_wait_pio(pcie)) { - dev_dbg(pcie->dev, "- wait pio timeout\n"); return -EINVAL; } @@ -630,12 +629,12 @@ static int pcie_advk_probe(struct udevice *dev) * clock should be gated as well. */ if (dm_gpio_is_valid(&pcie->reset_gpio)) { - dev_dbg(pcie->dev, "Toggle PCIE Reset GPIO ...\n"); + dev_dbg(dev, "Toggle PCIE Reset GPIO ...\n"); dm_gpio_set_value(&pcie->reset_gpio, 1); mdelay(200); dm_gpio_set_value(&pcie->reset_gpio, 0); } else { - dev_warn(pcie->dev, "PCIE Reset on GPIO support is missing\n"); + dev_warn(dev, "PCIE Reset on GPIO support is missing\n"); } pcie->first_busno = dev_seq(dev); -- 2.20.1

2 1

[PATCH] usb: xhci-pci: Check for errors from dm_pci_map_bar()
by Pali Rohár 18 Jan '21

18 Jan '21

Function dm_pci_map_bar() may fail and returns NULL. Check this to prevent dereferencing a NULL pointer. In xhci-pci this may happen when board does not enable CONFIG_PCI_PNP and PCI_BASE_ADDRESS_0 contains unconfigured zero address. Signed-off-by: Pali Rohár <pali(a)kernel.org> --- drivers/usb/host/xhci-pci.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c index 2b445f21b5..7f5be95f6c 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -13,7 +13,7 @@ #include <usb.h> #include <usb/xhci.h> -static void xhci_pci_init(struct udevice *dev, struct xhci_hccr **ret_hccr, +static int xhci_pci_init(struct udevice *dev, struct xhci_hccr **ret_hccr, struct xhci_hcor **ret_hcor) { struct xhci_hccr *hccr; @@ -22,6 +22,11 @@ static void xhci_pci_init(struct udevice *dev, struct xhci_hccr **ret_hccr, hccr = (struct xhci_hccr *)dm_pci_map_bar(dev, PCI_BASE_ADDRESS_0, PCI_REGION_MEM); + if (!hccr) { + printf("XHCI-PCI init cannot map PCI mem bar\n"); + return -EIO; + } + hcor = (struct xhci_hcor *)((uintptr_t) hccr + HC_LENGTH(xhci_readl(&hccr->cr_capbase))); @@ -35,14 +40,18 @@ static void xhci_pci_init(struct udevice *dev, struct xhci_hccr **ret_hccr, dm_pci_read_config32(dev, PCI_COMMAND, &cmd); cmd |= PCI_COMMAND_MASTER; dm_pci_write_config32(dev, PCI_COMMAND, cmd); + return 0; } static int xhci_pci_probe(struct udevice *dev) { struct xhci_hccr *hccr; struct xhci_hcor *hcor; + int ret; - xhci_pci_init(dev, &hccr, &hcor); + ret = xhci_pci_init(dev, &hccr, &hcor); + if (ret) + return ret; return xhci_register(dev, hccr, hcor); } -- 2.20.1

4 6

[PATCH] cmd: disk: Remove fit_print_contents API
by Ravik Hasija 18 Jan '21

18 Jan '21

fit_print_contents prints similar fit information as printed in bootm stages. Removing this API reduces redundancy & provides improvement in boottime. Signed-off-by: Ravik Hasija <rahasij(a)linux.microsoft.com> --- cmd/disk.c | 1 - 1 file changed, 1 deletion(-) diff --git a/cmd/disk.c b/cmd/disk.c index 8060e753eb..0bc3808dfe 100644 --- a/cmd/disk.c +++ b/cmd/disk.c @@ -120,7 +120,6 @@ int common_diskboot(struct cmd_tbl *cmdtp, const char *intf, int argc, return 1; } bootstage_mark(BOOTSTAGE_ID_IDE_FIT_READ_OK); - fit_print_contents(fit_hdr); } #endif -- 2.17.1

3 2

[PATCH] lib: cosmetic update of CONFIG_LIB_ELF description
by Patrick Delaunay 18 Jan '21

18 Jan '21

Change 2 typo error in CONFIG_LIB_ELF description: - Supoort => Support - fir => for Signed-off-by: Patrick Delaunay <patrick.delaunay(a)foss.st.com> --- lib/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Kconfig b/lib/Kconfig index 7673d2e4e0..cc89fb4d91 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -695,7 +695,7 @@ config LIB_DATE config LIB_ELF bool help - Supoort basic elf loading/validating functions. - This supports fir 32 bit and 64 bit versions. + Support basic elf loading/validating functions. + This supports for 32 bit and 64 bit versions. endmenu -- 2.17.1

3 2

[PATCH 1/1] mtd: misplaced log.h and dm/devres.h
by Heinrich Schuchardt 18 Jan '21

18 Jan '21

log.h and dm/devres.h are U-Boot includes. So placing them behind #ifndef __UBOOT__ does not make any sense. Fixes: f7ae49fc4f36 ("common: Drop log.h from common header") Fixes: 61b29b826838 ("dm: core: Require users of devres to include the header") Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- drivers/mtd/mtdcore.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index 1a4dec34d9..0d1f94c6cb 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -9,8 +9,6 @@ */ #ifndef __UBOOT__ -#include <log.h> -#include <dm/devres.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/ptrace.h> -- 2.29.2

3 2

[PATCH] lib: zlib: our putc() takes only one argument
by Heinrich Schuchardt 18 Jan '21

18 Jan '21

In contrast to the C99 standard [1] our putc() takes only one argument. [1] ISO/IEC 9899:1999 Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/zlib/deflate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/zlib/deflate.c b/lib/zlib/deflate.c index 1fe58d5da6..63473359e4 100644 --- a/lib/zlib/deflate.c +++ b/lib/zlib/deflate.c @@ -1284,7 +1284,7 @@ local void check_match(s, start, match, length) } if (z_verbose > 1) { fprintf(stderr,"\\[%d,%d]", start-match, length); - do { putc(s->window[start++], stderr); } while (--length != 0); + do { putc(s->window[start++]); } while (--length != 0); } } #else -- 2.29.2

2 1

[PATCH 1/1] lib: zlib: include ctype.h
by Heinrich Schuchardt 18 Jan '21

18 Jan '21

Our ctype.h is in include/linux/ Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/zlib/trees.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/zlib/trees.c b/lib/zlib/trees.c index 3e09517ed0..700c62f6d7 100644 --- a/lib/zlib/trees.c +++ b/lib/zlib/trees.c @@ -38,7 +38,7 @@ #include "deflate.h" #ifdef DEBUG -# include <ctype.h> +# include <linux/ctype.h> #endif /* =========================================================================== -- 2.29.2

2 1

[PATCH 1/1] lib: aes: build failure with DEBUG=1
by Heinrich Schuchardt 18 Jan '21

18 Jan '21

Building fails with DEBUG=1: lib/aes.c: In function ‘debug_print_vector’: lib/aes.c:622:45: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] 622 | printf("%s [%d] @0x%08x", name, num_bytes, (u32)data); Pointers can only be cast to (uintptr_t). But anyway we have %p for printing pointers. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/aes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/aes.c b/lib/aes.c index c998aecb3c..05ec235702 100644 --- a/lib/aes.c +++ b/lib/aes.c @@ -619,7 +619,7 @@ void aes_decrypt(u32 key_len, u8 *in, u8 *expkey, u8 *out) static void debug_print_vector(char *name, u32 num_bytes, u8 *data) { #ifdef DEBUG - printf("%s [%d] @0x%08x", name, num_bytes, (u32)data); + printf("%s [%d] @0x%p", name, num_bytes, data); print_buffer(0, data, 1, num_bytes, 16); #endif } -- 2.29.2

3 2