April 2021 - U-Boot

[PATCH] x86: Correct regwidth prompt in cbsysinfo
by Simon Glass 10 May '21

10 May '21

This should be 'regwidth', not 'baud'. Fix it. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- cmd/x86/cbsysinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/x86/cbsysinfo.c b/cmd/x86/cbsysinfo.c index a0db0ad364e..34fdaf5b1b1 100644 --- a/cmd/x86/cbsysinfo.c +++ b/cmd/x86/cbsysinfo.c @@ -205,7 +205,7 @@ static void show_table(struct sysinfo_t *info, bool verbose) print_hex(">type", ser->type); print_addr(">base", ser->baseaddr); print_dec(">baud", ser->baud); - print_hex(">baud", ser->regwidth); + print_hex(">regwidth", ser->regwidth); print_dec(">input_hz", ser->input_hertz); print_addr(">PCI addr", ser->uart_pci_addr); } -- 2.31.1.498.g6c1eba8ee3d-goog

2 2

[RFC] efi_loader: improve firmware capsule authentication
by AKASHI Takahiro 10 May '21

10 May '21

Heinrich, I'm currently thinking of improving capsule authentication that Sughosh has made, particularly around mkeficapsule command: 1) Add a signing feature to the command This will allow us to create a *signed* capsule file solely with mkeficapsule. We will no longer rely on EDK2's script. 2) Delete "-K" and "-D" option Specifically, revert 322c813f4bec ("mkeficapsule: Add support for embedding public key in a dtb") As I said, this feature doesn't have anything to do with creating a capsule file. Above all, we can do the same thing with the existing commands (dtc and fdtoverlay). 3) Add pytest for capsule authentication with sandbox Now I have done all of them above although some cleanup work is still needed. I think that (2) should be done in 2021.04. I plan to send patches for 1-3 (and maybe 5 and 7 below) if you agree. Other concerns: 4) Documentation Currently, "doc/board/emulation/qemu_capsule_update.rst" is the only document about the usage of UEFI capsule on U-Boot. Unfortunately, it contains some errors and more importantly, most of the content are generic, not qemu-specific. 5) Certificate (public key) in dtb That's fine, but again "board/emulation/common/qemu_capsule.c" is naturally generic. It should be available for other platforms with a new Kconfig option. # IMHO, I don't understand why the data in dtb needs be in efi-signature-list structure. A single key (cert) would be enough. 6) "capsule_authentication_enabled" I think that we have agreed with deleting this variable. But I don't see any patch. Moreover, capsule authentication must be enforced only if the attribute, IMAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED, is set. But there is no code to check the flag. 7) Pytest is broken Due to your and Ilias' recent patches, existing pytests for secure boot as well as capsule update are now broken. I'm not sure why you have not yet noticed. Presumably, Travis CI now skips those tests? If I have some time in the future, I will address them. But Sughosh can do as well. -Takahiro Akashi

4 10

[PATCH] pxe_utils: add localcmd defination
by Artem Lapkin 08 May '21

08 May '21

