March 2023 - U-Boot

Pull request: u-boot-rockchip-20230228
by Kever Yang 02 Mar '23

02 Mar '23

Hi Tom, Please pull the updates for rockchip platform: - Add support for rk3588 soc; - Add rk3588 Edgeble Neu6 board and Radxa ROCK5B board; - Add rk3308 Radxa ROCK Pi S board; - Add rk3568 Radxa ROCK 3 board, - Add rk3566 Radxa Compute Module 3 board; - Add support for sdram reg info version 3 - Refactor rockchip OTP/eFuse driver and add more soc support; - Add external TPL support for binman; binman support for mkimage ignore missing entry is based on [1]; CI: https://source.denx.de/u-boot/custodians/u-boot-rockchip/-/pipelines/15403 Thanks, - Kever [1] https://patchwork.ozlabs.org/project/uboot/patch/20230219220158.4160763-7-j… The following changes since commit e8c80ac0f7a13bf0fc016ce324b870c0cff7a2b8: Prepare v2023.04-rc3 (2023-02-27 17:18:36 -0500) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-rockchip.git tags/u-boot-rockchip-20230228 for you to fetch changes up to a6e85a35b50ade7df5f32092c1cc05ade303a22a: board: rock5b-rk3588: add memory gaps into kernel's DTB (2023-02-28 18:07:29 +0800) ---------------------------------------------------------------- Akash Gajjar (2): arm64: dts: rockchip: rk3568: Add Radxa ROCK 3 Model A board support arm64: dts: rockchip: rk3308: Add Radxa ROCK Pi S support Chris Morgan (7): gpio: gpio-rockchip: parse gpio-ranges for bank id dts: rockchip: px30: add gpio-ranges property to gpio nodes arm64: dts: rockchip: Sync rk356x from Linux main rockchip: rk3568: add boot device detection rockchip: rk3568: enable automatic power savings arm64: dts: rockchip: add gpio-ranges property to gpio nodes evb-rk3568: Update MAINTAINERS and documentation Christian Kohlschütter (1): arm: dts: rockchip: rk3399: nanopi-r4s: Provide smbios sysinfo Christopher Obbard (1): include: rk3328: Add default env for compressed kernel images Eugen Hristev (2): board: rockchip: add Radxa ROCK5B Rk3588 board board: rock5b-rk3588: add memory gaps into kernel's DTB Jagan Teki (27): board: edgeble: Fix neural-compute-module-2 board name rockchip: rk3568: Move DM_RESET in arch kconfig dt-bindings: rockchip: Sync rockchip, vop2.h from Linux arm64: dts: rockchip: rk3566: Add Radxa Compute Module 3 arm64: dts: rockchip: rk3566: Add Radxa Compute Module 3 IO board: rockchip: Add Radxa Compute Module 3 IO Board phy: rockchip: inno-usb2: Add support #address_cells = 2 drivers: phy: add naneng combphy for rk3568 arm64: dts: rk356x-u-boot: Drop combphy1 assigned-clocks/rates rockchip: rk3568: add rk3568 pinctrl driver rockchip: mkimage: Add rk3588 support arm: rockchip: Add cru header for rk3588 arm: rockchip: Add grf header for rk3588 dt-bindings: clk: Add dt-binding header for RK3588 clk: rockchip: Add rk3588 clk support clk: rockchip: pll: Add pll_rk3588 type for rk3588 ram: rockchip: Add rk3588 ddr driver support dt-bindings: power: Add power-domain header for rk3588 dt-bindings: reset: add rk3588 reset definitions arm: rockchip: Add ioc header for rk3588 arm64: dts: rockchip: Add base DT for rk3588 SoC arm64: dts: rockchip: rk3588: Add Edgeble Neu6 Model A SoM arm64: dts: rockchip: rk3588: Add Edgeble Neu6 Model A IO arm: rockchip: Add RK3588 arch core support ARM: dts: rockchip: Add rk3588-u-boot.dtsi ARM: dts: rockchip: rk3588s-u-boot: Add sdmmc node board: rockchip: Add Edgeble Neural Compute Module 6 John Keeping (1): mmc: rockchip_dw_mmc: fix DDR52 8-bit mode handling Jonas Karlman (21): rockchip: sdram: add basic support for sdram reg info version 3 rockchip: sdram: add dram bank with usable memory beyond 4GB rockchip: dts: rk3328: fix sdram params binman: Add support for a rockchip-tpl entry rockchip: Use an external TPL binary on RK3568 Revert "board: rockchip: Fix binman_init failure on EVB-RK3568" rockchip: mkimage: Update init size limit for RK3328 rockchip: mkimage: Update init size limit for RK3568 binman: Mark mkimage entry missing when its subnodes is missing rockchip: otp: Refactor to use driver data and ops rockchip: otp: Add support for RK3568 rockchip: otp: Add support for RK3588 rockchip: otp: Add dump_otp debug command rockchip: efuse: Refactor to use driver data and ops rockchip: efuse: Add support for RK3288 and more rockchip: efuse: Add support for RK3328 rockchip: efuse: Add support for RK3128 rockchip: efuse: Add support for RK3036 rockchip: misc: Set eth1addr mac address rockchip: rk3568: Read cpuid from otp rockchip: rk3588: Read cpuid from otp Manoj Sai (3): phy: rockchip-inno-usb2: Add USB2 PHY for rk3568 rockchip: rk3568: Select DM_REGULATOR_FIXED rk3566: radxa-cm3: Enable USB2.0, USB3.0 support Quentin Schulz (1): rockchip: ringneck: fix SDRAM init fail Vasily Khoruzhick (1): clk: rockchip: rk3568: add more supported clk rates for sdmmc and emmc Makefile | 1 + arch/arm/dts/Makefile | 8 +- arch/arm/dts/px30.dtsi | 4 + arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi | 17 + arch/arm/dts/rk3308-rock-pi-s.dts | 228 ++ arch/arm/dts/rk3328-sdram-ddr3-666.dtsi | 10 + arch/arm/dts/rk3328-sdram-ddr4-666.dtsi | 10 + arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi | 10 + arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi | 10 + arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi | 22 + arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi | 18 + arch/arm/dts/rk3566-radxa-cm3-io.dts | 272 ++ arch/arm/dts/rk3566-radxa-cm3.dtsi | 425 +++ arch/arm/dts/rk3568-evb.dts | 615 +++- arch/arm/dts/rk3568-rock-3a-u-boot.dtsi | 24 + arch/arm/dts/rk3568-rock-3a.dts | 609 ++++ arch/arm/dts/rk3568.dtsi | 122 + arch/arm/dts/rk356x-u-boot.dtsi | 17 + arch/arm/dts/rk356x.dtsi | 187 +- arch/arm/dts/rk3588-edgeble-neu6a-io-u-boot.dtsi | 24 + arch/arm/dts/rk3588-edgeble-neu6a-io.dts | 27 + arch/arm/dts/rk3588-edgeble-neu6a.dtsi | 32 + arch/arm/dts/rk3588-pinctrl.dtsi | 516 +++ arch/arm/dts/rk3588-rock-5b-u-boot.dtsi | 22 + arch/arm/dts/rk3588-rock-5b.dts | 44 + arch/arm/dts/rk3588-u-boot.dtsi | 7 + arch/arm/dts/rk3588.dtsi | 58 + arch/arm/dts/rk3588s-pinctrl.dtsi | 3403 ++++++++++++++++++++ arch/arm/dts/rk3588s-u-boot.dtsi | 71 + arch/arm/dts/rk3588s.dtsi | 1703 ++++++++++ arch/arm/dts/rockchip-u-boot.dtsi | 10 +- arch/arm/include/asm/arch-rk3588/boot0.h | 11 + arch/arm/include/asm/arch-rk3588/gpio.h | 11 + arch/arm/include/asm/arch-rockchip/clock.h | 24 + arch/arm/include/asm/arch-rockchip/cru_rk3588.h | 451 +++ arch/arm/include/asm/arch-rockchip/grf_rk3588.h | 35 + arch/arm/include/asm/arch-rockchip/ioc_rk3588.h | 101 + arch/arm/include/asm/arch-rockchip/sdram.h | 28 +- arch/arm/mach-rockchip/Kconfig | 34 + arch/arm/mach-rockchip/Makefile | 1 + arch/arm/mach-rockchip/board.c | 2 +- arch/arm/mach-rockchip/misc.c | 6 +- arch/arm/mach-rockchip/rk3568/rk3568.c | 31 + arch/arm/mach-rockchip/rk3588/Kconfig | 56 + arch/arm/mach-rockchip/rk3588/Makefile | 9 + arch/arm/mach-rockchip/rk3588/clk_rk3588.c | 32 + arch/arm/mach-rockchip/rk3588/rk3588.c | 157 + arch/arm/mach-rockchip/rk3588/syscon_rk3588.c | 32 + arch/arm/mach-rockchip/sdram.c | 21 +- board/edgeble/neural-compute-module-2/MAINTAINERS | 2 +- board/edgeble/neural-compute-module-6/Kconfig | 15 + board/edgeble/neural-compute-module-6/MAINTAINERS | 6 + board/edgeble/neural-compute-module-6/Makefile | 7 + board/edgeble/neural-compute-module-6/neu6.c | 4 + board/radxa/rock5b-rk3588/Kconfig | 15 + board/radxa/rock5b-rk3588/MAINTAINERS | 6 + board/radxa/rock5b-rk3588/Makefile | 6 + board/radxa/rock5b-rk3588/rock5b-rk3588.c | 39 + board/rockchip/evb_rk3308/MAINTAINERS | 7 + board/rockchip/evb_rk3568/MAINTAINERS | 14 + configs/evb-rk3568_defconfig | 1 - configs/nanopi-r4s-rk3399_defconfig | 6 + configs/neu6a-io-rk3588_defconfig | 67 + configs/radxa-cm3-io-rk3566_defconfig | 77 + configs/ringneck-px30_defconfig | 1 + configs/rock-3a-rk3568_defconfig | 74 + configs/rock-pi-s-rk3308_defconfig | 89 + configs/rock5b-rk3588_defconfig | 72 + doc/board/rockchip/rockchip.rst | 18 + drivers/clk/rockchip/Makefile | 1 + drivers/clk/rockchip/clk_pll.c | 267 +- drivers/clk/rockchip/clk_rk3568.c | 3 + drivers/clk/rockchip/clk_rk3588.c | 1996 ++++++++++++ drivers/gpio/rk_gpio.c | 20 +- drivers/misc/Kconfig | 4 - drivers/misc/rockchip-efuse.c | 333 +- drivers/misc/rockchip-otp.c | 230 +- drivers/mmc/rockchip_dw_mmc.c | 8 + drivers/phy/rockchip/Kconfig | 7 + drivers/phy/rockchip/Makefile | 1 + drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 65 +- drivers/phy/rockchip/phy-rockchip-naneng-combphy.c | 441 +++ drivers/pinctrl/rockchip/Makefile | 1 + drivers/pinctrl/rockchip/pinctrl-rk3568.c | 362 +++ drivers/ram/rockchip/Makefile | 1 + drivers/ram/rockchip/sdram_rk3588.c | 57 + include/configs/neural-compute-module-6.h | 15 + include/configs/rk3328_common.h | 4 +- include/configs/rk3568_common.h | 2 + include/configs/rk3588_common.h | 32 + include/configs/rock5b-rk3588.h | 15 + include/configs/rockchip-common.h | 4 + include/dt-bindings/clock/rockchip,rk3588-cru.h | 766 +++++ include/dt-bindings/power/rk3588-power.h | 69 + include/dt-bindings/reset/rockchip,rk3588-cru.h | 754 +++++ include/dt-bindings/soc/rockchip,vop2.h | 14 + tools/binman/entries.rst | 14 + tools/binman/etype/mkimage.py | 24 +- tools/binman/etype/rockchip_tpl.py | 20 + tools/binman/ftest.py | 18 + tools/binman/missing-blob-help | 5 + tools/binman/test/277_rockchip_tpl.dts | 16 + tools/binman/test/278_mkimage_missing_multiple.dts | 19 + tools/rkcommon.c | 5 +- 104 files changed, 15524 insertions(+), 163 deletions(-) create mode 100644 arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi create mode 100644 arch/arm/dts/rk3308-rock-pi-s.dts create mode 100644 arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi create mode 100644 arch/arm/dts/rk3566-radxa-cm3-io.dts create mode 100644 arch/arm/dts/rk3566-radxa-cm3.dtsi create mode 100644 arch/arm/dts/rk3568-rock-3a-u-boot.dtsi create mode 100644 arch/arm/dts/rk3568-rock-3a.dts create mode 100644 arch/arm/dts/rk3588-edgeble-neu6a-io-u-boot.dtsi create mode 100644 arch/arm/dts/rk3588-edgeble-neu6a-io.dts create mode 100644 arch/arm/dts/rk3588-edgeble-neu6a.dtsi create mode 100644 arch/arm/dts/rk3588-pinctrl.dtsi create mode 100644 arch/arm/dts/rk3588-rock-5b-u-boot.dtsi create mode 100644 arch/arm/dts/rk3588-rock-5b.dts create mode 100644 arch/arm/dts/rk3588-u-boot.dtsi create mode 100644 arch/arm/dts/rk3588.dtsi create mode 100644 arch/arm/dts/rk3588s-pinctrl.dtsi create mode 100644 arch/arm/dts/rk3588s-u-boot.dtsi create mode 100644 arch/arm/dts/rk3588s.dtsi create mode 100644 arch/arm/include/asm/arch-rk3588/boot0.h create mode 100644 arch/arm/include/asm/arch-rk3588/gpio.h create mode 100644 arch/arm/include/asm/arch-rockchip/cru_rk3588.h create mode 100644 arch/arm/include/asm/arch-rockchip/grf_rk3588.h create mode 100644 arch/arm/include/asm/arch-rockchip/ioc_rk3588.h create mode 100644 arch/arm/mach-rockchip/rk3588/Kconfig create mode 100644 arch/arm/mach-rockchip/rk3588/Makefile create mode 100644 arch/arm/mach-rockchip/rk3588/clk_rk3588.c create mode 100644 arch/arm/mach-rockchip/rk3588/rk3588.c create mode 100644 arch/arm/mach-rockchip/rk3588/syscon_rk3588.c create mode 100644 board/edgeble/neural-compute-module-6/Kconfig create mode 100644 board/edgeble/neural-compute-module-6/MAINTAINERS create mode 100644 board/edgeble/neural-compute-module-6/Makefile create mode 100644 board/edgeble/neural-compute-module-6/neu6.c create mode 100644 board/radxa/rock5b-rk3588/Kconfig create mode 100644 board/radxa/rock5b-rk3588/MAINTAINERS create mode 100644 board/radxa/rock5b-rk3588/Makefile create mode 100644 board/radxa/rock5b-rk3588/rock5b-rk3588.c create mode 100644 configs/neu6a-io-rk3588_defconfig create mode 100644 configs/radxa-cm3-io-rk3566_defconfig create mode 100644 configs/rock-3a-rk3568_defconfig create mode 100644 configs/rock-pi-s-rk3308_defconfig create mode 100644 configs/rock5b-rk3588_defconfig create mode 100644 drivers/clk/rockchip/clk_rk3588.c create mode 100644 drivers/phy/rockchip/phy-rockchip-naneng-combphy.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3568.c create mode 100644 drivers/ram/rockchip/sdram_rk3588.c create mode 100644 include/configs/neural-compute-module-6.h create mode 100644 include/configs/rk3588_common.h create mode 100644 include/configs/rock5b-rk3588.h create mode 100644 include/dt-bindings/clock/rockchip,rk3588-cru.h create mode 100644 include/dt-bindings/power/rk3588-power.h create mode 100644 include/dt-bindings/reset/rockchip,rk3588-cru.h create mode 100644 include/dt-bindings/soc/rockchip,vop2.h create mode 100644 tools/binman/etype/rockchip_tpl.py create mode 100644 tools/binman/test/277_rockchip_tpl.dts create mode 100644 tools/binman/test/278_mkimage_missing_multiple.dts

