November 2021 - U-Boot

[PATCH] fastboot: fix fastboot_set_reboot_flag()
by Roman Stratiienko 28 Jan '22

28 Jan '22

In case CONFIG_FASTBOOT_FLASH_MMC_DEV == 0, compile-time condition is not met and fastboot_set_reboot_flag() fails. Fixes: a362ce214f03 ("fastboot: Implement generic fastboot_set_reboot_flag") Signed-off-by: Roman Stratiienko <r.stratiienko(a)gmail.com> --- drivers/fastboot/fb_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/fastboot/fb_common.c b/drivers/fastboot/fb_common.c index cbcc3683c47..ef399d0c4ab 100644 --- a/drivers/fastboot/fb_common.c +++ b/drivers/fastboot/fb_common.c @@ -91,7 +91,7 @@ void fastboot_okay(const char *reason, char *response) */ int __weak fastboot_set_reboot_flag(enum fastboot_reboot_reason reason) { -#if CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC_DEV) +#ifdef CONFIG_FASTBOOT_FLASH_MMC_DEV static const char * const boot_cmds[] = { [FASTBOOT_REBOOT_REASON_BOOTLOADER] = "bootonce-bootloader", [FASTBOOT_REBOOT_REASON_FASTBOOTD] = "boot-fastboot", -- 2.27.0

4 3

[PATCH 1/3] dfu: use pointer to pass length to dfu_write()
by Frieder Schrempf 28 Jan '22

28 Jan '22

From: Frieder Schrempf <frieder.schrempf(a)kontron.de> This doesn't include any functional changes, but allows us to use the size parameter to report the actual written bytes back to the caller. This is useful in cases of unaligned writes to serial flash where the first write covers only a part of the buffer (until the next sector boundary) and the remaining bytes need to be written in a further call to dfu_write(). While at it, we also adjust the data type of the 'write' and 'left' variable in dfu_write_from_mem_addr() to match the values passed. Signed-off-by: Frieder Schrempf <frieder.schrempf(a)kontron.de> --- drivers/dfu/dfu.c | 23 ++++++++++++----------- include/dfu.h | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c index ff1859d946..5b2659ee7d 100644 --- a/drivers/dfu/dfu.c +++ b/drivers/dfu/dfu.c @@ -334,12 +334,12 @@ int dfu_flush(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num) return ret; } -int dfu_write(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num) +int dfu_write(struct dfu_entity *dfu, void *buf, int *size, int blk_seq_num) { int ret; debug("%s: name: %s buf: 0x%p size: 0x%x p_num: 0x%x offset: 0x%llx bufoffset: 0x%lx\n", - __func__, dfu->name, buf, size, blk_seq_num, dfu->offset, + __func__, dfu->name, buf, *size, blk_seq_num, dfu->offset, (unsigned long)(dfu->i_buf - dfu->i_buf_start)); ret = dfu_transaction_initiate(dfu, false); @@ -371,7 +371,7 @@ int dfu_write(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num) dfu->i_blk_seq_num = (dfu->i_blk_seq_num + 1) & 0xffff; /* flush buffer if overflow */ - if ((dfu->i_buf + size) > dfu->i_buf_end) { + if ((dfu->i_buf + *size) > dfu->i_buf_end) { ret = dfu_write_buffer_drain(dfu); if (ret) { dfu_transaction_cleanup(dfu); @@ -381,19 +381,19 @@ int dfu_write(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num) } /* we should be in buffer now (if not then size too large) */ - if ((dfu->i_buf + size) > dfu->i_buf_end) { + if ((dfu->i_buf + *size) > dfu->i_buf_end) { pr_err("Buffer overflow! (0x%p + 0x%x > 0x%p)\n", dfu->i_buf, - size, dfu->i_buf_end); + *size, dfu->i_buf_end); dfu_transaction_cleanup(dfu); dfu_error_callback(dfu, "Buffer overflow"); return -1; } - memcpy(dfu->i_buf, buf, size); - dfu->i_buf += size; + memcpy(dfu->i_buf, buf, *size); + dfu->i_buf += *size; /* if end or if buffer full flush */ - if (size == 0 || (dfu->i_buf + size) > dfu->i_buf_end) { + if (*size == 0 || (dfu->i_buf + *size) > dfu->i_buf_end) { ret = dfu_write_buffer_drain(dfu); if (ret) { dfu_transaction_cleanup(dfu); @@ -704,7 +704,8 @@ int dfu_get_alt(char *name) int dfu_write_from_mem_addr(struct dfu_entity *dfu, void *buf, int size) { - unsigned long dfu_buf_size, write, left = size; + unsigned int write, left = size; + unsigned long dfu_buf_size; int i, ret = 0; void *dp = buf; @@ -720,9 +721,9 @@ int dfu_write_from_mem_addr(struct dfu_entity *dfu, void *buf, int size) for (i = 0; left > 0; i++) { write = min(dfu_buf_size, left); - debug("%s: dp: 0x%p left: %lu write: %lu\n", __func__, + debug("%s: dp: 0x%p left: %lu write: %u\n", __func__, dp, left, write); - ret = dfu_write(dfu, dp, write, i); + ret = dfu_write(dfu, dp, &write, i); if (ret) { pr_err("DFU write failed\n"); return ret; diff --git a/include/dfu.h b/include/dfu.h index f6868982df..2df55e507e 100644 --- a/include/dfu.h +++ b/include/dfu.h @@ -335,7 +335,7 @@ int dfu_read(struct dfu_entity *de, void *buf, int size, int blk_seq_num); * @blk_seq_num: block sequence number * Return: 0 for success, -1 for error */ -int dfu_write(struct dfu_entity *de, void *buf, int size, int blk_seq_num); +int dfu_write(struct dfu_entity *de, void *buf, int *size, int blk_seq_num); /** * dfu_flush() - flush to dfu entity -- 2.33.0

2 3

[PATCH 0/8 v7] TPM cleanups and MMIO driver
by Ilias Apalodimas 27 Jan '22

27 Jan '22

Hi! This is the update for [1]. Changes since v6: - added a few missing @return in function documentation - switched TPM1_ defines to TPM_INFINEON_ Changes since v5: - Fixed 2 tpmv1.2 drivers. Some of the internal driver functions were conflicting with the new API Changes since v4: - renamed struct udevice *udev -> struct udevice *dev - added comments on struct tpm_tis_phy_ops - removed duplicate defines from tpm2_tis_spi driver (now in tpm_tis.h) - moved API function description for the .c to the .h file - added Reviewed-by tags from Simon and Heinrich Changes since v3: - Coverted SPI TPM to use the API as well - moved some log_info to log_debug - Added documentation on how to run QEMU and enabled TPM by default o arm qemu builds Changes since v2: - Add myself as a maintainer on TPM drivers Changes since v1: - split off the tis core code into a different file Ilias Apalodimas (6): tpm2: Introduce TIS tpm core tpm2: Add a TPMv2 MMIO TIS driver tpm: Use the new API on tpm2 spi driver configs: Enable tpmv2 mmio on qemu for arm/arm64 doc: qemu: Add instructions for swtpm usage MAINTAINERS: Add entry for TPM drivers [1] https://lore.kernel.org/u-boot/20211107213312.263357-1-ilias.apalodimas@lin… Ilias Apalodimas (8): tpm: refactor function names and macros for infineon v1.2 TPM tpm: refactor function names for LPC based TPMs tpm2: Introduce TIS tpm core tpm2: Add a TPMv2 MMIO TIS driver tpm: Use the new API on tpm2 spi driver configs: Enable tpmv2 mmio on qemu for arm/arm64 doc: qemu: Add instructions for swtpm usage MAINTAINERS: Add entry for TPM drivers MAINTAINERS | 5 + configs/qemu_arm64_defconfig | 2 + configs/qemu_arm_defconfig | 2 + doc/board/emulation/qemu-arm.rst | 25 ++ drivers/tpm/Kconfig | 9 + drivers/tpm/Makefile | 3 +- drivers/tpm/tpm2_tis_core.c | 463 +++++++++++++++++++++++++++++++ drivers/tpm/tpm2_tis_mmio.c | 157 +++++++++++ drivers/tpm/tpm2_tis_spi.c | 447 +++-------------------------- drivers/tpm/tpm_tis.h | 136 +++++++++ drivers/tpm/tpm_tis_infineon.c | 34 +-- drivers/tpm/tpm_tis_lpc.c | 4 +- include/tpm-v2.h | 1 + 13 files changed, 852 insertions(+), 436 deletions(-) create mode 100644 drivers/tpm/tpm2_tis_core.c create mode 100644 drivers/tpm/tpm2_tis_mmio.c -- 2.33.1

3 15

[PATCH 00/16] tools: Add support for signing devicetree blobs
by Simon Glass 27 Jan '22

27 Jan '22

At present mkimage supports signing FITs, the standard U-Boot image type. Various people are opposed to using FIT since: a) it requires adding support for FIT into other bootloaders, notably UEFI b) it requires packaging a kernel in this standard U-Boot format, meaning that distros must run 'mkimage' and deal with the kernel and initrd being inside a FIT The kernel and initrd can be dealt with in other ways. But without FIT, we have no standard way of signing and grouping FDT files. Instead we must include them in the distro as separate files. In particular, some sort of mechanism for verifying FDT files is needed. One option would be to tack a signature on before or after the file, processing it accordingly. But due to the nature of the FDT binary format, it is possible to embed a signature inside the FDT itself, which is very convenient. This series provides a tool, fdt_sign, which can add a signature to an FDT. The signature can be checked later, preventing any change to the FDT, other than in permitted nodes (e.g. /chosen). This series also provides a fdt_check_sign tool, used to check signatures. Both of these tools are stand-alone do not require mkimage or FIT. As with FIT signing, multiple signatures are possible, but in this case that requires that fit_sign be called once for each signature. To make the check fail if a signature does not match, it should be marked as 'required' using the -r flag to fdt_sign. Run-time support for checking FDT signatures could be added to U-Boot fairly easily, but needs further discussion as the correct plumbing needs to be determined. For now there is absolutely no configurability in the signature mechanism. It would of course be possible to adjust which nodes are signed, as is done for FIT, but that needs further discussion also. The omission of the /chosen node is implemented in h_exclude_nodes() like this: if (type == FDT_IS_NODE) { /* Ignore the chosen node as well as /signature and subnodes */ if (!strcmp("/chosen", data) || !strncmp("/signature", data, 10)) return 0; } Man pages are provided with example usage of the tools. Use this to view them: man -l doc/fdt_check_sign.1 This series also includes various clean-ups noticed along the way, as well as refactoring to avoid code duplication with the new tools. The last four patches are the new code. This series is available at u-boot-dm/fdt-sign-working : https://source.denx.de/u-boot/custodians/u-boot-dm/-/tree/fdt-sign-working Simon Glass (16): rsa: Add debugging for failure cases fit_check_sign: Update help to mention the key is in a dtb tools: Move copyfile() into a common file tools: Avoid leaving extra data at the end of copied files tools: Improve comments in signing functions tools: Drop unused name in image-host tools: Avoid confusion between keys and signatures tools: Tidy up argument order in fit_config_check_sig() tools: Pass the key blob around image: Return destination node for add_verify_data() method tools: Pass public-key node through to caller tools: mkimage: Show where signatures/keys are written tools: Add a new tool to sign FDT blobs tools: Add a new tool to check FDT-blob signatures test: Add a test for FDT signing tools: Add man pages for fdt_sign and fdt_check_sign MAINTAINERS | 7 + boot/image-fit-sig.c | 151 +++++++++---- boot/image-fit.c | 12 +- common/spl/spl_fit.c | 3 +- doc/fdt_check_sign.1 | 74 +++++++ doc/fdt_sign.1 | 111 ++++++++++ include/image.h | 80 ++++++- include/u-boot/ecdsa.h | 5 +- include/u-boot/rsa.h | 5 +- lib/ecdsa/ecdsa-libcrypto.c | 4 +- lib/rsa/rsa-sign.c | 5 +- lib/rsa/rsa-verify.c | 13 +- test/py/tests/test_fdt_sign.py | 83 ++++++++ test/py/tests/test_vboot.py | 21 +- test/py/tests/vboot/sign-fdt.dts | 23 ++ test/py/tests/vboot_comm.py | 22 ++ tools/Makefile | 10 +- tools/fdt-host.c | 353 +++++++++++++++++++++++++++++++ tools/fdt_check_sign.c | 85 ++++++++ tools/fdt_host.h | 46 ++++ tools/fdt_sign.c | 210 ++++++++++++++++++ tools/fit_check_sign.c | 4 +- tools/fit_common.c | 69 ++++++ tools/fit_common.h | 23 ++ tools/fit_image.c | 59 +----- tools/image-fdt-sig.c | 254 ++++++++++++++++++++++ tools/image-host.c | 155 +++++++++++--- tools/imagetool.h | 4 + tools/mkimage.c | 4 + 29 files changed, 1714 insertions(+), 181 deletions(-) create mode 100644 doc/fdt_check_sign.1 create mode 100644 doc/fdt_sign.1 create mode 100644 test/py/tests/test_fdt_sign.py create mode 100644 test/py/tests/vboot/sign-fdt.dts create mode 100644 test/py/tests/vboot_comm.py create mode 100644 tools/fdt-host.c create mode 100644 tools/fdt_check_sign.c create mode 100644 tools/fdt_sign.c create mode 100644 tools/image-fdt-sig.c -- 2.34.0.rc1.387.gb447b232ab-goog

