October 2024 - U-Boot

[PATCH v1 1/1] x86: cpu: Describe board final hooks in the header
by Andy Shevchenko 19 Oct '24

19 Oct '24

The new two declarations board_final_init() and board_final_cleanup() need a description. Add it here. Suggested-by: Simon Glass <sjg(a)chromium.org> Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- arch/x86/include/asm/cpu.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/x86/include/asm/cpu.h b/arch/x86/include/asm/cpu.h index d71bc1b80c05..a5b2043f7de1 100644 --- a/arch/x86/include/asm/cpu.h +++ b/arch/x86/include/asm/cpu.h @@ -298,7 +298,20 @@ u32 cpu_get_stepping(void); */ int cpu_phys_address_size(void); +/** + * board_final_init() - Final initialization hook (optional) + * + * Implements a custom initialization for boards that need to do it + * before the system is ready. + */ void board_final_init(void); + +/** + * board_final_cleanup() - Final cleanup hook (optional) + * + * Implements a custom cleanup for boards that need to do it before + * booting the OS. + */ void board_final_cleanup(void); #ifndef CONFIG_EFI_STUB -- 2.43.0.rc1.1336.g36b5255a03ac

2 1

[PATCH] mtd: spi-nor: Move SR3 WPS bit definition in the correct location
by Marek Vasut 19 Oct '24

19 Oct '24

Move the SR3 bit definition in the right place. Fix what is likely a rebase artifact. No functional change. Fixes: 215f1d5794c6 ("mtd: spi-nor: Clear Winbond SR3 WPS bit on boot") Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: Hai Pham <hai.pham.ud(a)renesas.com> Cc: Heinrich Schuchardt <xypron.glpk(a)gmx.de> Cc: Jagan Teki <jagan(a)amarulasolutions.com> Cc: Johann Neuhauser <jneuhauser(a)dh-electronics.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Takahiro Kuwano <Takahiro.Kuwano(a)infineon.com> Cc: Tom Rini <trini(a)konsulko.com> Cc: Venkatesh Yadav Abbarapu <venkatesh.abbarapu(a)amd.com> Cc: Vignesh R <vigneshr(a)ti.com> --- include/linux/mtd/spi-nor.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h index 1ae586b2e5f..655a6d197ea 100644 --- a/include/linux/mtd/spi-nor.h +++ b/include/linux/mtd/spi-nor.h @@ -182,15 +182,15 @@ /* Status Register 2 bits. */ #define SR2_QUAD_EN_BIT7 BIT(7) +/* Status Register 3 bits. */ +#define SR3_WPS BIT(2) + /* * Maximum number of flashes that can be connected * in stacked/parallel configuration */ #define SNOR_FLASH_CNT_MAX 2 -/* Status Register 3 bits. */ -#define SR3_WPS BIT(2) - /* For Cypress flash. */ #define SPINOR_OP_RD_ANY_REG 0x65 /* Read any register */ #define SPINOR_OP_WR_ANY_REG 0x71 /* Write any register */ -- 2.45.2

2 1

[PATCH 1/1] cmd: upl: correct printf code
by Heinrich Schuchardt 19 Oct '24

19 Oct '24

