January 2022 - U-Boot

[PATCH 1/1] lib: allow printing RISC-V EFI Boot Protocol GUID
by Heinrich Schuchardt 31 Jan '22

31 Jan '22

On RISC-V a new UEFI protocol has been introduced. Support printing its GUID using %pUs. Cc: Sunil V L <sunilvl(a)ventanamicro.com> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- cf. [RFC PATCH V2 1/2] efi_loader: Enable RISCV_EFI_BOOT_PROTOCOL support https://lists.denx.de/pipermail/u-boot/2022-January/473505.html --- lib/uuid.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/uuid.c b/lib/uuid.c index 24571ef5fb..284f8113ff 100644 --- a/lib/uuid.c +++ b/lib/uuid.c @@ -220,7 +220,13 @@ static const struct { "TCG2 Final Events Table", EFI_TCG2_FINAL_EVENTS_TABLE_GUID, }, +#ifdef CONFIG_EFI_RISCV_BOOT_PROTOCOL + { + "RISC-V Boot", + RISCV_EFI_BOOT_PROTOCOL_GUID, + }, #endif +#endif /* CONFIG_CMD_EFIDEBUG */ #ifdef CONFIG_CMD_NVEDIT_EFI /* signature database */ { -- 2.33.1

2 5

[PATCH] ram: stm32mp1: Unconditionally enable ASR
by Marek Vasut 31 Jan '22

31 Jan '22

Enable DRAM ASR, auto self-refresh, unconditionally. This saves non-trivial amount of power both at runtime and in suspend (on 2x W632GU6NB-15 ~150mW). Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Patrick Delaunay <patrick.delaunay(a)foss.st.com> Cc: Patrice Chotard <patrice.chotard(a)foss.st.com> --- drivers/ram/stm32mp1/stm32mp1_ddr.c | 26 ++++++++++++++++++++++++ drivers/ram/stm32mp1/stm32mp1_ddr_regs.h | 6 ++++++ 2 files changed, 32 insertions(+) diff --git a/drivers/ram/stm32mp1/stm32mp1_ddr.c b/drivers/ram/stm32mp1/stm32mp1_ddr.c index 0457166b127..70aed5c311e 100644 --- a/drivers/ram/stm32mp1/stm32mp1_ddr.c +++ b/drivers/ram/stm32mp1/stm32mp1_ddr.c @@ -27,6 +27,8 @@ #define RCC_DDRITFCR_DPHYAPBRST (BIT(17)) #define RCC_DDRITFCR_DPHYRST (BIT(18)) #define RCC_DDRITFCR_DPHYCTLRST (BIT(19)) +#define RCC_DDRITFCR_DDRCKMOD_MASK (0x7 << 20) +#define RCC_DDRITFCR_DDRCKMOD_ASR (0x1 << 20) struct reg_desc { const char *name; @@ -664,6 +666,26 @@ void stm32mp1_refresh_restore(struct stm32mp1_ddrctl *ctl, wait_sw_done_ack(ctl); } +static void stm32mp1_asr_enable(struct ddr_info *priv) +{ + struct stm32mp1_ddrctl *ctl = priv->ctl; + + clrsetbits_le32(priv->rcc + RCC_DDRITFCR, RCC_DDRITFCR_DDRCKMOD_MASK, + RCC_DDRITFCR_DDRCKMOD_ASR); + + start_sw_done(ctl); + + setbits_le32(&ctl->hwlpctl, DDRCTRL_HWLPCTL_HW_LP_EN); + writel(DDRCTRL_PWRTMG_POWERDOWN_TO_X32(0x10) | + DDRCTRL_PWRTMG_SELFREF_TO_X32(0x01), + &ctl->pwrtmg); + setbits_le32(&ctl->pwrctl, DDRCTRL_PWRCTL_EN_DFI_DRAM_CLK_DISABLE); + setbits_le32(&ctl->pwrctl, DDRCTRL_PWRCTL_SELFREF_EN); + + setbits_le32(&ctl->dfimisc, DDRCTRL_DFIMISC_DFI_INIT_COMPLETE_EN); + wait_sw_done_ack(ctl); +} + /* board-specific DDR power initializations. */ __weak int board_ddr_power_init(enum ddr_type ddr_type) { @@ -835,6 +857,10 @@ start: /* 12. set back registers in step 8 to the orginal values if desidered */ stm32mp1_refresh_restore(priv->ctl, config->c_reg.rfshctl3, config->c_reg.pwrctl); + +/* Enable auto-self-refresh, which saves a bit of power at runtime. */ + stm32mp1_asr_enable(priv); + } /* if (config->p_cal_present) */ /* enable uMCTL2 AXI port 0 and 1 */ diff --git a/drivers/ram/stm32mp1/stm32mp1_ddr_regs.h b/drivers/ram/stm32mp1/stm32mp1_ddr_regs.h index 3c8885a9657..de0f6f302c9 100644 --- a/drivers/ram/stm32mp1/stm32mp1_ddr_regs.h +++ b/drivers/ram/stm32mp1/stm32mp1_ddr_regs.h @@ -263,8 +263,14 @@ struct stm32mp1_ddrphy { #define DDRCTRL_PWRCTL_SELFREF_EN BIT(0) #define DDRCTRL_PWRCTL_POWERDOWN_EN BIT(1) +#define DDRCTRL_PWRCTL_EN_DFI_DRAM_CLK_DISABLE BIT(3) #define DDRCTRL_PWRCTL_SELFREF_SW BIT(5) +#define DDRCTRL_PWRTMG_SELFREF_TO_X32(n) (((n) & 0xff) << 16) +#define DDRCTRL_PWRTMG_POWERDOWN_TO_X32(n) ((n) & 0x1f) + +#define DDRCTRL_HWLPCTL_HW_LP_EN BIT(0) + #define DDRCTRL_RFSHCTL3_DIS_AUTO_REFRESH BIT(0) #define DDRCTRL_RFSHTMG_T_RFC_NOM_X1_X32_MASK GENMASK(27, 16) -- 2.34.1

1 0

[PATCH v3] mkimage: fix segfault on MacOS arm64
by Sergey V. Lobanov 31 Jan '22