pxe localboot usage too much limited, i think be useful improve it welcome for any suggestions and feedbacks... 1) add localcmd defination which can used with localboot by default localboot get from env, now we can define it in pxe script 2) localcmd can use without localboot 3) multiline usage for localcmd 4) add short alias ! for localcmd 5) localcmd eval as uboot script (run_command_list) 6) label + localcmd simple usage uboot pxe menu with uboot commands Usage examples # standalone usage LABEL update_uboot LOCALCMD ip=$tftpip && tftpboot $ip:boot.scr.uimg && script LABEL reset # multiline usage LOCALCMD echo RESET LOCALCMD reset LABEL reset again # multiline alias usage ! echo RESET ! reset LABEL localboot # redefile localcmd for localboot LOCALBOOT 1 LOCALCMD echo temporary redefine localcmd Signed-off-by: Artem Lapkin <art(a)khadas.com> --- cmd/pxe_utils.c | 29 ++++++++++++++++++++++++++++- cmd/pxe_utils.h | 1 + 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/cmd/pxe_utils.c b/cmd/pxe_utils.c index f1ed671a..fdf532ec 100644 --- a/cmd/pxe_utils.c +++ b/cmd/pxe_utils.c @@ -271,6 +271,9 @@ static void label_destroy(struct pxe_label *label) if (label->kernel) free(label->kernel); + if (label->localcmd) + free(label->localcmd); + if (label->config) free(label->config); @@ -322,7 +325,10 @@ static int label_localboot(struct pxe_label *label) { char *localcmd; - localcmd = from_env("localcmd"); + if (label->localcmd) + localcmd = label->localcmd; + else + localcmd = from_env("localcmd"); if (!localcmd) return -ENOENT; @@ -470,6 +477,11 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label) return 0; } + if (label->localcmd) { + if (!label->localboot_val) + return run_command_list(label->localcmd, strlen(label->localcmd), 0); + } + if (!label->kernel) { printf("No kernel given, skipping %s\n", label->name); @@ -687,6 +699,8 @@ enum token_type { T_APPEND, T_INITRD, T_LOCALBOOT, + T_LOCALCMD, + T_LOCALCMD2, T_DEFAULT, T_PROMPT, T_INCLUDE, @@ -721,6 +735,8 @@ static const struct token keywords[] = { {"kernel", T_KERNEL}, {"linux", T_LINUX}, {"localboot", T_LOCALBOOT}, + {"localcmd", T_LOCALCMD}, + {"!", T_LOCALCMD2}, {"append", T_APPEND}, {"initrd", T_INITRD}, {"include", T_INCLUDE}, @@ -1102,6 +1118,7 @@ static int parse_label(char **c, struct pxe_menu *cfg) int len; char *s = *c; struct pxe_label *label; + char *add; int err; label = label_create(); @@ -1177,6 +1194,16 @@ static int parse_label(char **c, struct pxe_menu *cfg) err = parse_integer(c, &label->localboot_val); break; + case T_LOCALCMD: + case T_LOCALCMD2: + if (label->localcmd) { + if (parse_sliteral(c, &add)) + sprintf(label->localcmd, "%s\n%s", label->localcmd, add); + } else { + err = parse_sliteral(c, &label->localcmd); + } + break; + case T_IPAPPEND: err = parse_integer(c, &label->ipappend); break; diff --git a/cmd/pxe_utils.h b/cmd/pxe_utils.h index bbdc606b..cdac1327 100644 --- a/cmd/pxe_utils.h +++ b/cmd/pxe_utils.h @@ -49,6 +49,7 @@ struct pxe_label { int attempted; int localboot; int localboot_val; + char *localcmd; struct list_head list; }; -- 2.25.1

2 1

[PATCH 0/5] Add support for embedding public key in platform's dtb
by Sughosh Ganu 08 May '21

08 May '21

Patch 1 fixes an issue of selection of IMAGE_SIGN_INFO config option when capsule authentication is enabled. Patch 2 add two config symbols, EFI_PKEY_DTB_EMBED and EFI_PKEY_FILE which are used for enabling embedding of the public key in the dtb, and specifying the esl file name. Patch 3 moves efi_capsule_auth_enabled as a weak function, which can be used as a default mechanism for checking if capsule authentication has been enabled. Patch 4 adds a default weak function for retrieving the public key from the platform's dtb. Patch 5 adds the functionality to embed the esl file into the platform's dtb during the platform build. I have tested this functionality on the STM32MP157C DK2 board. [1] - https://lists.denx.de/pipermail/u-boot/2021-March/442867.html Sughosh Ganu (5): efi_loader: Kconfig: Select IMAGE_SIGN_INFO when capsule authentication is enabled efi_loader: Kconfig: Add symbols for embedding the public key into the platform's dtb efi_capsule: Add a weak function to check whether capsule authentication is enabled efi_capsule: Add a weak function to get the public key needed for capsule authentication Makefile: Add provision for embedding public key in platform's dtb Makefile | 10 ++++++ board/emulation/common/qemu_capsule.c | 6 ---- lib/efi_loader/Kconfig | 16 ++++++++++ lib/efi_loader/efi_capsule.c | 44 ++++++++++++++++++++++++--- 4 files changed, 66 insertions(+), 10 deletions(-) -- 2.17.1