2 2

[PATCH v6 0/6] tpm: Support boot measurements
by Eddie James 01 Mar '23

01 Mar '23

This series adds support for measuring the boot images more generically than the existing EFI support. Several EFI functions have been moved to the TPM layer. The series includes optional measurement from the bootm command. A new test case has been added for the bootm measurement to test the new path, and the sandbox TPM2 driver has been updated to support this use case. This series is based on Ilias' auto-startup series and Simon's additions. Changes since v5: - Re-ordered the patches to put the sandbox TPM driver patch second - Remove unused platform_get_eventlog in efi_tcg2.c - First look for tpm_event_log_* properties instead of linux,sml-* - Fix efi_tcg2.c compilation - Select SHA* configs - Remove the !SANDBOX dependency for EFI TCG2 - Only compile in the measurement u-boot command when CONFIG_MEASURED_BOOT is enabled Changes since v4: - Remove tcg2_measure_event function and check for NULL data in tcg2_measure_data - Use tpm_auto_startup - Fix efi_tcg2.c compilation for removing tcg2_pcr_read function - Change PCR indexes for initrd and dtb - Drop u8 casting in measurement test - Use bullets in documentation Changes since v3: - Reordered headers - Refactored more of EFI code into common code Removed digest_info structure and instead used the common alg_to_mask and alg_to_len Improved event log parsing in common code to get it equivalent to EFI Common code now extends PCR if previous bootloader stage couldn't No need to allocate memory in the common code, so EFI copies the discovered buffer like it did before Rename efi measure_event function Changes since v2: - Add documentation. - Changed reserved memory address to the top of the RAM for sandbox dts. - Add measure state to booti and bootz. - Skip measurement for EFI images that should be measured Changes since v1: - Refactor TPM layer functions to allow EFI system to use them, and remove duplicate EFI functions. - Add test case - Drop #ifdefs for bootm - Add devicetree measurement config option - Update sandbox TPM driver Eddie James (6): tpm: Fix spelling for tpmu_ha union tpm: sandbox: Update for needed TPM2 capabilities tpm: Support boot measurements bootm: Support boot measurement test: Add sandbox TPM boot measurement doc: Add measured boot documentation arch/sandbox/dts/sandbox.dtsi | 13 + arch/sandbox/dts/test.dts | 13 + boot/Kconfig | 23 + boot/bootm.c | 70 +++ cmd/booti.c | 1 + cmd/bootm.c | 2 + cmd/bootz.c | 1 + configs/sandbox_defconfig | 1 + doc/usage/index.rst | 1 + doc/usage/measured_boot.rst | 23 + drivers/tpm/tpm2_tis_sandbox.c | 100 ++- include/bootm.h | 2 + include/efi_tcg2.h | 44 -- include/image.h | 1 + include/test/suites.h | 1 + include/tpm-v2.h | 246 +++++++- lib/Kconfig | 4 + lib/efi_loader/Kconfig | 2 - lib/efi_loader/efi_tcg2.c | 1053 +++----------------------------- lib/tpm-v2.c | 773 +++++++++++++++++++++++ test/boot/Makefile | 1 + test/boot/measurement.c | 66 ++ test/cmd_ut.c | 4 + 23 files changed, 1392 insertions(+), 1053 deletions(-) create mode 100644 doc/usage/measured_boot.rst create mode 100644 test/boot/measurement.c -- 2.31.1