31 Jan '22

mkimage segfaults due to the ASLR mechanism on MacOS arm64 It is required to use _dyld_get_image_vmaddr_slide() to prevent segfault on MacOS arm64 This patch is based on the discussion https://github.com/u-boot/u-boot/commit/3b142045e8a7f0ab17b6099e9226296af45… Thanks to Jessica Clarke, Ronny Kotzschmar and ptpt52 github user Reviewed-by: Jessica Clarke <jrtc27(a)jrtc27.com> Signed-off-by: Sergey V. Lobanov <sergey(a)lobanov.in> --- Changes since version 2: - Rebased on current master - Added Reviewed-by tag - Fixed typos and grammatical errors tools/imagetool.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/imagetool.h b/tools/imagetool.h index b7ac3a23d0..45eaada4b5 100644 --- a/tools/imagetool.h +++ b/tools/imagetool.h @@ -272,11 +272,13 @@ int rockchip_copy_image(int fd, struct image_tool_params *mparams); * b) we need a API call to get the respective section symbols */ #if defined(__MACH__) #include <mach-o/getsect.h> +#include <mach-o/dyld.h> #define INIT_SECTION(name) do { \ unsigned long name ## _len; \ char *__cat(pstart_, name) = getsectdata("__DATA", \ #name, &__cat(name, _len)); \ + __cat(pstart_, name) += _dyld_get_image_vmaddr_slide(0);\ char *__cat(pstop_, name) = __cat(pstart_, name) + \ __cat(name, _len); \ __cat(__start_, name) = (void *)__cat(pstart_, name); \ -- 2.32.0 (Apple Git-132)

2 1

Please pull u-boot-dm
by Simon Glass 31 Jan '22

31 Jan '22

Hi Tom, https://source.denx.de/u-boot/custodians/u-boot-dm/-/pipelines/10826 The following changes since commit e267665a7420bddbfd5833573fdfc9d0930ff515: Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sunxi (2022-01-30 17:12:34 -0500) are available in the Git repository at: git://git.denx.de/u-boot-dm.git tags/dm-pull-30jan22 for you to fetch changes up to fcc87efdf3772e6e8d060dc10d521442d7772ce9: binman: Skip node generation for images read from files (2022-01-30 20:40:58 -0700) ---------------------------------------------------------------- moveconfig fix binman support for listing files with generated entries ---------------------------------------------------------------- Alper Nebi Yasak (1): moveconfig: Fix code relying on now-stripped newline characters Jan Kiszka (1): binman: Skip node generation for images read from files tools/binman/etype/fit.py | 2 +- tools/binman/ftest.py | 18 ++++++++++++++++++ tools/binman/image.py | 9 +++++++-- tools/binman/test/219_fit_gennode.dts | 26 ++++++++++++++++++++++++++ tools/moveconfig.py | 26 +++++++++++++------------- 5 files changed, 65 insertions(+), 16 deletions(-) create mode 100644 tools/binman/test/219_fit_gennode.dts Regards, Simon

2 1

[PATCH] pylint: Adjust how the output is produced
by Simon Glass 31 Jan '22

31 Jan '22