5 26

[PATCH 00/13] display_options: Start to unify print_buffer() and hexdump
by Simon Glass 08 May '21

08 May '21

At present we have two ways of showing a hex dump. Once has been in U-Boot since the dawn of time and the other was recently added from Linux. They both have their own unique features. This series makes a few changes to bring them closer together. It also adds support for logging a buffer, which is useful since it can put it through the same log drivers as other logging output. Also it adds tests, so we can check the behaviour. The code-size impact of the main part of this series is 160 bytes on Thumb2, which seems acceptable. However the final patch adds another 600 bytes or so, which is not. Simon Glass (13): console: Report an error when output buffer is exhausted test: Detect when expect_str is too small test: Convert print tests to use ut framework test: Add a test for print_buffer() display_options: Drop two spaces before the ASCII column hexdump: Move API to header file hexdump: Add support for sandbox hexdump: Support any rowsize hexdump: Allow ctrl-c to interrupt output log: Drop log_nop() functions display_options: Split print_buffer() into two functions log: Add support for logging a buffer RFC: display_options: Use print_hex_dump() for print_buffer() common/console.c | 18 +- common/log.c | 30 ++++ include/asm-generic/global_data.h | 16 +- include/console.h | 3 +- include/display_options.h | 25 +++ include/hexdump.h | 81 ++++++++- include/log.h | 49 +++-- include/test/suites.h | 1 + include/test/test.h | 4 +- lib/display_options.c | 124 ++++++++----- lib/hexdump.c | 104 +++-------- test/cmd/mem_search.c | 26 +-- test/cmd_ut.c | 2 + test/dm/rtc.c | 9 +- test/log/log_test.c | 27 +++ test/print_ut.c | 286 ++++++++++++++++++++++++------ test/ut.c | 55 +++++- 17 files changed, 628 insertions(+), 232 deletions(-) -- 2.31.0.rc2.261.g7f71774620-goog

2 15

[PATCH 00/17] misc: Some more misc patches
by Simon Glass 08 May '21

08 May '21

Various issues were discovered in getting Chromium OS verified boot running on top of coreboot, booting into U-Boot. Improvements include: - enable serial console if even coreboot doesn't - enable cache always - show the BIOS date since Chromium OS's coreboot doesn't have a version - update docs - allow SPI driver to work without a PCH - fix mtrr command when multi-processing (CONFIG_MP) is disabled - add documentation about the memory map Simon Glass (17): pci: Use const for pci_find_device_id() etc. x86: pci: Allow binding of some devices before relocation x86: Allow coreboot serial driver to guess the UART spi: ich: Don't require the PCH tpm: cr50: Drop unnecessary coral headers x86: Don't set up MTRRs if previously done x86: Update the MP constants to avoid conflicts x86: Do cache set-up by default when booting from coreboot x86: coreboot: Show the BIOS date x86: coral: Allow booting from coreboot x86: Add function comments to cb_sysinfo.h x86: coreboot: Use vendor in the Kconfig x86: coreboot: Enable the cbsysinfo command x86: coreboot: Document the memory map x86: Check ROM exists before building vboot dtoc: Check that a parent is not missing doc: Update documentation for cros-2021.04 release arch/x86/cpu/coreboot/Kconfig | 3 +- arch/x86/cpu/i386/cpu.c | 2 +- arch/x86/dts/chromebook_coral.dts | 2 +- arch/x86/dts/chromebook_samus.dts | 2 +- arch/x86/include/asm/cb_sysinfo.h | 16 ++++++ arch/x86/include/asm/mp.h | 12 +++-- arch/x86/lib/init_helpers.c | 5 +- board/coreboot/coreboot/Kconfig | 12 +++-- board/coreboot/coreboot/coreboot.c | 3 ++ board/google/chromebook_coral/coral.c | 28 ++++++++++ doc/board/coreboot/coreboot.rst | 19 +++++++ doc/chromium/run_vboot.rst | 15 +++--- doc/device-tree-bindings/pci/x86-pci.txt | 7 ++- drivers/pci/pci-uclass.c | 39 ++++++++++++-- drivers/serial/serial_coreboot.c | 68 +++++++++++++++++++++--- drivers/spi/ich.c | 4 +- drivers/tpm/cr50_i2c.c | 2 - include/dt-bindings/pci/pci.h | 12 +++++ include/pci.h | 5 +- include/pci_ids.h | 1 + tools/dtoc/dtb_platdata.py | 9 ++++ tools/dtoc/test/dtoc_test_noparent.dts | 32 +++++++++++ tools/dtoc/test_dtoc.py | 10 ++++ 23 files changed, 264 insertions(+), 44 deletions(-) create mode 100644 include/dt-bindings/pci/pci.h create mode 100644 tools/dtoc/test/dtoc_test_noparent.dts -- 2.31.0.208.g409f899ff0-goog

