From f920257ac295087c55033407733e53961da36c29 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Sat, 23 Nov 2024 10:04:03 +0100 Subject: [PATCH 1/8] cmd: bootmenu typo 'read' %s/read/reads/ Signed-off-by: Heinrich Schuchardt --- 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 528b6b817e9d22dc5cd6f23e4135355e5179f084 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Tue, 26 Nov 2024 15:20:26 +0100 Subject: [PATCH 2/8] 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 --- 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 12876f8cd8d99c21c65aa478ef21f9deea356364 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 3/8] 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 --- 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 980bcccf4131f5af4f9cf2ada27781c19f365b7a Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Wed, 11 Dec 2024 17:31:54 +0100 Subject: [PATCH 4/8] crypto: typo volatge %s/volatge/voltage/g Signed-off-by: Heinrich Schuchardt Acked-by: Peng Fan --- 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 354a70a5d9f0a4ebf311e45c0f53ed835f4af103 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Wed, 11 Dec 2024 17:31:52 +0100 Subject: [PATCH 5/8] board: freescale: typo volatge %s/volatge/voltage/g Signed-off-by: Heinrich Schuchardt Acked-by: Peng Fan --- 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 0be26928bfc4f2a34df3eb447fee718d3551217c Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Wed, 11 Dec 2024 17:31:53 +0100 Subject: [PATCH 6/8] scripts: add volatge to spelling.txt To avoid future misspells add volatge to spelling.txt. Signed-off-by: Heinrich Schuchardt --- 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 9bb02f7f4533fbb48c8a5822b4b41a2e527b949c Mon Sep 17 00:00:00 2001 From: Venkatesh Yadav Abbarapu Date: Mon, 30 Dec 2024 12:32:06 +0530 Subject: [PATCH 7/8] mtd: spi-nor: Fix the spi_nor_read() when config SPI_STACKED_PARALLEL is enabled Update the spi_nor_read() function based on the config SPI_FLASH_BAR and update the length and bank calculation by spliting the memory of 16MB size banks only when the address width is 3byte. Fix the read issue for 4byte address width by passing the entire length to the read function. Fixes: 5d40b3d384 ("mtd: spi-nor: Add parallel and stacked memories support") Signed-off-by: Venkatesh Yadav Abbarapu --- drivers/mtd/spi/spi-nor-core.c | 73 ++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 30 deletions(-) diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c index ec841fb13bd..6f352c5c0e2 100644 --- a/drivers/mtd/spi/spi-nor-core.c +++ b/drivers/mtd/spi/spi-nor-core.c @@ -1130,17 +1130,19 @@ static int spi_nor_erase(struct mtd_info *mtd, struct erase_info *instr) goto erase_err; } offset = addr; - if (nor->flags & SNOR_F_HAS_PARALLEL) - offset /= 2; + if (CONFIG_IS_ENABLED(SPI_STACKED_PARALLEL)) { + if (nor->flags & SNOR_F_HAS_PARALLEL) + offset /= 2; - if (nor->flags & SNOR_F_HAS_STACKED) { - if (offset >= (mtd->size / 2)) - nor->spi->flags |= SPI_XFER_U_PAGE; - else - nor->spi->flags &= ~SPI_XFER_U_PAGE; + if (nor->flags & SNOR_F_HAS_STACKED) { + if (offset >= (mtd->size / 2)) + nor->spi->flags |= SPI_XFER_U_PAGE; + else + nor->spi->flags &= ~SPI_XFER_U_PAGE; + } } #ifdef CONFIG_SPI_FLASH_BAR - ret = write_bar(nor, addr); + ret = write_bar(nor, offset); if (ret < 0) goto erase_err; #endif @@ -1152,7 +1154,7 @@ static int spi_nor_erase(struct mtd_info *mtd, struct erase_info *instr) !(nor->flags & SNOR_F_NO_OP_CHIP_ERASE)) { ret = spi_nor_erase_chip(nor); } else { - ret = spi_nor_erase_sector(nor, addr); + ret = spi_nor_erase_sector(nor, offset); } if (ret < 0) goto erase_err; @@ -1576,11 +1578,12 @@ static int spi_nor_read(struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf) { struct spi_nor *nor = mtd_to_spi_nor(mtd); - int ret; loff_t offset = from; - u32 read_len = 0; u32 rem_bank_len = 0; + u32 stack_shift = 0; + size_t read_len; u8 bank; + int ret; bool is_ofst_odd = false; dev_dbg(nor->dev, "from 0x%08x, len %zd\n", (u32)from, len); @@ -1593,39 +1596,49 @@ static int spi_nor_read(struct mtd_info *mtd, loff_t from, size_t len, } while (len) { - bank = (u32)from / SZ_16M; - if (nor->flags & SNOR_F_HAS_PARALLEL) - bank /= 2; - - rem_bank_len = SZ_16M * (bank + 1); - if (nor->flags & SNOR_F_HAS_PARALLEL) - rem_bank_len *= 2; - rem_bank_len -= from; - + read_len = len; offset = from; - if (nor->flags & SNOR_F_HAS_STACKED) { - if (offset >= (mtd->size / 2)) { - offset = offset - (mtd->size / 2); - nor->spi->flags |= SPI_XFER_U_PAGE; - } else { - nor->spi->flags &= ~SPI_XFER_U_PAGE; + if (CONFIG_IS_ENABLED(SPI_FLASH_BAR)) { + bank = (u32)from / SZ_16M; + if (CONFIG_IS_ENABLED(SPI_STACKED_PARALLEL)) { + if (nor->flags & SNOR_F_HAS_PARALLEL) + bank /= 2; + } + rem_bank_len = SZ_16M * (bank + 1); + if (CONFIG_IS_ENABLED(SPI_STACKED_PARALLEL)) { + if (nor->flags & SNOR_F_HAS_PARALLEL) + rem_bank_len *= 2; + } + rem_bank_len -= from; + } + + if (CONFIG_IS_ENABLED(SPI_STACKED_PARALLEL)) { + if (nor->flags & SNOR_F_HAS_STACKED) { + stack_shift = 1; + if (offset >= (mtd->size / 2)) { + offset = offset - (mtd->size / 2); + nor->spi->flags |= SPI_XFER_U_PAGE; + } else { + nor->spi->flags &= ~SPI_XFER_U_PAGE; + } } } - if (nor->flags & SNOR_F_HAS_PARALLEL) - offset /= 2; + if (CONFIG_IS_ENABLED(SPI_STACKED_PARALLEL)) { + if (nor->flags & SNOR_F_HAS_PARALLEL) + offset /= 2; + } #ifdef CONFIG_SPI_FLASH_BAR ret = write_bar(nor, offset); if (ret < 0) return log_ret(ret); -#endif - if (len < rem_bank_len) read_len = len; else read_len = rem_bank_len; +#endif if (read_len == 0) return -EIO; From 4be40460758057b9a85b0303dc072c108813cdf6 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 30 Dec 2024 22:07:58 -0600 Subject: [PATCH 8/8] Prepare v2025.01-rc6 Signed-off-by: Tom Rini --- Makefile | 2 +- doc/develop/release_cycle.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ccc0b2fada8..9b84a2cb524 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ VERSION = 2025 PATCHLEVEL = 01 SUBLEVEL = -EXTRAVERSION = -rc5 +EXTRAVERSION = -rc6 NAME = # *DOCUMENTATION* diff --git a/doc/develop/release_cycle.rst b/doc/develop/release_cycle.rst index c0e394f77cc..449d0375a1b 100644 --- a/doc/develop/release_cycle.rst +++ b/doc/develop/release_cycle.rst @@ -77,7 +77,7 @@ For the next scheduled release, release candidates were made on:: * U-Boot v2025.01-rc5 was released on Mon 23 December 2024. -.. * U-Boot v2025.01-rc6 was released on Mon 30 December 2024. +* U-Boot v2025.01-rc6 was released on Mon 30 December 2024. Please note that the following dates are planned only and may be deviated from as needed.