The current Makefile rule requires there to be a 'Module' line in the pylint output, like this: ************* Module binman.fip_util This line only appears if pylint has some comments about the module. We cannot rely on it for naming. Update the code to instead use the filename as the identifier for each score, so rather than: multiplexed_log 7.49 we output: test_multiplexed_log.py 7.20 It is still easy to see which file the score relates to. In fact the new naming is nicer since the full subdirectories are shown. The avoids the problem where a module name is not produced, and the output gets out of sync. Regenerate pylint.base so we can start from the current baseline. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Makefile | 7 +- scripts/pylint.base | 441 +++++++++++++++++++++++--------------------- 2 files changed, 230 insertions(+), 218 deletions(-) diff --git a/Makefile b/Makefile index 10879f1f9cf..bb0c8d3d201 100644 --- a/Makefile +++ b/Makefile @@ -2269,9 +2269,10 @@ pylint: $(Q)find tools test -name "*.py" \ | xargs -n1 -P$(shell nproc 2>/dev/null || echo 1) \ sh -c 'pylint --reports=y --exit-zero -f parseable --ignore-imports=yes $$@ > pylint.out/$$(echo $$@ | tr / _ | sed s/.py//)' _ - $(Q)sed -n 's/Your code has been rated at $[-0-9.]*$.*/\1/p; s/\*\** Module $.*$/\1/p' pylint.out/* \ - |sed '$!N;s/\n/ /' \ - |sort > $(PYLINT_CUR) + $(Q)rm -f $(PYLINT_CUR) + $(Q)( cd pylint.out; for f in *; do \ + sed -ne "s/Your code has been rated at $[-0-9.]*$.*/$$f \1/p" $$f; \ + done ) | sort > $(PYLINT_CUR) $(Q)base=$$(mktemp) cur=$$(mktemp); cut -d' ' -f1 $(PYLINT_BASE) >$$base; \ cut -d' ' -f1 $(PYLINT_CUR) >$$cur; \ comm -3 $$base $$cur > $(PYLINT_DIFF); \ diff --git a/scripts/pylint.base b/scripts/pylint.base index cefdc235550..8c650f25729 100644 --- a/scripts/pylint.base +++ b/scripts/pylint.base @@ -1,215 +1,226 @@ -_testing 0.83 -atf_bl31 -6.00 -atf_fip 0.29 -binman.cbfs_util 8.38 -binman.cbfs_util_test 9.30 -binman.cmdline 9.09 -binman.control 4.92 -binman.elf 6.73 -binman.elf_test 5.41 -binman.entry 3.38 -binman.entry_test 5.34 -binman.fdt_test 3.23 -binman.fip_util 9.86 -binman.fip_util_test 9.75 -binman.fmap_util 6.88 -binman.ftest 7.46 -binman.image 7.05 -binman.image_test 4.48 -binman.main 5.00 -binman.setup 5.00 -binman.state 4.15 -blob -1.58 -blob_dtb -10.00 -blob_ext -19.09 -blob_ext_list -0.32 -blob_named_by_arg -7.78 -blob_phase -5.00 -buildman.board 7.82 -buildman.bsettings 1.71 -buildman.builder 6.91 -buildman.builderthread 7.39 -buildman.cmdline 9.04 -buildman.control 8.10 -buildman.func_test 7.18 -buildman.kconfiglib 7.49 -buildman.main 1.43 -buildman.test 6.17 -buildman.toolchain 6.55 -capsule_defs 5.00 -cbfs -1.44 -collection 2.67 -concurrencytest 7.26 -conftest -3.29 -conftest 1.88 -conftest 5.13 -conftest 6.56 -cros_ec_rw -6.00 -defs 6.67 -dtoc.dtb_platdata 7.90 -dtoc.fdt 4.50 -dtoc.fdt_util 6.70 -dtoc.main 7.78 -dtoc.setup 5.00 -dtoc.src_scan 8.91 -dtoc.test_dtoc 8.56 -dtoc.test_fdt 6.96 -dtoc.test_src_scan 9.43 -efivar 6.71 -endian-swap 9.29 -fdtmap -3.28 -files -7.43 -fill -6.43 -fit 5.32 -fmap -0.29 -fstest_defs 8.33 -fstest_helpers 4.29 -gbb -0.30 -genboardscfg 7.95 -image_header 5.77 -intel_cmc -12.50 -intel_descriptor 4.62 -intel_fit 0.00 -intel_fit_ptr 2.35 -intel_fsp -12.50 -intel_fsp_m -12.50 -intel_fsp_s -12.50 -intel_fsp_t -12.50 -intel_ifwi 2.71 -intel_me -12.50 -intel_mrc -10.00 -intel_refcode -10.00 -intel_vbt -12.50 -intel_vga -12.50 -microcode-tool 7.25 -mkimage 2.57 -moveconfig 8.32 -multiplexed_log 7.49 -opensbi -6.00 -patman 0.00 -patman.checkpatch 8.04 -patman.command 4.74 -patman.commit 3.25 -patman.control 8.14 -patman.cros_subprocess 7.56 -patman.func_test 8.14 -patman.get_maintainer 6.47 -patman.gitutil 5.62 -patman.main 8.23 -patman.patchstream 9.11 -patman.project 6.67 -patman.series 6.16 -patman.settings 5.89 -patman.setup 5.00 -patman.status 8.62 -patman.terminal 7.05 -patman.test_checkpatch 6.81 -patman.test_util 6.89 -patman.tools 4.31 -patman.tout 3.12 -powerpc_mpc85xx_bootpg_resetvec -10.00 -rkmux 6.90 -rmboard 7.76 -scp -6.00 -section 4.68 -sqfs_common 8.41 -test 8.18 -test_000_version 7.50 -test_ab 6.50 -test_abootimg 6.09 -test_authvar 8.93 -test_avb 5.52 -test_basic 0.60 -test_bind -2.99 -test_button 3.33 -test_capsule_firmware 3.89 -test_dfu 5.45 -test_dm 9.52 -test_efi_fit 8.16 -test_efi_loader 7.38 -test_efi_selftest 6.36 -test_env 7.15 -test_ext 0.00 -test_extension 2.14 -test_fit 6.83 -test_fit_ecdsa 7.94 -test_fit_hashes 7.70 -test_fpga 1.81 -test_fs_cmd 8.00 -test_gpio 6.09 -test_gpt 7.67 -test_handoff 5.00 -test_help 5.00 -test_hush_if_test 9.27 -test_log 8.64 -test_lsblk 8.00 -test_md 3.64 -test_mkdir 1.96 -test_mmc_rd 6.05 -test_mmc_wr 3.33 -test_net 6.84 -test_ofplatdata 5.71 -test_part 8.00 -test_pinmux 3.27 -test_pstore 2.31 -test_qfw 8.75 -test_sandbox_exit 6.50 -test_scp03 3.33 -test_sf 7.13 -test_shell_basics 9.58 -test_signed 8.38 -test_signed_intca 8.10 -test_sleep 7.78 -test_spl 2.22 -test_sqfs_load 7.46 -test_sqfs_ls 8.00 -test_stackprotector 5.71 -test_symlink 1.22 -test_tpm2 8.51 -test_ums 6.32 -test_unknown_cmd 5.00 -test_unlink 2.78 -test_unsigned 8.00 -test_ut 7.06 -test_vboot 6.00 -text -0.48 -u_boot -15.71 -u_boot_console_base 7.08 -u_boot_console_exec_attach 9.23 -u_boot_console_sandbox 8.06 -u_boot_dtb -12.22 -u_boot_dtb_with_ucode 0.39 -u_boot_elf -8.42 -u_boot_env 0.74 -u_boot_expanded -10.00 -u_boot_img -15.71 -u_boot_nodtb -15.71 -u_boot_spawn 7.65 -u_boot_spl -10.91 -u_boot_spl_bss_pad -9.29 -u_boot_spl_dtb -12.22 -u_boot_spl_elf -15.71 -u_boot_spl_expanded -9.09 -u_boot_spl_nodtb -10.91 -u_boot_spl_with_ucode_ptr -5.00 -u_boot_tpl -10.91 -u_boot_tpl_bss_pad -9.29 -u_boot_tpl_dtb -12.22 -u_boot_tpl_dtb_with_ucode -7.50 -u_boot_tpl_elf -15.71 -u_boot_tpl_expanded -9.09 -u_boot_tpl_nodtb -10.91 -u_boot_tpl_with_ucode_ptr -20.83 -u_boot_ucode 1.52 -u_boot_utils 6.94 -u_boot_with_ucode_ptr -0.71 -vblock -1.61 -vboot_evil 8.95 -vboot_forge 9.22 -x86_reset16 -15.71 -x86_reset16_spl -15.71 -x86_reset16_tpl -15.71 -x86_start16 -15.71 -x86_start16_spl -15.71 -x86_start16_tpl -15.71 -zynqmp_pm_cfg_obj_convert 6.67 +test_conftest.py 6.43 +test_multiplexed_log.py 7.20 +test_test.py 8.18 +test_tests_test_000_version.py 7.50 +test_tests_test_android_test_ab.py 6.50 +test_tests_test_android_test_abootimg.py 6.09 +test_tests_test_android_test_avb.py 5.52 +test_tests_test_bind.py -2.99 +test_tests_test_button.py 3.33 +test_tests_test_dfu.py 5.45 +test_tests_test_dm.py 9.52 +test_tests_test_efi_capsule_capsule_defs.py 5.00 +test_tests_test_efi_capsule_conftest.py 1.25 +test_tests_test_efi_capsule_test_capsule_firmware.py 3.89 +test_tests_test_efi_fit.py 7.59 +test_tests_test_efi_loader.py 7.38 +test_tests_test_efi_secboot_conftest.py -3.84 +test_tests_test_efi_secboot_defs.py 6.67 +test_tests_test_efi_secboot_test_authvar.py 8.93 +test_tests_test_efi_secboot_test_signed.py 8.38 +test_tests_test_efi_secboot_test_signed_intca.py 8.10 +test_tests_test_efi_secboot_test_unsigned.py 8.00 +test_tests_test_efi_selftest.py 6.36 +test_tests_test_env.py 7.08 +test_tests_test_extension.py 2.14 +test_tests_test_fit.py 6.20 +test_tests_test_fit_ecdsa.py 7.50 +test_tests_test_fit_hashes.py 7.70 +test_tests_test_fpga.py 1.81 +test_tests_test_fs_conftest.py 4.62 +test_tests_test_fs_fstest_defs.py 8.33 +test_tests_test_fs_fstest_helpers.py 4.29 +test_tests_test_fs_test_basic.py 0.40 +test_tests_test_fs_test_ext.py -0.25 +test_tests_test_fs_test_fs_cmd.py 8.00 +test_tests_test_fs_test_mkdir.py 1.96 +test_tests_test_fs_test_squashfs_sqfs_common.py 8.12 +test_tests_test_fs_test_squashfs_test_sqfs_load.py 7.12 +test_tests_test_fs_test_squashfs_test_sqfs_ls.py 8.00 +test_tests_test_fs_test_symlink.py 0.82 +test_tests_test_fs_test_unlink.py 2.22 +test_tests_test_gpio.py 6.09 +test_tests_test_gpt.py 7.67 +test_tests_test_handoff.py 5.00 +test_tests_test_help.py 5.00 +test_tests_test_hush_if_test.py 9.27 +test_tests_test_log.py 8.64 +test_tests_test_lsblk.py 8.00 +test_tests_test_md.py 3.64 +test_tests_test_mmc_rd.py 6.05 +test_tests_test_mmc_wr.py 3.33 +test_tests_test_net.py 6.84 +test_tests_test_ofplatdata.py 5.71 +test_tests_test_part.py 8.00 +test_tests_test_pinmux.py 3.27 +test_tests_test_pstore.py 2.31 +test_tests_test_qfw.py 8.75 +test_tests_test_sandbox_exit.py 6.50 +test_tests_test_scp03.py 3.33 +test_tests_test_sf.py 7.02 +test_tests_test_shell_basics.py 9.58 +test_tests_test_sleep.py 7.78 +test_tests_test_spl.py 2.22 +test_tests_test_stackprotector.py 5.71 +test_tests_test_tpm2.py 8.51 +test_tests_test_ums.py 6.32 +test_tests_test_unknown_cmd.py 5.00 +test_tests_test_ut.py 7.06 +test_tests_test_vboot.py 6.00 +test_tests_vboot_evil.py 8.95 +test_tests_vboot_forge.py 9.22 +test_u_boot_console_base.py 6.80 +test_u_boot_console_exec_attach.py 8.85 +test_u_boot_console_sandbox.py 7.22 +test_u_boot_spawn.py 7.39 +test_u_boot_utils.py 6.25 +tools_binman_bintool 8.59 +tools_binman_bintool_test 9.87 +tools_binman_btool__testing 6.09 +tools_binman_btool_cbfstool 7.39 +tools_binman_btool_fiptool 7.62 +tools_binman_btool_futility 6.96 +tools_binman_btool_ifwitool 3.33 +tools_binman_btool_lz4 5.93 +tools_binman_btool_lzma_alone 6.67 +tools_binman_btool_mkimage 6.79 +tools_binman_cbfs_util 7.77 +tools_binman_cbfs_util_test 9.27 +tools_binman_cmdline 9.03 +tools_binman_comp_util 6.25 +tools_binman_control 4.60 +tools_binman_elf 6.42 +tools_binman_elf_test 5.41 +tools_binman_entry 2.48 +tools_binman_entry_test 5.34 +tools_binman_etype__testing 0.83 +tools_binman_etype_atf_bl31 -6.00 +tools_binman_etype_atf_fip 0.29 +tools_binman_etype_blob -1.58 +tools_binman_etype_blob_dtb -10.00 +tools_binman_etype_blob_ext -19.09 +tools_binman_etype_blob_ext_list 0.00 +tools_binman_etype_blob_named_by_arg -7.78 +tools_binman_etype_blob_phase -5.00 +tools_binman_etype_cbfs -1.44 +tools_binman_etype_collection 2.33 +tools_binman_etype_cros_ec_rw -6.00 +tools_binman_etype_fdtmap -3.61 +tools_binman_etype_files -7.43 +tools_binman_etype_fill -6.43 +tools_binman_etype_fit 5.18 +tools_binman_etype_fmap -0.59 +tools_binman_etype_gbb 0.83 +tools_binman_etype_image_header 5.58 +tools_binman_etype_intel_cmc -12.50 +tools_binman_etype_intel_descriptor 4.62 +tools_binman_etype_intel_fit 0.00 +tools_binman_etype_intel_fit_ptr 2.35 +tools_binman_etype_intel_fsp -12.50 +tools_binman_etype_intel_fsp_m -12.50 +tools_binman_etype_intel_fsp_s -12.50 +tools_binman_etype_intel_fsp_t -12.50 +tools_binman_etype_intel_ifwi 2.88 +tools_binman_etype_intel_me -12.50 +tools_binman_etype_intel_mrc -10.00 +tools_binman_etype_intel_refcode -10.00 +tools_binman_etype_intel_vbt -12.50 +tools_binman_etype_intel_vga -12.50 +tools_binman_etype_mkimage 2.31 +tools_binman_etype_opensbi -6.00 +tools_binman_etype_powerpc_mpc85xx_bootpg_resetvec -10.00 +tools_binman_etype_scp -6.00 +tools_binman_etype_section 4.12 +tools_binman_etype_text -0.48 +tools_binman_etype_u_boot -15.71 +tools_binman_etype_u_boot_dtb -12.22 +tools_binman_etype_u_boot_dtb_with_ucode 0.39 +tools_binman_etype_u_boot_elf -8.42 +tools_binman_etype_u_boot_env 0.74 +tools_binman_etype_u_boot_expanded -10.00 +tools_binman_etype_u_boot_img -15.71 +tools_binman_etype_u_boot_nodtb -15.71 +tools_binman_etype_u_boot_spl -10.91 +tools_binman_etype_u_boot_spl_bss_pad -9.29 +tools_binman_etype_u_boot_spl_dtb -12.22 +tools_binman_etype_u_boot_spl_elf -15.71 +tools_binman_etype_u_boot_spl_expanded -9.09 +tools_binman_etype_u_boot_spl_nodtb -10.91 +tools_binman_etype_u_boot_spl_with_ucode_ptr -5.00 +tools_binman_etype_u_boot_tpl -10.91 +tools_binman_etype_u_boot_tpl_bss_pad -9.29 +tools_binman_etype_u_boot_tpl_dtb -12.22 +tools_binman_etype_u_boot_tpl_dtb_with_ucode -7.50 +tools_binman_etype_u_boot_tpl_elf -15.71 +tools_binman_etype_u_boot_tpl_expanded -9.09 +tools_binman_etype_u_boot_tpl_nodtb -10.91 +tools_binman_etype_u_boot_tpl_with_ucode_ptr -20.83 +tools_binman_etype_u_boot_ucode 1.52 +tools_binman_etype_u_boot_with_ucode_ptr -0.71 +tools_binman_etype_vblock 0.00 +tools_binman_etype_x86_reset16 -15.71 +tools_binman_etype_x86_reset16_spl -15.71 +tools_binman_etype_x86_reset16_tpl -15.71 +tools_binman_etype_x86_start16 -15.71 +tools_binman_etype_x86_start16_spl -15.71 +tools_binman_etype_x86_start16_tpl -15.71 +tools_binman_fdt_test 3.23 +tools_binman_fip_util 9.85 +tools_binman_fip_util_test 10.00 +tools_binman_fmap_util 6.67 +tools_binman_ftest 7.39 +tools_binman_image 6.48 +tools_binman_image_test 4.48 +tools_binman_main 4.29 +tools_binman_setup 5.00 +tools_binman_state 3.43 +tools_buildman_board 7.11 +tools_buildman_bsettings 0.98 +tools_buildman_builder 6.55 +tools_buildman_builderthread 7.35 +tools_buildman_cmdline 8.85 +tools_buildman_control 7.04 +tools_buildman_func_test 6.38 +tools_buildman_kconfiglib 7.48 +tools_buildman_main 1.43 +tools_buildman_test 6.10 +tools_buildman_toolchain 5.62 +tools_concurrencytest_concurrencytest 6.77 +tools_dtoc_dtb_platdata 7.82 +tools_dtoc_fdt 3.47 +tools_dtoc_fdt_util 5.00 +tools_dtoc_main 7.33 +tools_dtoc_setup 5.00 +tools_dtoc_src_scan 8.75 +tools_dtoc_test_dtoc 8.54 +tools_dtoc_test_fdt 6.92 +tools_dtoc_test_src_scan 9.43 +tools_efivar 6.71 +tools_endian-swap 8.93 +tools_genboardscfg 7.27 +tools_microcode-tool 7.19 +tools_moveconfig 8.11 +tools_patman___init__ 0.00 +tools_patman_checkpatch 7.61 +tools_patman_command 4.23 +tools_patman_commit 2.75 +tools_patman_control 8.14 +tools_patman_cros_subprocess 7.41 +tools_patman_func_test 7.87 +tools_patman_get_maintainer 4.71 +tools_patman_gitutil 4.58 +tools_patman_main 8.23 +tools_patman_patchstream 9.04 +tools_patman_project 3.33 +tools_patman_series 5.95 +tools_patman_settings 5.63 +tools_patman_setup 5.00 +tools_patman_status 8.43 +tools_patman_terminal 6.29 +tools_patman_test_checkpatch 6.81 +tools_patman_test_util 6.51 +tools_patman_tools 3.98 +tools_patman_tout 2.97 +tools_rkmux 6.76 +tools_rmboard 7.76 +tools_zynqmp_pm_cfg_obj_convert 6.67 -- 2.35.0.rc2.247.g8bbb082509-goog