4 52

[Patch v2 0/2] Add Xilinx clock wizard driver support
by Zhengxun Li 07 May '21

07 May '21

This series add support to enable clock wizard for zynq platform. Changes in v2: - naming is aligned with linux - delete inappropriate description and code Zhengxun Li (2): clk: zynq: Add clock wizard driver board: Add Zynq Mxic picozed development board support arch/arm/dts/Makefile | 3 +- arch/arm/dts/zynq-mxic-picozed.dts | 72 +++++++++++++++++ drivers/clk/Kconfig | 9 +++ drivers/clk/Makefile | 1 + drivers/clk/clk-xlnx-clock-wizard.c | 152 ++++++++++++++++++++++++++++++++++++ 5 files changed, 236 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/zynq-mxic-picozed.dts create mode 100644 drivers/clk/clk-xlnx-clock-wizard.c -- 1.9.1

3 6

[PATCH 0/2] allow environment to be updated from dtb
by Rasmus Villemoes 06 May '21

06 May '21

Patch 1 adds a config option for updating the environment, after it has been loaded from its persistent location, with a set of key/value pairs from a node in the control DTB. This is useful to create a few different images based on the same U-Boot binary, e.g. one for normal use, one for development and one for bootstrapping the board. It's also useful when SPL loads U-Boot from a FIT image and decides between multiple possible control DTBs; those control DTBs can then contain tweaks of the environment suitable for that particular board variant. Once those tweaks have been applied, one may no longer wish for the DTB settings to be applied on subsequent boots; this is easily achieved by clearing the fdt_env_path variable and saving the environment. In a previous version, I used a single property whose value was expected to have the form "foo=1\0bar=234\0". But using a node and individual property/value pairs is both more readable and more flexible - for example, the individual control dtbs can easily be prepared from each other using the fdtput utility, or with suitable includes in the .dts. Combining fragments in that way is not possible with a single property. Patch 2 simply adds a small test case to the sandbox. Rasmus Villemoes (2): env: allow environment to be amended from control dtb sandbox: add test of CONFIG_ENV_IMPORT_FDT arch/sandbox/dts/test.dts | 7 +++++++ common/board_r.c | 2 ++ configs/sandbox64_defconfig | 1 + configs/sandbox_defconfig | 1 + env/Kconfig | 18 ++++++++++++++++++ env/common.c | 23 +++++++++++++++++++++++ include/env.h | 15 +++++++++++++++ include/env_default.h | 3 +++ test/env/Makefile | 1 + test/env/fdt.c | 20 ++++++++++++++++++++ 10 files changed, 91 insertions(+) create mode 100644 test/env/fdt.c -- 2.29.2

4 13

