May 2021 - U-Boot

[PATCH v2 1/3] cmd: fs: Use part_get_info_by_dev_and_name_or_num to parse partitions
by Sean Anderson 15 May '21

15 May '21

This allows using dev#partlabel syntax. Signed-off-by: Sean Anderson <sean.anderson(a)seco.com> --- Changes in v2: - Add stub for when CONFIG_PARTITIONS=n fs/fs.c | 4 ++-- include/part.h | 12 +++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/fs/fs.c b/fs/fs.c index 900928c394..b7936fd4cf 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -385,8 +385,8 @@ int fs_set_blk_dev(const char *ifname, const char *dev_part_str, int fstype) } #endif - part = blk_get_device_part_str(ifname, dev_part_str, &fs_dev_desc, - &fs_partition, 1); + part = part_get_info_by_dev_and_name_or_num(ifname, dev_part_str, &fs_dev_desc, + &fs_partition, 1); if (part < 0) return -1; diff --git a/include/part.h b/include/part.h index 7f78271a98..419c859708 100644 --- a/include/part.h +++ b/include/part.h @@ -230,7 +230,7 @@ int part_get_info_by_name(struct blk_desc *dev_desc, * @param[in] allow_whole_dev true to allow the user to select partition 0 * (which means the whole device), false to require a valid * partition number >= 1 - * @return 0 on success, or a negative on error + * @return the partition number on success, or negative errno on error */ int part_get_info_by_dev_and_name_or_num(const char *dev_iface, const char *dev_part_str, @@ -275,6 +275,16 @@ static inline int blk_get_device_part_str(const char *ifname, struct disk_partition *info, int allow_whole_dev) { *dev_desc = NULL; return -1; } +static inline int +part_get_info_by_dev_and_name_or_num(const char *dev_iface, + const char *dev_part_str, + struct blk_desc **dev_desc, + struct disk_partition *part_info, + int allow_whole_dev) +{ + *dev_desc = NULL; + return -ENOSYS; +} #endif /* -- 2.25.1

4 11

[PULL] u-boot-sh/master
by Marek Vasut 15 May '21

15 May '21

The following changes since commit 59a2b9e605c5a5e2dff35506a13b51f33d3051b4: Merge tag 'u-boot-imx-20210502' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx (2021-05-11 12:23:11 -0400) are available in the Git repository at: git://source.denx.de/u-boot-sh.git master for you to fetch changes up to 8f76c9d73ab2ae58a84094990de3d0733ce23b13: ARM: renesas: Scrub duplicate memory nodes from DT on Gen3 (2021-05-12 21:36:27 +0200) ---------------------------------------------------------------- Marek Vasut (2): ARM: rmobile: Add missing rcar-common/common.c to Beacon RZG2M kit ARM: renesas: Scrub duplicate memory nodes from DT on Gen3 arch/arm/mach-rmobile/Kconfig | 1 + board/beacon/beacon-rzg2m/Makefile | 2 +- board/beacon/beacon-rzg2m/beacon-rzg2m.c | 15 --------------- board/renesas/rcar-common/common.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 82 insertions(+), 16 deletions(-)

2 1

[PULL u-boot] Please pull u-boot-amlogic-20210514
by Neil Armstrong 15 May '21

15 May '21

