- U-Boot - denx.biz

[PATCH v2] xilinx: Enable meminfo command with mapping
by Michal Simek 27 Jan '25

27 Jan '25

Enable meminfo command to be able to see where things are mapped. Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- Changes in v2: - Also cover Kria configs/amd_versal2_virt_defconfig | 2 ++ configs/microblaze-generic_defconfig | 2 ++ configs/xilinx_versal_net_virt_defconfig | 2 ++ configs/xilinx_versal_virt_defconfig | 2 ++ configs/xilinx_zynq_virt_defconfig | 2 ++ configs/xilinx_zynqmp_kria_defconfig | 2 ++ configs/xilinx_zynqmp_virt_defconfig | 2 ++ 7 files changed, 14 insertions(+) diff --git a/configs/amd_versal2_virt_defconfig b/configs/amd_versal2_virt_defconfig index 22dad1b7076b..a7d8b035a714 100644 --- a/configs/amd_versal2_virt_defconfig +++ b/configs/amd_versal2_virt_defconfig @@ -30,6 +30,8 @@ CONFIG_SYS_PROMPT="versal2> " CONFIG_CMD_BOOTMENU=y CONFIG_CMD_GREPENV=y CONFIG_CMD_NVEDIT_EFI=y +CONFIG_CMD_MEMINFO=y +CONFIG_CMD_MEMINFO_MAP=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_ALT_MEMTEST=y CONFIG_CMD_SHA1SUM=y diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig index 2e618d81544d..87756cb26df5 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig @@ -42,6 +42,8 @@ CONFIG_CMD_IMLS=y CONFIG_CMD_SPL=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_MEMINFO=y +CONFIG_CMD_MEMINFO_MAP=y CONFIG_CMD_GPIO=y CONFIG_CMD_SAVES=y CONFIG_BOOTP_BOOTFILESIZE=y diff --git a/configs/xilinx_versal_net_virt_defconfig b/configs/xilinx_versal_net_virt_defconfig index b40f7b7f8556..081ad424a9aa 100644 --- a/configs/xilinx_versal_net_virt_defconfig +++ b/configs/xilinx_versal_net_virt_defconfig @@ -32,6 +32,8 @@ CONFIG_CMD_SMBIOS=y CONFIG_CMD_BOOTMENU=y CONFIG_CMD_GREPENV=y CONFIG_CMD_NVEDIT_EFI=y +CONFIG_CMD_MEMINFO=y +CONFIG_CMD_MEMINFO_MAP=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_ALT_MEMTEST=y CONFIG_CMD_SHA1SUM=y diff --git a/configs/xilinx_versal_virt_defconfig b/configs/xilinx_versal_virt_defconfig index ccbd33ee1cf7..dd6e3ca34660 100644 --- a/configs/xilinx_versal_virt_defconfig +++ b/configs/xilinx_versal_virt_defconfig @@ -38,6 +38,8 @@ CONFIG_CMD_SMBIOS=y CONFIG_CMD_BOOTMENU=y CONFIG_CMD_GREPENV=y CONFIG_CMD_NVEDIT_EFI=y +CONFIG_CMD_MEMINFO=y +CONFIG_CMD_MEMINFO_MAP=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_ALT_MEMTEST=y CONFIG_CMD_SHA1SUM=y diff --git a/configs/xilinx_zynq_virt_defconfig b/configs/xilinx_zynq_virt_defconfig index ed3d10194857..c2422c5b4dcf 100644 --- a/configs/xilinx_zynq_virt_defconfig +++ b/configs/xilinx_zynq_virt_defconfig @@ -56,6 +56,8 @@ CONFIG_CMD_IMLS=y CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_THOR_RESET_OFF=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_MEMINFO=y +CONFIG_CMD_MEMINFO_MAP=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_ALT_MEMTEST=y CONFIG_CMD_DFU=y diff --git a/configs/xilinx_zynqmp_kria_defconfig b/configs/xilinx_zynqmp_kria_defconfig index a68bd522f90a..ce44148dc0bc 100644 --- a/configs/xilinx_zynqmp_kria_defconfig +++ b/configs/xilinx_zynqmp_kria_defconfig @@ -63,6 +63,8 @@ CONFIG_CMD_SMBIOS=y CONFIG_CMD_BOOTMENU=y CONFIG_CMD_GREPENV=y CONFIG_CMD_NVEDIT_EFI=y +CONFIG_CMD_MEMINFO=y +CONFIG_CMD_MEMINFO_MAP=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_ALT_MEMTEST=y CONFIG_CMD_SHA1SUM=y diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig index b13079cdf707..05ead1a41b4d 100644 --- a/configs/xilinx_zynqmp_virt_defconfig +++ b/configs/xilinx_zynqmp_virt_defconfig @@ -63,6 +63,8 @@ CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_THOR_RESET_OFF=y CONFIG_CMD_GREPENV=y CONFIG_CMD_NVEDIT_EFI=y +CONFIG_CMD_MEMINFO=y +CONFIG_CMD_MEMINFO_MAP=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_ALT_MEMTEST=y CONFIG_CMD_SHA1SUM=y -- 2.43.0

1 0

[PATCH v2 0/3] Static initcalls
by Jerome Forissier 27 Jan '25

27 Jan '25