Building on 32-bit results in a build failure: cmd/upl.c:75:51: warning: format ‘%lx’ expects argument of type ‘long unsigned int’, but argument 3 has type ‘size_t’ {aka ‘unsigned int’} [-Wformat=] 75 | printf("UPL handoff written to %lx size %lx\n", addr, abuf_size(&buf)); | ~~^ ~~~~~~~~~~~~~~~ | | | | | size_t {aka unsigned int} | long unsigned int | %x Fixes: 264f4b0b34c0 ("upl: Add a command") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- cmd/upl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/upl.c b/cmd/upl.c index c9745886507..4996f36c787 100644 --- a/cmd/upl.c +++ b/cmd/upl.c @@ -72,7 +72,7 @@ static int do_upl_write(struct cmd_tbl *cmdtp, int flag, int argc, return CMD_RET_FAILURE; } addr = map_to_sysmem(abuf_data(&buf)); - printf("UPL handoff written to %lx size %lx\n", addr, abuf_size(&buf)); + printf("UPL handoff written to %lx size %zx\n", addr, abuf_size(&buf)); if (env_set_hex("upladdr", addr) || env_set_hex("uplsize", abuf_size(&buf))) { printf("Cannot set env var\n"); -- 2.45.2

4 3

[PATCH] lmb: notify when adjacent regions are added
by Caleb Connolly 19 Oct '24

19 Oct '24

lmb_add_region() returns a positive integer if the added regions causes existing regions to be coalesced. We still want to notify the EFI subsystem about these added regions though, so adjust lmb_add() to only bail on errors. This fixes EFI memory allocation on boards with adjacent memory banks as is the case on several Qualcomm boards like the RB3 Gen 2. Fixes: 2f6191526a13 (lmb: notify of any changes to the LMB memory map) Signed-off-by: Caleb Connolly <caleb.connolly(a)linaro.org> --- Cc: u-boot-qcom(a)groups.io --- lib/lmb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/lmb.c b/lib/lmb.c index 78fe2d4de7c6..7e90f178763b 100644 --- a/lib/lmb.c +++ b/lib/lmb.c @@ -486,9 +486,9 @@ long lmb_add(phys_addr_t base, phys_size_t size) long ret; struct alist *lmb_rgn_lst = &lmb.free_mem; ret = lmb_add_region(lmb_rgn_lst, base, size); - if (ret) + if (ret < 0) return ret; if (lmb_should_notify(LMB_NONE)) return lmb_map_update_notify(base, size, MAP_OP_ADD); -- 2.46.2

6 5

[PATCH v2 0/2] sandbox: add bootmethod EFI boot-manager
by Heinrich Schuchardt 19 Oct '24

19 Oct '24

The EFI boot-manager is the default method to boot EFI binaries. We should be able to use it on the Sandbox. * Enable EFI boot-manager bootmethod on the sandbox. * Adjust unit tests to reflect the additional boot method. * Reduce the noisyness of the EFI sub-system if not ESP is available. v2: Reduce the number of messages if there is no ESP to persist variables. Heinrich Schuchardt (2): efi_loader: reduce noisiness if ESP is missing sandbox: add bootmethod EFI boot-manager arch/sandbox/dts/test.dts | 4 ++++ lib/efi_loader/efi_var_file.c | 22 ++++++++++++++-------- test/boot/bootmeth.c | 28 +++++++++++++++++----------- 3 files changed, 35 insertions(+), 19 deletions(-) -- 2.45.2

5 12

[GIT PULL v2] Please pull u-boot-imx-master-20241018a
by Fabio Estevam 18 Oct '24

18 Oct '24

Hi Tom, Please pull from u-boot-imx/master, thanks. The following changes since commit 608a31bdec6284ad6f821226e4c62c9cd3052874: Merge patch series "Introduce the lwIP network stack" (2024-10-16 11:11:57 -0600) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git tags/u-boot-imx-master-20241018a for you to fetch changes up to 9b1cecdd9b6eaf22c4fa268430669ceff0c48786: cpu: imx8_cpu: Avoid revision to corrupt device tree (2024-10-18 09:41:09 -0300) u-boot-imx-master-20241018a --------------------------- CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/22796 - Switch to using upstream DT on DH i.MX8MP DHCOM PDK2/PDK3. - Add ability to build fallback DTBOs from arch/$(ARCH)/dts. - Remove fdt_high and initrd_high env variables from imx6-dhcom. - Add dummy clk for imx8. - Fix DT corruption in imx8_cpu. - Improve DDR stability on pico-imx7d. ---------------------------------------------------------------- Marek Vasut (3): dts: Add ability to build fallback DTBOs from arch/$(ARCH)/dts arm64: dts: imx: Switch to using upstream DT on DH i.MX8MP DHCOM PDK2/PDK3 ARM: dts: imx6-dhcom: Remove fdt_high and initrd_high env variables Peng Fan (2): clk: imx8: Add dummy clk cpu: imx8_cpu: Avoid revision to corrupt device tree Ray Chang (1): pico-imx7d: Increase ODT resistor value Makefile | 4 + arch/arm/dts/Makefile | 2 - arch/arm/dts/imx8mp-dhcom-pdk2.dts | 158 ------------------ arch/arm/dts/imx8mp-dhcom-pdk3.dts | 317 ------------------------------------ board/technexion/pico-imx7d/spl.c | 10 +- configs/imx8mp_dhcom_pdk2_defconfig | 6 +- configs/imx8mp_dhcom_pdk3_defconfig | 6 +- drivers/clk/imx/clk-imx8qm.c | 4 + drivers/clk/imx/clk-imx8qxp.c | 4 + drivers/cpu/imx8_cpu.c | 32 ++-- dts/Kconfig | 16 ++ dts/Makefile | 14 +- include/configs/dh_imx6.h | 3 +- scripts/Makefile.dts | 6 + 14 files changed, 78 insertions(+), 504 deletions(-) delete mode 100644 arch/arm/dts/imx8mp-dhcom-pdk2.dts delete mode 100644 arch/arm/dts/imx8mp-dhcom-pdk3.dts

2 1

[PATCH] Azure: Update to latest containers
by Tom Rini 18 Oct '24

18 Oct '24

Soon Azure will be removing the macOS-12 container in following their normal support schedule. Move us to macOS-14 so we won't have problems there for a while. At the same time, our Windows container is the oldest supported, so move to the newer option. Finally, Ubuntu 22.04 is the middle option currently, but 24.04 should be fine. Link: https://github.com/actions/runner-images/issues/10721 Signed-off-by: Tom Rini <trini(a)konsulko.com> --- That issue is, as of this writing, the only place to list macOS-15, so I'm using 14 instead. --- .azure-pipelines.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index b66d49a62ba0..18700c4cc7be 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -1,7 +1,7 @@ variables: - windows_vm: windows-2019 - ubuntu_vm: ubuntu-22.04 - macos_vm: macOS-12 + windows_vm: windows-2022 + ubuntu_vm: ubuntu-24.04 + macos_vm: macOS-14 ci_runner_image: trini/u-boot-gitlab-ci-runner:jammy-20240808-21Aug2024 # Add '-u 0' options for Azure pipelines, otherwise we get "permission # denied" error when it tries to "useradd -m -u 1001 vsts_azpcontainer", -- 2.43.0

1 1

[PULL] u-boot-at91-fixes-2025.01-a
by Eugen Hristev 18 Oct '24

18 Oct '24

Hello Tom, Please pull tag u-boot-at91-fixes-2025.01-a , the first set of fixes for the 2025.01 cycle. This small set includes the maintainer e-mail update and a missing header that was causing some build issues. Thanks, Eugen The following changes since commit d2061828a4c1b60b44cd2307b6a782ac2efbffbe: dts: Deduplicate dtbs target (2024-10-14 19:32:04 -0600) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-at91.git tags/u-boot-at91-fixes-2025.01-a for you to fetch changes up to 684939089a31b8a5bedbbb4c2f2bcf935da7d9c6: ARM: at91: clock: Add missing include of asm/io.h (2024-10-18 10:10:41 +0300) ---------------------------------------------------------------- First set of u-boot-at91 fixes for the 2025.01 cycle ---------------------------------------------------------------- Alexander Dahl (1): ARM: at91: clock: Add missing include of asm/io.h Eugen Hristev (1): .mailmap: update e-mail address for Eugen Hristev .mailmap | 3 ++- arch/arm/mach-at91/include/mach/clk.h | 1 + doc/git-mailrc | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-)