[PATCH v4 0/5] sysinfo: Add gpio sysinfo driver
by Sean Anderson 06 May '21

06 May '21

This series adds a GPIO sysinfo driver using the dm_gpio_get_values_as_int_base3 function. The board revision is mapped based in devicetree properties. This series is based on Simon's GPIO series [1]. [1] https://patchwork.ozlabs.org/project/uboot/list/?series=228126 Changes in v4: - Enable sysinfo_gpio test for sandbox - Fix test failure caused by uninitialized variable - Rebase onto u-boot/master Changes in v3: - Fix assuming any nonzero return of dev_count_phandle_with_args was an error. - Fix assuming nonzero return from dm_gpio_get_values_as_int_base3 is an error. - Move detected bool into sysinfo_priv struct - Rebase onto u-boot/next - Use SYSINFO_ID_BOARD_MODEL instead of SYSINFO_ID_REVISION Changes in v2: - Document sysinfo_gpio_priv - Enforce sysinfo detect ordering in uclass. Users must still call sysinfo_detect beforehand. - Fix unbalanced brace in sysinfo_gpio_get_int - Modify sysinfo test to check for detect() ordering. - Refactor driver to take advantage of the uclass detect ordering guarantee. - Reorder includes - Set BOARD_HWVERSION to SYSINFO_ID_REVISION, as they represent the same content. - Use enums instead of defines for sysinfo ids Sean Anderson (5): dm: gpio: Fix gpio_get_list_count failing with livetree sysinfo: Use global sysinfo IDs for existing sysinfo drivers sysinfo: Require that sysinfo_detect be called before other methods sysinfo: Add gpio-sysinfo driver test: Add gpio-sysinfo test arch/sandbox/dts/test.dts | 7 + common/spl/spl_fit.c | 4 + configs/sandbox64_defconfig | 1 + configs/sandbox_defconfig | 1 + configs/sandbox_flattree_defconfig | 1 + configs/sandbox_noinst_defconfig | 1 + configs/sandbox_spl_defconfig | 1 + .../sysinfo/gpio-sysinfo.txt | 37 +++++ drivers/gpio/gpio-uclass.c | 6 +- drivers/sysinfo/Kconfig | 8 + drivers/sysinfo/Makefile | 1 + drivers/sysinfo/gazerbeam.h | 8 +- drivers/sysinfo/gpio.c | 141 ++++++++++++++++++ drivers/sysinfo/sandbox.h | 2 +- drivers/sysinfo/sysinfo-uclass.c | 29 +++- include/sysinfo.h | 26 ++-- test/dm/Makefile | 1 + test/dm/sysinfo-gpio.c | 69 +++++++++ test/dm/sysinfo.c | 25 ++-- 19 files changed, 342 insertions(+), 27 deletions(-) create mode 100644 doc/device-tree-bindings/sysinfo/gpio-sysinfo.txt create mode 100644 drivers/sysinfo/gpio.c create mode 100644 test/dm/sysinfo-gpio.c -- 2.25.1

2 10

[PATCH v2] cmd: gpt: Add option to write GPT partitions to environment variable
by Farhan Ali 06 May '21

06 May '21