This series replaces the dynamic initcalls (with function pointers) with static calls, and gets rid of initcall_run_list(), init_sequence_f, init_sequence_f_r and init_sequence_r. This makes the code simpler and the binary slighlty smaller: -2281 bytes/-0.21 % with LTO enabled and -510 bytes/-0.05 % with LTO disabled (xilinx_zynqmp_kria_defconfig). Execution time doesn't seem to change noticeably. There is no impact on the SPL. The inline assembly fixes, although they look unrelated, are triggered on some platforms with LTO enabled. For example: kirkwood_defconfig. Azure CI passed [1] except: - World build, imx8ulp_evk (and other imx*): "bl31.bin: Can't open: No such file or directory" - World build, xilinx_zynqmp_kria: "file not found: pmu_obj.bin" ...which are clearly unrelated to this series. [1] https://dev.azure.com/u-boot/u-boot/_build/results?buildId=10405 Changes in v5: - Fix mistake in initcall_run_r(): CONFIG_IS_ENABLED(SYS_EARLY_PCI_INIT) should have been !CONFIG_IS_ENABLED(...). As a result, several CI tests were failing. (Tom R.) - Restore fixes in test/py/tests/test_trace.py and arch/sh/lib/board.c which had unexpectedly disappeared from v4 and caused CI errors. - Fix CI error caused by wrong conditionals on the fix_fdt() call: tools/buildman/buildman -o /tmp -seP powerpc [...] common/board_f.c:752:12: error: 'fix_fdt' defined but not used [-Werror=unused-function] - Add "arm: asm/system.h: mrc and mcr need .arm if __thumb2__ is not set" to fix a build error with LTO detecting mcr/mrc instructions emitted in Thumb mode on a CPU that doesn't support it: make sheevaplug_defconfig make -j$(nproc) CROSS_COMPILE="ccache arm-linux-gnueabi-" [...] LTO u-boot {standard input}: Assembler messages: {standard input}:9241: Error: selected processor does not support `mcr p15,1,r0,c15,c11,0' in Thumb mode {standard input}:19196: Error: selected processor does not support `mrc p15,1,r3,c15,c1,0' in Thumb mode {standard input}:19223: Error: selected processor does not support `mcr p15,1,r3,c15,c1,0' in Thumb mode {standard input}:19241: Error: selected processor does not support `mrc p15,1,r3,c15,c1,0' in Thumb mode {standard input}:19268: Error: selected processor does not support `mcr p15,1,r3,c15,c1,0' in Thumb mode {standard input}:19286: Error: selected processor does not support `mrc p15,1,r3,c15,c1,0' in Thumb mode {standard input}:19321: Error: selected processor does not support `mcr p15,1,r3,c15,c1,0' in Thumb mode {standard input}:19341: Error: selected processor does not support `mrc p15,0,r3,c1,c0,0' in Thumb mode {standard input}:19372: Error: selected processor does not support `mcr p15,0,r3,c1,c0,0' in Thumb mode make[1]: *** [/tmp/ccu1wZWX.mk:11: /tmp/ccIab81n.ltrans3.ltrans.o] Error 1 Changes in v4: - Fold all changes to board_init_*() into a single patch - Use '#if CONFIG_IS_ENABLED(FOO) INITCALL(init_foo) #endif' instead of 'CONFIG_IS_ENABLED(FOO, (INITCALL(init_foo);));' (Caleb C., Simon G.). As a consequence, drop Michal's patch ("common: board: Simplify array with function pointers with CONFIG_IS_ENABLED"). - Rebase on next Changes in v3: - Use printf() rather than debug() to report initcall failures (Quentin S.) - initcall_run_f(): replace one erroneous call to WATCHDOG_INIT() with WATCHDOG_RESET() (Ilias A.) - Fix relocate_code() in arch/sh/lib/board.c to address CI failures with r2dplus (https://lists.denx.de/pipermail/u-boot/2025-January/576213.html) (Tom R.) - Add comments to initcall_run_f() and initcall_run_r() (Simon G.) Changes in v2: - INTICALL() and INITCALL_EVT() now call hang() immediately on error - Fixed typo: s/intcall_run_f_r/initcall_run_f_r/ Jerome Forissier (3): arm: asm/system.h: mrc and mcr need .arm if __thumb2__ is not set common: board: make initcalls static initcall: remove initcall_run_list() arch/arm/include/asm/system.h | 22 +- arch/arm/lib/cache.c | 5 +- arch/arm/mach-kirkwood/include/mach/cpu.h | 9 +- arch/sh/lib/board.c | 9 +- common/board_f.c | 223 +++++++++---------- common/board_r.c | 251 +++++++++++----------- include/initcall.h | 45 ++-- lib/Makefile | 1 - lib/initcall.c | 102 --------- test/py/tests/test_trace.py | 8 +- 10 files changed, 297 insertions(+), 378 deletions(-) delete mode 100644 lib/initcall.c -- 2.43.0

2 10

[PATCH v4 v5 00/10] add support for Enclustra Mercury AA1 SoMs
by Lothar Rubusch 27 Jan '25

27 Jan '25