5 40

[PATCH] usb: Use the first available device for ehci_gadget
by Sean Anderson 26 Jan '22

26 Jan '22

For whatever reason, usb_setup_ehci_gadget removes and probes USB device 0. However, not all systems have a device 0. Use the first device instead. The device probed should probably have something to do with the controller (as specified by e.g. ums <controller> or fastboot <controller>). In fact, I find it odd that we probe the USB device in the first place, because this is just to set up the gadget itself. Presumably, the controller should be probed by usb_gadget_initialize somehow. Signed-off-by: Sean Anderson <sean.anderson(a)seco.com> --- drivers/usb/host/usb-uclass.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c index fd39c3345c..27e2fc6fcd 100644 --- a/drivers/usb/host/usb-uclass.c +++ b/drivers/usb/host/usb-uclass.c @@ -396,7 +396,7 @@ int usb_setup_ehci_gadget(struct ehci_ctrl **ctlrp) int ret; /* Find the old device and remove it */ - ret = uclass_find_device_by_seq(UCLASS_USB, 0, &dev); + ret = uclass_find_first_device(UCLASS_USB, &dev); if (ret) return ret; ret = device_remove(dev, DM_REMOVE_NORMAL); @@ -419,7 +419,7 @@ int usb_remove_ehci_gadget(struct ehci_ctrl **ctlrp) int ret; /* Find the old device and remove it */ - ret = uclass_find_device_by_seq(UCLASS_USB, 0, &dev); + ret = uclass_find_first_device(UCLASS_USB, &dev); if (ret) return ret; ret = device_remove(dev, DM_REMOVE_NORMAL); -- 2.25.1