This change would enhance the existing 'gpt read' command to allow (optionally) writing of the read GPT partitions to an environment variable in the UBOOT partitions layout format. This would allow users to easily change the overall partition settings by editing said variable and then using the variable in the 'gpt write' and 'gpt verify' commands. Signed-off-by: Farhan Ali <farhan.ali(a)broadcom.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Heinrich Schuchardt <xypron.glpk(a)gmx.de> Cc: Corneliu Doban <cdoban(a)broadcom.com> Cc: Rayagonda Kokatanur <rayagonda.kokatanur(a)broadcom.com> Cc: Rasmus Villemoes <rasmus.villemoes(a)prevas.dk> --- Changes for v2: - Checked for argv[4] existence before calling do_get_gpt_info - Added missing update to doc/README.gpt --- cmd/gpt.c | 46 ++++++++++++++++++++++++++++++++++++++-------- doc/README.gpt | 17 +++++++++++++++++ 2 files changed, 55 insertions(+), 8 deletions(-) diff --git a/cmd/gpt.c b/cmd/gpt.c index 76a95ad..17f2b83 100644 --- a/cmd/gpt.c +++ b/cmd/gpt.c @@ -350,17 +350,46 @@ static int get_gpt_info(struct blk_desc *dev_desc) } /* a wrapper to test get_gpt_info */ -static int do_get_gpt_info(struct blk_desc *dev_desc) +static int do_get_gpt_info(struct blk_desc *dev_desc, char * const namestr) { - int ret; + int numparts; + + numparts = get_gpt_info(dev_desc); + + if (numparts > 0) { + if (namestr) { + char disk_guid[UUID_STR_LEN + 1]; + char *partitions_list; + int partlistlen; + int ret = -1; + + ret = get_disk_guid(dev_desc, disk_guid); + if (ret < 0) + return ret; + + partlistlen = calc_parts_list_len(numparts); + partitions_list = malloc(partlistlen); + if (!partitions_list) { + del_gpt_info(); + return -ENOMEM; + } + memset(partitions_list, '\0', partlistlen); + + ret = create_gpt_partitions_list(numparts, disk_guid, + partitions_list); + if (ret < 0) + printf("Error: Could not create partition list string!\n"); + else + env_set(namestr, partitions_list); - ret = get_gpt_info(dev_desc); - if (ret > 0) { - print_gpt_info(); + free(partitions_list); + } else { + print_gpt_info(); + } del_gpt_info(); return 0; } - return ret; + return numparts; } #endif @@ -982,7 +1011,7 @@ static int do_gpt(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) ret = do_disk_guid(blk_dev_desc, argv[4]); #ifdef CONFIG_CMD_GPT_RENAME } else if (strcmp(argv[1], "read") == 0) { - ret = do_get_gpt_info(blk_dev_desc); + ret = do_get_gpt_info(blk_dev_desc, (argc == 5) ? argv[4] : NULL); } else if ((strcmp(argv[1], "swap") == 0) || (strcmp(argv[1], "rename") == 0)) { ret = do_rename_gpt_parts(blk_dev_desc, argv[1], argv[4], argv[5]); @@ -1028,8 +1057,9 @@ U_BOOT_CMD(gpt, CONFIG_SYS_MAXARGS, 1, do_gpt, " gpt guid mmc 0 varname\n" #ifdef CONFIG_CMD_GPT_RENAME "gpt partition renaming commands:\n" - " gpt read <interface> <dev>\n" + " gpt read <interface> <dev> [<varname>]\n" " - read GPT into a data structure for manipulation\n" + " - read GPT partitions into environment variable\n" " gpt swap <interface> <dev> <name1> <name2>\n" " - change all partitions named name1 to name2\n" " and vice-versa\n" diff --git a/doc/README.gpt b/doc/README.gpt index ac975f6..91e397d 100644 --- a/doc/README.gpt +++ b/doc/README.gpt @@ -237,6 +237,23 @@ doc/arch/index.rst: => gpt swap host 0 name othername [ . . . ] +Modifying GPT partition layout from U-Boot: +=========================================== + +The entire GPT partition layout can be exported to an environment +variable and then modified enmasse. Users can change the partition +numbers, offsets, names and sizes. The resulting variable can used to +reformat the device. Here is an example of reading the GPT partitions +into a variable and then modifying them: + +U-BOOT> gpt read mmc 0 current_partitions +U-BOOT> env edit current_partitions +edit: uuid_disk=[...];name=part1,start=0x4000,size=0x4000,uuid=[...]; +name=part2,start=0xc000,size=0xc000,uuid=[...];[ . . . ] + +U-BOOT> gpt write mmc 0 $current_partitions +U-BOOT> gpt verify mmc 0 $current_partitions + Partition type GUID: ==================== -- 1.8.3.1

3 2