Introduce the support for three variants of Enclustra's Intel Mercury AA1 (with Intel Arria10) SoMs and additional configs. The DT approach is partly based on dts/upstream, which are (going to be) upstreamed to the linux kernel. Signed-off-by: Lothar Rubusch <l.rubusch(a)gmail.com> --- v4 -> v5: - exclude typo / wording fixes for binman.rst, gdb.rst and binman/entries.rst - implicitely builds using binman v3 -> v4: - fix wrong mail address in v2 and author - update scripts for stdboot and generic load - clean up patch organization (patch 7/10 was malformed and almost empty, added and removed stances,..) - fix binding used for "enclustra,altera_set_storage" - separate u-boot specific part of .dts to a socfpga_arria10_mercury_aa1-u-boot.dtsi file - integrate fpga.itb build with binman in the -u-boot.dtsi file note: 1. due to binman, now the build will need binman build (i.e. requirements) and is build then with "make NO_PYTHON=1" 2. the fpga bitstream files bitstream.core.rbf and bitstream.periph.rbf are generated by a particular Quartus design, so they can't be committed here. This makes the build fail, if build with binman. For testing, thus build with "make CONFIG_BINMAN=n" - fix some typos in binman and gdb documentation (additional patch) v2 -> v3: - update of DT concept to work with dts/upstream - update of DT parts in arch/arm/dts, because of: -- the handoff initialization of the Arria10 SoC -- the fpga loader for the bitstream in the DTS -- the adjustments to access the boot media, from where to load the fpga.itb -- and to mux media for booting, e.g. QSPI off, when booting from MMC - implementation of kconfig options to combine SoM .dtsi file, carrier board .dtsi files, boot-mode parts, and so on resulting in a single .dts file located in arch/arm/dts because of the above mentioned reasons - adjustents to (better) satisfy dtb checks - updated MAINTAINERS - updated documentation - update to use standard boot and environment as only environment, removal of explicit variables and environment files - removal of duplicate codes - cleanup and implement altera_set_storage (boot media switch command in u-boot shell) based on DM - fix spansion flash access to allow flashing from off the u-boot shell, this patch was already presented separately, the fix is actively needed for the AA1 SoM - sort lists in several files alfabetically - update boot commands using && instead of ; v1 -> v2: - removal si5338 driver - removal si5338 driver usage - rename .c file for the boot cmd, build conditionally - add separate .c file for late boot init to read MAC address from eeprom - keep DT approach for u-boot under discussion - fix issues in doc - update MAINTAINERS to cover doc --- Lothar Rubusch (10): doc: board: enclustra: add Enclustra Mercury+ AA1 ARM: socfpga: add Mercury+ AA1 SoM support ARM: dts: socfpga: add Mercury+ AA1 for u-boot dts ARM: socfpga: add Enclustra storage switch ARM: socfpga: add Mercury+ AA1 boot scripts ARM: socfpga: AA1: support MAC from secure eeprom misc: atsha204a: update kconfig description ARM: dts: arria10: update according to DTSpec ARM: socfpga: update function call to modern API ARM: socfpga: apply binman approach to fpga parts arch/arm/dts/socfpga_arria10.dtsi | 42 ++- ..._arria10_enclustra_mercury_aa1-u-boot.dtsi | 89 +++++ .../socfpga_arria10_enclustra_mercury_aa1.dts | 62 ++++ .../socfpga_arria10_mercury_aa1-u-boot.dtsi | 19 ++ .../dts/socfpga_arria10_mercury_aa1_handoff.h | 305 ++++++++++++++++++ arch/arm/mach-socfpga/Kconfig | 10 + arch/arm/mach-socfpga/misc_arria10.c | 2 - board/enclustra/bootscripts/qspi-aa1.cmd | 12 + board/enclustra/bootscripts/sd-aa1.cmd | 9 + board/enclustra/common/Kconfig | 25 ++ board/enclustra/common/Makefile | 7 + board/enclustra/common/enclustra_mac.h | 48 +++ board/enclustra/common/mac_atsha204.c | 102 ++++++ board/enclustra/common/mac_common.c | 52 +++ board/enclustra/common/mac_ds28.c | 93 ++++++ board/enclustra/mercury_aa1/Kconfig | 52 +++ board/enclustra/mercury_aa1/MAINTAINERS | 12 + board/enclustra/mercury_aa1/Makefile | 10 + .../mercury_aa1/aa1_board_late_init.c | 17 + .../mercury_aa1/aa1_set_storage_cmd.c | 190 +++++++++++ .../socfpga_enclustra_mercury_aa1_defconfig | 86 +++++ doc/board/enclustra/index.rst | 9 + doc/board/enclustra/mercury-aa1.rst | 230 +++++++++++++ doc/board/index.rst | 1 + drivers/misc/Kconfig | 2 +- include/configs/socfpga_mercury_aa1.h | 23 ++ 26 files changed, 1497 insertions(+), 12 deletions(-) create mode 100644 arch/arm/dts/socfpga_arria10_enclustra_mercury_aa1-u-boot.dtsi create mode 100644 arch/arm/dts/socfpga_arria10_enclustra_mercury_aa1.dts create mode 100644 arch/arm/dts/socfpga_arria10_mercury_aa1_handoff.h create mode 100644 board/enclustra/bootscripts/qspi-aa1.cmd create mode 100644 board/enclustra/bootscripts/sd-aa1.cmd create mode 100644 board/enclustra/common/Kconfig create mode 100644 board/enclustra/common/Makefile create mode 100644 board/enclustra/common/enclustra_mac.h create mode 100644 board/enclustra/common/mac_atsha204.c create mode 100644 board/enclustra/common/mac_common.c create mode 100644 board/enclustra/common/mac_ds28.c create mode 100644 board/enclustra/mercury_aa1/Kconfig create mode 100644 board/enclustra/mercury_aa1/MAINTAINERS create mode 100644 board/enclustra/mercury_aa1/Makefile create mode 100644 board/enclustra/mercury_aa1/aa1_board_late_init.c create mode 100644 board/enclustra/mercury_aa1/aa1_set_storage_cmd.c create mode 100644 configs/socfpga_enclustra_mercury_aa1_defconfig create mode 100644 doc/board/enclustra/index.rst create mode 100644 doc/board/enclustra/mercury-aa1.rst create mode 100644 include/configs/socfpga_mercury_aa1.h -- 2.39.2

2 12

[PATCH v4 00/11] add support for Enclustra Mercury AA1 SoMs
by Lothar Rubusch 27 Jan '25

27 Jan '25