2 2

Please pull u-boot-marvell/master
by Stefan Roese 31 Jan '22

31 Jan '22

Hi Tom, please pull the next batch of mostly Marvell MVEBU related patches: ---------------------------------------------------------------- - kirkwood: Add Pogoplug-V4 support (Tony) - kirkwood: GoFlex Home : Use Marvell PHY driver (Tony) - Another set of kwboot improvements (Pali) - Minor misc stuff ---------------------------------------------------------------- Here the Azure build, without any issues: https://dev.azure.com/sr0718/u-boot/_build/results?buildId=156&view=results Thanks, Stefan The following changes since commit e267665a7420bddbfd5833573fdfc9d0930ff515: Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sunxi (2022-01-30 17:12:34 -0500) 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 648f8d5f6b1db3920e84ab5085568b1eb29b8c5e: arm: kirkwood: GoFlex Home : Use Marvell uclass mvgbe and PHY driver for Ethernet (2022-01-31 10:23:38 +0100) ---------------------------------------------------------------- Pali Rohár (15): arm: mvebu: Espressobin: Fix URLs in comments tools: kwboot: Increase blk_rsp_timeo to 2s tools: kwboot: Wait blk_rsp_timeo when flushing tools: kwboot: Improve retrying logic for incomplete xmodem packets tools: kwboot: Remove code for handling CAN byte tools: kwboot: Do not change received character in kwboot_xm_recv_reply() tools: kwboot: Fix handling of repeated xmodem packets tools: kwboot: Show 'E' in progress output when error occurs tools: kwboot: Allow to use option -b without image path tools: kwboot: Force BootROM to flush input queue after boot pattern tools: kwboot: Remove 2s delay before sending first xmodem packet tools: kwboot: Handle EINTR in kwboot_write() tools: kwboot: Handle EINTR in kwboot_tty_recv() tools: kwboot: Fix usage of -D without -t tools: kwboot: Set debug flag to 1 Tony Dinh (5): arm: kirkwood: Pogoplug-V4 : Add DTS files arm: kirkwood: Pogoplug-V4 : Add Kconfig files arm: kirkwood: Pogoplug-V4 : Add board implementation files arm: kirkwood: Pogoplug V4 : Use Marvell network PHY driver arm: kirkwood: GoFlex Home : Use Marvell uclass mvgbe and PHY driver for Ethernet arch/arm/dts/Makefile | 1 + arch/arm/dts/kirkwood-pogoplug-series-4.dts | 180 ++++++++++++++++++++++++++++ arch/arm/mach-kirkwood/Kconfig | 6 + board/Marvell/mvebu_armada-37xx/board.c | 4 +- board/Seagate/goflexhome/goflexhome.c | 84 ++----------- board/cloudengines/pogo_v4/Kconfig | 16 +++ board/cloudengines/pogo_v4/MAINTAINERS | 6 + board/cloudengines/pogo_v4/Makefile | 10 ++ board/cloudengines/pogo_v4/kwbimage.cfg | 148 +++++++++++++++++++++++ board/cloudengines/pogo_v4/pogo_v4.c | 148 +++++++++++++++++++++++ configs/goflexhome_defconfig | 2 + configs/pogo_v4_defconfig | 80 +++++++++++++ include/configs/goflexhome.h | 32 ++--- include/configs/pogo_v4.h | 56 +++++++++ tools/kwboot.c | 154 ++++++++++++++++++------ 15 files changed, 790 insertions(+), 137 deletions(-) create mode 100644 arch/arm/dts/kirkwood-pogoplug-series-4.dts create mode 100644 board/cloudengines/pogo_v4/Kconfig create mode 100644 board/cloudengines/pogo_v4/MAINTAINERS create mode 100644 board/cloudengines/pogo_v4/Makefile create mode 100644 board/cloudengines/pogo_v4/kwbimage.cfg create mode 100644 board/cloudengines/pogo_v4/pogo_v4.c create mode 100644 configs/pogo_v4_defconfig create mode 100644 include/configs/pogo_v4.h