4 18

[PATCH v2 0/4] patman: Speed up some operations
by Simon Glass 01 Mar '23

01 Mar '23

This little series updates patman to run the get_maintainer.py script in parallel for each commit. It also does the same with checkpatch. In some cases this can make a dramatic different to the speed. Changes in v2: - Fix 'uncorrect' typo in subject - Fix missing 'f' on format string Simon Glass (4): patman: Drop an incorrect comment about git am patman: Refactor MakeCcFile() into two functions patman: Run get_maintainer.pl in parallel patman: Check patches in parallel tools/patmanu/checkpatch.py | 46 +++++++++------- tools/patmanu/control.py | 2 +- tools/patmanu/func_test.py | 2 + tools/patmanu/series.py | 107 ++++++++++++++++++++++++++++-------- 4 files changed, 112 insertions(+), 45 deletions(-) -- 2.39.2.637.g21b0678d19-goog

2 8

[PATCH 00/17] patman: Convert camel case
by Simon Glass 01 Mar '23

01 Mar '23

Much of the Python code in U-Boot was written using the Chromium OS Python style. This series converts the patman class methods and functions from camel case to snake case. This fits with PEP8 and is one step along the way to making the code more compliant with that. Simon Glass (17): patman: Convert camel case in tools.py patman: Convert camel case in command.py patman: Convert camel case in checkpatch.py patman: Convert camel case in commit.py patman: Convert camel case in cros_subprocess.py patman: Convert camel case in func_test.py patman: Convert camel case in get_maintainer.py patman: Convert camel case in gitutil.py patman: Convert camel case in project.py patman: Convert camel case in test_checkpatch.py patman: Convert camel case in test_util.py patman: Convert camel case in tout.py patman: Rename Print() to Tprint() patman: Rename Color() method to build() patman: Convert camel case in terminal.py patman: Update with new pylint scores RFC: tools: Add a camel-case conversion script scripts/pylint.base | 26 +- scripts/style.py | 180 +++++++++++ tools/binman/bintool.py | 30 +- tools/binman/bintool_test.py | 34 +- tools/binman/btool/lz4.py | 8 +- tools/binman/btool/lzma_alone.py | 16 +- tools/binman/cbfs_util.py | 12 +- tools/binman/cbfs_util_test.py | 20 +- tools/binman/control.py | 74 ++--- tools/binman/elf.py | 20 +- tools/binman/elf_test.py | 20 +- tools/binman/entry.py | 42 +-- tools/binman/entry_test.py | 4 +- tools/binman/etype/atf_fip.py | 2 +- tools/binman/etype/blob.py | 4 +- tools/binman/etype/blob_ext_list.py | 2 +- tools/binman/etype/fdtmap.py | 2 +- tools/binman/etype/files.py | 2 +- tools/binman/etype/fill.py | 2 +- tools/binman/etype/fit.py | 20 +- tools/binman/etype/fmap.py | 6 +- tools/binman/etype/gbb.py | 10 +- tools/binman/etype/intel_ifwi.py | 12 +- tools/binman/etype/mkimage.py | 8 +- tools/binman/etype/section.py | 26 +- tools/binman/etype/text.py | 4 +- tools/binman/etype/u_boot_elf.py | 6 +- tools/binman/etype/u_boot_env.py | 4 +- tools/binman/etype/u_boot_spl_bss_pad.py | 4 +- tools/binman/etype/u_boot_spl_expanded.py | 2 +- tools/binman/etype/u_boot_tpl_bss_pad.py | 4 +- tools/binman/etype/u_boot_tpl_expanded.py | 2 +- tools/binman/etype/u_boot_ucode.py | 4 +- tools/binman/etype/u_boot_with_ucode_ptr.py | 2 +- tools/binman/etype/vblock.py | 10 +- tools/binman/fdt_test.py | 4 +- tools/binman/fip_util.py | 16 +- tools/binman/fip_util_test.py | 36 +-- tools/binman/fmap_util.py | 2 +- tools/binman/ftest.py | 324 ++++++++++---------- tools/binman/image.py | 16 +- tools/binman/main.py | 6 +- tools/binman/state.py | 34 +- tools/buildman/builder.py | 108 +++---- tools/buildman/builderthread.py | 12 +- tools/buildman/control.py | 46 +-- tools/buildman/func_test.py | 20 +- tools/buildman/test.py | 30 +- tools/buildman/toolchain.py | 26 +- tools/dtoc/fdt.py | 4 +- tools/dtoc/fdt_util.py | 12 +- tools/dtoc/main.py | 6 +- tools/dtoc/test_dtoc.py | 76 ++--- tools/dtoc/test_fdt.py | 34 +- tools/dtoc/test_src_scan.py | 12 +- tools/patman/checkpatch.py | 36 +-- tools/patman/command.py | 30 +- tools/patman/commit.py | 10 +- tools/patman/control.py | 20 +- tools/patman/cros_subprocess.py | 59 ++-- tools/patman/func_test.py | 74 ++--- tools/patman/get_maintainer.py | 8 +- tools/patman/gitutil.py | 176 +++++------ tools/patman/main.py | 8 +- tools/patman/patchstream.py | 12 +- tools/patman/project.py | 4 +- tools/patman/series.py | 32 +- tools/patman/settings.py | 4 +- tools/patman/status.py | 22 +- tools/patman/terminal.py | 56 ++-- tools/patman/test_checkpatch.py | 80 ++--- tools/patman/test_util.py | 8 +- tools/patman/tools.py | 86 +++--- tools/patman/tout.py | 58 ++-- tools/rmboard.py | 16 +- 75 files changed, 1214 insertions(+), 1033 deletions(-) create mode 100755 scripts/style.py -- 2.35.0.rc2.247.g8bbb082509-goog