Introduce the support for three variants of Enclustra's Intel Mercury AA1 (with Intel Arria10) SoMs and additional configs. The DT approach is partly based on dts/upstream, which are (going to be) upstreamed to the linux kernel. Signed-off-by: Lothar Rubusch <l.rubusch(a)gmail.com> --- v3 -> v4: - fix wrong mail address in v2 and author - update scripts for stdboot and generic load - clean up patch organization (patch 7/10 was malformed and almost empty, added and removed stances,..) - fix binding used for "enclustra,altera_set_storage" - separate u-boot specific part of .dts to a socfpga_arria10_mercury_aa1-u-boot.dtsi file - integrate fpga.itb build with binman in the -u-boot.dtsi file note: 1. due to binman, now the build will need binman build (i.e. requirements) and is build then with "make NO_PYTHON=1" 2. the fpga bitstream files bitstream.core.rbf and bitstream.periph.rbf are generated by a particular Quartus design, so they can't be committed here. This makes the build fail, if build with binman. For testing, thus build with "make CONFIG_BINMAN=n" - fix some typos in binman and gdb documentation (additional patch) v2 -> v3: - update of DT concept to work with dts/upstream - update of DT parts in arch/arm/dts, because of: -- the handoff initialization of the Arria10 SoC -- the fpga loader for the bitstream in the DTS -- the adjustments to access the boot media, from where to load the fpga.itb -- and to mux media for booting, e.g. QSPI off, when booting from MMC - implementation of kconfig options to combine SoM .dtsi file, carrier board .dtsi files, boot-mode parts, and so on resulting in a single .dts file located in arch/arm/dts because of the above mentioned reasons - adjustents to (better) satisfy dtb checks - updated MAINTAINERS - updated documentation - update to use standard boot and environment as only environment, removal of explicit variables and environment files - removal of duplicate codes - cleanup and implement altera_set_storage (boot media switch command in u-boot shell) based on DM - fix spansion flash access to allow flashing from off the u-boot shell, this patch was already presented separately, the fix is actively needed for the AA1 SoM - sort lists in several files alfabetically - update boot commands using && instead of ; v1 -> v2: - removal si5338 driver - removal si5338 driver usage - rename .c file for the boot cmd, build conditionally - add separate .c file for late boot init to read MAC address from eeprom - keep DT approach for u-boot under discussion - fix issues in doc - update MAINTAINERS to cover doc --- Lothar Rubusch (11): doc: board: enclustra: add Enclustra Mercury+ AA1 ARM: socfpga: add Mercury+ AA1 SoM support ARM: dts: socfpga: add Mercury+ AA1 for u-boot dts ARM: socfpga: add Enclustra storage switch ARM: socfpga: add Mercury+ AA1 boot scripts ARM: socfpga: AA1: support MAC from secure eeprom misc: atsha204a: update kconfig description ARM: dts: arria10: update according to DTSpec ARM: socfpga: update function call to modern API ARM: socfpga: apply binman approach to fpga parts doc: develop: orthographic delights arch/arm/dts/socfpga_arria10.dtsi | 42 ++- ..._arria10_enclustra_mercury_aa1-u-boot.dtsi | 89 +++++ .../socfpga_arria10_enclustra_mercury_aa1.dts | 62 ++++ .../socfpga_arria10_mercury_aa1-u-boot.dtsi | 19 ++ .../dts/socfpga_arria10_mercury_aa1_handoff.h | 305 ++++++++++++++++++ arch/arm/mach-socfpga/Kconfig | 10 + arch/arm/mach-socfpga/misc_arria10.c | 2 - board/enclustra/bootscripts/qspi-aa1.cmd | 12 + board/enclustra/bootscripts/sd-aa1.cmd | 9 + board/enclustra/common/Kconfig | 25 ++ board/enclustra/common/Makefile | 7 + board/enclustra/common/enclustra_mac.h | 48 +++ board/enclustra/common/mac_atsha204.c | 102 ++++++ board/enclustra/common/mac_common.c | 52 +++ board/enclustra/common/mac_ds28.c | 93 ++++++ board/enclustra/mercury_aa1/Kconfig | 52 +++ board/enclustra/mercury_aa1/MAINTAINERS | 12 + board/enclustra/mercury_aa1/Makefile | 10 + .../mercury_aa1/aa1_board_late_init.c | 17 + .../mercury_aa1/aa1_set_storage_cmd.c | 190 +++++++++++ .../socfpga_enclustra_mercury_aa1_defconfig | 86 +++++ doc/board/enclustra/index.rst | 9 + doc/board/enclustra/mercury-aa1.rst | 230 +++++++++++++ doc/board/index.rst | 1 + doc/develop/gdb.rst | 2 +- drivers/misc/Kconfig | 2 +- include/configs/socfpga_mercury_aa1.h | 23 ++ tools/binman/binman.rst | 4 +- tools/binman/entries.rst | 22 +- 29 files changed, 1511 insertions(+), 26 deletions(-) create mode 100644 arch/arm/dts/socfpga_arria10_enclustra_mercury_aa1-u-boot.dtsi create mode 100644 arch/arm/dts/socfpga_arria10_enclustra_mercury_aa1.dts create mode 100644 arch/arm/dts/socfpga_arria10_mercury_aa1_handoff.h create mode 100644 board/enclustra/bootscripts/qspi-aa1.cmd create mode 100644 board/enclustra/bootscripts/sd-aa1.cmd create mode 100644 board/enclustra/common/Kconfig create mode 100644 board/enclustra/common/Makefile create mode 100644 board/enclustra/common/enclustra_mac.h create mode 100644 board/enclustra/common/mac_atsha204.c create mode 100644 board/enclustra/common/mac_common.c create mode 100644 board/enclustra/common/mac_ds28.c create mode 100644 board/enclustra/mercury_aa1/Kconfig create mode 100644 board/enclustra/mercury_aa1/MAINTAINERS create mode 100644 board/enclustra/mercury_aa1/Makefile create mode 100644 board/enclustra/mercury_aa1/aa1_board_late_init.c create mode 100644 board/enclustra/mercury_aa1/aa1_set_storage_cmd.c create mode 100644 configs/socfpga_enclustra_mercury_aa1_defconfig create mode 100644 doc/board/enclustra/index.rst create mode 100644 doc/board/enclustra/mercury-aa1.rst create mode 100644 include/configs/socfpga_mercury_aa1.h -- 2.25.1

