December 2023 - U-Boot

[PATCH] fw_env: keep calling read() until whole flash block is read
by Rafał Miłecki 06 Jan '24

06 Jan '24

From: Rafał Miłecki <rafal(a)milecki.pl> It's totally valid for read() to provide less bytes than requested maximum. It may happen if there is no more data available yet or source pushes data in small chunks. This actually happens when trying to read env data from NVMEM device. Kernel may provide NVMEM content in page size parts (like 4096 B). This fixes warnings like: Warning on /sys/bus/nvmem/devices/u-boot-env0/nvmem: Attempted to read 16384 bytes but got 4096 Warning on /sys/bus/nvmem/devices/u-boot-env0/nvmem: Attempted to read 12288 bytes but got 4096 Warning on /sys/bus/nvmem/devices/u-boot-env0/nvmem: Attempted to read 8192 bytes but got 4096 Since the main loop in flash_read_buf() is used to read blocks this patch adds a new nested one. Signed-off-by: Rafał Miłecki <rafal(a)milecki.pl> --- tools/env/fw_env.c | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index 0347e9d15a..90010dabd8 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -948,29 +948,25 @@ static int flash_read_buf(int dev, int fd, void *buf, size_t count, */ lseek(fd, blockstart + block_seek, SEEK_SET); - rc = read(fd, buf + processed, readlen); - if (rc == -1) { - fprintf(stderr, "Read error on %s: %s\n", - DEVNAME(dev), strerror(errno)); - return -1; - } + while (readlen) { + rc = read(fd, buf + processed, readlen); + if (rc == -1) { + fprintf(stderr, "Read error on %s: %s\n", + DEVNAME(dev), strerror(errno)); + return -1; + } #ifdef DEBUG - fprintf(stderr, "Read 0x%x bytes at 0x%llx on %s\n", - rc, (unsigned long long)blockstart + block_seek, - DEVNAME(dev)); + fprintf(stderr, "Read 0x%x bytes at 0x%llx on %s\n", + rc, (unsigned long long)blockstart + block_seek, + DEVNAME(dev)); #endif - processed += rc; - if (rc != readlen) { - fprintf(stderr, - "Warning on %s: Attempted to read %zd bytes but got %d\n", - DEVNAME(dev), readlen, rc); + processed += rc; readlen -= rc; - block_seek += rc; - } else { - blockstart += blocklen; - readlen = min(blocklen, count - processed); - block_seek = 0; } + + blockstart += blocklen; + readlen = min(blocklen, count - processed); + block_seek = 0; } return processed; -- 2.35.3

2 1

[PATCH] fw_env: rename variables holding env data content
by Rafał Miłecki 06 Jan '24

06 Jan '24