1 34

[PATCH] arm64: a37xx: pinctrl: probe after binding
by Robert Marko 01 Mar '23

01 Mar '23

Currently, pinctrl drivers are getting probed during post-bind, however that is being reverted, and on A37XX pinctrl driver is the one that registers the GPIO driver during the probe. So, if the pinctrl driver doesn't get probed GPIO-s won't get registered and thus they cannot be used. This is a problem on the Methode eDPU as it just uses SB pins as GPIO-s and without them being registered networking won't work as it only has one SFP slot and the TX disable GPIO is on the SB controller. So, lets just add a flag only to A37XX driver to probe after binding in order for the GPIO driver to always get registered. Signed-off-by: Robert Marko <robert.marko(a)sartura.hr> --- drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c index 25fbe39abd1..1be6252227d 100644 --- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c +++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c @@ -745,6 +745,19 @@ static int armada_37xx_pinctrl_probe(struct udevice *dev) return 0; } +static int armada_37xx_pinctrl_bind(struct udevice *dev) +{ + /* + * Make sure that the pinctrl driver gets probed after binding + * as on A37XX the pinctrl driver is the one that is also + * registering the GPIO one during probe, so if its not probed + * GPIO-s are not registered as well. + */ + dev_or_flags(dev, DM_FLAG_PROBE_AFTER_BIND); + + return 0; +} + static const struct udevice_id armada_37xx_pinctrl_of_match[] = { { .compatible = "marvell,armada3710-sb-pinctrl", @@ -762,6 +775,7 @@ U_BOOT_DRIVER(armada_37xx_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = of_match_ptr(armada_37xx_pinctrl_of_match), .probe = armada_37xx_pinctrl_probe, + .bind = armada_37xx_pinctrl_bind, .priv_auto = sizeof(struct armada_37xx_pinctrl), .ops = &armada_37xx_pinctrl_ops, }; -- 2.39.0