2 1

[PATCH v6 00/12] efi: Add a test for EFI bootmeth
by Simon Glass 18 Oct '24

18 Oct '24

The test coverage for the EFI bootmeth is incomplete since it does not actually boot the application. This series creates a simple test for this purpose. It includes a few patches to make this work: - ANSI output from the EFI loader confusing the unit-testing checker - Hang in sandbox virtio due to EFI probing all block devices Other necessary fixes have been split out into two other series. Changes in v6: - Expand the debug messages to be more descriptive - Drop the patch to disable sandbox virtio blk with EFI - Add new patch to disable the sandbox virtio blk device - Deal with sandbox CONFIG_LOGF_FUNC - Rebase on -next - Drop patches previously applied - Drop mention of helloworld since it is no-longer used by this test Changes in v5: - Drop the Fixes tag Changes in v4: - Add efi_loader tag to some patches - Split out non-EFI patches into a different series Changes in v3: - Drop the extra- rules since scripts/Makefile.lib takes care of it - Add new patch to drop crt0/relocal extra- rules - Put back the Linaro copyright accidentally removed Changes in v2: - Reword commit message - Use 'Firmware vendor' instead of just 'Vendor' - Add many new patches to resolve all the outstanding test issues Simon Glass (12): efi_loader: Rename and move CMD_BOOTEFI_HELLO_COMPILE efi: arm: x86: riscv: Drop crt0/relocal extra- rules efi_loader: Shorten the app rules efi_loader: Shorten the app rules further efi_loader: Show the vendor in helloworld efi: Use the same filename for all sandbox builds bootstd: Add debugging for efi bootmeth efi_loader: Disable ANSI output for tests efi_loader: Add a test app sandbox: virtio: Disable the sandbox virtio blk device test: efi: boot: Set up an image suitable for EFI testing test: efi: boot: Add a test for the efi bootmeth arch/Kconfig | 3 +- arch/arm/lib/Makefile | 8 ---- arch/riscv/lib/Makefile | 4 -- arch/sandbox/dts/test.dts | 2 +- arch/x86/lib/Makefile | 16 ------- boot/bootmeth_efi.c | 11 ++++- cmd/Kconfig | 14 +----- configs/octeontx2_95xx_defconfig | 2 +- configs/octeontx2_96xx_defconfig | 2 +- configs/octeontx_81xx_defconfig | 2 +- configs/octeontx_83xx_defconfig | 2 +- doc/develop/uefi/uefi.rst | 2 +- include/efi_default_filename.h | 24 +--------- include/efi_loader.h | 21 ++++++++- lib/efi_loader/Kconfig | 22 +++++++++ lib/efi_loader/Makefile | 47 ++++++------------- lib/efi_loader/efi_console.c | 26 +++++++---- lib/efi_loader/helloworld.c | 3 ++ lib/efi_loader/testapp.c | 68 ++++++++++++++++++++++++++++ test/boot/bootdev.c | 18 +++++++- test/boot/bootflow.c | 65 +++++++++++++++++++++++++- test/py/tests/bootstd/flash1.img.xz | Bin 0 -> 5016 bytes test/py/tests/test_efi_fit.py | 2 +- test/py/tests/test_efi_loader.py | 2 +- test/py/tests/test_ut.py | 52 ++++++++++++++++++--- 25 files changed, 294 insertions(+), 124 deletions(-) create mode 100644 lib/efi_loader/testapp.c create mode 100644 test/py/tests/bootstd/flash1.img.xz -- 2.43.0