2 2

[PATCH] introduce CONFIG_DEVICE_TREE_INCLUDES
by Rasmus Villemoes 26 Jan '22

26 Jan '22

The build system already automatically looks for and includes an in-tree *-u-boot.dtsi when building the control .dtb. However, there are some things that are awkward to maintain in such an in-tree file, most notably the metadata associated to public keys used for verified boot. The only "official" API to get that metadata into the .dtb is via mkimage, as a side effect of building an actual signed image. But there are multiple problems with that. First of all, the final U-Boot (be it U-Boot proper or an SPL) image is built based on a binary image, the .dtb, and possibly some other binary artifacts. So modifying the .dtb after the build requires the meta-buildsystem (Yocto, buildroot, whatnot) to know about and repeat some of the steps that are already known to and handled by U-Boot's build system, resulting in needless duplication of code. It's also somewhat annoying and inconsistent to have a .dtb file in the build folder which is not generated by the command listed in the corresponding .cmd file (that of course applies to any generated file). So the contents of the /signature node really needs to be baked into the .dtb file when it is first created, which means providing the relevant data in the form of a .dtsi file. One could in theory put that data into the *-u-boot.dtsi file, but it's more convenient to be able to provide it externally: For example, when developing for a customer, it's common to use a set of dummy keys for development, while the consultants do not (and should not) have access to the actual keys used in production. For such a setup, it's easier if the keys used are chosen via the meta-buildsystem and the path(s) patched in during the configure step. And of course, nothing prevents anybody from having DEVICE_TREE_INCLUDES point at files maintained in git, or for that matter from including the public key metadata in the *-u-boot.dtsi directly and ignore this feature. There are other uses for this, e.g. in combination with ENV_IMPORT_FDT it can be used for providing the contents of the /config/environment node, so I don't want to tie this exclusively to use for verified boot. Signed-off-by: Rasmus Villemoes <rasmus.villemoes(a)prevas.dk> --- Getting the public key metadata into .dtsi form can be done with a little scripting (roughly 'mkimage -K' of a dummy image followed by 'dtc -I dtb -O dts'). I have a script that does that, along with options to set 'required' and 'required-mode' properties, include u-boot,dm-spl properties in case one wants to check U-Boot proper from SPL with the verified boot mechanism, etc. I'm happy to share that script if this gets accepted, but it's moot if this is rejected. I have previously tried to get an fdt_add_pubkey tool accepted [1,2] to disentangle the kernel and u-boot builds (or u-boot and SPL builds for that matter!), but as I've since realized, that isn't quite enough - the above points re modifying the .dtb after it is created but before that is used to create further build artifacts still stand. However, such a tool could still be useful for creating the .dtsi info without the private keys being present, and my key2dtsi.sh script could easily be modified to use a tool like that should it ever appear. [1] https://lore.kernel.org/u-boot/20200211094818.14219-3-rasmus.villemoes@prev… [2] https://lore.kernel.org/u-boot/2184f1e6dd6247e48133c76205feeabe@kaspersky.c… dts/Kconfig | 9 +++++++++ scripts/Makefile.lib | 2 ++ 2 files changed, 11 insertions(+) diff --git a/dts/Kconfig b/dts/Kconfig index dabe0080c1..593dddbaf0 100644 --- a/dts/Kconfig +++ b/dts/Kconfig @@ -139,6 +139,15 @@ config DEFAULT_DEVICE_TREE It can be overridden from the command line: $ make DEVICE_TREE=<device-tree-name> +config DEVICE_TREE_INCLUDES + string "Extra .dtsi files to include when building DT control" + depends on OF_CONTROL + help + U-Boot's control .dtb is usually built from an in-tree .dts + file, plus (if available) an in-tree U-Boot-specific .dtsi + file. This option specifies a space-separated list of extra + .dtsi files that will also be used. + config OF_LIST string "List of device tree files to include for DT control" depends on SPL_LOAD_FIT || MULTI_DTB_FIT diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 78bbebe7e9..a2accba940 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -320,6 +320,8 @@ quiet_cmd_dtc = DTC $@ # Bring in any U-Boot-specific include at the end of the file cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \ (cat $<; $(if $(u_boot_dtsi),echo '$(pound)include "$(u_boot_dtsi)"')) > $(pre-tmp); \ + $(foreach f,$(subst $(quote),,$(CONFIG_DEVICE_TREE_INCLUDES)), \ + echo '$(pound)include "$(f)"' >> $(pre-tmp);) \ $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $(pre-tmp) ; \ $(DTC) -O dtb -o $@ -b 0 \ -i $(dir $<) $(DTC_FLAGS) \ -- 2.31.1