3 4

[PATCH] tests: Build correct sandbox configuration on 32bit
by Michal Suchanek 01 Mar '23

01 Mar '23

Currently sandbox configuration defautls to 64bit and there is no automation for building 32bit sandbox on 32bit hosts. cpp does not know about target specification, code needs to be compiled to determine integer width. Add a test program that prints the integer width, and a make target that aligns the sandbox configuration with the result. Signed-off-by: Michal Suchanek <msuchanek(a)suse.de> --- Makefile | 6 ++++++ doc/arch/sandbox.rst | 16 +++++++++++----- test/py/conftest.py | 1 + tools/Makefile | 2 ++ tools/bits-per-long.c | 14 ++++++++++++++ 5 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 tools/bits-per-long.c diff --git a/Makefile b/Makefile index 3866cc62f9..e5463573f3 100644 --- a/Makefile +++ b/Makefile @@ -2166,6 +2166,12 @@ tools-all: envtools tools ; cross_tools: export CROSS_BUILD_TOOLS=y cross_tools: tools ; +PHONY += set_host_bits +set_host_bits: tools + $(Q)sed -i -e /CONFIG_HOST_$$($(objtree)/tools/bits-per-long)BIT/d $(KCONFIG_CONFIG) + $(Q)sed -i -E -e "s/CONFIG_HOST_(..)BIT=y/# CONFIG_HOST_\1BIT is not set/" $(KCONFIG_CONFIG) + $(Q)echo CONFIG_HOST_$$($(objtree)/tools/bits-per-long)BIT=y >> $(KCONFIG_CONFIG) + .PHONY : CHANGELOG CHANGELOG: git log --no-merges U-Boot-1_1_5.. | \ diff --git a/doc/arch/sandbox.rst b/doc/arch/sandbox.rst index 068d4a3be4..d751205eba 100644 --- a/doc/arch/sandbox.rst +++ b/doc/arch/sandbox.rst @@ -33,9 +33,11 @@ machines. There are two versions of the sandbox: One using 32-bit-wide integers, and one using 64-bit-wide integers. The 32-bit version can be build and run on either -32 or 64-bit hosts by either selecting or deselecting CONFIG_SANDBOX_32BIT; by -default, the sandbox it built for a 32-bit host. The sandbox using 64-bit-wide -integers can only be built on 64-bit hosts. +32 or 64-bit hosts by either selecting or deselecting HOST_64BIT; by +default, the sandbox it built for a 64-bit host. The sandbox using 64-bit-wide +integers can only be built on 64-bit hosts. There is no automation for ensuring +32bit build on 32bit hosts - use ``make set_host_bits`` to adjust the sandbox +config. Note that standalone/API support is not available at present. @@ -51,7 +53,9 @@ Basic Operation To run sandbox U-Boot use something like:: - make sandbox_defconfig all + make sandbox_defconfig + make set_host_bits + make all ./u-boot Note: If you get errors about 'sdl-config: Command not found' you may need to @@ -59,7 +63,9 @@ install libsdl2.0-dev or similar to get SDL support. Alternatively you can build sandbox without SDL (i.e. no display/keyboard support) by removing the CONFIG_SANDBOX_SDL line in include/configs/sandbox.h or using:: - make sandbox_defconfig all NO_SDL=1 + make sandbox_defconfig + make set_host_bits + make all NO_SDL=1 ./u-boot U-Boot will start on your computer, showing a sandbox emulation of the serial diff --git a/test/py/conftest.py b/test/py/conftest.py index 304e93164a..3d1fd6883a 100644 --- a/test/py/conftest.py +++ b/test/py/conftest.py @@ -104,6 +104,7 @@ def run_build(config, source_dir, build_dir, board_type, log): o_opt = '' cmds = ( ['make', o_opt, '-s', board_type + '_defconfig'], + ['make', o_opt, '-s', 'set_host_bits'], ['make', o_opt, '-s', '-j{}'.format(os.cpu_count())], ) name = 'make' diff --git a/tools/Makefile b/tools/Makefile index 34a1aa7a8b..d6b585953d 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -68,6 +68,8 @@ HOSTCFLAGS_img2srec.o := -pedantic hostprogs-$(CONFIG_XWAY_SWAP_BYTES) += xway-swap-bytes HOSTCFLAGS_xway-swap-bytes.o := -pedantic +hostprogs-y += bits-per-long + hostprogs-y += mkenvimage mkenvimage-objs := mkenvimage.o os_support.o lib/crc32.o diff --git a/tools/bits-per-long.c b/tools/bits-per-long.c new file mode 100644 index 0000000000..7630e1623f --- /dev/null +++ b/tools/bits-per-long.c @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <stdio.h> + +int main(int argc, char **argv) +{ + unsigned long testvar = ~0UL; + unsigned int i; + + for (i = 0; testvar; i++, testvar >>= 1) + ; + + return printf("%u\n", i); +} + -- 2.37.3