5 34

[PATCH 1/3] x86: coreboot: Update the timestamp code to use sysinfo
by Simon Glass 18 Oct '24

18 Oct '24

Rather than using a special variable, get the timestamp info from the coreboot sysinfo struct. Return a proper error as well. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- arch/x86/cpu/coreboot/timestamp.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/arch/x86/cpu/coreboot/timestamp.c b/arch/x86/cpu/coreboot/timestamp.c index ec4003c4e77..681191d85bb 100644 --- a/arch/x86/cpu/coreboot/timestamp.c +++ b/arch/x86/cpu/coreboot/timestamp.c @@ -6,13 +6,12 @@ */ #include <bootstage.h> +#include <errno.h> #include <asm/arch/timestamp.h> #include <asm/cb_sysinfo.h> #include <asm/u-boot-x86.h> #include <linux/compiler.h> -static struct timestamp_table *ts_table __section(".data"); - void timestamp_init(void) { timestamp_add_now(TS_U_BOOT_INITTED); @@ -20,6 +19,8 @@ void timestamp_init(void) void timestamp_add(enum timestamp_id id, uint64_t ts_time) { + const struct sysinfo_t *info = cb_get_sysinfo(); + struct timestamp_table *ts_table = info->tstamp_table; struct timestamp_entry *tse; if (!ts_table || (ts_table->num_entries == ts_table->max_entries)) @@ -37,13 +38,15 @@ void timestamp_add_now(enum timestamp_id id) int timestamp_add_to_bootstage(void) { + const struct sysinfo_t *info = cb_get_sysinfo(); + const struct timestamp_table *ts_table = info->tstamp_table; uint i; if (!ts_table) - return -1; + return -ENOENT; for (i = 0; i < ts_table->num_entries; i++) { - struct timestamp_entry *tse = &ts_table->entries[i]; + const struct timestamp_entry *tse = &ts_table->entries[i]; const char *name = NULL; switch (tse->entry_id) { -- 2.34.1

3 10