2 1

[RFC PATCH v3 0/9] FWU: Add support for FWU Multi Bank Update feature
by Sughosh Ganu 31 Jan '22

31 Jan '22

The patchset adds support for the FWU Multi Bank Update[1] feature. Certain aspects of the Dependable Boot[2] specification have also been implemented. The FWU multi bank update feature is used for supporting multiple sets(also called banks) of firmware image(s), allowing the platform to boot from a different bank, in case it fails to boot from the active bank. This functionality is supported by keeping the relevant information in a structure called metadata, which provides information on the images. Among other parameters, the metadata structure contains information on the currect active bank that is being used to boot image(s). Functionality is being added to work with the UEFI capsule driver in u-boot. The metadata is read to gather information on the update bank, which is the bank to which the firmware images would be flashed to. On a successful completion of the update of all components, the active bank field in the metadata is updated, to reflect the bank from which the platform will boot on the subsequent boots. Currently, the feature is being enabled on the STM32MP157C-DK2 board which boots a FIP image from a uSD card partitioned with the GPT partioning scheme. This also requires changes in the previous stage of bootloader, which parses the metadata and selects the bank to boot the image(s) from. Support is being added in tf-a(BL2 stage) for the STM32MP157C-DK2 board to boot the active bank images. These changes are under review currently[3]. These patches are based on top of the series from Takahiro to add Authentication support to mkeficapsule utility[4] [1] - https://developer.arm.com/documentation/den0118/a [2] - https://staging-git.codelinaro.org/linaro/firmware-dual-banked-updates/test [3] - https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/12566 [4] - https://patchwork.ozlabs.org/project/uboot/list/?series=281549 Changes since V2: * Use uint*_t types in fwu_mdata.h since the file is to be reused in other projects * Keep only the FWU metadata structures in fwu_mdata.h * Move all other function and macro declarations in fwu.h * Keep common implementations of fwu_update_active_index and fwu_revert_boot_index in fwu_mdata.c * Add a update_mdata function pointer in the fwu_mdata_ops structure * Move the function definition of fwu_verify_mdata to fwu_mdata.c to facilitate reuse * Remove the block device specific desc->devnum parameter for the fwu_plat_get_alt_num function call * Change the implementation of fwu_plat_get_alt_num to get the devnum in the function before calling gpt_plat_get_alt_num * Add logic to delete the TrialStateCtr variable if system is not in Trial State * Add logic to check if bit 15(OS Acceptance) of the Flags member in the capsule header is set * Add logic to set the accept bit of all images from a capsule if the OS Acceptance bit in the capsule header is not set * Include the log.h and stdio.h header files Sughosh Ganu (9): FWU: Add FWU metadata structure and functions for accessing metadata FWU: Add FWU metadata access functions for GPT partitioned block devices FWU: stm32mp1: Add helper functions for accessing FWU metadata FWU: STM32MP1: Add support to read boot index from backup register EFI: FMP: Add provision to update image's ImageTypeId in image descriptor FWU: Add boot time checks as highlighted by the FWU specification FWU: Add support for FWU Multi Bank Update feature FWU: cmd: Add a command to read FWU metadata mkeficapsule: Add support for generating empty capsules board/st/stm32mp1/stm32mp1.c | 183 ++++++++++ cmd/Kconfig | 7 + cmd/Makefile | 1 + cmd/fwu_mdata.c | 67 ++++ common/board_r.c | 6 + include/fwu.h | 81 +++++ include/fwu_mdata.h | 69 ++++ lib/Kconfig | 6 + lib/Makefile | 1 + lib/efi_loader/efi_capsule.c | 233 ++++++++++++- lib/efi_loader/efi_firmware.c | 90 ++++- lib/efi_loader/efi_setup.c | 3 +- lib/fwu_updates/Kconfig | 31 ++ lib/fwu_updates/Makefile | 11 + lib/fwu_updates/fwu.c | 198 +++++++++++ lib/fwu_updates/fwu_mdata.c | 358 +++++++++++++++++++ lib/fwu_updates/fwu_mdata_gpt_blk.c | 521 ++++++++++++++++++++++++++++ tools/eficapsule.h | 8 + tools/mkeficapsule.c | 102 +++++- 19 files changed, 1955 insertions(+), 21 deletions(-) create mode 100644 cmd/fwu_mdata.c create mode 100644 include/fwu.h create mode 100644 include/fwu_mdata.h create mode 100644 lib/fwu_updates/Kconfig create mode 100644 lib/fwu_updates/Makefile create mode 100644 lib/fwu_updates/fwu.c create mode 100644 lib/fwu_updates/fwu_mdata.c create mode 100644 lib/fwu_updates/fwu_mdata_gpt_blk.c -- 2.17.1

