From 4e743f3c60495b3b58d612ba5cd42f5149a62089 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 23 Dec 2024 08:50:09 -0600 Subject: [PATCH 1/9] configs: Resync with savedefconfig Resync all defconfig files using qconfig.py Signed-off-by: Tom Rini (cherry picked from commit d532df3a614cf834213f6740fd56f0fd4e2d3662) --- configs/ls1028ardb_tfa_defconfig | 2 +- configs/rpi_3_b_plus_defconfig | 4 ++-- configs/rpi_3_defconfig | 4 ++-- configs/rpi_4_defconfig | 4 ++-- configs/rpi_arm64_defconfig | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/configs/ls1028ardb_tfa_defconfig b/configs/ls1028ardb_tfa_defconfig index a535e8969b9..89e452bdb1a 100644 --- a/configs/ls1028ardb_tfa_defconfig +++ b/configs/ls1028ardb_tfa_defconfig @@ -67,6 +67,7 @@ CONFIG_I2C_MUX=y CONFIG_I2C_MUX_PCA954x=y CONFIG_SYS_I2C_EEPROM_ADDR=0x57 CONFIG_FSL_ESDHC=y +CONFIG_FSL_ESDHC_SUPPORT_ADMA2=y CONFIG_MTD=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y @@ -101,4 +102,3 @@ CONFIG_USB_ETHER_ASIX88179=y CONFIG_USB_ETHER_RTL8152=y CONFIG_WDT=y CONFIG_WDT_SP805=y -CONFIG_FSL_ESDHC_SUPPORT_ADMA2=y diff --git a/configs/rpi_3_b_plus_defconfig b/configs/rpi_3_b_plus_defconfig index a6a8431c8ff..b05a9193666 100644 --- a/configs/rpi_3_b_plus_defconfig +++ b/configs/rpi_3_b_plus_defconfig @@ -10,6 +10,8 @@ CONFIG_ENV_SIZE=0x4000 CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b-plus" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_LOAD_ADDR=0x1000000 +CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y +CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y CONFIG_BOOTSTD_DEFAULTS=y CONFIG_OF_BOARD_SETUP=y CONFIG_FDT_SIMPLEFB=y @@ -55,5 +57,3 @@ CONFIG_VIDEO_BCM2835=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_PHYS_TO_BUS=y # CONFIG_HEXDUMP is not set -CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y -CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig index 358096f3d1c..267e4978e6e 100644 --- a/configs/rpi_3_defconfig +++ b/configs/rpi_3_defconfig @@ -10,6 +10,8 @@ CONFIG_ENV_SIZE=0x4000 CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_LOAD_ADDR=0x1000000 +CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y +CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y CONFIG_BOOTSTD_DEFAULTS=y CONFIG_OF_BOARD_SETUP=y CONFIG_FDT_SIMPLEFB=y @@ -55,5 +57,3 @@ CONFIG_VIDEO_BCM2835=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_PHYS_TO_BUS=y # CONFIG_HEXDUMP is not set -CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y -CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig index 17b6688e75c..993b79703b7 100644 --- a/configs/rpi_4_defconfig +++ b/configs/rpi_4_defconfig @@ -10,6 +10,8 @@ CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_SYS_LOAD_ADDR=0x1000000 CONFIG_PCI=y +CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y +CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y CONFIG_BOOTSTD_DEFAULTS=y CONFIG_OF_BOARD_SETUP=y CONFIG_FDT_SIMPLEFB=y @@ -68,5 +70,3 @@ CONFIG_VIDEO_BCM2835=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_PHYS_TO_BUS=y # CONFIG_HEXDUMP is not set -CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y -CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y diff --git a/configs/rpi_arm64_defconfig b/configs/rpi_arm64_defconfig index a8723ea24e1..9fe5d177943 100644 --- a/configs/rpi_arm64_defconfig +++ b/configs/rpi_arm64_defconfig @@ -8,6 +8,8 @@ CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_SYS_LOAD_ADDR=0x1000000 CONFIG_PCI=y +CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y +CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y CONFIG_BOOTSTD_DEFAULTS=y CONFIG_OF_BOARD_SETUP=y CONFIG_FDT_SIMPLEFB=y @@ -62,5 +64,3 @@ CONFIG_VIDEO_BCM2835=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_PHYS_TO_BUS=y # CONFIG_HEXDUMP is not set -CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y -CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y From 42f4b73085c9c9c36c0b00cfc17b19b2aac90a0f Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 23 Dec 2024 20:40:49 -0600 Subject: [PATCH 2/9] Prepare v2025.01-rc5 Signed-off-by: Tom Rini (cherry picked from commit 3391587e3fe22db6c71882f652e13543a4501694) Note: Makefile version changes dropped (base is already at v2025.12). --- doc/develop/release_cycle.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/develop/release_cycle.rst b/doc/develop/release_cycle.rst index 9f9252b18d2..c0e394f77cc 100644 --- a/doc/develop/release_cycle.rst +++ b/doc/develop/release_cycle.rst @@ -75,7 +75,7 @@ For the next scheduled release, release candidates were made on:: * U-Boot v2025.01-rc4 was released on Mon 09 December 2024. -.. * U-Boot v2025.01-rc5 was released on Mon 23 December 2024. +* U-Boot v2025.01-rc5 was released on Mon 23 December 2024. .. * U-Boot v2025.01-rc6 was released on Mon 30 December 2024. From 83c0ea54c9a9da01fdede655851ce7202f20edea Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Sat, 23 Nov 2024 10:04:03 +0100 Subject: [PATCH 3/9] cmd: bootmenu typo 'read' %s/read/reads/ Signed-off-by: Heinrich Schuchardt (cherry picked from commit f920257ac295087c55033407733e53961da36c29) --- cmd/bootmenu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/bootmenu.c b/cmd/bootmenu.c index ffa63a4628d..b633aedf011 100644 --- a/cmd/bootmenu.c +++ b/cmd/bootmenu.c @@ -239,7 +239,7 @@ static int prepare_bootmenu_entry(struct bootmenu_data *menu, /** * prepare_uefi_bootorder_entry() - generate the uefi bootmenu entries * - * This function read the "BootOrder" UEFI variable + * This function reads the "BootOrder" UEFI variable * and generate the bootmenu entries in the order of "BootOrder". * * @menu: pointer to the bootmenu structure From bb6145c8fc7dff51e6483fd51abebcea31ced8f0 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Tue, 26 Nov 2024 15:20:26 +0100 Subject: [PATCH 4/9] cmd/rng: fix long help text MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The number of bytes may only be specified if a device number id provided. Correct the formatting. Acked-by: Marek Behún Signed-off-by: Heinrich Schuchardt (cherry picked from commit 528b6b817e9d22dc5cd6f23e4135355e5179f084) --- cmd/rng.c | 4 ++-- doc/usage/cmd/rng.rst | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/rng.c b/cmd/rng.c index 2fb7202303a..4d91094a8ec 100644 --- a/cmd/rng.c +++ b/cmd/rng.c @@ -75,6 +75,6 @@ static int do_rng(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) U_BOOT_CMD( rng, 3, 0, do_rng, "print bytes from the hardware random number generator", - "list - list all the probed rng devices\n" - "rng [dev] [n] - print n random bytes(max 64) read from dev\n" + "list - list all probed rng devices\n" + "rng [dev [n]] - print n random bytes (max 64) read from dev\n" ); diff --git a/doc/usage/cmd/rng.rst b/doc/usage/cmd/rng.rst index 4a61e33d272..c071f01e841 100644 --- a/doc/usage/cmd/rng.rst +++ b/doc/usage/cmd/rng.rst @@ -12,14 +12,14 @@ Synopsis :: rng list - rng [dev] [n] + rng [dev [n]] rng list -------- List all the probed rng devices. -rng [dev] [n] +rng [dev [n]] ------------- The *rng* command reads the random number generator(RNG) device and From 34fa3dfb4061db656f820f3011213b6b97ea41c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Neusch=C3=A4fer?= Date: Sun, 15 Dec 2024 16:38:29 +0100 Subject: [PATCH 5/9] doc: fit: Format image tree source example MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The example in kernel_fdt.rst is inconsistently indented, making it difficult to read. Indent the example with the same standard as the other examples: Four spaces for the ReST code block and for every nesting level. Signed-off-by: J. Neuschäfer (cherry picked from commit 12876f8cd8d99c21c65aa478ef21f9deea356364) --- doc/usage/fit/kernel_fdt.rst | 88 ++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/doc/usage/fit/kernel_fdt.rst b/doc/usage/fit/kernel_fdt.rst index 9cc26fb7831..3802c8292d6 100644 --- a/doc/usage/fit/kernel_fdt.rst +++ b/doc/usage/fit/kernel_fdt.rst @@ -5,50 +5,50 @@ Single kernel and FDT blob :: - /dts-v1/; + /dts-v1/; - / { - description = "Simple image with single Linux kernel and FDT blob"; - #address-cells = <1>; + / { + description = "Simple image with single Linux kernel and FDT blob"; + #address-cells = <1>; - images { - kernel { - description = "Vanilla Linux kernel"; - data = /incbin/("./vmlinux.bin.gz"); - type = "kernel"; - arch = "ppc"; - os = "linux"; - compression = "gzip"; - load = <00000000>; - entry = <00000000>; - hash-1 { - algo = "crc32"; - }; - hash-2 { - algo = "sha256"; - }; - }; - fdt-1 { - description = "Flattened Device Tree blob"; - data = /incbin/("./target.dtb"); - type = "flat_dt"; - arch = "ppc"; - compression = "none"; - hash-1 { - algo = "crc32"; - }; - hash-2 { - algo = "sha256"; - }; - }; - }; + images { + kernel { + description = "Vanilla Linux kernel"; + data = /incbin/("./vmlinux.bin.gz"); + type = "kernel"; + arch = "ppc"; + os = "linux"; + compression = "gzip"; + load = <00000000>; + entry = <00000000>; + hash-1 { + algo = "crc32"; + }; + hash-2 { + algo = "sha256"; + }; + }; + fdt-1 { + description = "Flattened Device Tree blob"; + data = /incbin/("./target.dtb"); + type = "flat_dt"; + arch = "ppc"; + compression = "none"; + hash-1 { + algo = "crc32"; + }; + hash-2 { + algo = "sha256"; + }; + }; + }; - configurations { - default = "conf-1"; - conf-1 { - description = "Boot Linux kernel with FDT blob"; - kernel = "kernel"; - fdt = "fdt-1"; - }; - }; - }; + configurations { + default = "conf-1"; + conf-1 { + description = "Boot Linux kernel with FDT blob"; + kernel = "kernel"; + fdt = "fdt-1"; + }; + }; + }; From 4430d96177c68e6fcf172729fbf0d1fef57b91cf Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Wed, 11 Dec 2024 17:31:54 +0100 Subject: [PATCH 6/9] crypto: typo volatge %s/volatge/voltage/g Signed-off-by: Heinrich Schuchardt Acked-by: Peng Fan (cherry picked from commit 980bcccf4131f5af4f9cf2ada27781c19f365b7a) --- drivers/crypto/fsl/jr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c index c45481bef0b..8f7a821ebf3 100644 --- a/drivers/crypto/fsl/jr.c +++ b/drivers/crypto/fsl/jr.c @@ -654,7 +654,7 @@ static int rng_init(uint8_t sec_idx, ccsr_sec_t *sec) ret = instantiate_rng(sec_idx, sec, gen_sk); /* * entropy delay is calculated via self-test method. - * self-test are run across different volatge, temp. + * self-test are run across different voltage, temp. * if worst case value for ent_dly is identified, * loop can be skipped for that platform. */ From 550ce743191c6081b3e6607ad3008c7074318da5 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Wed, 11 Dec 2024 17:31:52 +0100 Subject: [PATCH 7/9] board: freescale: typo volatge %s/volatge/voltage/g Signed-off-by: Heinrich Schuchardt Acked-by: Peng Fan (cherry picked from commit 354a70a5d9f0a4ebf311e45c0f53ed835f4af103) --- board/freescale/ls1088a/ls1088a.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c index 9f4eb4811d9..9606434e8ff 100644 --- a/board/freescale/ls1088a/ls1088a.c +++ b/board/freescale/ls1088a/ls1088a.c @@ -690,7 +690,7 @@ int get_serdes_volt(void) dm_i2c_read(dev, PMBUS_CMD_READ_VOUT, (void *)&vcode, 2); #endif if (ret) { - printf("VID: failed to read the volatge\n"); + printf("VID: failed to read the voltage\n"); return ret; } @@ -716,11 +716,11 @@ int set_serdes_volt(int svdd) (void *)&buff, 5); #endif if (ret) { - printf("VID: I2C failed to write to the volatge regulator\n"); + printf("VID: I2C failed to write to the voltage regulator\n"); return -1; } - /* Wait for the volatge to get to the desired value */ + /* Wait for the voltage to get to the desired value */ do { vdd_last = get_serdes_volt(); if (vdd_last < 0) { @@ -778,7 +778,7 @@ int set_serdes_volt(int svdd) return -1; } - /* Wait for the volatge to get to the desired value */ + /* Wait for the voltage to get to the desired value */ udelay(10000); return 1; From 83b07f66473daec6439e4386e9de8e1b806dd8ef Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Wed, 11 Dec 2024 17:31:53 +0100 Subject: [PATCH 8/9] scripts: add volatge to spelling.txt To avoid future misspells add volatge to spelling.txt. Signed-off-by: Heinrich Schuchardt (cherry picked from commit 0be26928bfc4f2a34df3eb447fee718d3551217c) --- scripts/spelling.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/spelling.txt b/scripts/spelling.txt index 17fdc620d54..aec616b1d3b 100644 --- a/scripts/spelling.txt +++ b/scripts/spelling.txt @@ -1584,6 +1584,7 @@ virtaul||virtual virtiual||virtual visiters||visitors vitual||virtual +volatge||voltage vunerable||vulnerable wakeus||wakeups wathdog||watchdog From b5d9a76d55999004a3d88433824becad995342a1 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 26 Dec 2024 10:21:22 -0600 Subject: [PATCH 9/9] Merge tag 'doc-2025-01-rc6' of https://source.denx.de/u-boot/custodians/u-boot-efi Pull request doc-2025-01-rc6 Fix a number of typos * cmd: bootmenu typo 'read' * cmd/rng: fix long help text * crypto: typo volatge * board: freescale: typo volatge * scripts: add volatge to spelling.txt * doc: fit: Format image tree source example (cherry picked from commit cb7410257ac930a6fb05f1c63b291b7d399f19f2)