4 28

[PATCH] MAINTAINERS: assign sandbox drivers to SANDBOX
by Heinrich Schuchardt 01 Mar '23

01 Mar '23

Drivers should have a maintainer. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 6f53f9c2f6..a69a226ddf 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1335,6 +1335,7 @@ M: Simon Glass <sjg(a)chromium.org> S: Maintained F: arch/sandbox/ F: doc/arch/sandbox.rst +F: drivers/*/*sandbox*.c F: include/dt-bindings/*/sandbox*.h SEAMA -- 2.38.1

2 2

[PATCH 1/1] sandbox: allow building sandbox_spl with CONFIG_DEBUG
by Heinrich Schuchardt 01 Mar '23

01 Mar '23

Building sandbox_spl with CONFIG_DEBUG leads to errors due to missing symbols: /usr/bin/ld: common/spl/spl_fit.o: in function `spl_fit_upload_fpga': common/spl/spl_fit.c:595: undefined reference to `fpga_load' /usr/bin/ld: test/test-main.o: in function `dm_test_post_run': test/test-main.c:124: undefined reference to `crc8' /usr/bin/ld: test/test-main.o: in function `dm_test_pre_run': test/test-main.c:95: undefined reference to `crc8' collect2: error: ld returned 1 exit status This is due to -Og not eliminating unused functions. Add FPGA and CRC8 support to the defconfig. Sandbox tests for SPL_FPGA and CRC8 should be created. So enabling these setting is advised anyway. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- configs/sandbox_spl_defconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig index 4e0021a76f..851c3b687a 100644 --- a/configs/sandbox_spl_defconfig +++ b/configs/sandbox_spl_defconfig @@ -33,6 +33,7 @@ CONFIG_SPL_NO_BSS_LIMIT=y CONFIG_HANDOFF=y CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_ENV_SUPPORT=y +CONFIG_SPL_FPGA=y CONFIG_SPL_I2C=y CONFIG_SPL_RTC=y CONFIG_CMD_CPU=y @@ -126,6 +127,8 @@ CONFIG_DM_DEMO=y CONFIG_DM_DEMO_SIMPLE=y CONFIG_DM_DEMO_SHAPE=y CONFIG_SPL_FIRMWARE=y +CONFIG_DM_FPGA=y +CONFIG_SANDBOX_FPGA=y CONFIG_GPIO_HOG=y CONFIG_QCOM_PMIC_GPIO=y CONFIG_SANDBOX_GPIO=y @@ -237,6 +240,7 @@ CONFIG_FS_CRAMFS=y CONFIG_CMD_DHRYSTONE=y CONFIG_RSA_VERIFY_WITH_PKEY=y CONFIG_TPM=y +CONFIG_SPL_CRC8=y CONFIG_LZ4=y CONFIG_ZSTD=y CONFIG_ERRNO_STR=y -- 2.38.1