5 44

[PATCH] arm: kirkwood: GoFlex Home : Use Marvell uclass mvgbe and PHY driver for Ethernet
by Tony Dinh 31 Jan '22

31 Jan '22

The GoFlex Home board has the network chip Marvell 88E1116R. Use uclass mvgbe and the compatible driver M88E1118R to bring up Ethernet. - Currently, CONFIG_RESET_PHY_R symbol is used in arch/arm/mach-kirkwood/include/mach/config.h for all Kirkwood boards with mv8831116 PHY, with each board defines the function reset_phy(). Undefine it for this board. - Add board_eth_init() to use uclass mvgbe to bring up the network. And remove ad-hoc code. - Enable CONFIG_PHY_MARVELL to properly configure the network. - Miscellaneous changes: use CONFIG_SYS_THUMB_BUILD to keep u-boot image under 512K, use BIT macro, and cleanup comments. Signed-off-by: Tony Dinh <mibodhi(a)gmail.com> --- board/Seagate/goflexhome/goflexhome.c | 84 ++++----------------------- configs/goflexhome_defconfig | 2 + include/configs/goflexhome.h | 32 +++------- 3 files changed, 22 insertions(+), 96 deletions(-) diff --git a/board/Seagate/goflexhome/goflexhome.c b/board/Seagate/goflexhome/goflexhome.c index 52be64fb8c..caea89c10e 100644 --- a/board/Seagate/goflexhome/goflexhome.c +++ b/board/Seagate/goflexhome/goflexhome.c @@ -1,10 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright (C) 2021 - * Tony Dinh <mibodhi(a)gmail.com> - * Suriyan Ramasami <suriyan.r(a)gmail.com> - * - * Copyright (C) 2013 Suriyan Ramasami <suriyan.r(a)gmail.com> + * Copyright (C) 2021-2022 Tony Dinh <mibodhi(a)gmail.com> + * Copyright (C) 2013-2021 Suriyan Ramasami <suriyan.r(a)gmail.com> * * Based on dockstar.c originally written by * Copyright (C) 2010 Eric C. Cooper <ecc(a)cmu.edu> @@ -18,14 +15,14 @@ #include <common.h> #include <bootstage.h> #include <init.h> -#include <miiphy.h> -#include <net.h> +#include <netdev.h> #include <asm/global_data.h> #include <asm/mach-types.h> #include <asm/arch/soc.h> #include <asm/arch/mpp.h> #include <asm/arch/cpu.h> #include <asm/io.h> +#include <linux/bitops.h> DECLARE_GLOBAL_DATA_PTR; @@ -98,6 +95,11 @@ int board_early_init_f(void) return 0; } +int board_eth_init(struct bd_info *bis) +{ + return cpu_eth_init(bis); +} + int board_init(void) { /* @@ -111,73 +113,9 @@ int board_init(void) return 0; } -static int fdt_get_phy_addr(const char *path) -{ - const void *fdt = gd->fdt_blob; - const u32 *reg; - const u32 *val; - int node, phandle, addr; - - /* Find the node by its full path */ - node = fdt_path_offset(fdt, path); - if (node >= 0) { - /* Look up phy-handle */ - val = fdt_getprop(fdt, node, "phy-handle", NULL); - if (val) { - phandle = fdt32_to_cpu(*val); - if (!phandle) - return -1; - /* Follow it to its node */ - node = fdt_node_offset_by_phandle(fdt, phandle); - if (node) { - /* Look up reg */ - reg = fdt_getprop(fdt, node, "reg", NULL); - if (reg) { - addr = fdt32_to_cpu(*reg); - return addr; - } - } - } - } - return -1; -} - -#ifdef CONFIG_RESET_PHY_R -/* Configure and enable MV88E1116 PHY */ -void reset_phy(void) -{ - u16 reg; - int phyaddr; - char *name = "ethernet-controller@72000"; - char *eth0_path = "/ocp@f1000000/ethernet-controller@72000/ethernet0-port@0"; - - if (miiphy_set_current_dev(name)) - return; - - phyaddr = fdt_get_phy_addr(eth0_path); - if (phyaddr < 0) - return; - - /* - * Enable RGMII delay on Tx and Rx for CPU port - * Ref: sec 4.7.2 of chip datasheet - */ - miiphy_write(name, phyaddr, MV88E1116_PGADR_REG, 2); - miiphy_read(name, phyaddr, MV88E1116_MAC_CTRL_REG, &reg); - reg |= (MV88E1116_RGMII_RXTM_CTRL | MV88E1116_RGMII_TXTM_CTRL); - miiphy_write(name, phyaddr, MV88E1116_MAC_CTRL_REG, reg); - miiphy_write(name, phyaddr, MV88E1116_PGADR_REG, 0); - - /* reset the phy */ - miiphy_reset(name, phyaddr); - - printf("88E1116 Initialized on %s\n", name); -} -#endif /* CONFIG_RESET_PHY_R */ - #if CONFIG_IS_ENABLED(BOOTSTAGE) -#define GREEN_LED (1 << 14) -#define ORANGE_LED (1 << 15) +#define GREEN_LED BIT(14) +#define ORANGE_LED BIT(15) #define BOTH_LEDS (GREEN_LED | ORANGE_LED) #define NEITHER_LED 0 diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig index ec8b7398d0..e6eb00a938 100644 --- a/configs/goflexhome_defconfig +++ b/configs/goflexhome_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_SYS_DCACHE_OFF=y CONFIG_ARCH_CPU_INIT=y +CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_KIRKWOOD=y CONFIG_SYS_KWD_CONFIG="board/Seagate/goflexhome/kwbimage.cfg" CONFIG_SYS_TEXT_BASE=0x600000 @@ -47,6 +48,7 @@ CONFIG_SATA_MV=y # CONFIG_MMC is not set CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y +CONFIG_PHY_MARVELL=y CONFIG_DM_ETH=y CONFIG_MVGBE=y CONFIG_MII=y diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h index 90e37d9853..c279579268 100644 --- a/include/configs/goflexhome.h +++ b/include/configs/goflexhome.h @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* + * Copyright (C) 2022 Tony Dinh <mibodhi(a)gmai.com> * Copyright (C) 2013 Suriyan Ramasami <suriyan.r(a)gmail.com> * * Based on dockstar.h originally written by @@ -14,32 +15,18 @@ #ifndef _CONFIG_GOFLEXHOME_H #define _CONFIG_GOFLEXHOME_H +#include <linux/bitops.h> + /* * Default GPIO configuration and LED status */ #define GOFLEXHOME_OE_LOW (~(0)) #define GOFLEXHOME_OE_HIGH (~(0)) -#define GOFLEXHOME_OE_VAL_LOW (1 << 29) /* USB_PWEN low */ -#define GOFLEXHOME_OE_VAL_HIGH (1 << 17) /* LED pin high */ - -/* PHY related */ -#define MV88E1116_LED_FCTRL_REG 10 -#define MV88E1116_CPRSP_CR3_REG 21 -#define MV88E1116_MAC_CTRL_REG 21 -#define MV88E1116_PGADR_REG 22 -#define MV88E1116_RGMII_TXTM_CTRL (1 << 4) -#define MV88E1116_RGMII_RXTM_CTRL (1 << 5) +#define GOFLEXHOME_OE_VAL_LOW BIT(29) /* USB_PWEN low */ +#define GOFLEXHOME_OE_VAL_HIGH BIT(17) /* LED pin high */ #include "mv-common.h" -/* - * Environment variables configurations - */ -/* - * max 4k env size is enough, but in case of nand - * it has to be rounded to sector size - */ - /* * Default environment variables */ @@ -47,22 +34,21 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "console=console=ttyS0,115200\0" \ "mtdids=nand0=orion_nand\0" \ - "mtdparts="CONFIG_MTDPARTS_DEFAULT \ + "mtdparts=" CONFIG_MTDPARTS_DEFAULT \ "kernel=/boot/uImage\0" \ "bootargs_root=ubi.mtd=root root=ubi0:root rootfstype=ubifs ro\0" /* * Ethernet Driver configuration */ -#ifdef CONFIG_CMD_NET #define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ #define CONFIG_PHY_BASE_ADR 0 -#endif /* CONFIG_CMD_NET */ +#ifdef CONFIG_RESET_PHY_R +#undef CONFIG_RESET_PHY_R /* remove legacy reset_phy() */ +#endif /* SATA driver configuration */ -#ifdef CONFIG_SATA #define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_LBA48 -#endif /* CONFIG_SATA */ #endif /* _CONFIG_GOFLEXHOME_H */ -- 2.30.2