5 23

[PATCH 1/1] test: fix pylint warnings in test_env.py
by Heinrich Schuchardt 25 Jan '22

25 Jan '22

* assert does not need parentheses * add module docstring * fix misspelled constant True * limit lines to 100 characters Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- test/py/tests/test_env.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/test/py/tests/test_env.py b/test/py/tests/test_env.py index 9bed2f48d7..39fad4194b 100644 --- a/test/py/tests/test_env.py +++ b/test/py/tests/test_env.py @@ -2,11 +2,13 @@ # Copyright (c) 2015 Stephen Warren # Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved. -# Test operation of shell commands relating to environment variables. +""" +Test operation of shell commands relating to environment variables. +""" import os import os.path -from subprocess import call, check_call, CalledProcessError +from subprocess import call, CalledProcessError import pytest import u_boot_utils @@ -191,7 +193,7 @@ def test_env_printenv_non_existent(state_test_env): c = state_test_env.u_boot_console with c.disable_check('error_notification'): response = c.run_command('printenv %s' % var) - assert(response == '## Error: "%s" not defined' % var) + assert response == '## Error: "%s" not defined' % var @pytest.mark.buildconfigspec('cmd_echo') def test_env_unset_non_existent(state_test_env): @@ -256,7 +258,7 @@ def test_env_import_checksum_no_size(state_test_env): with c.disable_check('error_notification'): response = c.run_command('env import -c %s -' % addr) - assert(response == '## Error: external checksum format must pass size') + assert response == '## Error: external checksum format must pass size' @pytest.mark.buildconfigspec('cmd_importenv') def test_env_import_whitelist_checksum_no_size(state_test_env): @@ -269,7 +271,7 @@ def test_env_import_whitelist_checksum_no_size(state_test_env): with c.disable_check('error_notification'): response = c.run_command('env import -c %s - foo1 foo2 foo4' % addr) - assert(response == '## Error: external checksum format must pass size') + assert response == '## Error: external checksum format must pass size' @pytest.mark.buildconfigspec('cmd_exportenv') @pytest.mark.buildconfigspec('cmd_importenv') @@ -358,12 +360,14 @@ def test_env_info(state_test_env): assert '= true' in l or '= false' in l nb_line += 1 else: - assert true + assert True assert nb_line == 3 response = c.run_command('env info -p -d') - assert 'Default environment is used' in response or "Environment was loaded from persistent storage" in response - assert 'Environment can be persisted' in response or "Environment cannot be persisted" in response + assert 'Default environment is used' in response or \ + "Environment was loaded from persistent storage" in response + assert 'Environment can be persisted' in response or \ + "Environment cannot be persisted" in response response = c.run_command('env info -p -d -q') assert response == "" -- 2.32.0