3 14

Re: [PATCH] examples: fix building on arm32
by 黄利亚 27 Jan '25

27 Jan '25

Hello Heinrich I modified the code for arm32 architecture. You may be using an ARM64 architecture. Take a look at the architecture used. version of U-Boot (commit in git):     d8a7100d658eb201fa0e955667fdff298db31945 operating system and architecture:     5.15.0-130-generic x86_64 installed version of gcc and binutils     gcc version 9.4.0 (Ubuntu 9.4.0-1ubuntu1~20.04.3)     GNU ld (GNU Binutils for Ubuntu) 2.34   used defconfig     stm32h750-art-pi_defconfig used commands for building     make CROSS_COMPILE=arm-none-eabi- ARCH=arm stm32h750-art-pi_defconfig     make CROSS_COMPILE=arm-none-eabi- ARCH=arm menuconfig # to add CONFIG_API=y, CONFIG_EXAMPLES=y     make CROSS_COMPILE=arm-none-eabi- ARCH=arm -j 12 https://developer.arm.com/documentation/den0013/d/Application-Binary-Interf… lists IP, SP, PC as aliases for registers R12, R13, R15. ------------------------------------------------------------ I have tried using R12, R13, R15 and the error message is as follows:     examples/api/crt0.S:32: Error: lo register required -- `ldr r12,=search_hint'     examples/api/crt0.S:34: Error: lo register required -- `str R13,[r12]'     examples/api/crt0.S:40: Error: lo register required -- `ldr r12,=syscall_ptr'     examples/api/crt0.S:41: Error: lo register required -- `ldr r15,[r12]' As the error message suggests, you need to use a low register (lo register), and r12 and similar registers belong to the high register (hi register) category. Best regards LiYa ------------------ 原始邮件 ------------------ 发件人: "Heinrich Schuchardt" <heinrich.schuchardt(a)canonical.com>; 发送时间: 2025年1月27日(星期一) 下午2:49 收件人: "Tom Rini"<trini(a)konsulko.com>; 抄送: "黄利亚"<1425075683(a)qq.com>;"u-boot"<u-boot(a)lists.denx.de>;"Heinrich Schuchardt"<heinrich.schuchardt(a)canonical.com>; 主题: [PATCH 1/1] examples/api: improve determination of LOAD_ADDR The current load address for the 'demo' binary does not work for qemu_arm_defconfig. The suitability of an address to load an ELF binary and run it does not only depend on the architecture but also on the memory layout of the board. On most boards we can assume that 8 MiB of memory is available above $loadaddr. So $loadaddr + 0x400000 should work there. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> ---  examples/api/Makefile | 23 +++--------------------  1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/examples/api/Makefile b/examples/api/Makefile index 722c7e45904..be97b8015bd 100644 --- a/examples/api/Makefile +++ b/examples/api/Makefile @@ -5,26 +5,9 @@  # Provide symbol API_BUILD to signal that the API example is being built.  KBUILD_CPPFLAGS += -DAPI_BUILD   -ifeq ($(ARCH),powerpc) -LOAD_ADDR = 0x40000 -endif -ifeq ($(ARCH),arm) -ifdef CONFIG_64BIT -LOAD_ADDR = 0x40400000 -else -LOAD_ADDR = 0x1000000 -endif -endif -ifeq ($(ARCH),mips) -ifdef CONFIG_64BIT -LOAD_ADDR = 0xffffffff80200000 -else -LOAD_ADDR = 0x80200000 -endif -endif -ifeq ($(ARCH),riscv) -LOAD_ADDR = 0x84000000 -endif +# Environment variable loadaddr is set from CONFIG_SYS_LOAD_ADDR. +# Run the examples 4 MiB above this address. +LOAD_ADDR:=${shell printf 0x%X $$(( $(CONFIG_SYS_LOAD_ADDR) + 0x400000 ))}    # Resulting ELF and binary exectuables will be named demo and demo.bin  extra-y = demo -- 2.47.1

1 0

[PATCH v3 1/2] board: phytec: common: Add product information to FTD
by Daniel Schultz 27 Jan '25

27 Jan '25