3 3

[PATCH u-boot-marvell 00/14] Another set of kwboot improvements
by Marek Behún 31 Jan '22

31 Jan '22

From: Marek Behún <marek.behun(a)nic.cz> Hello Stefan, here comes another set of kwboot improvements from Pali, reviewed and signed off by myself. Marek Pali Rohár (14): tools: kwboot: Increase blk_rsp_timeo to 2s tools: kwboot: Wait blk_rsp_timeo when flushing tools: kwboot: Improve retrying logic for incomplete xmodem packets tools: kwboot: Remove code for handling CAN byte tools: kwboot: Do not change received character in kwboot_xm_recv_reply() tools: kwboot: Fix handling of repeated xmodem packets tools: kwboot: Show 'E' in progress output when error occurs tools: kwboot: Allow to use option -b without image path tools: kwboot: Force BootROM to flush input queue after boot pattern tools: kwboot: Remove 2s delay before sending first xmodem packet tools: kwboot: Handle EINTR in kwboot_write() tools: kwboot: Handle EINTR in kwboot_tty_recv() tools: kwboot: Fix usage of -D without -t tools: kwboot: Set debug flag to 1 tools/kwboot.c | 154 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 115 insertions(+), 39 deletions(-) -- 2.34.1

2 29

[PATCH] arm: kirkwood: Pogoplug V4 : Use Marvel network PHY driver
by Tony Dinh 31 Jan '22

31 Jan '22

The Pogoplug V4 board has the network chip Marvell 88E1118R. So to properly configure the network, enable CONFIG_PHY_MARVELL to activate the driver M88E1118R. - This patch depends on the series: https://patchwork.ozlabs.org/project/uboot/patch/20220124061712.28316-2-mib… Signed-off-by: Tony Dinh <mibodhi(a)gmail.com> --- configs/pogo_v4_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/pogo_v4_defconfig b/configs/pogo_v4_defconfig index 5490067b9e..1cf409c834 100644 --- a/configs/pogo_v4_defconfig +++ b/configs/pogo_v4_defconfig @@ -62,6 +62,7 @@ CONFIG_KIRKWOOD_GPIO=y CONFIG_MVEBU_MMC=y CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y +CONFIG_PHY_MARVELL=y CONFIG_DM_ETH=y CONFIG_MVGBE=y CONFIG_MII=y -- 2.30.2

2 3