From: Rafał Miłecki <rafal(a)milecki.pl> Rename "addr0" and "addr1" to "buf0" and "buf1" accordingly. Name "addr" suggests that variable contains a numeric value being some kind of address. Name "buf" is de facto a standard name for pointer to allocated memory for reading data to. While at it drop redundant checks for NULL before calling free(). Signed-off-by: Rafał Miłecki <rafal(a)milecki.pl> --- tools/env/fw_env.c | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index bf8b7ba304..0347e9d15a 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -1416,11 +1416,11 @@ int fw_env_open(struct env_opts *opts) { int crc0, crc0_ok; unsigned char flag0; - void *addr0 = NULL; + void *buf0 = NULL; int crc1, crc1_ok; unsigned char flag1; - void *addr1 = NULL; + void *buf1 = NULL; int ret; @@ -1430,8 +1430,8 @@ int fw_env_open(struct env_opts *opts) if (parse_config(opts)) /* should fill envdevices */ return -EINVAL; - addr0 = calloc(1, CUR_ENVSIZE); - if (addr0 == NULL) { + buf0 = calloc(1, CUR_ENVSIZE); + if (buf0 == NULL) { fprintf(stderr, "Not enough memory for environment (%ld bytes)\n", CUR_ENVSIZE); @@ -1440,13 +1440,13 @@ int fw_env_open(struct env_opts *opts) } dev_current = 0; - if (flash_io(O_RDONLY, addr0, CUR_ENVSIZE)) { + if (flash_io(O_RDONLY, buf0, CUR_ENVSIZE)) { ret = -EIO; goto open_cleanup; } if (!have_redund_env) { - struct env_image_single *single = addr0; + struct env_image_single *single = buf0; crc0 = crc32(0, (uint8_t *)single->data, ENV_SIZE); crc0_ok = (crc0 == single->crc); @@ -1458,12 +1458,12 @@ int fw_env_open(struct env_opts *opts) environment.dirty = 1; } - environment.image = addr0; + environment.image = buf0; environment.crc = &single->crc; environment.flags = NULL; environment.data = single->data; } else { - struct env_image_redundant *redundant0 = addr0; + struct env_image_redundant *redundant0 = buf0; struct env_image_redundant *redundant1; crc0 = crc32(0, (uint8_t *)redundant0->data, ENV_SIZE); @@ -1472,17 +1472,17 @@ int fw_env_open(struct env_opts *opts) flag0 = redundant0->flags; dev_current = 1; - addr1 = calloc(1, CUR_ENVSIZE); - if (addr1 == NULL) { + buf1 = calloc(1, CUR_ENVSIZE); + if (buf1 == NULL) { fprintf(stderr, "Not enough memory for environment (%ld bytes)\n", CUR_ENVSIZE); ret = -ENOMEM; goto open_cleanup; } - redundant1 = addr1; + redundant1 = buf1; - if (flash_io(O_RDONLY, addr1, CUR_ENVSIZE)) { + if (flash_io(O_RDONLY, buf1, CUR_ENVSIZE)) { ret = -EIO; goto open_cleanup; } @@ -1571,17 +1571,17 @@ int fw_env_open(struct env_opts *opts) * flags before writing out */ if (dev_current) { - environment.image = addr1; + environment.image = buf1; environment.crc = &redundant1->crc; environment.flags = &redundant1->flags; environment.data = redundant1->data; - free(addr0); + free(buf0); } else { - environment.image = addr0; + environment.image = buf0; environment.crc = &redundant0->crc; environment.flags = &redundant0->flags; environment.data = redundant0->data; - free(addr1); + free(buf1); } #ifdef DEBUG fprintf(stderr, "Selected env in %s\n", DEVNAME(dev_current)); @@ -1590,11 +1590,8 @@ int fw_env_open(struct env_opts *opts) return 0; open_cleanup: - if (addr0) - free(addr0); - - if (addr1) - free(addr1); + free(buf0); + free(buf1); return ret; } -- 2.35.3

2 1

[PATCH] fw_env: fix reading NVMEM device's "compatible" value
by Rafał Miłecki 06 Jan '24

06 Jan '24

From: Rafał Miłecki <rafal(a)milecki.pl> Call to fread() was changed to check for return value. The problem is it can't be checked for returning 1 (as it is) to determine success. We call fread() with buffer size as "size" argument. Reading any "compatible" value shorter than buffer size will result in returning 0 even on success. Modify code to use fstat() to determine expected read length. This fixes regression that broke using fw_env with NVMEM devices. Fixes: c059a22b7776 ("tools: env: fw_env: Fix unused-result warning") Cc: Jaehoon Chung <jh80.chung(a)samsung.com> Signed-off-by: Rafał Miłecki <rafal(a)milecki.pl> --- tools/env/fw_env.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index c9a8774ace..bf8b7ba304 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -1732,6 +1732,7 @@ static int find_nvmem_device(void) } while (!nvmem && (dent = readdir(dir))) { + struct stat s; FILE *fp; size_t size; @@ -1749,14 +1750,22 @@ static int find_nvmem_device(void) continue; } - size = fread(buf, sizeof(buf), 1, fp); + if (fstat(fileno(fp), &s)) { + fprintf(stderr, "Failed to fstat %s\n", comp); + goto next; + } + + if (s.st_size >= sizeof(buf)) { + goto next; + } + + size = fread(buf, s.st_size, 1, fp); if (size != 1) { fprintf(stderr, "read failed about %s\n", comp); - fclose(fp); - return -EIO; + goto next; } - + buf[s.st_size] = '\0'; if (!strcmp(buf, "u-boot,env")) { bytes = asprintf(&nvmem, "%s/%s/nvmem", path, dent->d_name); @@ -1765,6 +1774,7 @@ static int find_nvmem_device(void) } } +next: fclose(fp); } -- 2.35.3

2 1

[PATCH v2 00/26] sync am65x device tree with Linux v6.7-rc1
by Bryan Brattlof 06 Jan '24

06 Jan '24

Hello Again Everyone! This series gets the am65x booting again along with syncing the device tree files with v6.7-rc1 Linux. The bulk of these patches unify the WKUP SPL board file with the arm64 files to make future syncs from Linux much easier. In the end the DTBs should look a lot like what the DTBs look like for the am64x which is fairly similar to the am65x. For those interested in what UART boot looks like: https://paste.sr.ht/~bryanb/7df8a645dc548912cd806abd5ecab967ef3287bc Changes from v1: [0] - fixed multi-line comment format - moved wkup_uart0 and mcu_uart0 U-Boot overrides to the r5 board file as they are not needed for a53/main domain U-Boot builds - corrected a bad wkup_i2c0_pins_default fixup in PATCH 6/26 - spelling fix (s/Libux/Linux/) in commit body for PATCH 6/26 - added trailers from Tom Thanks for reviewing and happy holidays ~Bryan [0] https://lore.kernel.org/u-boot/20231221174412.210807-1-bb@ti.com/ Bryan Brattlof (26): configs: am65x_evm_r5: enable driver for fixed regulators configs: am65x_evm_a53: disable CONSOLE_MUX arm: dts: k3-am654-r5: Merge board file and U-Boot overlay arm: dts: k3-am654: pull in dtb update from Linux arm: dts: k3-am654: copy bootph properties to a53 dts arm: dts: k3-am654: include a53 board dtb for r5 build arm: dts: k3-am654: remove duplicate vtt_supply arm: dts: k3-am654: remove duplicate wkup_uart0 arm: dts: k3-am654: remove duplicate timer arm: dts: k3-am654: remove duplicate mcu_ringacc arm: dts: k3-am654: remove duplicate mcu_udmap arm: dts: k3-am654: add needed regs to udmap nodes arm: dts: k3-am654: remove duplicate mcu_uart0 node arm: dts: k3-am654: remove duplicate main_uart0 arm: dts: k3-am654: remove duplicate sdhci0 pinmux node arm: dts: k3-am654: remove duplicate sdhci1 pinmux node arm: dts: k3-am654: remove duplicate wkup_i2c0 arm: dts: k3-am654: remove duplicate ospi0 node arm: dts: k3-am654: remove usb0 arm: dts: k3-am654: remove duplicate mdio arm: dts: k3-am654: remove duplicate vtt pinmux arm: dts: k3-am654: remove duplicate root properties arm: dts: k3-am654: remove un-needed aliases arm: dts: k3-am654: move dummy_clock to root node arm: dts: k3-am654: remove duplicate mcu secure proxy node arm: dts: k3-am654: convert bootph-pre-ram to bootph-all arch/arm/dts/k3-am65-main.dtsi | 342 +++++++++++++++--- arch/arm/dts/k3-am65-mcu.dtsi | 156 +++++++- arch/arm/dts/k3-am65-wakeup.dtsi | 10 +- arch/arm/dts/k3-am65.dtsi | 19 +- arch/arm/dts/k3-am654-base-board-u-boot.dtsi | 195 +++++++++- arch/arm/dts/k3-am654-base-board.dts | 301 +++++++++------ .../dts/k3-am654-r5-base-board-u-boot.dtsi | 208 ----------- arch/arm/dts/k3-am654-r5-base-board.dts | 303 ++++------------ arch/arm/dts/k3-am654.dtsi | 7 + configs/am65x_evm_a53_defconfig | 1 - configs/am65x_evm_r5_defconfig | 2 + 11 files changed, 886 insertions(+), 658 deletions(-) delete mode 100644 arch/arm/dts/k3-am654-r5-base-board-u-boot.dtsi base-commit: 0a0ceea2269b983e736b80104f03cc800d1a5e2a -- 2.43.0

4 55

[PATCH v1 1/1] drivers: misc: Add socfpga_dtreg driver for Intel SoCFPGA
by wan.yee.lau＠intel.com 05 Jan '24

05 Jan '24

From: Wan Yee Lau <wan.yee.lau(a)intel.com> This driver can be used to provide user a clean interface and all register settings are centralized in one place, device tree without need for hardcoding in the source code. Signed-off-by: Wan Yee Lau <wan.yee.lau(a)intel.com> --- .../misc/socfpga_dtreg.txt | 66 ++++++++++ drivers/misc/Kconfig | 7 ++ drivers/misc/Makefile | 1 + drivers/misc/socfpga_dtreg.c | 117 ++++++++++++++++++ 4 files changed, 191 insertions(+) create mode 100644 doc/device-tree-bindings/misc/socfpga_dtreg.txt create mode 100644 drivers/misc/socfpga_dtreg.c diff --git a/doc/device-tree-bindings/misc/socfpga_dtreg.txt b/doc/device-tree-bindings/misc/socfpga_dtreg.txt new file mode 100644 index 0000000000..5458103f88 --- /dev/null +++ b/doc/device-tree-bindings/misc/socfpga_dtreg.txt @@ -0,0 +1,66 @@ +* Firewall and privilege register settings in device tree + +Required properties: +-------------------- + +- compatible: should contain "intel,socfpga-dtreg" +- reg: Physical base address and size of block register. +- intel,offset-settings: 32-bit offset address of block register, + followed by 32-bit value settings and + the masking bits, only masking bit + set to 1 allows modification. + +This driver can be used to provide user a clean interface and all register +settings are centralized in one place, device tree without need for +hardcoding in the source code. + +General setup would be to set the memory address used by the register, +followed by the offset-settings containing the 32-bit offset address +of the block register, then the 32-bit value settings and +lastly the masking bits. + +Example: +-------- + +Configuration for multiple dtreg node support in device tree: + + socfpga_mainfirewall: socfpga-mainfirewall { + compatible = "intel,socfpga-dtreg"; + #address-cells = <1>; + #size-cells = <1>; + bootph-all; + + coh_cpu0_bypass_OC_Firewall_main_Firewall@f7100200 { + reg = <0xf7100200 0x00000014>; + intel,offset-settings = + /* Disable ocram security at CCU for non secure access */ + <0x0000004 0x8000ffff 0xe007ffff>, + <0x0000008 0x8000ffff 0xe007ffff>, + <0x000000c 0x8000ffff 0xe007ffff>, + <0x0000010 0x8000ffff 0xe007ffff>; + bootph-all; + }; + }; + + socfpga_mpfefirewall: socfpga-mpfefirewall { + compatible = "intel,socfpga-dtreg"; + #address-cells = <1>; + #size-cells = <1>; + bootph-all; + + soc_noc_fw_mpfe_csr_inst_0_mpfe_scr@f8020000 { + reg = <0xf8020000 0x0000001c>; + intel,offset-settings = + /* Disable MPFE firewall for SMMU */ + <0x00000000 0x00010101 0x00010101>, + /* Disable MPFE firewall for HMC adapter */ + <0x00000004 0x00000001 0x00010101>; + bootph-all; + }; + }; + +To call the nodes use: + + ret = uclass_get_device_by_name(UCLASS_NOP, "socfpga-mainfirewall", &dev); + ret = uclass_get_device_by_name(UCLASS_NOP, "socfpga-mpfefirewall", &dev); + diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index fccd9b89b8..c423905ba2 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -683,4 +683,11 @@ config SL28CPLD the base driver which provides common access methods for the sub-drivers. +config SPL_SOCFPGA_DT_REG + bool "Enable register setting from device tree in SPL" + depends on SPL + help + Enable register setting from device tree. This also + provides user a clean interface and all register settings are + centralized in one place, device tree. endmenu diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index b67b82358a..8f813edd84 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -89,3 +89,4 @@ obj-$(CONFIG_K3_AVS0) += k3_avs.o obj-$(CONFIG_ESM_K3) += k3_esm.o obj-$(CONFIG_ESM_PMIC) += esm_pmic.o obj-$(CONFIG_SL28CPLD) += sl28cpld.o +obj-$(CONFIG_SPL_SOCFPGA_DT_REG) += socfpga_dtreg.o diff --git a/drivers/misc/socfpga_dtreg.c b/drivers/misc/socfpga_dtreg.c new file mode 100644 index 0000000000..982f9592cb --- /dev/null +++ b/drivers/misc/socfpga_dtreg.c @@ -0,0 +1,117 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2023 Intel Corporation <www.intel.com> + */ + +#include <asm/io.h> +#include <common.h> +#include <dm.h> +#include <errno.h> +#include <linux/sizes.h> + +#define NUMBER_OF_ELEMENTS 3 + +static int socfpga_dtreg_probe(struct udevice *dev) +{ + const fdt32_t *list; + fdt_addr_t offset, base; + fdt_val_t val, read_val, mask, set_mask; + int size, i; + u32 blk_sz, reg; + ofnode node; + const char *name = NULL; + + debug("%s(dev=%p)\n", __func__, dev); + + if (!dev_has_ofnode(dev)) + return 0; + + dev_for_each_subnode(node, dev) { + name = ofnode_get_name(node); + if (!name) + return -EINVAL; + + if (ofnode_read_u32_index(node, "reg", 1, &blk_sz)) + return -EINVAL; + + base = ofnode_get_addr(node); + if (base == FDT_ADDR_T_NONE) + return -EINVAL; + + debug("%s(node_offset 0x%lx node_name %s ", __func__, + node.of_offset, name); + debug("node addr 0x%llx blk sz 0x%x)\n", base, blk_sz); + + list = ofnode_read_prop(node, "intel,offset-settings", &size); + if (!list) + return -EINVAL; + + debug("%s(intel,offset-settings property size=%x)\n", __func__, + size); + size /= sizeof(*list) * NUMBER_OF_ELEMENTS; + + /* + * First element: offset + * Second element: val + * Third element: mask + */ + for (i = 0; i < size; i++) { + offset = fdt32_to_cpu(*list++); + val = fdt32_to_cpu(*list++); + + /* Reads the masking bit value from the list */ + mask = fdt32_to_cpu(*list++); + + /* + * Reads out the offsets, value and masking bits + * Ex: <0x00000000 0x00000230 0xffffffff> + */ + debug("%s(intel,offset-settings 0x%llx : 0x%llx : 0x%llx)\n", + __func__, offset, val, mask); + + if (blk_sz < offset + SZ_4) { + printf("%s: Overflow as offset 0x%llx or reg", + __func__, offset); + printf(" write is more than block size 0x%x\n", + blk_sz); + return -EINVAL; + } + + if (mask != 0) { + if (mask == 0xffffffff) { + reg = base + offset; + writel(val, (uintptr_t)reg); + } else { + /* Mask the value with the masking bits */ + set_mask = val & mask; + + reg = base + offset; + + /* Clears and sets specific bits in the register */ + clrsetbits_le32((uintptr_t)reg, mask, set_mask); + } + } + + read_val = readl((uintptr_t)reg); + + /* Reads out the register, masked value and the read value */ + debug("%s(reg 0x%x = wr : 0x%llx rd : 0x%llx)\n", + __func__, reg, set_mask, read_val); + + } + } + + return 0; +}; + +static const struct udevice_id socfpga_dtreg_ids[] = { + {.compatible = "intel,socfpga-dtreg"}, + { } +}; + +U_BOOT_DRIVER(socfpga_dtreg) = { + .name = "socfpga-dtreg", + .id = UCLASS_NOP, + .of_match = socfpga_dtreg_ids, + .probe = socfpga_dtreg_probe, +}; -- 2.25.1

5 8

[PATCH 0/2] board: ti: am6x: Switch to standard boot
by Roger Quadros 05 Jan '24

05 Jan '24

Hi, This series switches am64x to standard boot flow. Also minor fix to am62x boot targets. NOTE: Tested on AM64x GP EVM but I had to hand edit the grub.cfg file provided with the TI release [1] from, menuentry 'boot'{ linux /Image root=PARTUUID=3a4a99a8-02 rootwait rootfstype=ext4 } to, menuentry 'boot'{ linux /Image console=ttyS2,115200n8 root=PARTUUID=3a4a99a8-02 rootwait rootfstype=ext4 } else there is no console output. [1] https://dr-download.ti.com/software-development/software-development-kit-sd… cheers, -roger Roger Quadros (2): board: ti: am62x: am62x.env: Fix boot_targets board: ti: am64x: Switch to standard boot flow board/ti/am62x/am62x.env | 2 +- board/ti/am64x/am64x.env | 1 + configs/am64x_evm_a53_defconfig | 5 +++-- include/configs/am64x_evm.h | 2 -- 4 files changed, 5 insertions(+), 5 deletions(-) base-commit: 90c81f407dd4a7747385b10f9b8f732202c45cde prerequisite-patch-id: afb49f33f198747451687f83936f039049365924 prerequisite-patch-id: 1d8297eb0a3b44d8578cae785cc22f0fb6077239 prerequisite-patch-id: 4ae9fdc0b3737e55289a78a59d546a08c03d62e5 prerequisite-patch-id: 2be0e0caf153bec2c453b2f21342ba207c1ee13d prerequisite-patch-id: 7710703ce9a41b72ff3fb89abf0823625a5b5454 prerequisite-patch-id: 60d61440bf0ab8c0bea8b971ef18aa6d0d26e113 prerequisite-patch-id: c974e6d80489cbb0ee8cc1f3e19bcc9cf47f25b6 -- 2.34.1

7 28

[PATCH v7 0/9] ATF and OP-TEE Firewalling for K3 devices.
by Manorit Chawdhry 05 Jan '24

05 Jan '24

K3 devices have firewalls that are used to prevent illegal accesses to memory regions that are deemed secure. The series prevents the illegal accesses to ATF and OP-TEE regions that are present in different K3 devices. AM62X, AM62AX and AM64X are currently in hold due to some firewall configurations that our System Controller (TIFS) needs to handle. The devices that are not configured with the firewalling nodes will not be affected and can continue to work fine until the firewall nodes are added so will be a non-blocking merge. Test Logs: https://gist.github.com/manorit2001/4cead2fb3a19eb5d19005b3f54682627 CICD Run: https://github.com/u-boot/u-boot/pull/442 Signed-off-by: Manorit Chawdhry <m-chawdhry(a)ti.com> --- Changes in v7: * Andrew - Update documentation - Incorporate templating * Simon - Change the prefix for -binman.dtsi files * Jon - Remove the unintentional dependency on python3.9+ (https://lore.kernel.org/all/CADL8D3ZWoZpMidBTy+iSs-KOB6+LRAFVcDa-n_fVqvd00Z…) - Add another patch to fix templating inclusion log - Change headings level for secure boot documentation - Populate 3 priv id slots for the background firewalls that require it - Link to v6: https://lore.kernel.org/r/20231206-binman-firewalling-v6-0-e7fce13a6dc1@ti.… --- Manorit Chawdhry (9): dtoc: Change dst to self in debug message binman: ti-secure: Add support for firewalling entities binman: ftest: Add test for ti-secure firewall node arm: dts: k3-binman: Add k3-security.h and include it in k3-binman.dtsi arm: dts: k3-j721e-binman: Add firewall configurations arm: dts: k3-j721s2-binman: Add firewall configurations arm: dts: k3-j7200-binman: Add firewall configurations docs: board: ti: k3: Cleanup FIT signature documentation docs: board: ti: k3: Add secure booting documentation arch/arm/dts/k3-binman.dtsi | 49 ++++ arch/arm/dts/k3-j7200-binman.dtsi | 90 ++++++ arch/arm/dts/k3-j721e-binman.dtsi | 116 ++++++++ arch/arm/dts/k3-j721s2-binman.dtsi | 123 ++++++++ arch/arm/dts/k3-security.h | 58 ++++ doc/board/ti/k3.rst | 313 ++++++++++++++------- tools/binman/btool/openssl.py | 16 +- tools/binman/etype/ti_secure.py | 95 +++++++ tools/binman/etype/x509_cert.py | 4 +- tools/binman/ftest.py | 23 ++ tools/binman/test/324_ti_secure_firewall.dts | 28 ++ .../325_ti_secure_firewall_missing_property.dts | 28 ++ tools/dtoc/fdt.py | 2 +- 13 files changed, 842 insertions(+), 103 deletions(-) --- base-commit: 2b28c3b871cd5d55b19f0a86cef970139f8ab952 change-id: 20230724-binman-firewalling-65ecdb23ec0a Best regards, -- Manorit Chawdhry <m-chawdhry(a)ti.com>

5 13

[PATCH 00/34] x86: expo: Add support for editing coreboot CMOS RAM settings
by Simon Glass 04 Jan '24

04 Jan '24

U-Boot provides support for editing settings with an 'expo', as well as reading and writing settings to CMOS RAM. This series integrates expo functionality with coreboot, using the sysinfo table to get a list of settings, creating an expo with them and allowing them to be edited. A new CI test provides coverage for some coreboot-related commands. For this to work, a number of minor tweaks are made to existing tests, so that they pass on coreboot (x86) or at least are skipped when they cannot pass. Likely most of these fixes will apply to other boards too. It includes several other fixes and improvements: - new -m flag for 'bootflow scan' so it can display a menu automatically - Fix for video-scrolling crash with Truetype - menu items can now have individual integer values - menu items are lined up according to the width of all menu labels Simon Glass (34): test: Run tests that don't need devices test: Add a new suite for commands test: Add helper to skip to partial console line test: Make UT_LIB_ASN1 depend on sandbox test: Run bootstd tests only on sandbox test: Handle use of stack pointer in bdinfo test: bdinfo: Add missing asserts test: fdt: Add a special case for real boards test: font: Add dependencies on fonts test: event: Only run test_event_probe() on sandbox test: lmb: Move tests into the lib suite test: print: Skip test on x86 video: Add a function to clear the display sandbox: Add a dummy booti command bootstd: Add a menu option to bootflow scan video: Add a dark-grey console colour video: Avoid starting a new line to close to the bottom expo: Place menu items to the right of all labels expo: Set the initial next_id to 1 expo: Use standard numbering for save and discard expo: Allow menu items to have values expo: Add a little more cedit CMOS logging expo: Support menu-item values in cedit expo: Drop unneceesary calls to expo_str() expo: Drop scene_title_set() expo: Add forward declaration for udevice to cedit x86: coreboot: Enable unit tests x86: CI: Update coreboot x86: coreboot: Add a test for cbsysinfo command x86: coreboot: Show the option table x86: coreboot: Enable support for the configuration editor x86: coreboot: Add a command to check and update CMOS RAM x86: coreboot: Allow building an expo for editing CMOS config x86: Enable RTC command by default .azure-pipelines.yml | 2 +- .gitlab-ci.yml | 2 +- arch/sandbox/dts/cedit.dtsi | 3 + arch/sandbox/lib/bootm.c | 7 + arch/x86/dts/coreboot.dts | 7 + boot/Makefile | 4 + boot/cedit.c | 191 +++++++++++++++-------- boot/expo.c | 3 + boot/expo_build.c | 36 ++--- boot/expo_build_cb.c | 244 ++++++++++++++++++++++++++++++ boot/scene.c | 61 ++++++-- boot/scene_internal.h | 30 +++- boot/scene_menu.c | 26 +++- boot/scene_textline.c | 3 +- cmd/Kconfig | 14 +- cmd/bootflow.c | 27 +++- cmd/booti.c | 2 +- cmd/cedit.c | 28 ++++ cmd/cls.c | 25 +-- cmd/x86/Makefile | 1 + cmd/x86/cbcmos.c | 141 +++++++++++++++++ cmd/x86/cbsysinfo.c | 73 ++++++++- common/console.c | 31 ++++ configs/coreboot64_defconfig | 2 + configs/coreboot_defconfig | 6 + configs/tools-only_defconfig | 3 +- doc/board/coreboot/coreboot.rst | 6 + doc/develop/cedit.rst | 9 +- doc/develop/expo.rst | 26 +++- doc/usage/cmd/bootflow.rst | 5 + doc/usage/cmd/cbcmos.rst | 45 ++++++ doc/usage/cmd/cbsysinfo.rst | 99 ++++++++++++ doc/usage/cmd/cedit.rst | 91 ++++++++++- doc/usage/index.rst | 1 + drivers/video/vidconsole-uclass.c | 4 +- drivers/video/video-uclass.c | 3 + include/cedit.h | 1 + include/console.h | 10 ++ include/expo.h | 51 +++++-- include/test/cedit-test.h | 30 ++-- include/test/cmd.h | 15 ++ include/test/suites.h | 1 + include/test/ut.h | 30 ++++ include/video.h | 4 +- include/video_console.h | 8 + test/Kconfig | 6 + test/Makefile | 2 +- test/boot/bootflow.c | 82 ++++++++++ test/boot/cedit.c | 22 ++- test/boot/expo.c | 26 +++- test/boot/files/expo_ids.h | 3 +- test/boot/files/expo_layout.dts | 5 +- test/cmd/Makefile | 3 + test/cmd/bdinfo.c | 23 ++- test/cmd/cmd_ut_cmd.c | 21 +++ test/cmd/coreboot.c | 120 +++++++++++++++ test/cmd/fdt.c | 8 +- test/cmd/font.c | 6 +- test/cmd_ut.c | 8 +- test/common/event.c | 3 + test/lib/lmb.c | 36 ++--- test/print_ut.c | 8 + test/test-main.c | 3 +- test/ut.c | 27 ++++ tools/expo.py | 33 +++- 65 files changed, 1640 insertions(+), 216 deletions(-) create mode 100644 boot/expo_build_cb.c create mode 100644 cmd/x86/cbcmos.c create mode 100644 doc/usage/cmd/cbcmos.rst create mode 100644 include/test/cmd.h create mode 100644 test/cmd/cmd_ut_cmd.c create mode 100644 test/cmd/coreboot.c -- 2.42.0.582.g8ccd20d70d-goog

3 54

[PATCH v3 0/3] Add imx93-var-som support
by Mathieu Othacehe 04 Jan '24

04 Jan '24

From: Mathieu Othacehe <m.othacehe(a)gmail.com> Hello, This v3 adds support for binman and documents how to build and flash a bootloader for the i.MX93 Variscite Symphony evaluation board. Thanks, Mathieu v2: https://lists.denx.de/pipermail/u-boot/2023-December/542001.html Mathieu Othacehe (3): spl: binman: Disable u_boot_any symbols for i.MX93 boards mach-imx: Add i.MX93 binman support. Add imx93-var-som support arch/arm/dts/Makefile | 3 +- arch/arm/dts/imx93-u-boot.dtsi | 88 + .../dts/imx93-var-som-symphony-u-boot.dtsi | 253 +++ arch/arm/dts/imx93-var-som-symphony.dts | 305 ++++ arch/arm/dts/imx93-var-som.dtsi | 111 ++ arch/arm/include/asm/arch-imx9/clock.h | 1 + arch/arm/mach-imx/Makefile | 22 +- arch/arm/mach-imx/imx9/Kconfig | 7 + board/variscite/common/eth.c | 59 + board/variscite/common/eth.h | 12 + board/variscite/common/imx9_eeprom.c | 190 +++ board/variscite/common/imx9_eeprom.h | 83 + board/variscite/common/mmc.c | 47 + board/variscite/imx93_var_som/Kconfig | 12 + board/variscite/imx93_var_som/MAINTAINERS | 7 + board/variscite/imx93_var_som/Makefile | 17 + board/variscite/imx93_var_som/container.cfg | 10 + board/variscite/imx93_var_som/imx93_var_som.c | 126 ++ .../variscite/imx93_var_som/imx93_var_som.env | 104 ++ board/variscite/imx93_var_som/imximage.cfg | 10 + .../variscite/imx93_var_som/lpddr4x_timing.c | 1489 +++++++++++++++++ board/variscite/imx93_var_som/spl.c | 144 ++ common/spl/Kconfig | 2 +- common/spl/Kconfig.tpl | 2 +- common/spl/Kconfig.vpl | 2 +- configs/imx93_var_som_defconfig | 156 ++ doc/board/variscite/imx93_var_som.rst | 68 + doc/board/variscite/index.rst | 1 + include/configs/imx93_var_som.h | 48 + 29 files changed, 3374 insertions(+), 5 deletions(-) create mode 100644 arch/arm/dts/imx93-u-boot.dtsi create mode 100644 arch/arm/dts/imx93-var-som-symphony-u-boot.dtsi create mode 100644 arch/arm/dts/imx93-var-som-symphony.dts create mode 100644 arch/arm/dts/imx93-var-som.dtsi create mode 100644 board/variscite/common/eth.c create mode 100644 board/variscite/common/eth.h create mode 100644 board/variscite/common/imx9_eeprom.c create mode 100644 board/variscite/common/imx9_eeprom.h create mode 100644 board/variscite/common/mmc.c create mode 100644 board/variscite/imx93_var_som/Kconfig create mode 100644 board/variscite/imx93_var_som/MAINTAINERS create mode 100644 board/variscite/imx93_var_som/Makefile create mode 100644 board/variscite/imx93_var_som/container.cfg create mode 100644 board/variscite/imx93_var_som/imx93_var_som.c create mode 100644 board/variscite/imx93_var_som/imx93_var_som.env create mode 100644 board/variscite/imx93_var_som/imximage.cfg create mode 100644 board/variscite/imx93_var_som/lpddr4x_timing.c create mode 100644 board/variscite/imx93_var_som/spl.c create mode 100644 configs/imx93_var_som_defconfig create mode 100644 doc/board/variscite/imx93_var_som.rst create mode 100644 include/configs/imx93_var_som.h -- 2.25.1

3 8

[PATCH 0/4] arm64: zymqmp: DT alignments
by Michal Simek 04 Jan '24

04 Jan '24

Hi, sending couple of patches to get in sync with Linux kernel and they are already in linux-next. The last patch is based on the latest proposed update in dt binding. When dt binding is reviewed this patch can be merged to U-Boot too but I want to make it available earlier. Thanks, Michal Michal Simek (4): arm64: zynqmp: Move fixed clock to / for kv260 arm64: zynqmp: Fix clock node name in kv260 cards arm64: zynqmp: Remove mt25qu512a compatible string from SOM arm64: zynqmp: Rename i2c?-gpio to i2c?-gpio-grp arch/arm/dts/zynq-zc702.dts | 2 +- arch/arm/dts/zynqmp-sc-revB.dts | 4 +- arch/arm/dts/zynqmp-sck-kd-g-revA.dtso | 2 +- arch/arm/dts/zynqmp-sck-kr-g-revA.dtso | 2 +- arch/arm/dts/zynqmp-sck-kr-g-revB.dtso | 2 +- arch/arm/dts/zynqmp-sck-kv-g-revA.dtso | 52 ++++++++++----------- arch/arm/dts/zynqmp-sck-kv-g-revB.dtso | 54 +++++++++++----------- arch/arm/dts/zynqmp-sm-k26-revA.dts | 2 +- arch/arm/dts/zynqmp-vp-x-a2785-00-revA.dts | 4 +- arch/arm/dts/zynqmp-vpk120-revA.dts | 4 +- arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts | 4 +- arch/arm/dts/zynqmp-zcu100-revC.dts | 2 +- arch/arm/dts/zynqmp-zcu102-revA.dts | 4 +- arch/arm/dts/zynqmp-zcu104-revA.dts | 2 +- arch/arm/dts/zynqmp-zcu104-revC.dts | 2 +- arch/arm/dts/zynqmp-zcu106-revA.dts | 4 +- arch/arm/dts/zynqmp-zcu111-revA.dts | 4 +- arch/arm/dts/zynqmp-zcu208-revA.dts | 4 +- arch/arm/dts/zynqmp-zcu216-revA.dts | 4 +- arch/arm/dts/zynqmp-zcu670-revA.dts | 4 +- arch/arm/dts/zynqmp-zcu670-revB.dts | 4 +- 23 files changed, 83 insertions(+), 87 deletions(-) -- 2.36.1

1 5