ft_board_setup inside the board code allows to alter device-tree during the boot process. Introduce a new function for the PHYTEC SOM detection to read the product name and part number from the EEPROM content and include both into the device-tree as * phytec,som-part-number * phytec,som-product-name This function can be called from the board code when those values should be exposed to Linux. This patch also updates the phytec_print_som_info function and changes the output. Signed-off-by: Daniel Schultz <d.schultz(a)phytec.de> --- Changes in v2: * Removed 'struct bd_info' as argument in function phytec_ft_board_fixup Changes in v3: * Removed not required check if variable data is valid in new functions. * Moved '+1' from string length definitions to snprintf calls. * Define more string lenghts to check snprintf result. * Return -EINVAL instead of -1. board/phytec/common/phytec_som_detection.c | 198 ++++++++++++++++----- board/phytec/common/phytec_som_detection.h | 12 ++ 2 files changed, 167 insertions(+), 43 deletions(-) diff --git a/board/phytec/common/phytec_som_detection.c b/board/phytec/common/phytec_som_detection.c index 166c3eae565..1f2213902ed 100644 --- a/board/phytec/common/phytec_som_detection.c +++ b/board/phytec/common/phytec_som_detection.c @@ -271,11 +271,122 @@ err: return ret; } +static int phytec_get_product_name(struct phytec_eeprom_data *data, + char *product) +{ + struct phytec_api2_data *api2; + unsigned int ksp_no, som_type; + int len; + + if (!data->valid || data->payload.api_rev < PHYTEC_API_REV2) + return -EINVAL; + + api2 = &data->payload.data.data_api2; + + if (api2->som_type > 1 && api2->som_type <= 3) { + ksp_no = (api2->ksp_no << 8) | api2->som_no; + len = snprintf(product, PHYTEC_PRODUCT_NAME_MAX_LEN + 1, + "%s-%04u", phytec_som_type_str[api2->som_type], + ksp_no); + if (len != PHYTEC_PRODUCT_NAME_KSP_LEN) + return -EINVAL; + return 0; + } + + switch (api2->som_type) { + case 0: + som_type = api2->som_type; + break; + case 4: + som_type = 0; + break; + case 5: + som_type = 0; + break; + case 6: + som_type = 1; + break; + case 7: + som_type = 1; + break; + default: + pr_err("%s: Invalid SOM type: %i", __func__, api2->som_type); + return -EINVAL; + }; + + len = snprintf(product, PHYTEC_PRODUCT_NAME_MAX_LEN + 1, "%s-%03u", + phytec_som_type_str[som_type], api2->som_no); + if (len != PHYTEC_PRODUCT_NAME_STD_LEN) + return -EINVAL; + return 0; +} + +static int phytec_get_part_number(struct phytec_eeprom_data *data, + char *part) +{ + char product_name[PHYTEC_PRODUCT_NAME_MAX_LEN + 1] = {'\0'}; + struct phytec_api2_data *api2; + unsigned int ksp_type; + int res, len; + + if (!data->valid || data->payload.api_rev < PHYTEC_API_REV2) + return -EINVAL; + + api2 = &data->payload.data.data_api2; + + res = phytec_get_product_name(data, product_name); + if (res) + return res; + + if (api2->som_type <= 1) { + len = snprintf(part, PHYTEC_PART_NUMBER_MAX_LEN + 1, + "%s-%s.%s", product_name, api2->opt, + api2->bom_rev); + if (len < PHYTEC_PART_NUMBER_STD_LEN) + return -EINVAL; + return 0; + } + if (api2->som_type <= 3) { + snprintf(part, PHYTEC_PART_NUMBER_MAX_LEN + 1, "%s.%s", + product_name, api2->bom_rev); + if (len != PHYTEC_PART_NUMBER_KSP_LEN) + return -EINVAL; + return 0; + } + + switch (api2->som_type) { + case 4: + ksp_type = 3; + break; + case 5: + ksp_type = 2; + break; + case 6: + ksp_type = 3; + break; + case 7: + ksp_type = 2; + break; + default: + pr_err("%s: Invalid SOM type: %i", __func__, api2->som_type); + return -EINVAL; + }; + + len = snprintf(part, PHYTEC_PART_NUMBER_MAX_LEN + 1, "%s-%s%02u.%s", + product_name, phytec_som_type_str[ksp_type], + api2->ksp_no, api2->bom_rev); + if (len < PHYTEC_PART_NUMBER_STD_KSP_LEN) + return -EINVAL; + + return 0; +} + void __maybe_unused phytec_print_som_info(struct phytec_eeprom_data *data) { + char part_number[PHYTEC_PART_NUMBER_MAX_LEN + 1] = {'\0'}; struct phytec_api2_data *api2; char pcb_sub_rev; - unsigned int ksp_no, sub_som_type1, sub_som_type2; + int res; if (!data) data = &eeprom_data; @@ -289,50 +400,14 @@ void __maybe_unused phytec_print_som_info(struct phytec_eeprom_data *data) pcb_sub_rev = api2->pcb_sub_opt_rev & 0x0f; pcb_sub_rev = pcb_sub_rev ? ((pcb_sub_rev - 1) + 'a') : ' '; - /* print standard product string */ - if (api2->som_type <= 1) { - printf("SoM: %s-%03u-%s.%s PCB rev: %u%c\n", - phytec_som_type_str[api2->som_type], api2->som_no, - api2->opt, api2->bom_rev, api2->pcb_rev, pcb_sub_rev); + res = phytec_get_part_number(data, part_number); + if (res) return; - } - /* print KSP/KSM string */ - if (api2->som_type <= 3) { - ksp_no = (api2->ksp_no << 8) | api2->som_no; - printf("SoM: %s-%u ", - phytec_som_type_str[api2->som_type], ksp_no); - /* print standard product based KSP/KSM strings */ - } else { - switch (api2->som_type) { - case 4: - sub_som_type1 = 0; - sub_som_type2 = 3; - break; - case 5: - sub_som_type1 = 0; - sub_som_type2 = 2; - break; - case 6: - sub_som_type1 = 1; - sub_som_type2 = 3; - break; - case 7: - sub_som_type1 = 1; - sub_som_type2 = 2; - break; - default: - pr_err("%s: Invalid SoM type: %i", __func__, api2->som_type); - return; - }; - - printf("SoM: %s-%03u-%s-%03u ", - phytec_som_type_str[sub_som_type1], - api2->som_no, phytec_som_type_str[sub_som_type2], - api2->ksp_no); - } - printf("Option: %s BOM rev: %s PCB rev: %u%c\n", api2->opt, - api2->bom_rev, api2->pcb_rev, pcb_sub_rev); + printf("SOM: %s\n", part_number); + printf("PCB Rev.: %u%c\n", api2->pcb_rev, pcb_sub_rev); + if (api2->som_type > 1) + printf("Options: %s\n", api2->opt); } char * __maybe_unused phytec_get_opt(struct phytec_eeprom_data *data) @@ -379,6 +454,37 @@ u8 __maybe_unused phytec_get_som_type(struct phytec_eeprom_data *data) return data->payload.data.data_api2.som_type; } +#if IS_ENABLED(CONFIG_OF_LIBFDT) +int phytec_ft_board_fixup(struct phytec_eeprom_data *data, void *blob) +{ + char product_name[PHYTEC_PRODUCT_NAME_MAX_LEN + 1] = {'\0'}; + char part_number[PHYTEC_PART_NUMBER_MAX_LEN + 1] = {'\0'}; + int res; + + if (!data) + data = &eeprom_data; + + if (!data->valid || data->payload.api_rev < PHYTEC_API_REV2) + return -EINVAL; + + res = phytec_get_product_name(data, product_name); + if (res) + return res; + + fdt_setprop(blob, 0, "phytec,som-product-name", product_name, + strlen(product_name) + 1); + + res = phytec_get_part_number(data, part_number); + if (res) + return res; + + fdt_setprop(blob, 0, "phytec,som-part-number", part_number, + strlen(part_number) + 1); + + return 0; +} +#endif /* IS_ENABLED(CONFIG_OF_LIBFDT) */ + #if IS_ENABLED(CONFIG_CMD_EXTENSION) struct extension *phytec_add_extension(const char *name, const char *overlay, const char *other) @@ -458,6 +564,12 @@ inline struct phytec_api3_element * __maybe_unused return NULL; } +#if IS_ENABLED(CONFIG_OF_LIBFDT) +inline int phytec_ft_board_fixup(struct phytec_eeprom_data *data, void *blob) +{ + return 0; +} +#endif /* IS_ENABLED(CONFIG_OF_LIBFDT) */ #if IS_ENABLED(CONFIG_CMD_EXTENSION) inline struct extension *phytec_add_extension(const char *name, const char *overlay, diff --git a/board/phytec/common/phytec_som_detection.h b/board/phytec/common/phytec_som_detection.h index 5e35a13cb21..187424a2b44 100644 --- a/board/phytec/common/phytec_som_detection.h +++ b/board/phytec/common/phytec_som_detection.h @@ -8,6 +8,7 @@ #define _PHYTEC_SOM_DETECTION_H #include "phytec_som_detection_blocks.h" +#include <fdtdec.h> #define PHYTEC_MAX_OPTIONS 17 #define PHYTEC_EEPROM_INVAL 0xff @@ -17,6 +18,14 @@ #define PHYTEC_GET_OPTION(option) \ (((option) > '9') ? (option) - 'A' + 10 : (option) - '0') +#define PHYTEC_PRODUCT_NAME_STD_LEN 7 // PCx-000 +#define PHYTEC_PRODUCT_NAME_KSP_LEN 8 // KSP-0000 +#define PHYTEC_PRODUCT_NAME_MAX_LEN PHYTEC_PRODUCT_NAME_KSP_LEN +#define PHYTEC_PART_NUMBER_STD_LEN 11 // PCx-000-\w{1,17}.Ax +#define PHYTEC_PART_NUMBER_KSP_LEN 11 // KSP-0000.Ax +#define PHYTEC_PART_NUMBER_STD_KSP_LEN 16 // PCx-000-KSx00.Ax +#define PHYTEC_PART_NUMBER_MAX_LEN PHYTEC_PRODUCT_NAME_MAX_LEN + 21 + enum { PHYTEC_API_REV0 = 0, PHYTEC_API_REV1, @@ -86,6 +95,9 @@ void __maybe_unused phytec_print_som_info(struct phytec_eeprom_data *data); char * __maybe_unused phytec_get_opt(struct phytec_eeprom_data *data); u8 __maybe_unused phytec_get_rev(struct phytec_eeprom_data *data); u8 __maybe_unused phytec_get_som_type(struct phytec_eeprom_data *data); +#if IS_ENABLED(CONFIG_OF_LIBFDT) +int phytec_ft_board_fixup(struct phytec_eeprom_data *data, void *blob); +#endif /* IS_ENABLED(CONFIG_OF_LIBFDT) */ #if IS_ENABLED(CONFIG_CMD_EXTENSION) struct extension *phytec_add_extension(const char *name, const char *overlay, -- 2.25.1

