December 2024 - U-Boot

[PATCH 1/4] bloblist: fix typo in code comments
by Harrison Mutai 18 Dec '24

18 Dec '24

Signed-off-by: Harrison Mutai <harrison.mutai(a)arm.com> --- common/Kconfig | 2 +- include/bloblist.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/Kconfig b/common/Kconfig index e8d89bf6eb..9e89ccd390 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -1075,7 +1075,7 @@ config BLOBLIST_SIZE Sets the size of the bloblist in bytes. This must include all overhead (alignment, bloblist header, record header). The bloblist is set up in the first part of U-Boot to run (TPL, SPL or U-Boot - proper), and this sane bloblist is used for subsequent phases. + proper), and this same bloblist is used for subsequent phases. config BLOBLIST_SIZE_RELOC hex "Size of bloblist after relocation" diff --git a/include/bloblist.h b/include/bloblist.h index ff32d3fecf..9d3ec3a8fa 100644 --- a/include/bloblist.h +++ b/include/bloblist.h @@ -456,7 +456,7 @@ int bloblist_init(void); /** * bloblist_maybe_init() - Init the bloblist system if not already done * - * Calls bloblist_init() if the GD_FLG_BLOBLIST_READY flag is not et + * Calls bloblist_init() if the GD_FLG_BLOBLIST_READY flag is not set * * Return: 0 if OK, -ve on error */ -- 2.46.2

2 3

[PATCH 3/4] bloblist: add support for CONFIG_BLOBLIST_PASSAGE
by Harrison Mutai 18 Dec '24

18 Dec '24