2 1

[PATCH 0/6] Add a pylint check
by Simon Glass 25 Jan '22

25 Jan '22

U-Boot has about 60k lines of Python code. This is quite small relative to the total code size, but it is still important to keep the code style consistent. This series allows pylint to be run on Python files within U-Boot to detect any changes that reduce the current pylint ‘score’ of any modules. It works by comparing the current state against a base state kept in a file. The check is invoked with: make pylint This should gradually help to improve the code. The series also tidies up a few minor nits to produce better pylint output. Simon Glass (6): .gitignore: Ignore any html coverage directory dtoc: Fix up a code comment that confuses pylint patman: Update the list of modules tools: Add init files for Python tools Makefile: Add a pylint checker to the build Azure/GitLab CI: Add the pylint checker .azure-pipelines.yml | 17 +++ .gitignore | 7 ++ .gitlab-ci.yml | 12 +++ Makefile | 45 +++++++- doc/develop/index.rst | 8 ++ doc/develop/python_cq.rst | 80 ++++++++++++++ scripts/pylint.base | 211 +++++++++++++++++++++++++++++++++++++ tools/binman/__init__.py | 0 tools/buildman/__init__.py | 0 tools/dtoc/__init__.py | 0 tools/dtoc/dtb_platdata.py | 2 +- tools/patman/__init__.py | 9 +- 12 files changed, 386 insertions(+), 5 deletions(-) create mode 100644 doc/develop/python_cq.rst create mode 100644 scripts/pylint.base create mode 100644 tools/binman/__init__.py create mode 100644 tools/buildman/__init__.py create mode 100644 tools/dtoc/__init__.py -- 2.34.0.rc2.393.gf8c9666880-goog