2 2

[PATCH] API: system info adds FLASH and clk fetches
by 1425075683＠qq.com 27 Jan '25

27 Jan '25

From: Liya Huang <1425075683(a)qq.com> Refer to api/api platform-powerpc.c implementation Signed-off-by: Liya Huang <1425075683(a)qq.com> --- api/api_platform.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/api/api_platform.c b/api/api_platform.c index 7a789bd2016..d5cbcd6e201 100644 --- a/api/api_platform.c +++ b/api/api_platform.c @@ -17,9 +17,15 @@ int platform_sys_info(struct sys_info *si) { int i; + si->clk_bus = gd->bus_clk; + si->clk_cpu = gd->cpu_clk; + for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) platform_set_mr(si, gd->bd->bi_dram[i].start, gd->bd->bi_dram[i].size, MR_ATTR_DRAM); + platform_set_mr(si, gd->ram_base, gd->ram_size, MR_ATTR_DRAM); + platform_set_mr(si, gd->bd->bi_flashstart, gd->bd->bi_flashsize, MR_ATTR_FLASH); + return 1; } -- 2.25.1

1 0

[PATCH 0/4] rng: msm: fixes for MSM8916
by Sam Day 27 Jan '25

27 Jan '25

The msm-rng driver is currently broken on MSM8916. The first issue is that the core clock isn't defined and thus not being enabled before registers in the PRNG block are accessed. The second issue is that the enable method is only initializing the PRNG registers if the block is *already* initialized. This would have likely caused issues elsewhere once the driver was in more active use, but the problems on MSM8916 are immediate: trying to modify the state of LFSR_CFG causes SErrors, presumably because this register is protected by TZ. I also included a couple of extra patches while I'm in the neighborhood. One is to improve the logging in apq8016 clk_enable (which would have better surfaced the first issue). The other changes msm-rng driver slightly to only enable its core clock when it's needed (similar to how the kernel does it). Signed-off-by: Sam Day <me(a)samcday.com> --- Sam Day (4): clk/qcom: apq8016: add PRNG_AHB_CLK rng: msm: don't enable PRNG if it's already enabled clk/qcom: apq8016: improve clk_enable logging rng: msm: keep core clock disabled when PRNG not in use drivers/clk/qcom/clock-apq8016.c | 9 +++++---- drivers/rng/msm_rng.c | 13 +++++++++++-- 2 files changed, 16 insertions(+), 6 deletions(-) --- base-commit: 8a2a71a4eec7afdca6377ee46b1ed7e78ec692c9 change-id: 20250126-msm-rng-fixes-f5a722a9492c Best regards, -- Sam Day <me(a)samcday.com>

