November 2021 - U-Boot

[RFC] binman: add support for creating dummy files for external blobs
by Heiko Thiery 25 Nov '21

25 Nov '21

While converting to binman for an imx8mq board, it has been found that building in the u-boot CI fails. This is because an imx8mq requires an external binary (signed_hdmi_imx8m.bin). If this file cannot be found mkimage fails. To be able to build this board in the u-boot CI a binman option (--fake-ext-blobs) is introduced that can be switched on via the u-boot makefile option BINMAN_FAKE_EXT_BLOBS. With that the needed dummy files are created. Signed-off-by: Heiko Thiery <heiko.thiery(a)gmail.com> --- Makefile | 1 + tools/binman/cmdline.py | 2 ++ tools/binman/control.py | 16 ++++++++++++++++ tools/binman/entry.py | 1 + tools/binman/etype/blob_ext.py | 1 + 5 files changed, 21 insertions(+) diff --git a/Makefile b/Makefile index f911f70344..1a833a1637 100644 --- a/Makefile +++ b/Makefile @@ -1307,6 +1307,7 @@ cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \ -a tpl-bss-pad=$(if $(CONFIG_TPL_SEPARATE_BSS),,1) \ -a spl-dtb=$(CONFIG_SPL_OF_REAL) \ -a tpl-dtb=$(CONFIG_SPL_OF_REAL) \ + $(if $(BINMAN_FAKE_EXT_BLOBS),--fake-ext-blobs) \ $(BINMAN_$(@F)) OBJCOPYFLAGS_u-boot.ldr.hex := -I binary -O ihex diff --git a/tools/binman/cmdline.py b/tools/binman/cmdline.py index d6156df408..2b29981cb4 100644 --- a/tools/binman/cmdline.py +++ b/tools/binman/cmdline.py @@ -52,6 +52,8 @@ controlled by a description in the board device tree.''' help='Configuration file (.dtb) to use') build_parser.add_argument('--fake-dtb', action='store_true', help='Use fake device tree contents (for testing only)') + build_parser.add_argument('--fake-ext-blobs', action='store_true', + help='Create fake ext blobs with dummy content (for testing only)') build_parser.add_argument('-i', '--image', type=str, action='append', help='Image filename to build (if not specified, build all)') build_parser.add_argument('-I', '--indir', action='append', diff --git a/tools/binman/control.py b/tools/binman/control.py index 0dbcbc28e9..f95aadd1f3 100644 --- a/tools/binman/control.py +++ b/tools/binman/control.py @@ -8,6 +8,7 @@ from collections import OrderedDict import glob import os +import pathlib import pkg_resources import re @@ -401,6 +402,17 @@ def ReplaceEntries(image_fname, input_fname, indir, entry_paths, return image +def PrepareFakeExtBlobs(images): + for (_, image) in images.items(): + for entry in image._entries.values(): + if entry.allow_dummy: + if not pathlib.Path(entry._filename).is_file(): + tout.Warning("Missing external blob '%s', fake it" % + entry._filename) + with open(entry._filename, "wb") as out: + out.truncate(1024) + + def PrepareImagesAndDtbs(dtb_fname, select_images, update_fdt, use_expanded): """Prepare the images to be processed and select the device tree @@ -629,6 +641,10 @@ def Binman(args): images = PrepareImagesAndDtbs(dtb_fname, args.image, args.update_fdt, use_expanded) + + if args.fake_ext_blobs: + PrepareFakeExtBlobs(images) + if args.test_section_timeout: # Set the first image to timeout, used in testThreadTimeout() images[list(images.keys())[0]].test_section_timeout = True diff --git a/tools/binman/entry.py b/tools/binman/entry.py index 70222718ea..2f5c38d15a 100644 --- a/tools/binman/entry.py +++ b/tools/binman/entry.py @@ -100,6 +100,7 @@ class Entry(object): self.missing = False self.external = False self.allow_missing = False + self.allow_dummy = False @staticmethod def Lookup(node_path, etype, expanded): diff --git a/tools/binman/etype/blob_ext.py b/tools/binman/etype/blob_ext.py index d6b0ca17c3..85bc9fe6b8 100644 --- a/tools/binman/etype/blob_ext.py +++ b/tools/binman/etype/blob_ext.py @@ -26,3 +26,4 @@ class Entry_blob_ext(Entry_blob): def __init__(self, section, etype, node): Entry_blob.__init__(self, section, etype, node) self.external = True + self.allow_dummy = True -- 2.30.2

4 5

[PATCH v2 0/6] drivers: tpm: Fix Atmel/Microchip TPMv1.2 issues
by Mathew McBride 25 Nov '21

25 Nov '21

While doing bringup/rebase for the Ten64 I did some troubleshooting for the tpm (v1.2, NOT tpm2) command which did not appear to function, despite the Linux driver and tools (tcsd) working on the same board. Evidently the Atmel TPM driver hasn't kept up with various step changes in the I2C and TPM stacks, and while TPMv1.2 is quite dated to TPMv2 it would be nice to make some use of the hardware that is there. (Admittedly I would love to replace our hardware TPM with an fTPM but that is a project for another day) There are also subcommands in tpm-v1 which also have been missed in changes to the TPMv1 API and are fixed in this patchset. Changes in v2: - Include model number in get_desc output Example: "Atmel AT97SC3204T I2C 1.2 TPM (tpm@29)" Mathew McBride (6): cmd: tpm-v1: fix compile error in TPMv1 list resources command cmd: tpm-v1: fix load_key_by_sha1 compile errors drivers: tpm: atmel_twi: drop non-DM_I2C compatibility drivers: tpm: atmel_twi: do not use an offset byte drivers: tpm: atmel_twi: implement get_desc operation drivers: tpm: atmel_twi: fix printf specifier compile warning cmd/tpm-v1.c | 17 +++++++++++------ drivers/tpm/tpm_atmel_twi.c | 22 +++++++--------------- lib/tpm-v1.c | 4 ++-- 3 files changed, 20 insertions(+), 23 deletions(-) -- 2.30.1

3 14

[PATCH 1/3] arm: socfpga: arria10: Setting image magic value to romcode initswstate reg
by sin.hui.kho＠intel.com 25 Nov '21

25 Nov '21

From: Tien Fong Chee <tien.fong.chee(a)intel.com> The romcode_initswstate register need to be set with FSBL_IMAGE_IS_VALID value if the current FSBL image is found valid, otherwise BootROM will look for next subsequent valid FSBL image when warm reset is triggered. Signed-off-by: Tien Fong Chee <tien.fong.chee(a)intel.com> Signed-off-by: Sin Hui Kho <sin.hui.kho(a)intel.com> --- .../mach-socfpga/include/mach/system_manager_arria10.h | 3 ++- arch/arm/mach-socfpga/spl_a10.c | 10 +++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-socfpga/include/mach/system_manager_arria10.h b/arch/arm/mach-socfpga/include/mach/system_manager_arria10.h index e4fc6d2e55..75e1fcd80f 100644 --- a/arch/arm/mach-socfpga/include/mach/system_manager_arria10.h +++ b/arch/arm/mach-socfpga/include/mach/system_manager_arria10.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* - * Copyright (C) 2016-2017 Intel Corporation <www.intel.com> + * Copyright (C) 2016-2021 Intel Corporation <www.intel.com> */ #ifndef _SYSTEM_MANAGER_ARRIA10_H_ @@ -31,6 +31,7 @@ #define SYSMGR_A10_NOC_IDLEACK 0xd0 #define SYSMGR_A10_NOC_IDLESTATUS 0xd4 #define SYSMGR_A10_FPGA2SOC_CTRL 0xd8 +#define SYSMGR_A10_ROMCODE_INITSWSTATE 0x20C #define SYSMGR_SDMMC SYSMGR_A10_SDMMC diff --git a/arch/arm/mach-socfpga/spl_a10.c b/arch/arm/mach-socfpga/spl_a10.c index ecb656e4de..f6c4b5708d 100644 --- a/arch/arm/mach-socfpga/spl_a10.c +++ b/arch/arm/mach-socfpga/spl_a10.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright (C) 2012-2019 Altera Corporation <www.altera.com> + * Copyright (C) 2012-2021 Altera Corporation <www.altera.com> */ #include <common.h> @@ -32,6 +32,7 @@ #include <memalign.h> #define FPGA_BUFSIZ 16 * 1024 +#define FSBL_IMAGE_IS_VALID 0x49535756 DECLARE_GLOBAL_DATA_PTR; @@ -169,3 +170,10 @@ void board_init_f(ulong dummy) config_dedicated_pins(gd->fdt_blob); WATCHDOG_RESET(); } + +/* board specific function prior loading SSBL / U-Boot proper */ +void spl_board_prepare_for_boot(void) +{ + writel(FSBL_IMAGE_IS_VALID, socfpga_get_sysmgr_addr() + + SYSMGR_A10_ROMCODE_INITSWSTATE); +} -- 2.25.1

2 5

variable __rel_dyn_start and __rel_dyn_end missing for u-boot proper?
by Chan Kim 25 Nov '21

25 Nov '21

Hello experts, I can't find the definition of variable __rel_dyn_start and __rel_dyn_end for u-boot proper build. Those variables are used in arch/arm/cpu/armv8/start.S (though they are enclosed in #ifdef CONFIG_POSISION_INDEPDNED and #endif) pie_fixup: adr x0, _start /* x0 <- Runtime value of _start */ ldr x1, _TEXT_BASE /* x1 <- Linked value of _start */ subs x9, x0, x1 /* x9 <- Run-vs-link offset */ beq pie_fixup_done adrp x2, __rel_dyn_start /* x2 <- Runtime &__rel_dyn_start */ add x2, x2, #:lo12:__rel_dyn_start adrp x3, __rel_dyn_end /* x3 <- Runtime &__rel_dyn_end */ add x3, x3, #:lo12:__rel_dyn_end pie_fix_loop: Shouldn't they be added in arch/arm/cpu/armv8/u-boot.lds like in arch/arm/cpu/u-boot-spl.lds? These are only places __rel_dyn_star/end are defined for arm. (v2021.10) ckim@ckim-ubuntu:~/U-BOOT/u-boot$ grep '__rel_dyn_$start\|end$.*=.*\.' arch/arm -r arch/arm/cpu/u-boot-spl.lds: __rel_dyn_start = .; arch/arm/cpu/u-boot-spl.lds: __rel_dyn_end = .; arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds: __rel_dyn_start = .; arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds: __rel_dyn_end = .; By the way, I asked a question about the relocation code on stack exchange. I would be very happy if anyone here could spare some time to answer my question. https://stackoverflow.com/questions/70092014/cant-exactly-understand-the-ass embly-code-about-how-relocation-works-in-u-boot/70094227#70094227 Thank you! Chan Kim

1 0

[PATCH v3] env: Avoid using GNU features in awk
by Simon Glass 25 Nov '21

25 Nov '21

GNU has a very useful third argument to match() but this is not supported in the POSIX awk. Update the code to cope, so that the script is POSIX-compliant. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Changes in v3: - Reword commit message and comment to avoid casting aspersions Changes in v2: - Fix the has_var match() that had left-over test code scripts/env2string.awk | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/scripts/env2string.awk b/scripts/env2string.awk index 57d0fc8f3ba..e71c46dfb46 100644 --- a/scripts/env2string.awk +++ b/scripts/env2string.awk @@ -24,26 +24,33 @@ NF { # Quote quotes gsub("\"", "\\\"") + # Avoid using the non-POSIX third parameter to match(), by splitting + # the work into several steps. + has_var = match($0, "^([^ \t=][^ =]*)=(.*)$") + # Is this the start of a new environment variable? - if (match($0, "^([^ \t=][^ =]*)=(.*)$", arr)) { + if (has_var) { if (length(env) != 0) { # Record the value of the variable now completed vars[var] = env } - var = arr[1] - env = arr[2] + + # Collect the variable name. The value follows the '=' + match($0, "^([^ \t=][^ =]*)=") + var = substr($0, 1, RLENGTH - 1) + env = substr($0, RLENGTH + 1) # Deal with += which concatenates the new string to the existing - # variable - if (length(env) != 0 && match(var, "^(.*)[+]$", var_arr)) - { + # variable. Again we are careful to use POSIX match() + if (length(env) != 0 && match(var, "^(.*)[+]$")) { + plusname = substr(var, RSTART, RLENGTH - 1) # Allow var\+=val to indicate that the variable name is # var+ and this is not actually a concatenation - if (substr(var_arr[1], length(var_arr[1])) == "\\") { + if (substr(plusname, length(plusname)) == "\\") { # Drop the backslash sub(/\\[+]$/, "+", var) } else { - var = var_arr[1] + var = plusname env = vars[var] env } } -- 2.34.0.rc2.393.gf8c9666880-goog

2 2

[PATCH 0/5] test: fix pylint warnings
by Heinrich Schuchardt 25 Nov '21

25 Nov '21

Fix pylint warning like: * missing docstring * incorrect indentation * don't inherit from object * unused variable Heinrich Schuchardt (5): test: fix pylint errors in multiplexed_log.py test: fix pylint errors in u_boot_spawn.py test: fix pylint errors in u_boot_utils.py test: fix pylint error in u_boot_console_sandbox.py test: fix pylint error in u_boot_console_exec_attach.py test/py/multiplexed_log.py | 14 ++++++++------ test/py/u_boot_console_exec_attach.py | 6 ++++-- test/py/u_boot_console_sandbox.py | 4 +++- test/py/u_boot_spawn.py | 26 +++++++++++++------------- test/py/u_boot_utils.py | 25 ++++++++++++++----------- 5 files changed, 42 insertions(+), 33 deletions(-) -- 2.32.0

2 10

[PATCH] sandbox: poweroff in efi_system_reset()
by Heinrich Schuchardt 25 Nov '21

25 Nov '21

efi_system_reset() should exit if called with EFI_RESET_SHUTDOWN. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- arch/sandbox/cpu/start.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c index a74f5ec7ba..13b0731ec3 100644 --- a/arch/sandbox/cpu/start.c +++ b/arch/sandbox/cpu/start.c @@ -434,8 +434,10 @@ void __efi_runtime EFIAPI efi_reset_system( efi_status_t reset_status, unsigned long data_size, void *reset_data) { - os_fd_restore(); - os_relaunch(os_argv); + if (reset_type == EFI_RESET_SHUTDOWN) + sandbox_exit(); + else + sandbox_reset(); } void sandbox_reset(void) -- 2.32.0

2 1

[PATCH 0/5] lmb: documentation and clean up
by Heinrich Schuchardt 25 Nov '21

25 Nov '21

Add the LMB library to the HTML documenation. Start cleaning up the library. Heinrich Schuchardt (5): lmb: remove lmb_is_nomap() from include doc: add include/lmb.h to the HTML documentation lmb: remove extern keyword in lmb.h lmb: drop unused lmb_size_bytes() lmb: fix typo 'commun' doc/api/index.rst | 1 + doc/api/lmb.rst | 7 +++++ include/lmb.h | 72 +++++++++++++++++++---------------------------- lib/Kconfig | 2 +- test/lib/lmb.c | 5 ++++ 5 files changed, 43 insertions(+), 44 deletions(-) create mode 100644 doc/api/lmb.rst -- 2.32.0

3 11

[PATCH v3 0/3] Add hs400 support for rk3399 and rk3568
by Yifeng Zhao 25 Nov '21

25 Nov '21

RK3399 and RK3568 are use different sdhci controllers. The drivers need to be updated to support these two platforms and it's easy to support new platforms. Changes in v3: - Optimize hs200 tuning function. - Add check for callback function. - Add return value for tuning function. - Fixed source clock rate with host->max_clk, the interface clock is divided from the source clock. - Config the interface clock by clk_set_rate directly - Enable SDMA. Changes in v2: - Add mmc_of_parse to parse dts config. - Used read_poll_timeout api to check dll lock status - Add execute tuning api for hs200 tuning - Used sdhci_set_clock api to set clock. - Used read_poll_timeout api to check dll status. Yifeng Zhao (3): mmc: rockchip_sdhci: add phy and clock config for rk3399 mmc: rockchip_sdhci: Add support for RK3568 rockchip: config: evb-rk3399: add hs400 and SDMA support configs/evb-rk3399_defconfig | 2 + drivers/mmc/rockchip_sdhci.c | 422 ++++++++++++++++++++++++++++++++--- 2 files changed, 388 insertions(+), 36 deletions(-) -- 2.17.1

6 12

[PATCH v4 0/5] sf: Add documentation and an 'sf mmap' command
by Simon Glass 25 Nov '21

25 Nov '21

This little series adds documentation and a few other tidy-ups to the 'sf' command. It also provides a way to access memory-mapped SPI via the command line. Changes in v4: - Split out the 'const' change into a separate patch - Show the 'sf probe' output in the examples Changes in v3: - Add configuration and return value also Changes in v2: - Explain why 'usage' cannot be const - Many fixes as suggested by Heinrich Simon Glass (5): command: Use a constant pointer for the help sf: Use const for the stage name sf: Tidy up code to avoid #ifdef sf: doc: Add documentation for the 'sf' command sf: Provide a command to access memory-mapped SPI arch/Kconfig | 2 + cmd/Kconfig | 8 ++ cmd/sf.c | 67 +++++++--- doc/usage/index.rst | 1 + doc/usage/sf.rst | 308 ++++++++++++++++++++++++++++++++++++++++++++ include/command.h | 2 +- 6 files changed, 369 insertions(+), 19 deletions(-) create mode 100644 doc/usage/sf.rst -- 2.33.0.464.g1972c5931b-goog

4 30