3 17

[PATCH v2] image-board: fix wrong implementation ram disk address setup from cmdline
by Artem Lapkin 24 Jan '22

24 Jan '22

Problem Wrong implementation logic: ramdisk cmdline image address always ignored! Next block { rd_addr = hextoul(select, NULL) } unusable for raw initrd. We have unbootable raw initrd images because, select_ramdisk for raw initrd images ignore submited select addr and setup rd_datap value to 0 Signed-off-by: Artem Lapkin <art(a)khadas.com> --- V2 changes _ rebase to master _ from https://patchwork.ozlabs.org/project/uboot/patch/20211016051915.4157293-1-a… --- boot/image-board.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/image-board.c b/boot/image-board.c index bf8817165c..87a8f07432 100644 --- a/boot/image-board.c +++ b/boot/image-board.c @@ -334,7 +334,7 @@ static int select_ramdisk(bootm_headers_t *images, const char *select, u8 arch, if (select) { ulong default_addr; - bool done = true; + bool done = false; if (CONFIG_IS_ENABLED(FIT)) { /* @@ -352,13 +352,13 @@ static int select_ramdisk(bootm_headers_t *images, const char *select, u8 arch, &fit_uname_config)) { debug("* ramdisk: config '%s' from image at 0x%08lx\n", fit_uname_config, rd_addr); + done = true; } else if (fit_parse_subimage(select, default_addr, &rd_addr, &fit_uname_ramdisk)) { debug("* ramdisk: subimage '%s' from image at 0x%08lx\n", fit_uname_ramdisk, rd_addr); - } else { - done = false; + done = true; } } if (!done) { -- 2.25.1

5 5

[PATCH] mxc_gpio: on imx8m read the DR instead of the PSR
by Angus Ainslie 20 Jan '22

20 Jan '22

On imx8m it is more correct to read the data register than the pad status register. In output mode the pad status register does not contain the value being output so we must read the DR for the value. In input mode the DR will contain the same value as the PSR when the pad mode is GPIO. If the pad mode is not GPIO and the pin is an input then 0 is always returned. Signed-off-by: Angus Ainslie <angus(a)akkea.ca> --- drivers/gpio/mxc_gpio.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c index 03471db9e80..0d9f6f44042 100644 --- a/drivers/gpio/mxc_gpio.c +++ b/drivers/gpio/mxc_gpio.c @@ -211,6 +211,9 @@ static void mxc_gpio_bank_set_value(struct gpio_regs *regs, int offset, static int mxc_gpio_bank_get_value(struct gpio_regs *regs, int offset) { +if (IS_ENABLED(CONFIG_IMX8M)) + return (readl(&regs->gpio_dr) >> offset) & 0x01; +else return (readl(&regs->gpio_psr) >> offset) & 0x01; } -- 2.25.1

3 8