1 4

[PATCH 1/3] arch: arm: dts: phyboard-electra-uboot.dtsi: Add bootph props to i2c
by Wadim Egorov 27 Jan '25

27 Jan '25

Add bootph-all properties to I2C0 nodes to ensure the bus and EEPROM are accessible across all stages. This enables reading the SoM configuration at any point during the boot process. Signed-off-by: Wadim Egorov <w.egorov(a)phytec.de> --- arch/arm/dts/k3-am642-phyboard-electra-rdk-u-boot.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm/dts/k3-am642-phyboard-electra-rdk-u-boot.dtsi b/arch/arm/dts/k3-am642-phyboard-electra-rdk-u-boot.dtsi index 8f3c3a185ae..c68a48678a2 100644 --- a/arch/arm/dts/k3-am642-phyboard-electra-rdk-u-boot.dtsi +++ b/arch/arm/dts/k3-am642-phyboard-electra-rdk-u-boot.dtsi @@ -72,6 +72,14 @@ bootph-all; }; +&main_i2c0 { + bootph-all; +}; + +&main_i2c0_pins_default { + bootph-all; +}; + &main_mmc1_pins_default { bootph-all; }; -- 2.34.1

2 4

[PATCH 1/1] examples: eliminate CONFIG_STANDALONE_LOAD_ADDR
by Heinrich Schuchardt 27 Jan '25

27 Jan '25

CONFIG_STANDALONE_LOAD_ADDR has been used for examples/standalone but not for examples/api. The suitability of an address to load an ELF binary and run it does not only depend on the architecture but also on the memory layout of the board which is not reflected in the default value of CONFIG_STANDALONE_LOAD_ADDR. Commit 32b7e39db4d3 ("Convert CONFIG_STANDALONE_LOAD_ADDR to Kconfig") set the default on RISC-V to 0x0 though most boards used 0x80200000 before the patch. On most boards we can assume 8 MiB of memory available above $loadaddr. So we can safely use $loadaddr + 4 MiB as load address for the standalone example and eliminate CONFIG_STANDALONE_LOAD_ADDR altogether. Fixes: 32b7e39db4d3 ("Convert CONFIG_STANDALONE_LOAD_ADDR to Kconfig") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- api/Kconfig | 20 -------------------- config.mk | 1 - examples/standalone/Makefile | 6 +++++- 3 files changed, 5 insertions(+), 22 deletions(-) diff --git a/api/Kconfig b/api/Kconfig index b5a7399d7f3..8cfd98ad6a6 100644 --- a/api/Kconfig +++ b/api/Kconfig @@ -19,24 +19,4 @@ config EXAMPLES U-Boot provides an API for standalone applications. Examples are provided in directory examples/. -config STANDALONE_LOAD_ADDR - depends on EXAMPLES - hex "Address in memory to link standalone applications to" - default 0xffffffff80200000 if MIPS && 64BIT - default 0x8c000000 if SH - default 0x82000000 if ARC - default 0x80f00000 if MICROBLAZE - default 0x80300000 if ARCH_OMAP2PLUS || FSL_LSCH2 || FSL_LSCH3 - default 0x80200000 if MIPS && 32BIT - default 0x0c100000 if ARM - default 0x02000000 if NIOS2 - default 0x00040000 if PPC || X86 - default 0x00020000 if M68K - default 0x0 if RISCV - default SYS_LOAD_ADDR - help - This option defines a board specific value for the address where - standalone program gets loaded, thus overwriting the architecture - dependent default settings. - endmenu diff --git a/config.mk b/config.mk index e294be2a4c4..abed9cb65c6 100644 --- a/config.mk +++ b/config.mk @@ -76,4 +76,3 @@ export PLATFORM_CPPFLAGS export RELFLAGS export LDFLAGS_FINAL export LDFLAGS_STANDALONE -export CONFIG_STANDALONE_LOAD_ADDR diff --git a/examples/standalone/Makefile b/examples/standalone/Makefile index 559170dd5c9..9b57f1c0c66 100644 --- a/examples/standalone/Makefile +++ b/examples/standalone/Makefile @@ -7,6 +7,10 @@ extra-y := hello_world extra-$(CONFIG_SPI_FLASH_ATMEL) += atmel_df_pow2 extra-$(CONFIG_PPC) += sched +# Environment variable loadaddr is set from CONFIG_SYS_LOAD_ADDR. +# Run the examples 4 MiB above this address. +LOAD_ADDR:=${shell printf 0x%X $$(( $(CONFIG_SYS_LOAD_ADDR) + 0x400000 ))} + # # Some versions of make do not handle trailing white spaces properly; # leading to build failures. The problem was found with GNU Make 3.80. @@ -46,7 +50,7 @@ endif # source file. ccflags-y += $(call cc-option,-fno-toplevel-reorder) -LDFLAGS_STANDALONE += -Ttext $(CONFIG_STANDALONE_LOAD_ADDR) +LDFLAGS_STANDALONE += -Ttext $(LOAD_ADDR) ######################################################################### -- 2.47.1

1 0