March 2021 - U-Boot

[PATCH] Azure: Use "pacman -Sy" to install the toolchain
by Tom Rini 27 Mar '21

27 Mar '21

We now see an error such as: warning: database file for 'ucrt64' does not exist (use '-Sy' to download) error: failed to prepare transaction (could not find database) So use -Sy as suggested. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- .azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 0d618b70621b..8e11b76e3af5 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -23,7 +23,7 @@ jobs: %CD:~0,2%\msys64\usr\bin\bash -lc "pacman --noconfirm -Syyuu" displayName: 'Update MSYS2' - script: | - %CD:~0,2%\msys64\usr\bin\bash -lc "pacman --noconfirm --needed -S make gcc bison flex diffutils openssl-devel" + %CD:~0,2%\msys64\usr\bin\bash -lc "pacman --noconfirm --needed -Sy make gcc bison flex diffutils openssl-devel" displayName: 'Install Toolchain' - script: | echo make tools-only_defconfig tools-only NO_SDL=1 > build-tools.sh -- 2.17.1

2 2

[PATCH] efi_loader: Cleanup get_var duplication
by Ilias Apalodimas 27 Mar '21

27 Mar '21

get_var() is defined statically in efi_bootmgr.c and doesn't properly check a buffer allocation. Remove it completely and use the exported function from efi_var_common.c that does the same thing Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- lib/efi_loader/efi_bootmgr.c | 36 ++---------------------------------- 1 file changed, 2 insertions(+), 34 deletions(-) diff --git a/lib/efi_loader/efi_bootmgr.c b/lib/efi_loader/efi_bootmgr.c index 46c8011344b9..1fe19237f9a6 100644 --- a/lib/efi_loader/efi_bootmgr.c +++ b/lib/efi_loader/efi_bootmgr.c @@ -30,38 +30,6 @@ static const struct efi_runtime_services *rs; * should do normal or recovery boot. */ -/** - * get_var() - get UEFI variable - * - * It is the caller's duty to free the returned buffer. - * - * @name: name of variable - * @vendor: vendor GUID of variable - * @size: size of allocated buffer - * Return: buffer with variable data or NULL - */ -static void *get_var(u16 *name, const efi_guid_t *vendor, - efi_uintn_t *size) -{ - efi_status_t ret; - void *buf = NULL; - - *size = 0; - ret = efi_get_variable_int(name, vendor, NULL, size, buf, NULL); - if (ret == EFI_BUFFER_TOO_SMALL) { - buf = malloc(*size); - ret = efi_get_variable_int(name, vendor, NULL, size, buf, NULL); - } - - if (ret != EFI_SUCCESS) { - free(buf); - *size = 0; - return NULL; - } - - return buf; -} - /** * try_load_entry() - try to load image for boot option * @@ -89,7 +57,7 @@ static efi_status_t try_load_entry(u16 n, efi_handle_t *handle, varname[6] = hexmap[(n & 0x00f0) >> 4]; varname[7] = hexmap[(n & 0x000f) >> 0]; - load_option = get_var(varname, &efi_global_variable_guid, &size); + load_option = efi_get_var(varname, &efi_global_variable_guid, &size); if (!load_option) return EFI_LOAD_ERROR; @@ -210,7 +178,7 @@ efi_status_t efi_bootmgr_load(efi_handle_t *handle, void **load_options) } /* BootOrder */ - bootorder = get_var(L"BootOrder", &efi_global_variable_guid, &size); + bootorder = efi_get_var(L"BootOrder", &efi_global_variable_guid, &size); if (!bootorder) { log_info("BootOrder not defined\n"); ret = EFI_NOT_FOUND; -- 2.31.0

2 1

[PATCH v2 1/1] riscv: assembler versions of memcpy, memmove, memset
by Heinrich Schuchardt 27 Mar '21

27 Mar '21

Provide optimized versions of memcpy(), memmove(), memset() copied from the Linux kernel. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> Reviewed-by: Leo Yu-Chi Liang <ycliang(a)andestech.com> --- v2: remove duplicate line in arch/riscv/lib/Makefile --- arch/riscv/Kconfig | 78 ++++++++++++++++++++++ arch/riscv/include/asm/string.h | 36 +++++----- arch/riscv/lib/Makefile | 4 ++ arch/riscv/lib/memcpy.S | 108 ++++++++++++++++++++++++++++++ arch/riscv/lib/memmove.S | 64 ++++++++++++++++++ arch/riscv/lib/memset.S | 113 ++++++++++++++++++++++++++++++++ 6 files changed, 382 insertions(+), 21 deletions(-) create mode 100644 arch/riscv/lib/memcpy.S create mode 100644 arch/riscv/lib/memmove.S create mode 100644 arch/riscv/lib/memset.S diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 55eaee2da6..7d0bd73ce2 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -271,4 +271,82 @@ config STACK_SIZE_SHIFT config OF_BOARD_FIXUP default y if OF_SEPARATE && RISCV_SMODE +config USE_ARCH_MEMCPY + bool "Use an assembly optimized implementation of memcpy" + default y + help + Enable the generation of an optimized version of memcpy. + Such an implementation may be faster under some conditions + but may increase the binary size. + +config SPL_USE_ARCH_MEMCPY + bool "Use an assembly optimized implementation of memcpy for SPL" + default y if USE_ARCH_MEMCPY + depends on SPL + help + Enable the generation of an optimized version of memcpy. + Such an implementation may be faster under some conditions + but may increase the binary size. + +config TPL_USE_ARCH_MEMCPY + bool "Use an assembly optimized implementation of memcpy for TPL" + default y if USE_ARCH_MEMCPY + depends on TPL + help + Enable the generation of an optimized version of memcpy. + Such an implementation may be faster under some conditions + but may increase the binary size. + +config USE_ARCH_MEMMOVE + bool "Use an assembly optimized implementation of memmove" + default y + help + Enable the generation of an optimized version of memmove. + Such an implementation may be faster under some conditions + but may increase the binary size. + +config SPL_USE_ARCH_MEMMOVE + bool "Use an assembly optimized implementation of memmove for SPL" + default y if USE_ARCH_MEMCPY + depends on SPL + help + Enable the generation of an optimized version of memmove. + Such an implementation may be faster under some conditions + but may increase the binary size. + +config TPL_USE_ARCH_MEMMOVE + bool "Use an assembly optimized implementation of memmove for TPL" + default y if USE_ARCH_MEMCPY + depends on TPL + help + Enable the generation of an optimized version of memmove. + Such an implementation may be faster under some conditions + but may increase the binary size. + +config USE_ARCH_MEMSET + bool "Use an assembly optimized implementation of memset" + default y + help + Enable the generation of an optimized version of memset. + Such an implementation may be faster under some conditions + but may increase the binary size. + +config SPL_USE_ARCH_MEMSET + bool "Use an assembly optimized implementation of memset for SPL" + default y if USE_ARCH_MEMSET + depends on SPL + help + Enable the generation of an optimized version of memset. + Such an implementation may be faster under some conditions + but may increase the binary size. + +config TPL_USE_ARCH_MEMSET + bool "Use an assembly optimized implementation of memset for TPL" + default y if USE_ARCH_MEMSET + depends on TPL + help + Enable the generation of an optimized version of memset. + Such an implementation may be faster under some conditions + but may increase the binary size. + endmenu diff --git a/arch/riscv/include/asm/string.h b/arch/riscv/include/asm/string.h index 0fc3424a2f..7dee3e4c9f 100644 --- a/arch/riscv/include/asm/string.h +++ b/arch/riscv/include/asm/string.h @@ -19,31 +19,25 @@ #undef __HAVE_ARCH_STRRCHR #undef __HAVE_ARCH_STRCHR -#undef __HAVE_ARCH_MEMCPY -#undef __HAVE_ARCH_MEMMOVE #undef __HAVE_ARCH_MEMCHR #undef __HAVE_ARCH_MEMZERO -#undef __HAVE_ARCH_MEMSET -#ifdef CONFIG_MARCO_MEMSET -#define memset(_p, _v, _n) \ - (typeof(_p) (p) = (_p); \ - typeof(_v) (v) = (_v); \ - typeof(_n) (n) = (_n); \ - { \ - if ((n) != 0) { \ - if (__builtin_constant_p((v)) && (v) == 0) \ - __memzero((p), (n)); \ - else \ - memset((p), (v), (n)); \ - } \ - (p); \ - }) +#undef __HAVE_ARCH_MEMCPY +#if CONFIG_IS_ENABLED(USE_ARCH_MEMCPY) +#define __HAVE_ARCH_MEMCPY +#endif +extern void *memcpy(void *, const void *, __kernel_size_t); + +#undef __HAVE_ARCH_MEMMOVE +#if CONFIG_IS_ENABLED(USE_ARCH_MEMMOVE) +#define __HAVE_ARCH_MEMMOVE +#endif +extern void *memmove(void *, const void *, __kernel_size_t); -#define memzero(_p, _n) \ - (typeof(_p) (p) = (_p); \ - typeof(_n) (n) = (_n); \ - { if ((n) != 0) __memzero((p), (n)); (p); }) +#undef __HAVE_ARCH_MEMZERO +#if CONFIG_IS_ENABLED(USE_ARCH_MEMSET) +#define __HAVE_ARCH_MEMSET #endif +extern void *memset(void *, int, __kernel_size_t); #endif /* __ASM_RISCV_STRING_H */ diff --git a/arch/riscv/lib/Makefile b/arch/riscv/lib/Makefile index 12c14f2019..ff0677aa96 100644 --- a/arch/riscv/lib/Makefile +++ b/arch/riscv/lib/Makefile @@ -36,3 +36,7 @@ CFLAGS_REMOVE_$(EFI_RELOC) := $(CFLAGS_NON_EFI) extra-$(CONFIG_CMD_BOOTEFI_HELLO_COMPILE) += $(EFI_CRT0) $(EFI_RELOC) extra-$(CONFIG_CMD_BOOTEFI_SELFTEST) += $(EFI_CRT0) $(EFI_RELOC) extra-$(CONFIG_EFI) += $(EFI_CRT0) $(EFI_RELOC) + +obj-$(CONFIG_$(SPL_TPL_)USE_ARCH_MEMSET) += memset.o +obj-$(CONFIG_$(SPL_TPL_)USE_ARCH_MEMMOVE) += memmove.o +obj-$(CONFIG_$(SPL_TPL_)USE_ARCH_MEMCPY) += memcpy.o diff --git a/arch/riscv/lib/memcpy.S b/arch/riscv/lib/memcpy.S new file mode 100644 index 0000000000..51ab716253 --- /dev/null +++ b/arch/riscv/lib/memcpy.S @@ -0,0 +1,108 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (C) 2013 Regents of the University of California + */ + +#include <linux/linkage.h> +#include <asm/asm.h> + +/* void *memcpy(void *, const void *, size_t) */ +ENTRY(__memcpy) +WEAK(memcpy) + move t6, a0 /* Preserve return value */ + + /* Defer to byte-oriented copy for small sizes */ + sltiu a3, a2, 128 + bnez a3, 4f + /* Use word-oriented copy only if low-order bits match */ + andi a3, t6, SZREG-1 + andi a4, a1, SZREG-1 + bne a3, a4, 4f + + beqz a3, 2f /* Skip if already aligned */ + /* + * Round to nearest double word-aligned address + * greater than or equal to start address + */ + andi a3, a1, ~(SZREG-1) + addi a3, a3, SZREG + /* Handle initial misalignment */ + sub a4, a3, a1 +1: + lb a5, 0(a1) + addi a1, a1, 1 + sb a5, 0(t6) + addi t6, t6, 1 + bltu a1, a3, 1b + sub a2, a2, a4 /* Update count */ + +2: + andi a4, a2, ~((16*SZREG)-1) + beqz a4, 4f + add a3, a1, a4 +3: + REG_L a4, 0(a1) + REG_L a5, SZREG(a1) + REG_L a6, 2*SZREG(a1) + REG_L a7, 3*SZREG(a1) + REG_L t0, 4*SZREG(a1) + REG_L t1, 5*SZREG(a1) + REG_L t2, 6*SZREG(a1) + REG_L t3, 7*SZREG(a1) + REG_L t4, 8*SZREG(a1) + REG_L t5, 9*SZREG(a1) + REG_S a4, 0(t6) + REG_S a5, SZREG(t6) + REG_S a6, 2*SZREG(t6) + REG_S a7, 3*SZREG(t6) + REG_S t0, 4*SZREG(t6) + REG_S t1, 5*SZREG(t6) + REG_S t2, 6*SZREG(t6) + REG_S t3, 7*SZREG(t6) + REG_S t4, 8*SZREG(t6) + REG_S t5, 9*SZREG(t6) + REG_L a4, 10*SZREG(a1) + REG_L a5, 11*SZREG(a1) + REG_L a6, 12*SZREG(a1) + REG_L a7, 13*SZREG(a1) + REG_L t0, 14*SZREG(a1) + REG_L t1, 15*SZREG(a1) + addi a1, a1, 16*SZREG + REG_S a4, 10*SZREG(t6) + REG_S a5, 11*SZREG(t6) + REG_S a6, 12*SZREG(t6) + REG_S a7, 13*SZREG(t6) + REG_S t0, 14*SZREG(t6) + REG_S t1, 15*SZREG(t6) + addi t6, t6, 16*SZREG + bltu a1, a3, 3b + andi a2, a2, (16*SZREG)-1 /* Update count */ + +4: + /* Handle trailing misalignment */ + beqz a2, 6f + add a3, a1, a2 + + /* Use word-oriented copy if co-aligned to word boundary */ + or a5, a1, t6 + or a5, a5, a3 + andi a5, a5, 3 + bnez a5, 5f +7: + lw a4, 0(a1) + addi a1, a1, 4 + sw a4, 0(t6) + addi t6, t6, 4 + bltu a1, a3, 7b + + ret + +5: + lb a4, 0(a1) + addi a1, a1, 1 + sb a4, 0(t6) + addi t6, t6, 1 + bltu a1, a3, 5b +6: + ret +END(__memcpy) diff --git a/arch/riscv/lib/memmove.S b/arch/riscv/lib/memmove.S new file mode 100644 index 0000000000..07d1d2152b --- /dev/null +++ b/arch/riscv/lib/memmove.S @@ -0,0 +1,64 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#include <linux/linkage.h> +#include <asm/asm.h> + +ENTRY(__memmove) +WEAK(memmove) + move t0, a0 + move t1, a1 + + beq a0, a1, exit_memcpy + beqz a2, exit_memcpy + srli t2, a2, 0x2 + + slt t3, a0, a1 + beqz t3, do_reverse + + andi a2, a2, 0x3 + li t4, 1 + beqz t2, byte_copy + +word_copy: + lw t3, 0(a1) + addi t2, t2, -1 + addi a1, a1, 4 + sw t3, 0(a0) + addi a0, a0, 4 + bnez t2, word_copy + beqz a2, exit_memcpy + j byte_copy + +do_reverse: + add a0, a0, a2 + add a1, a1, a2 + andi a2, a2, 0x3 + li t4, -1 + beqz t2, reverse_byte_copy + +reverse_word_copy: + addi a1, a1, -4 + addi t2, t2, -1 + lw t3, 0(a1) + addi a0, a0, -4 + sw t3, 0(a0) + bnez t2, reverse_word_copy + beqz a2, exit_memcpy + +reverse_byte_copy: + addi a0, a0, -1 + addi a1, a1, -1 + +byte_copy: + lb t3, 0(a1) + addi a2, a2, -1 + sb t3, 0(a0) + add a1, a1, t4 + add a0, a0, t4 + bnez a2, byte_copy + +exit_memcpy: + move a0, t0 + move a1, t1 + ret +END(__memmove) diff --git a/arch/riscv/lib/memset.S b/arch/riscv/lib/memset.S new file mode 100644 index 0000000000..34c5360c67 --- /dev/null +++ b/arch/riscv/lib/memset.S @@ -0,0 +1,113 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (C) 2013 Regents of the University of California + */ + + +#include <linux/linkage.h> +#include <asm/asm.h> + +/* void *memset(void *, int, size_t) */ +ENTRY(__memset) +WEAK(memset) + move t0, a0 /* Preserve return value */ + + /* Defer to byte-oriented fill for small sizes */ + sltiu a3, a2, 16 + bnez a3, 4f + + /* + * Round to nearest XLEN-aligned address + * greater than or equal to start address + */ + addi a3, t0, SZREG-1 + andi a3, a3, ~(SZREG-1) + beq a3, t0, 2f /* Skip if already aligned */ + /* Handle initial misalignment */ + sub a4, a3, t0 +1: + sb a1, 0(t0) + addi t0, t0, 1 + bltu t0, a3, 1b + sub a2, a2, a4 /* Update count */ + +2: /* Duff's device with 32 XLEN stores per iteration */ + /* Broadcast value into all bytes */ + andi a1, a1, 0xff + slli a3, a1, 8 + or a1, a3, a1 + slli a3, a1, 16 + or a1, a3, a1 +#ifdef CONFIG_64BIT + slli a3, a1, 32 + or a1, a3, a1 +#endif + + /* Calculate end address */ + andi a4, a2, ~(SZREG-1) + add a3, t0, a4 + + andi a4, a4, 31*SZREG /* Calculate remainder */ + beqz a4, 3f /* Shortcut if no remainder */ + neg a4, a4 + addi a4, a4, 32*SZREG /* Calculate initial offset */ + + /* Adjust start address with offset */ + sub t0, t0, a4 + + /* Jump into loop body */ + /* Assumes 32-bit instruction lengths */ + la a5, 3f +#ifdef CONFIG_64BIT + srli a4, a4, 1 +#endif + add a5, a5, a4 + jr a5 +3: + REG_S a1, 0(t0) + REG_S a1, SZREG(t0) + REG_S a1, 2*SZREG(t0) + REG_S a1, 3*SZREG(t0) + REG_S a1, 4*SZREG(t0) + REG_S a1, 5*SZREG(t0) + REG_S a1, 6*SZREG(t0) + REG_S a1, 7*SZREG(t0) + REG_S a1, 8*SZREG(t0) + REG_S a1, 9*SZREG(t0) + REG_S a1, 10*SZREG(t0) + REG_S a1, 11*SZREG(t0) + REG_S a1, 12*SZREG(t0) + REG_S a1, 13*SZREG(t0) + REG_S a1, 14*SZREG(t0) + REG_S a1, 15*SZREG(t0) + REG_S a1, 16*SZREG(t0) + REG_S a1, 17*SZREG(t0) + REG_S a1, 18*SZREG(t0) + REG_S a1, 19*SZREG(t0) + REG_S a1, 20*SZREG(t0) + REG_S a1, 21*SZREG(t0) + REG_S a1, 22*SZREG(t0) + REG_S a1, 23*SZREG(t0) + REG_S a1, 24*SZREG(t0) + REG_S a1, 25*SZREG(t0) + REG_S a1, 26*SZREG(t0) + REG_S a1, 27*SZREG(t0) + REG_S a1, 28*SZREG(t0) + REG_S a1, 29*SZREG(t0) + REG_S a1, 30*SZREG(t0) + REG_S a1, 31*SZREG(t0) + addi t0, t0, 32*SZREG + bltu t0, a3, 3b + andi a2, a2, SZREG-1 /* Update count */ + +4: + /* Handle trailing misalignment */ + beqz a2, 6f + add a3, t0, a2 +5: + sb a1, 0(t0) + addi t0, t0, 1 + bltu t0, a3, 5b +6: + ret +END(__memset) -- 2.30.2

1 0

[PATCH v2] spi: spi-uclass: Add support to manually relocate spi memory ops
by Michal Simek 27 Mar '21

27 Mar '21

From: T Karthik Reddy <t.karthik.reddy(a)xilinx.com> Add spi memory operations to relocate manually when CONFIG_NEEDS_MANUAL_RELOC is enabled. Signed-off-by: T Karthik Reddy <t.karthik.reddy(a)xilinx.com> Acked-by: Ashok Reddy Soma <ashok.reddy.soma(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- Changes in v2: - Check if mem_ops is defined before relocation - reported-by Pratyush Yadav <p.yadav(a)ti.com> drivers/spi/spi-uclass.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c index 7155d4aebd6d..ee30110b5658 100644 --- a/drivers/spi/spi-uclass.c +++ b/drivers/spi/spi-uclass.c @@ -11,6 +11,7 @@ #include <log.h> #include <malloc.h> #include <spi.h> +#include <spi-mem.h> #include <dm/device_compat.h> #include <asm/global_data.h> #include <dm/device-internal.h> @@ -199,6 +200,16 @@ static int spi_post_probe(struct udevice *bus) ops->set_mode += gd->reloc_off; if (ops->cs_info) ops->cs_info += gd->reloc_off; + if (ops->mem_ops) { + struct spi_controller_mem_ops *mem_ops = + (struct spi_controller_mem_ops *)ops->mem_ops; + if (mem_ops->adjust_op_size) + mem_ops->adjust_op_size += gd->reloc_off; + if (mem_ops->supports_op) + mem_ops->supports_op += gd->reloc_off; + if (mem_ops->exec_op) + mem_ops->exec_op += gd->reloc_off; + } reloc_done++; } #endif -- 2.30.1

3 2

[PATCH v5 0/2] x86: Minor improvements mostly for image loading
by Simon Glass 27 Mar '21

27 Mar '21

This series provides a few improvements for loading of images. It also provides a way to show more detailed model information as well as an of-platdata fix noticed recently. Note that this series depends on the GPIO series here: http://patchwork.ozlabs.org/project/uboot/list/?series=226118 Changes in v5: - Rebase to upstream/next Changes in v4: - Rebase to x86/master (but will not build until GPIO series lands) - Update cover letter Changes in v3: - Rebase to master - Rebase to master - Drop patches previously applied Changes in v2: - Fix two missing asterisks in comments Simon Glass (2): sysinfo: Allow showing model info from sysinfo x86: coral: Show memory config and SKU ID on startup arch/x86/dts/chromebook_coral.dts | 11 ++ board/google/chromebook_coral/coral.c | 139 +++++++++++++++++- board/google/chromebook_coral/variant_gpio.h | 6 - common/board_info.c | 37 ++++- .../sysinfo/google,coral.txt | 37 +++++ include/sysinfo.h | 4 + 6 files changed, 212 insertions(+), 22 deletions(-) create mode 100644 doc/device-tree-bindings/sysinfo/google,coral.txt -- 2.31.0.rc2.261.g7f71774620-goog

1 4

[PATCH 00/11] binman: Enhancements to expanded entries
by Simon Glass 27 Mar '21

27 Mar '21

At present it is not always possible to have an expanded entry as a sibling of another node. This limitation applies in most situations where the other node has properties which binman must update, or when other nodes appear after the expanded entry. An example is a 'hash' node in the same section as an expanding node, since binman must update the hash node with the hash of the expanding node, but it cannot do this while also inserting the expanding node. These limitations are mostly to do with how the fdt library worked (the one provided by dtoc). This library still uses pylibfdt directly. At some point it would be nice to have a hierarchical (live-tree) implementation in pylibfdt (and therefore libfdt), but this does not exist at present. It would simplify the code in the fdt library. This series takes the support for expanded entries a little further, allow them to be used in nearly any situation. Where expanded entries are not wanted in a paricular case, a new 'no-expanded' property can be used. Another problem found in the real world is that some systems require a particular alignment for entries. For example, Intel chips struggle to read data from SPI flash unless it is word-aligned. This series provides a way to specify the default alignment for all the entries in a section, to avoid the tedium of putting this in every single entry. Finally, the vblock implementation includes code to collect the contents of other entries, as specified by a phandle. It happens that this doesn't work if one of the entries is a section, e.g. an expanding entry, since (for efficiency reasons) binman currently only calculates section contents when performing final image assembly. This series removes this limitation. It also creates a new 'collection' entry type, to serve as a base class for vblock, since it is likely that this functionality will be useful for other entry types. Simon Glass (11): binman: Use a unique number for the symbols test file binman: Allow disabling expanding an entry binman: Add support for a collection of entries binman: Support obtaining section contents immediately binman: Support default alignment for sections dtoc: Improve internal error for Refresh() dtoc: Tidy up property-offset handling dtoc: Tweak ordering of fdt-offsets refreshing dtoc: Add a subnode test for multiple nodes dtoc: Support adding subnodes alongside existing ones dtoc: Add new check that offsets are correct tools/binman/binman.rst | 14 +++ tools/binman/entries.rst | 21 ++++- tools/binman/entry.py | 16 +++- tools/binman/etype/cbfs.py | 1 + tools/binman/etype/collection.py | 67 ++++++++++++++ tools/binman/etype/mkimage.py | 1 + tools/binman/etype/section.py | 36 ++++++-- tools/binman/etype/u_boot.py | 2 +- tools/binman/etype/u_boot_spl.py | 2 +- tools/binman/etype/u_boot_tpl.py | 2 +- tools/binman/etype/vblock.py | 36 ++++---- tools/binman/ftest.py | 57 +++++++++++- ...ymbols_nodtb.dts => 196_symbols_nodtb.dts} | 0 tools/binman/test/197_symbols_expand.dts | 23 +++++ tools/binman/test/198_collection.dts | 27 ++++++ tools/binman/test/199_collection_section.dts | 32 +++++++ tools/binman/test/200_align_default.dts | 30 ++++++ tools/dtoc/fdt.py | 92 +++++++++++++++---- tools/dtoc/test/dtoc_test_simple.dts | 4 + tools/dtoc/test_fdt.py | 76 ++++++++++++--- 20 files changed, 470 insertions(+), 69 deletions(-) create mode 100644 tools/binman/etype/collection.py rename tools/binman/test/{192_symbols_nodtb.dts => 196_symbols_nodtb.dts} (100%) create mode 100644 tools/binman/test/197_symbols_expand.dts create mode 100644 tools/binman/test/198_collection.dts create mode 100644 tools/binman/test/199_collection_section.dts create mode 100644 tools/binman/test/200_align_default.dts -- 2.31.0.rc2.261.g7f71774620-goog

1 22

[PATCH 1/1] sandbox: define __dyn_sym_start, dyn_sym_end
by Heinrich Schuchardt 27 Mar '21

27 Mar '21

On RISC-V the symbols __dyn_sym_start, dyn_sym_end are referenced in efi_runtime_relocate(). Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- arch/sandbox/cpu/u-boot.lds | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/sandbox/cpu/u-boot.lds b/arch/sandbox/cpu/u-boot.lds index 936da5e140..a1f509c9ab 100644 --- a/arch/sandbox/cpu/u-boot.lds +++ b/arch/sandbox/cpu/u-boot.lds @@ -44,6 +44,13 @@ SECTIONS { *(.__efi_runtime_rel_stop) } + + .dynsym : + { + __dyn_sym_start = .; + *(.dynsym) + __dyn_sym_end = .; + } } INSERT BEFORE .data; -- 2.30.2

2 2

[PATCH v2 0/6] Add rt-thread art-pi board support
by dillon.minfei＠gmail.com 27 Mar '21

27 Mar '21

From: dillon min <dillon.minfei(a)gmail.com> These patches aim to adds u-boot support on art-pi board. the board resources: - stm32h750xbh6 128k flash, 1024k sram - 32MiB sdram - 16MiB spi flash - 8MiB qspi flash - onboard wifi, bt, fm the detail board information can be found at: https://art-pi.gitee.io/website/ --- changes in v2: - fix wrong author/date in previous submit - sync with kernel device tree files - add st,stm32h750-pinctrl in doc and pinctrl driver dillon min (6): ARM: dts: stm32: split sdram pin & timing parameter into specific board dts ARM: dts: stm32: Add RT-Thread art-pi board support board: Add rt-thread art-pi board support ram: stm32: fix strsep failed on read only memory dt-bindings: pinctrl: stm32: Add st,stm32h750-pinctrl for stm32h750 soc pinctrl: stm32: Add st,stm32h750-pinctrl compatible string arch/arm/dts/Makefile | 3 +- arch/arm/dts/stm32h7-pinctrl.dtsi | 340 +++++++++++++++++++++ arch/arm/dts/stm32h7-u-boot.dtsi | 100 +----- arch/arm/dts/stm32h743-pinctrl.dtsi | 307 +------------------ arch/arm/dts/stm32h743.dtsi | 168 +++++++++- arch/arm/dts/stm32h743i-disco-u-boot.dtsi | 98 ++++++ arch/arm/dts/stm32h743i-eval-u-boot.dtsi | 98 ++++++ arch/arm/dts/stm32h750-pinctrl.dtsi | 11 + arch/arm/dts/stm32h750.dtsi | 5 + arch/arm/dts/stm32h750i-art-pi-u-boot.dtsi | 81 +++++ arch/arm/dts/stm32h750i-art-pi.dts | 188 ++++++++++++ arch/arm/mach-stm32/stm32h7/Kconfig | 4 + board/st/stm32h750-art-pi/Kconfig | 19 ++ board/st/stm32h750-art-pi/MAINTAINERS | 7 + board/st/stm32h750-art-pi/Makefile | 6 + board/st/stm32h750-art-pi/stm32h750-art-pi.c | 58 ++++ configs/stm32h750-art-pi_defconfig | 51 ++++ .../pinctrl/st,stm32-pinctrl.txt | 1 + drivers/pinctrl/pinctrl_stm32.c | 1 + drivers/ram/stm32_sdram.c | 3 + include/configs/stm32h750-art-pi.h | 48 +++ include/dt-bindings/memory/stm32-sdram.h | 2 + 22 files changed, 1198 insertions(+), 401 deletions(-) create mode 100644 arch/arm/dts/stm32h7-pinctrl.dtsi create mode 100644 arch/arm/dts/stm32h750-pinctrl.dtsi create mode 100644 arch/arm/dts/stm32h750.dtsi create mode 100644 arch/arm/dts/stm32h750i-art-pi-u-boot.dtsi create mode 100644 arch/arm/dts/stm32h750i-art-pi.dts create mode 100644 board/st/stm32h750-art-pi/Kconfig create mode 100644 board/st/stm32h750-art-pi/MAINTAINERS create mode 100644 board/st/stm32h750-art-pi/Makefile create mode 100644 board/st/stm32h750-art-pi/stm32h750-art-pi.c create mode 100644 configs/stm32h750-art-pi_defconfig create mode 100644 include/configs/stm32h750-art-pi.h -- 2.7.4

3 8

[PATCH 00/19] sandbox: Preparation for running vboot from coreboot
by Simon Glass 27 Mar '21

27 Mar '21

This series contains various patches related to running U-Boot with Chromium OS verified boot. Most of them relate to sandbox. Simon Glass (19): sandbox: Only call timer_timebase_fallback() if present sandbox: Only delete the executable if requested sandbox: cros_ec: Only write EC state when the EC is probed sandbox: Disintangle declarations in do_host_bind() sandbox: Update do_host_bind() argument counting sandbox: Provide a way to bind fixed/removeable devices sandbox: image: Allow sandbox to load any image test: Silenece the echo and print tests binman: Show a message when changing subnodes spl: Split out bootstage ID into a function bootstage: Warning if space is exhausted sf: Support querying write-protect cpu: Rename SPL_CPU_SUPPORT to SPL_CPU malloc: Export malloc_simple_info() doc: Convert Chromium OS docs to rst command: Fix operation of !CONFIG_CMDLINE bloblist: Make BLOBLIST_TABLES depend on BLOBLIST bootm: Skip command-line substitution if !CONFIG_CMDLINE sandbox: Correct uninit conflict arch/riscv/cpu/ax25/Kconfig | 2 +- arch/riscv/cpu/fu540/Kconfig | 2 +- arch/riscv/cpu/generic/Kconfig | 2 +- arch/sandbox/cpu/cpu.c | 6 +- arch/sandbox/cpu/os.c | 24 +++-- arch/x86/lib/spl.c | 2 +- cmd/host.c | 35 +++++-- common/bootm.c | 3 +- common/bootstage.c | 18 ++-- common/image-fit.c | 4 + common/spl/Kconfig | 2 +- common/spl/spl.c | 23 ++++- configs/chromebook_coral_defconfig | 2 +- configs/chromebook_link64_defconfig | 2 +- configs/qemu-x86_64_defconfig | 2 +- doc/arch/sandbox.rst | 2 + .../chainload.rst} | 80 ++++++++++------ doc/chromium/{ => files}/chromebook_jerry.its | 0 .../{ => files}/devkeys/kernel.keyblock | Bin .../devkeys/kernel_data_key.vbprivk | Bin doc/chromium/{ => files}/nyan-big.its | 0 doc/chromium/index.rst | 14 +++ doc/chromium/overview.rst | 74 ++++++++++++++ .../run_vboot.rst} | 90 ++++++++---------- doc/index.rst | 8 ++ drivers/Makefile | 2 +- drivers/block/sandbox.c | 8 +- drivers/misc/cros_ec_sandbox.c | 4 + drivers/mtd/spi/sf-uclass.c | 9 ++ drivers/mtd/spi/sf_internal.h | 4 + drivers/mtd/spi/sf_probe.c | 8 ++ drivers/mtd/spi/spi-nor-core.c | 11 +++ drivers/mtd/spi/spi-nor-tiny.c | 6 ++ drivers/timer/sandbox_timer.c | 3 +- drivers/timer/timer-uclass.c | 6 +- include/command.h | 10 +- include/image.h | 5 + include/malloc.h | 3 +- include/sandboxblockdev.h | 9 +- include/spi_flash.h | 27 ++++++ lib/Kconfig | 2 +- lib/binman.c | 4 +- test/cmd/test_echo.c | 3 +- test/dm/sf.c | 10 +- test/lib/test_print.c | 8 +- 45 files changed, 394 insertions(+), 145 deletions(-) rename doc/{README.chromium-chainload => chromium/chainload.rst} (79%) rename doc/chromium/{ => files}/chromebook_jerry.its (100%) rename doc/chromium/{ => files}/devkeys/kernel.keyblock (100%) rename doc/chromium/{ => files}/devkeys/kernel_data_key.vbprivk (100%) rename doc/chromium/{ => files}/nyan-big.its (100%) create mode 100644 doc/chromium/index.rst create mode 100644 doc/chromium/overview.rst rename doc/{README.chromium => chromium/run_vboot.rst} (68%) -- 2.31.0.rc2.261.g7f71774620-goog

3 39

[PATCH] sandbox: dtsi: add rng
by Vincent Stehlé 27 Mar '21

27 Mar '21

Having an rng in the sandbox is useful not only for tests but also for e.g. UEFI. Therefore, copy the rng node from test.dts to sandbox.dtsi. In the case of UEFI, it can then be verified with `efidebug dh' that a "Random Number Generator" protocol is indeed present. This also fixes the following `bootefi' error: Missing RNG device for EFI_RNG_PROTOCOL Signed-off-by: Vincent Stehlé <vincent.stehle(a)arm.com> Cc: Simon Glass <sjg(a)chromium.org> --- arch/sandbox/dts/sandbox.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/sandbox/dts/sandbox.dtsi b/arch/sandbox/dts/sandbox.dtsi index dc933f3bfc7..43b9342ce56 100644 --- a/arch/sandbox/dts/sandbox.dtsi +++ b/arch/sandbox/dts/sandbox.dtsi @@ -196,6 +196,10 @@ compatible = "sandbox,reset"; }; + rng { + compatible = "sandbox,sandbox-rng"; + }; + sound { compatible = "sandbox,sound"; cpu { -- 2.30.1

3 2