Hi Tom, please find a few dwmac meson8b glue fixes, dwc3 meson-g12a probe fix and the missing stuff to have HDMI working on the Beelink GTKing/King-Pro boards. The CI job is at https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic/pipelines/7516 Thanks, Neil The following changes since commit 530c8d4af2e18c6142ab7cac6f11dd92c02b2bc9: Merge branch '2021-05-13-extension-board-detection-and-DT-overlay-application' (2021-05-13 13:09:14 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-amlogic.git tags/u-boot-amlogic-20210514 for you to fetch changes up to 4c2eb955cfd77d667485c5141cda2821aa1f97ef: net: designware: meson8b: add g12a compatible (2021-05-14 17:46:50 +0200) ---------------------------------------------------------------- - dts: add missing -u-boot.dtsi to enable HDMI on Beelink GTKing/King-Pro - usb: dwc3-meson-g12a: skip phy on -ENODATA aswell - net: dwmac_meson8b: do not set TX delay in TXID & RXID - net: designware: meson8b: add g12a compatible ---------------------------------------------------------------- Neil Armstrong (4): ARM: dts: add missing -u-boot.dtsi to enable HDMI on Beelink GTKing/King-Pro usb: dwc3-meson-g12a: skip phy on -ENODATA aswell net: dwmac_meson8b: do not set TX delay in TXID & RXID net: designware: meson8b: add g12a compatible arch/arm/dts/meson-g12b-gtking-pro-u-boot.dtsi | 7 +++++++ arch/arm/dts/meson-g12b-gtking-u-boot.dtsi | 7 +++++++ drivers/net/dwmac_meson8b.c | 24 ++++++++++++++++++++---- drivers/usb/dwc3/dwc3-meson-g12a.c | 2 +- 4 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 arch/arm/dts/meson-g12b-gtking-pro-u-boot.dtsi create mode 100644 arch/arm/dts/meson-g12b-gtking-u-boot.dtsi

2 1

[PULL] u-boot-riscv/master
by Leo Liang 15 May '21

15 May '21

Hi Tom, CI result: https://source.denx.de/u-boot/custodians/u-boot-riscv/-/pipelines/7504 The following changes since commit 530c8d4af2e18c6142ab7cac6f11dd92c02b2bc9: Merge branch '2021-05-13-extension-board-detection-and-DT-overlay-application' (2021-05-13 13:09:14 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-riscv.git for you to fetch changes up to ffdc71bc0977c1e6b7b6e6a5a005e1f77213bf21: Revert "riscv: cpu: fu740: clear feature disable CSR" (2021-05-14 16:26:20 +0800) ---------------------------------------------------------------- Bin Meng (1): Revert "riscv: cpu: fu740: clear feature disable CSR" Rick Chen (1): MAINTAINERS: Add a co-maintainer for RISC-V Sean Anderson (11): clk: Warn on failure to assign rate clk: k210: Fix PLLs not being enabled clk: k210: Fix PLL enable always getting taken clk: k210: Remove k210_register_pll clk: k210: Move the clint clock to under aclk clk: Add support for the k210 clock driver pre-relocation riscv: Enable some devices pre-relocation riscv: Enable AI ram on K210 riscv: k210: Rename airam to aisram riscv: k210: Use AI as the parent clock of aisram, not PLL1 riscv: Don't reserve AI ram in k210 dts Vincent Chen (1): pwm: sifive: make set_config() and set_enable() work properly MAINTAINERS | 1 + arch/riscv/cpu/fu540/spl.c | 15 --------------- arch/riscv/dts/k210.dtsi | 22 +++++++--------------- board/sipeed/maix/maix.c | 14 ++++++++++++-- configs/sipeed_maix_bitm_defconfig | 2 ++ drivers/clk/clk-uclass.c | 11 +++++++---- drivers/clk/kendryte/clk.c | 26 ++++++++++++++------------ drivers/clk/kendryte/pll.c | 26 ++++---------------------- drivers/pwm/pwm-sifive.c | 21 +++++++++++---------- include/configs/sipeed-maix.h | 3 +-- include/kendryte/pll.h | 4 ---- 11 files changed, 59 insertions(+), 86 deletions(-) Best regards, Leo

3 2

Please pull u-boot-marvell/master
by Stefan Roese 15 May '21

15 May '21

Hi Tom, please pull the next batch of Marvell Armada related patches. Here the summary log: ---------------------------------------------------------------- - Add base support for Marvell OcteonTX2 CN9130 DB (mostly done by Kostya) - Sync Armada mvpp2 ethernet driver with Marvell version (misc Marvell authors) - Sync Armada 8k MMU setup with Marvell version (misc Marvell authors) - spi: kirkwood: Some fixes especially for baudrate generation (misc Marvell authors) - mvebu: x530: Reduce SPL image size (Stefan) - Rename "rx_training" to "mvebu_comphy_rx_training" (Stefan) ---------------------------------------------------------------- Here the Azure build: https://dev.azure.com/sr0718/u-boot/_build/results?buildId=87&view=results It shows some issues with xilinx_versal_virt, which seem to be not related to this patch set and also occurred yesterday. Thanks, Stefan The following changes since commit ea184cbff99ea1d82dcf94c95afe054e95da5069: Merge tag 'ti-v2021.07-rc3' of https://source.denx.de/u-boot/custodians/u-boot-ti (2021-05-12 10:07:21 -0400) are available in the Git repository at: git@source.denx.de:u-boot/custodians/u-boot-marvell.git for you to fetch changes up to e0a6df9efa69bfe662def66d12b8702ad1cf3a51: arm: octeontx2: Add Octeon TX2 CN913x DB support (2021-05-13 08:18:19 +0200) ---------------------------------------------------------------- Ben Peled (3): net: mvpp2: AN Bypass in 1000 and 2500 basex mode net: mvpp2: remove unused define MVPP22_SMI_PHY_ADDR_REG net: mvpp2: fix missing switch case break Grzegorz Jaszczyk (4): spi: kirkwood: prevent limiting speed to 0 arm64: mvebu: do not map firmware RT service region arm64: mvebu: a8k: move firmware related definitions to fw info arm64: mvebu: extend the mmio region Ken Ma (1): spi: kirkwood: support extended baud rates Konstantin Porotchkin (2): arm: octeontx2: Add dtsi/dts files for Octeon TX2 CN913x DB arm: octeontx2: Add Octeon TX2 CN913x DB support Marcin Wojtas (4): net: mvpp2: remove redundant SMI address configuration net: mvpp2: add explicit sgmii-2500 support spi: kirkwood: prevent configuring speed exceeding max controller freq pcie: designware: mvebu: do not configure ATU for IO when not used Stefan Chulski (5): phy: introduce 1000BaseX and 2500BaseX modes net: mvpp2: add CP115 port1 10G/5G SFI support net: mvpp2: add 1000BaseX and 2500BaseX ppv2 support net: mvpp2: Fix 2.5G GMII_SPEED configurations net: mvpp2: allow MDIO registration for fixed links Stefan Roese (2): mvebu: x530: Reduce SPL image size cmd: mvebu: Rename rx_training to mvebu_comphy_rx_training jinghua (1): arm64: mvebu: a8k: align memory regions arch/arm/dts/Makefile | 6 + arch/arm/dts/cn9130-db-A.dts | 55 ++++ arch/arm/dts/cn9130-db-B.dts | 51 ++++ arch/arm/dts/cn9130-db-dev-info.dtsi | 44 +++ arch/arm/dts/cn9130-db.dtsi | 316 ++++++++++++++++++++++ arch/arm/dts/cn9131-db-A.dts | 54 ++++ arch/arm/dts/cn9131-db-B.dts | 69 +++++ arch/arm/dts/cn9131-db.dtsi | 166 ++++++++++++ arch/arm/dts/cn9132-db-A.dts | 13 + arch/arm/dts/cn9132-db-B.dts | 13 + arch/arm/dts/cn9132-db.dtsi | 217 +++++++++++++++ arch/arm/mach-mvebu/armada8k/cpu.c | 70 ++--- arch/arm/mach-mvebu/include/mach/fw_info.h | 18 ++ board/Marvell/octeontx2_cn913x/MAINTAINERS | 1 + board/Marvell/octeontx2_cn913x/README | 24 ++ cmd/mvebu/Kconfig | 9 +- cmd/mvebu/Makefile | 2 +- cmd/mvebu/{rx_training.c => comphy_rx_training.c} | 10 +- configs/mvebu_db_cn9130_defconfig | 89 ++++++ configs/x530_defconfig | 2 +- drivers/net/mvpp2.c | 257 +++++++++++------- drivers/pci/pcie_dw_mvebu.c | 37 ++- drivers/spi/kirkwood_spi.c | 67 ++++- include/phy_interface.h | 4 + 24 files changed, 1413 insertions(+), 181 deletions(-) create mode 100644 arch/arm/dts/cn9130-db-A.dts create mode 100644 arch/arm/dts/cn9130-db-B.dts create mode 100644 arch/arm/dts/cn9130-db-dev-info.dtsi create mode 100644 arch/arm/dts/cn9130-db.dtsi create mode 100644 arch/arm/dts/cn9131-db-A.dts create mode 100644 arch/arm/dts/cn9131-db-B.dts create mode 100644 arch/arm/dts/cn9131-db.dtsi create mode 100644 arch/arm/dts/cn9132-db-A.dts create mode 100644 arch/arm/dts/cn9132-db-B.dts create mode 100644 arch/arm/dts/cn9132-db.dtsi create mode 100644 arch/arm/mach-mvebu/include/mach/fw_info.h create mode 100644 board/Marvell/octeontx2_cn913x/README rename cmd/mvebu/{rx_training.c => comphy_rx_training.c} (74%) create mode 100644 configs/mvebu_db_cn9130_defconfig

2 3

[PATCH 1/1] doc: man-page for size command
by Heinrich Schuchardt 15 May '21

15 May '21

Provide a man-page for the size command. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- doc/usage/index.rst | 1 + doc/usage/size.rst | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 doc/usage/size.rst diff --git a/doc/usage/index.rst b/doc/usage/index.rst index 528b3c745e..6f45fd3878 100644 --- a/doc/usage/index.rst +++ b/doc/usage/index.rst @@ -38,6 +38,7 @@ Shell commands pstore qfw sbi + size true scp03 reset diff --git a/doc/usage/size.rst b/doc/usage/size.rst new file mode 100644 index 0000000000..f0c35e4826 --- /dev/null +++ b/doc/usage/size.rst @@ -0,0 +1,40 @@ +.. SPDX-License-Identifier: GPL-2.0+ + +size command +============ + +Synopsis +-------- + +:: + + size <interface> <dev[:part]> <filename> + +Description +----------- + +The size command determines the size of a file and sets the environment variable +filesize to this value. If filename points to a directory, the value is set to +zero. + +If the command fails, the filesize environment variable is not changed. + +dev + device number + +part + partition number, defaults to 1 + +filename + path to file + +Configuration +------------- + +The size command is only available if CONFIG_CMD_FS_GENERIC=y. + +Return value +------------ + +The return value $? is set to 0 (true) if the command succeded and to 1 (false) +otherwise. -- 2.30.2

1 0

[PATCH v2] riscv: Fix arch_fixup_fdt always failing without /chosen
by Sean Anderson 15 May '21

15 May '21

If /chosen was missing, chosen_offset would never get updated with the new /chosen node. This would cause fdt_setprop_u32 to fail. This patch fixes this by setting chosen_offset. In addition, log any errors from setting boot-hartid as well. Fixes: 5370478d1c7 ("riscv: Add boot hartid to device tree") Signed-off-by: Sean Anderson <seanga2(a)gmail.com> Reviewed-by: Bin Meng <bmeng.cn(a)gmail.com> Reviewed-by: Rick Chen <rick(a)andestech.com> Reviewed-by: Atish Patra <atish.patra(a)wdc.com> --- I have not actually tested this (nor observed the original failure). But this seemed buggy from inspection. Changes in v2: - Fix "Fixes" pointing to wrong commit arch/riscv/lib/fdt_fixup.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/arch/riscv/lib/fdt_fixup.c b/arch/riscv/lib/fdt_fixup.c index 1f3f23621c..f636b28449 100644 --- a/arch/riscv/lib/fdt_fixup.c +++ b/arch/riscv/lib/fdt_fixup.c @@ -151,14 +151,17 @@ int arch_fixup_fdt(void *blob) } chosen_offset = fdt_path_offset(blob, "/chosen"); if (chosen_offset < 0) { - err = fdt_add_subnode(blob, 0, "chosen"); - if (err < 0) { + chosen_offset = fdt_add_subnode(blob, 0, "chosen"); + if (chosen_offset < 0) { log_err("chosen node cannot be added\n"); - return err; + return chosen_offset; } } /* Overwrite the boot-hartid as U-Boot is the last stage BL */ - fdt_setprop_u32(blob, chosen_offset, "boot-hartid", gd->arch.boot_hart); + err = fdt_setprop_u32(blob, chosen_offset, "boot-hartid", + gd->arch.boot_hart); + if (err < 0) + return log_msg_ret("could not set boot-hartid", err); #endif /* Copy the reserved-memory node to the DT used by OS */ -- 2.31.0

1 0

[PATCH 0/4] efi_loader: capsule: improve capsule authentication support
by AKASHI Takahiro 15 May '21

15 May '21

As I discussed in [1], I have made a couple of improvements on the current implemenation of capsule update. Among others, this patch series 1. add signing feature to mkeficapsule 2. remove dtb operation from mkeficapsule 3. add pytest for capsule authentication (on sandbox) NOTE: I temporarily include Patch#3 in order to show that it is not worth implementing in C as we can do the same thing with a very small shell script. My intent is *NOT* to merge Patch#3 in upstream. Prerequisite patches ==================== See Sughosh's [2] and my [3]. Test ==== * passed the pytest which is included in this patch series on sandbox built locally. Todo ==== * review and update the document for capsule update doc/board/emulation/qemu_capsule_update.rst (but not in this patch series) [1] https://lists.denx.de/pipermail/u-boot/2021-April/447918.html [2] https://lists.denx.de/pipermail/u-boot/2021-April/447183.html [3] https://lists.denx.de/pipermail/u-boot/2021-May/449347.html https://lists.denx.de/pipermail/u-boot/2021-May/449348.html https://lists.denx.de/pipermail/u-boot/2021-May/449349.html https://lists.denx.de/pipermail/u-boot/2021-May/449350.html https://lists.denx.de/pipermail/u-boot/2021-May/449351.html Changes ======= Initial release (May 12, 2021) * based on v2021.07-rc2 AKASHI Takahiro (4): tools: mkeficapsule: add firmwware image signing tools: mkeficapsule: remove device-tree related operation tools: add fdtsig command test/py: efi_capsule: add image authentication test Makefile | 7 +- .../py/tests/test_efi_capsule/capsule_defs.py | 5 + test/py/tests/test_efi_capsule/conftest.py | 35 +- test/py/tests/test_efi_capsule/signature.dts | 8 + .../test_capsule_firmware_signed.py | 234 +++++++++ tools/Makefile | 7 +- tools/fdtsig.c | 274 +++++++++++ tools/fdtsig.sh | 40 ++ tools/mkeficapsule.c | 455 ++++++++++-------- 9 files changed, 856 insertions(+), 209 deletions(-) create mode 100644 test/py/tests/test_efi_capsule/signature.dts create mode 100644 test/py/tests/test_efi_capsule/test_capsule_firmware_signed.py create mode 100644 tools/fdtsig.c create mode 100755 tools/fdtsig.sh -- 2.31.0

4 54

[PATCH] efi_loader: consider no-map property of reserved memory
by Heinrich Schuchardt 15 May '21

15 May '21

If a reserved memory node in the device tree has the property no-map, remove it from the UEFI memory map provided by GetMemoryMap(). Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- cmd/bootefi.c | 34 ++++++++++++++++++++++++++++------ include/efi.h | 3 +++ lib/efi_loader/efi_memory.c | 7 +++++-- 3 files changed, 36 insertions(+), 8 deletions(-) diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 40d5ef2b3a..f173105251 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -135,12 +135,29 @@ done: return ret; } -static void efi_reserve_memory(u64 addr, u64 size) +/** + * efi_reserve_memory() - add reserved memory to memory map + * + * @addr: start address of the reserved memory range + * @size: size of the reserved memory range + * @nomap: indicates that the memory range shall be hidden from the memory + * map + */ +static void efi_reserve_memory(u64 addr, u64 size, bool nomap) { + int type; + efi_uintn_t ret; + /* Convert from sandbox address space. */ addr = (uintptr_t)map_sysmem(addr, 0); - if (efi_add_memory_map(addr, size, - EFI_RESERVED_MEMORY_TYPE) != EFI_SUCCESS) + + if (nomap) + type = EFI_NO_MAP_MEMORY; + else + type = EFI_RESERVED_MEMORY_TYPE; + + ret = efi_add_memory_map(addr, size, type); + if (ret != EFI_SUCCESS) log_err("Reserved memory mapping failed addr %llx size %llx\n", addr, size); } @@ -166,7 +183,7 @@ static void efi_carve_out_dt_rsv(void *fdt) for (i = 0; i < nr_rsv; i++) { if (fdt_get_mem_rsv(fdt, i, &addr, &size) != 0) continue; - efi_reserve_memory(addr, size); + efi_reserve_memory(addr, size, false); } /* process reserved-memory */ @@ -186,8 +203,13 @@ static void efi_carve_out_dt_rsv(void *fdt) * a size instead of a reg property. */ if (fdt_addr != FDT_ADDR_T_NONE && - fdtdec_get_is_enabled(fdt, subnode)) - efi_reserve_memory(fdt_addr, fdt_size); + fdtdec_get_is_enabled(fdt, subnode)) { + bool nomap; + + nomap = !!fdt_getprop(fdt, subnode, "no-map", + NULL); + efi_reserve_memory(fdt_addr, fdt_size, nomap); + } subnode = fdt_next_subnode(fdt, subnode); } } diff --git a/include/efi.h b/include/efi.h index f986aad877..50190021ef 100644 --- a/include/efi.h +++ b/include/efi.h @@ -181,6 +181,9 @@ enum efi_mem_type { EFI_MAX_MEMORY_TYPE, EFI_TABLE_END, /* For efi_build_mem_table() */ + + /* Memory that shall not be mapped */ + EFI_NO_MAP_MEMORY, }; /* Attribute values */ diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index 7be756e370..d156b9533c 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -251,7 +251,7 @@ static efi_status_t efi_add_memory_map_pg(u64 start, u64 pages, EFI_PRINT("%s: 0x%llx 0x%llx %d %s\n", __func__, start, pages, memory_type, overlap_only_ram ? "yes" : "no"); - if (memory_type >= EFI_MAX_MEMORY_TYPE) + if (memory_type >= EFI_MAX_MEMORY_TYPE && memory_type != EFI_NO_MAP_MEMORY) return EFI_INVALID_PARAMETER; if (!pages) @@ -327,7 +327,10 @@ static efi_status_t efi_add_memory_map_pg(u64 start, u64 pages, } /* Add our new map */ - list_add_tail(&newlist->link, &efi_mem); + if (memory_type == EFI_NO_MAP_MEMORY) + free(newlist); + else + list_add_tail(&newlist->link, &efi_mem); /* And make sure memory is listed in descending order */ efi_mem_sort(); -- 2.28.0

3 9

[PATCH] riscv: Fix arch_fixup_fdt always failing without /chosen
by Sean Anderson 14 May '21

14 May '21

If /chosen was missing, chosen_offset would never get updated with the new /chosen node. This would cause fdt_setprop_u32 to fail. This patch fixes this by setting chosen_offset. In addition, log any errors from setting boot-hartid as well. Fixes: 177c53fe6c6 ("riscv: Move all fdt fixups together") Signed-off-by: Sean Anderson <seanga2(a)gmail.com> --- I have not actually tested this (nor observed the original failure). But this seemed buggy from inspection. arch/riscv/lib/fdt_fixup.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/arch/riscv/lib/fdt_fixup.c b/arch/riscv/lib/fdt_fixup.c index 1f3f23621c..f636b28449 100644 --- a/arch/riscv/lib/fdt_fixup.c +++ b/arch/riscv/lib/fdt_fixup.c @@ -151,14 +151,17 @@ int arch_fixup_fdt(void *blob) } chosen_offset = fdt_path_offset(blob, "/chosen"); if (chosen_offset < 0) { - err = fdt_add_subnode(blob, 0, "chosen"); - if (err < 0) { + chosen_offset = fdt_add_subnode(blob, 0, "chosen"); + if (chosen_offset < 0) { log_err("chosen node cannot be added\n"); - return err; + return chosen_offset; } } /* Overwrite the boot-hartid as U-Boot is the last stage BL */ - fdt_setprop_u32(blob, chosen_offset, "boot-hartid", gd->arch.boot_hart); + err = fdt_setprop_u32(blob, chosen_offset, "boot-hartid", + gd->arch.boot_hart); + if (err < 0) + return log_msg_ret("could not set boot-hartid", err); #endif /* Copy the reserved-memory node to the DT used by OS */ -- 2.31.0

4 5