3 4

[PATCH v2 1/1] sandbox: fix building with CONFIG_SPL_TIMER=y
by Heinrich Schuchardt 01 Mar '23

01 Mar '23

Building sandbox_defconfig with CONFIG_SPL_TIMER=y results in an error include/dm/platdata.h:63:33: error: static assertion failed: "Cannot use U_BOOT_DRVINFO with of-platdata. Please use devicetree instead" Add a missing condition in the sandbox driver. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- v2: don't create U_BOOT_DRVINFO for DT_PLAT_C (as requested in review comment by Simon) --- drivers/timer/sandbox_timer.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/timer/sandbox_timer.c b/drivers/timer/sandbox_timer.c index c846bfb9f1..1da7e0c3a7 100644 --- a/drivers/timer/sandbox_timer.c +++ b/drivers/timer/sandbox_timer.c @@ -66,6 +66,8 @@ U_BOOT_DRIVER(sandbox_timer) = { }; /* This is here in case we don't have a device tree */ +#if !CONFIG_IS_ENABLED(OF_PLATDATA) U_BOOT_DRVINFO(sandbox_timer_non_fdt) = { .name = "sandbox_timer", }; +#endif -- 2.38.1

2 2

[PATCH] tools: binman: minor formatting fix in docs
by Ralph Siemsen 01 Mar '23

01 Mar '23

This should fix a rendering oddity when viewing the docs online at https://u-boot.readthedocs.io/en/latest/develop/package/binman.html Signed-off-by: Ralph Siemsen <ralph.siemsen(a)linaro.org> --- tools/binman/binman.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/binman/binman.rst b/tools/binman/binman.rst index 03a99a19bc..0921e31878 100644 --- a/tools/binman/binman.rst +++ b/tools/binman/binman.rst @@ -393,9 +393,9 @@ system-library directory, replace the last line with: Running binman -------------- -Type:: +Type: -.. code-block: bash +.. code-block:: bash make NO_PYTHON=1 PREFIX=/ install binman build -b <board_name> -- 2.25.1

2 2