When the configuration option CONFIG_BLOBLIST_PASSAGE is selected, the bloblist present in the incoming standard passage is utilised in-place. There is no need to specify the size of the bloblist as the system automatically detects it using the header information. Signed-off-by: Harrison Mutai <harrison.mutai(a)arm.com> --- common/Kconfig | 7 +++++++ common/bloblist.c | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/common/Kconfig b/common/Kconfig index 9e89ccd390..11066ec643 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -1056,6 +1056,12 @@ config BLOBLIST_ALLOC specify a fixed address on systems where this is unknown or can change at runtime. +config BLOBLIST_PASSAGE + bool "Use bloblist in-place" + help + Use a bloblist in the incoming standard passage. The size is detected + automatically so CONFIG_BLOBLIST_SIZE can be 0. + endchoice config BLOBLIST_ADDR @@ -1070,6 +1076,7 @@ config BLOBLIST_ADDR config BLOBLIST_SIZE hex "Size of bloblist" + default 0x0 if BLOBLIST_PASSAGE default 0x400 help Sets the size of the bloblist in bytes. This must include all diff --git a/common/bloblist.c b/common/bloblist.c index ec6ff7a5a9..db0091dc0e 100644 --- a/common/bloblist.c +++ b/common/bloblist.c @@ -475,6 +475,9 @@ int bloblist_reloc(void *to, uint to_size) { struct bloblist_hdr *hdr; + if (to_size == 0) + return 0; + if (to_size < gd->bloblist->total_size) return -ENOSPC; @@ -510,7 +513,7 @@ int bloblist_init(void) * install the bloblist passed from previous loader to this fixed * address. */ - bool from_boot_arg = fixed && xpl_is_first_phase(); + bool from_boot_arg = xpl_is_first_phase(); if (xpl_prev_phase() == PHASE_TPL && !IS_ENABLED(CONFIG_TPL_BLOBLIST)) from_addr = false; -- 2.46.2

2 1

[PATCH] spi: atmel: Really drop atmel_spi.h
by Alexander Dahl 18 Dec '24

18 Dec '24

First try dropping this was with commit 37434db29be4 ("spi: atmel: Drop atmel_spi.h") back in 2018 which was reverted not much later with commit 5270df283676 ("Revert "spi: atmel: Drop atmel_spi.h""). Second try dropping this was in 2020 with commit beeb34ac0cc6 ("spi: atmel: Drop atmel_spi.h"), but that only moved all the definitions into the source file and did not remove the header file. Currently all of the definitions in the header file are (still) contained in the source file, and the header file is include nowhere. Fixes: beeb34ac0cc6 ("spi: atmel: Drop atmel_spi.h") Signed-off-by: Alexander Dahl <ada(a)thorsis.com> --- Notes: Build tested for all upstream atmel boards. This is no complete build coverage, but should be safe to remove, because it is not included anywhere. drivers/spi/atmel_spi.h | 86 ----------------------------------------- 1 file changed, 86 deletions(-) delete mode 100644 drivers/spi/atmel_spi.h diff --git a/drivers/spi/atmel_spi.h b/drivers/spi/atmel_spi.h deleted file mode 100644 index 9663cca5e66..00000000000 --- a/drivers/spi/atmel_spi.h +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Register definitions for the Atmel AT32/AT91 SPI Controller - */ - -/* Register offsets */ -#include <linux/bitops.h> -#define ATMEL_SPI_CR 0x0000 -#define ATMEL_SPI_MR 0x0004 -#define ATMEL_SPI_RDR 0x0008 -#define ATMEL_SPI_TDR 0x000c -#define ATMEL_SPI_SR 0x0010 -#define ATMEL_SPI_IER 0x0014 -#define ATMEL_SPI_IDR 0x0018 -#define ATMEL_SPI_IMR 0x001c -#define ATMEL_SPI_CSR(x) (0x0030 + 4 * (x)) -#define ATMEL_SPI_VERSION 0x00fc - -/* Bits in CR */ -#define ATMEL_SPI_CR_SPIEN BIT(0) -#define ATMEL_SPI_CR_SPIDIS BIT(1) -#define ATMEL_SPI_CR_SWRST BIT(7) -#define ATMEL_SPI_CR_LASTXFER BIT(24) - -/* Bits in MR */ -#define ATMEL_SPI_MR_MSTR BIT(0) -#define ATMEL_SPI_MR_PS BIT(1) -#define ATMEL_SPI_MR_PCSDEC BIT(2) -#define ATMEL_SPI_MR_FDIV BIT(3) -#define ATMEL_SPI_MR_MODFDIS BIT(4) -#define ATMEL_SPI_MR_WDRBT BIT(5) -#define ATMEL_SPI_MR_LLB BIT(7) -#define ATMEL_SPI_MR_PCS(x) (((x) & 15) << 16) -#define ATMEL_SPI_MR_DLYBCS(x) ((x) << 24) - -/* Bits in RDR */ -#define ATMEL_SPI_RDR_RD(x) (x) -#define ATMEL_SPI_RDR_PCS(x) ((x) << 16) - -/* Bits in TDR */ -#define ATMEL_SPI_TDR_TD(x) (x) -#define ATMEL_SPI_TDR_PCS(x) ((x) << 16) -#define ATMEL_SPI_TDR_LASTXFER BIT(24) - -/* Bits in SR/IER/IDR/IMR */ -#define ATMEL_SPI_SR_RDRF BIT(0) -#define ATMEL_SPI_SR_TDRE BIT(1) -#define ATMEL_SPI_SR_MODF BIT(2) -#define ATMEL_SPI_SR_OVRES BIT(3) -#define ATMEL_SPI_SR_ENDRX BIT(4) -#define ATMEL_SPI_SR_ENDTX BIT(5) -#define ATMEL_SPI_SR_RXBUFF BIT(6) -#define ATMEL_SPI_SR_TXBUFE BIT(7) -#define ATMEL_SPI_SR_NSSR BIT(8) -#define ATMEL_SPI_SR_TXEMPTY BIT(9) -#define ATMEL_SPI_SR_SPIENS BIT(16) - -/* Bits in CSRx */ -#define ATMEL_SPI_CSRx_CPOL BIT(0) -#define ATMEL_SPI_CSRx_NCPHA BIT(1) -#define ATMEL_SPI_CSRx_CSAAT BIT(3) -#define ATMEL_SPI_CSRx_BITS(x) ((x) << 4) -#define ATMEL_SPI_CSRx_SCBR(x) ((x) << 8) -#define ATMEL_SPI_CSRx_SCBR_MAX GENMASK(7, 0) -#define ATMEL_SPI_CSRx_DLYBS(x) ((x) << 16) -#define ATMEL_SPI_CSRx_DLYBCT(x) ((x) << 24) - -/* Bits in VERSION */ -#define ATMEL_SPI_VERSION_REV(x) ((x) & 0xfff) -#define ATMEL_SPI_VERSION_MFN(x) ((x) << 16) - -/* Constants for CSRx:BITS */ -#define ATMEL_SPI_BITS_8 0 -#define ATMEL_SPI_BITS_9 1 -#define ATMEL_SPI_BITS_10 2 -#define ATMEL_SPI_BITS_11 3 -#define ATMEL_SPI_BITS_12 4 -#define ATMEL_SPI_BITS_13 5 -#define ATMEL_SPI_BITS_14 6 -#define ATMEL_SPI_BITS_15 7 -#define ATMEL_SPI_BITS_16 8 - -/* Register access macros */ -#define spi_readl(as, reg) \ - readl(as->regs + ATMEL_SPI_##reg) -#define spi_writel(as, reg, value) \ - writel(value, as->regs + ATMEL_SPI_##reg) base-commit: 25fb58e88aba0c4af0af554d7b141be3f2e5e0b5 -- 2.39.5

1 0

[PATCH 0/4] Enable bloblist support on Vexpress64
by Harrison Mutai 18 Dec '24

18 Dec '24

This series of patches enhances the vexpress64 platform by enabling bloblist support. It also introduces support for CONFIG_BLOBLIST_PASSAGE. This is necessary to boot vexpress64 and other boards without manually specifying a fixed address and size for the bloblist. After this change, all the bloblist init modes are supported (i.e., fixed, alloc, passage) and Vexpress64 boots with CONFIG_BLOBLIST_PASSAGE. Harrison Mutai (4): bloblist: fix typo in code comments board: vexpress64: default to hardware device tree bloblist: add support for CONFIG_BLOBLIST_PASSAGE board: vexpress64: enable bloblist for SPL handoff board/armltd/vexpress64/Makefile | 3 ++- board/armltd/vexpress64/vexpress64.c | 4 ++++ common/Kconfig | 9 ++++++++- common/bloblist.c | 5 ++++- configs/vexpress_fvp_bloblist_defconfig | 5 +++++ doc/board/armltd/vexpress64.rst | 16 ++++++++++++++++ include/bloblist.h | 2 +- include/configs/vexpress_aemv8.h | 6 ++++-- 8 files changed, 44 insertions(+), 6 deletions(-) create mode 100644 configs/vexpress_fvp_bloblist_defconfig -- 2.46.2

1 0

[PATCH 1/2] gitlab: Add a Rockpro64 to the sjg lab
by Simon Glass 18 Dec '24

18 Dec '24

I have one of these boards with Armbian_22.02.2_Rockpro64_bullseye loaded. Add an entry for it so that it can be used for testing. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- .gitlab-ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 61563c87ea6..c620cfd1e34 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -705,3 +705,8 @@ colibrimx8: variables: ROLE: colibrimx8 <<: *lab_dfn + +rockpro64: + variables: + ROLE: rockpro64 + <<: *lab_dfn -- 2.34.1

3 4

[PATCH 1/3] gitlab: Resurrect the Pine64+ in the sjg lab
by Simon Glass 18 Dec '24

18 Dec '24

This is working again, so add it back. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- .gitlab-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1c15907fffa..5fa417e79c6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -655,11 +655,11 @@ kevin: ROLE: kevin <<: *lab_dfn -# pine64 has a hardware failure 30-Nov-24 -#pine64: -# variables: -# ROLE: pine64 -# <<: *lab_dfn +# pine64+ +pine64: + variables: + ROLE: pine64 + <<: *lab_dfn # c4 needs binman supported added, so signing works #c4: -- 2.34.1

2 6

cm_fx6 booting
by Simon Glass 18 Dec '24

18 Dec '24

Hi, I have a Compulab Utilite cm_fx6 in my lab but I am not sure how to make it boot. I am using: dd if=u-boot-with-spl.imx of=/dev/sdt bs=1K seek=1 It does seem to detect an image on the mmc (since it doesn't boot from SPI flash), but SPL and U-Boot output nothing. Does anyone have any ideas? Perhaps this device is a bit old. Thanks, Simon

2 2

[PATCH 0/5] Static initcalls
by Jerome Forissier 18 Dec '24

18 Dec '24

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: -2655 bytes/-0.25 % with LTO enabled and -1344 bytes/-0.12 % with LTO disabled (xilinx_zynqmp_kria_defconfig). Execution time doesn't seem to change noticeably. There is no impact on the SPL. Jerome Forissier (4): board_init_f(): use static calls board_init_f_r(): use static calls board_init_r(): use static calls initcall: remove initcall_run_list() Michal Simek (1): common: board: Simplify array with function pointers with CONFIG_IS_ENABLED common/board_f.c | 213 +++++++++++++++---------------- common/board_r.c | 244 ++++++++++++++---------------------- include/initcall.h | 43 +++---- lib/Makefile | 1 - lib/initcall.c | 102 --------------- test/py/tests/test_trace.py | 8 +- 6 files changed, 218 insertions(+), 393 deletions(-) delete mode 100644 lib/initcall.c -- 2.43.0

2 12

[PATCH v2 0/3] boot: android: rework the bootargs concatenation
by Nicolas Belin 18 Dec '24

18 Dec '24

Rework the bootargs concatenation logic to make the logic clearer and address several issues such as: - checking the value at the address kcmdline_extra instead of checking the address value itself - freeing the string that was malloced for the concatenation - making sure to malloc the right amount of bytes for the concatenated string, not forgetting the byte for the NULL termination Signed-off-by: Nicolas Belin <nbelin(a)baylibre.com> --- Changes in v2: - Improve the logic to avoid trailing whitespaces in the concatenated bootargs - Drop the last patch reordering the length calculation as it is already done by the improved logic - Link to v1: https://lore.kernel.org/r/20241211-fix-bootargs-concatenation-v1-0-c6752bcb… --- Nicolas Belin (3): boot: android: fix extra command line support boot: android: free newbootargs when done boot: android: rework bootargs concatenation boot/image-android.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) --- base-commit: b841e559cd26ffcb20f22e8ee75debed9616c002 change-id: 20241211-fix-bootargs-concatenation-8b616c110b63 Best regards, -- Nicolas Belin <nbelin(a)baylibre.com>

2 5

[PATCH 0/4] Fix OSPI boot for J722S
by Prasanth Babu Mantena 18 Dec '24

18 Dec '24

This series fixes OSPI boot for J722S. It contains fixes for DMSC communication, R5 regmap for ospi and dma specific overrides for ospi. Test log: https://gist.github.com/PrasanthBabuMantena/ad469dd09ab7263f85f87dadda46c86d Vaishnav Achath (4): mailbox: k3-sec-proxy: Add DM to DMSC communication thread for J722S arm: dts: k3-j722s-r5-evm: Fix DM2TIFS secproxy thread ID arm: mach-k3: j722_spl: Add FAST XSPI boot mode arm: dts: k3-j722s*: Add overrides specific to OSPI arch/arm/dts/k3-j722s-evm-u-boot.dtsi | 4 ++++ arch/arm/dts/k3-j722s-r5-evm.dts | 17 +++++++++++++++-- arch/arm/mach-k3/include/mach/j722s_spl.h | 1 + arch/arm/mach-k3/j722s/j722s_init.c | 2 ++ drivers/mailbox/k3-sec-proxy.c | 2 +- 5 files changed, 23 insertions(+), 3 deletions(-) -- 2.34.1

3 9