August 2021 - U-Boot

[PATCH v2 1/5] rockchip: rk3188-cru-common: sync clock dt-binding header from Linux
by Johan Jonker 04 Nov '21

04 Nov '21

In order to update the DT for rk3066 and rk3188 sync the clock dt-binding header. This is the state as of v5.12 in Linux. Signed-off-by: Johan Jonker <jbx6244(a)gmail.com> Reviewed-by: Heiko Stuebner <heiko(a)sntech.de> --- include/dt-bindings/clock/rk3188-cru-common.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/include/dt-bindings/clock/rk3188-cru-common.h b/include/dt-bindings/clock/rk3188-cru-common.h index 1e7931da0c..afad90680f 100644 --- a/include/dt-bindings/clock/rk3188-cru-common.h +++ b/include/dt-bindings/clock/rk3188-cru-common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2014 MundoReader S.L. * Author: Heiko Stuebner <heiko(a)sntech.de> @@ -59,12 +59,14 @@ #define ACLK_LCDC1 196 #define ACLK_GPU 197 #define ACLK_SMC 198 -#define ACLK_CIF 199 +#define ACLK_CIF1 199 #define ACLK_IPP 200 #define ACLK_RGA 201 #define ACLK_CIF0 202 #define ACLK_CPU 203 #define ACLK_PERI 204 +#define ACLK_VEPU 205 +#define ACLK_VDPU 206 /* pclk gates */ #define PCLK_GRF 320 @@ -125,8 +127,12 @@ #define HCLK_NANDC0 467 #define HCLK_CPU 468 #define HCLK_PERI 469 +#define HCLK_CIF1 470 +#define HCLK_VEPU 471 +#define HCLK_VDPU 472 +#define HCLK_HDMI 473 -#define CLK_NR_CLKS (HCLK_PERI + 1) +#define CLK_NR_CLKS (HCLK_HDMI + 1) /* soft-reset indices */ #define SRST_MCORE 2 -- 2.11.0

3 10

[PATCH v2] imx: spl: fix imx8m secure boot
by Heiko Schocher 03 Nov '21

03 Nov '21

cherry-picked from NXP code: 719d665a87c6: ("MLK-20467 imx8m: Fix issue for booting signed image through uuu") which fixes secure boot on imx8m based boards. Problem was that FIT header and so IVT header too, was loaded to memallocated address. So the ivt header address coded in IVT itself does not fit with the real position. Signed-off-by: Heiko Schocher <hs(a)denx.de> --- replaces Series: https://lists.denx.de/pipermail/u-boot/2021-August/457308.html @Tim: could you please test this version on your hardware? azure build: https://dev.azure.com/hs0298/hs/_build/results?buildId=72&view=results Works on sdcard and QSPI NOR boot on phycore-imx8mp board. Changes in v2: - use code from NXP commit 719d665 as Ye Li suggested. arch/arm/mach-imx/spl.c | 14 ++++++++++++++ common/spl/spl_fit.c | 7 ++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index 36033d611c..59c6c3752d 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -334,6 +334,20 @@ void board_spl_fit_post_load(const void *fit) } #endif +void *board_spl_fit_buffer_addr(ulong fit_size, int sectors, int bl_len) +{ + int align_len = ARCH_DMA_MINALIGN - 1; + + /* Some devices like SDP, NOR, NAND, SPI are using bl_len =1, so their fit address + * is different with SD/MMC, this cause mismatch with signed address. Thus, adjust + * the bl_len to align with SD/MMC. + */ + if (bl_len < 512) + bl_len = 512; + + return (void *)((CONFIG_SYS_TEXT_BASE - fit_size - bl_len - + align_len) & ~align_len); +} #endif #if defined(CONFIG_MX6) && defined(CONFIG_SPL_OS_BOOT) diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index f41abca0cc..a4337d3c88 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -538,6 +538,11 @@ static void *spl_get_fit_load_buffer(size_t size) return buf; } +__weak void *board_spl_fit_buffer_addr(ulong fit_size, int sectors, int bl_len) +{ + return spl_get_fit_load_buffer(sectors * bl_len); +} + /* * Weak default function to allow customizing SPL fit loading for load-only * use cases by allowing to skip the parsing/processing of the FIT contents @@ -631,7 +636,7 @@ static int spl_simple_fit_read(struct spl_fit_info *ctx, * For FIT with external data, data is not loaded in this step. */ sectors = get_aligned_image_size(info, size, 0); - buf = spl_get_fit_load_buffer(sectors * info->bl_len); + buf = board_spl_fit_buffer_addr(size, sectors, info->bl_len); count = info->read(info, sector, sectors, buf); ctx->fit = buf; -- 2.31.1

4 5

[PATCH v3 0/5] Fix compiler warnings for 32-bit ARM
by Simon Glass 01 Nov '21

01 Nov '21

These were noticed when building sandbox on a Raspberry Pi 400, which uses 32-bit linux. To make this work, I enabled CONFIG_HOST_32BIT in 'make menuconfig'. It would be nice if that were automatic, since we have the logic already in arch/sandbox/config.mk So this series adds that. It also fixes the unicode warnings of the form: /usr/bin/ld: warning: arch/sandbox/cpu/start.o uses 2-byte wchar_t yet the output is to use 4-byte wchar_t; use of wchar_t values across objects may fail as suggested by Heinrich. Changes in v3: - Mention the link to the new upstream patch - Change some things EFI things missed (or new since) last time - Use 'bitness' instead of 'bit' - Add a new patch to change non-EFI occurences Changes in v2: - Add new patch to reduce checkpatch unicode-string spam - Drop patches previously applied - Put all the packages in gcc.rst Joe Perches (1): checkpatch: Support wide strings Simon Glass (4): efi: Use 16-bit unicode strings sandbox: Detect the host bit size automatically treewide: Use 16-bit unicode strings RFC: treewide: Drop -fshort-char Makefile | 13 ++- arch/arm/config.mk | 2 +- arch/sandbox/Kconfig | 13 ++- arch/x86/config.mk | 2 +- arch/x86/cpu/Makefile | 2 +- arch/x86/lib/Makefile | 6 +- cmd/efidebug.c | 12 +- include/efi_loader.h | 2 +- include/efi_selftest.h | 4 +- lib/efi/Makefile | 4 +- lib/efi_loader/efi_bootmgr.c | 12 +- lib/efi_loader/efi_boottime.c | 2 +- lib/efi_loader/efi_capsule.c | 20 ++-- lib/efi_loader/efi_helper.c | 2 +- lib/efi_loader/efi_image_loader.c | 8 +- lib/efi_loader/efi_setup.c | 20 ++-- lib/efi_loader/efi_signature.c | 4 +- lib/efi_loader/efi_string.c | 2 +- lib/efi_loader/efi_var_common.c | 14 +-- lib/efi_loader/efi_variable.c | 6 +- lib/efi_loader/efi_variable_tee.c | 2 +- lib/efi_loader/helloworld.c | 40 +++---- lib/efi_selftest/dtbdump.c | 82 +++++++------- lib/efi_selftest/efi_selftest.c | 2 +- lib/efi_selftest/efi_selftest_block_device.c | 6 +- lib/efi_selftest/efi_selftest_devicepath.c | 2 +- lib/efi_selftest/efi_selftest_exception.c | 2 +- lib/efi_selftest/efi_selftest_fdt.c | 6 +- lib/efi_selftest/efi_selftest_hii.c | 8 +- lib/efi_selftest/efi_selftest_load_file.c | 4 +- lib/efi_selftest/efi_selftest_loadimage.c | 4 +- .../efi_selftest_miniapp_exception.c | 4 +- lib/efi_selftest/efi_selftest_miniapp_exit.c | 8 +- .../efi_selftest_miniapp_return.c | 2 +- lib/efi_selftest/efi_selftest_reset.c | 2 +- lib/efi_selftest/efi_selftest_textoutput.c | 12 +- .../efi_selftest_unicode_collation.c | 38 +++---- lib/efi_selftest/efi_selftest_util.c | 106 +++++++++--------- lib/efi_selftest/efi_selftest_variables.c | 22 ++-- .../efi_selftest_variables_runtime.c | 4 +- lib/efi_selftest/initrddump.c | 60 +++++----- lib/lzma/Types.h | 4 +- scripts/checkpatch.pl | 7 +- scripts/kconfig/Makefile | 14 ++- test/print_ut.c | 2 +- test/unicode_ut.c | 22 ++-- 46 files changed, 320 insertions(+), 295 deletions(-) -- 2.32.0.554.ge1b32706d8-goog

3 10

[PATCH v2] cmd: usb_mass_storage: Use part_get_info_by_dev_and_name_or_num
by Sean Anderson 29 Oct '21

29 Oct '21

This allows specifying partitions using more extended syntax. This is particularly useful to access eMMC hardware partitions. For example, this allows something like ums mmc 0.0,0.1,0.2,0.3 to expose four LUNs for each of the four default eMMC hardware partitions. Note that the comma syntax was already present. Signed-off-by: Sean Anderson <sean.anderson(a)seco.com> --- Changes in v2: - Reword commit message to include an example cmd/usb_mass_storage.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/usb_mass_storage.c b/cmd/usb_mass_storage.c index 14fa7233c7..d4e619b842 100644 --- a/cmd/usb_mass_storage.c +++ b/cmd/usb_mass_storage.c @@ -74,8 +74,8 @@ static int ums_init(const char *devtype, const char *devnums_part_str) if (!devnum_part_str) break; - partnum = blk_get_device_part_str(devtype, devnum_part_str, - &block_dev, &info, 1); + partnum = part_get_info_by_dev_and_name_or_num(devtype, devnum_part_str, + &block_dev, &info, 1); if (partnum < 0) goto cleanup; -- 2.25.1

2 5

[PATCH] imx: spl: Use FIELD_GET for bitfield access
by Sean Anderson 28 Oct '21

28 Oct '21

This macro clarifies accesses, and eliminates the need to have a separate shift define. Signed-off-by: Sean Anderson <sean.anderson(a)seco.com> --- arch/arm/include/asm/mach-imx/sys_proto.h | 5 +---- arch/arm/mach-imx/spl.c | 8 ++++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h index 43eae6d796..796c0f8b52 100644 --- a/arch/arm/include/asm/mach-imx/sys_proto.h +++ b/arch/arm/include/asm/mach-imx/sys_proto.h @@ -78,12 +78,9 @@ struct bd_info; #define IMX6_SRC_GPR10_BMODE BIT(28) #define IMX6_SRC_GPR10_PERSIST_SECONDARY_BOOT BIT(30) -#define IMX6_BMODE_MASK GENMASK(7, 0) -#define IMX6_BMODE_SHIFT 4 +#define IMX6_BMODE_MASK GENMASK(7, 4) #define IMX6_BMODE_EMI_MASK BIT(3) -#define IMX6_BMODE_EMI_SHIFT 3 #define IMX6_BMODE_SERIAL_ROM_MASK GENMASK(26, 24) -#define IMX6_BMODE_SERIAL_ROM_SHIFT 24 enum imx6_bmode_serial_rom { IMX6_BMODE_ECSPI1, diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index 36033d611c..2f3c1afbb9 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -18,6 +18,7 @@ #include <spl.h> #include <asm/mach-imx/hab.h> #include <asm/mach-imx/boot_mode.h> +#include <linux/bitfield.h> #include <g_dnl.h> #include <linux/libfdt.h> @@ -55,11 +56,11 @@ u32 spl_boot_device(void) return BOOT_DEVICE_BOARD; /* BOOT_CFG1[7:4] - see IMX6DQRM Table 8-8 */ - switch ((reg & IMX6_BMODE_MASK) >> IMX6_BMODE_SHIFT) { + switch (FIELD_GET(IMX6_BMODE_MASK, reg)) { /* EIM: See 8.5.1, Table 8-9 */ case IMX6_BMODE_EMI: /* BOOT_CFG1[3]: NOR/OneNAND Selection */ - switch ((reg & IMX6_BMODE_EMI_MASK) >> IMX6_BMODE_EMI_SHIFT) { + switch (FIELD_GET(IMX6_BMODE_EMI_MASK, reg)) { case IMX6_BMODE_ONENAND: return BOOT_DEVICE_ONENAND; case IMX6_BMODE_NOR: @@ -77,8 +78,7 @@ u32 spl_boot_device(void) /* Serial ROM: See 8.5.5.1, Table 8-22 */ case IMX6_BMODE_SERIAL_ROM: /* BOOT_CFG4[2:0] */ - switch ((reg & IMX6_BMODE_SERIAL_ROM_MASK) >> - IMX6_BMODE_SERIAL_ROM_SHIFT) { + switch (FIELD_GET(IMX6_BMODE_SERIAL_ROM_MASK, reg)) { case IMX6_BMODE_ECSPI1: case IMX6_BMODE_ECSPI2: case IMX6_BMODE_ECSPI3: -- 2.25.1

2 3

[PATCH 1/1] video: fix positioning in TrueType console
by Heinrich Schuchardt 28 Oct '21

28 Oct '21

With the patch accurate positioning is possible for mono-typed fonts: Fix the return value of console_truetype_putc_xy(). The current position is passed as parameter x. Some part of x represents a fractional pixel. The return value represents how much the character position must be advanced. This should only comprise the width of the current character and not the preexisting fractional pixel position. Characters are not square. As all characters of a mono-type font we can take the width of any character. 'W' as one of the widest ANSI characters provides also a good value for variable width fonts. The character width must be a float. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- drivers/video/console_truetype.c | 27 ++++++++++++++++++++------- include/video_console.h | 2 +- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/drivers/video/console_truetype.c b/drivers/video/console_truetype.c index 318a060926..56939af849 100644 --- a/drivers/video/console_truetype.c +++ b/drivers/video/console_truetype.c @@ -211,7 +211,7 @@ static int console_truetype_putc_xy(struct udevice *dev, uint x, uint y, int width_frac, linenum; struct pos_info *pos; u8 *bits, *data; - int advance; + int advance, kern_adv; void *start, *line, *sync_start, *sync_end; int row, ret; int bg_r, bg_g, bg_b; @@ -226,8 +226,11 @@ static int console_truetype_putc_xy(struct udevice *dev, uint x, uint y, * this character */ xpos = frac(VID_TO_PIXEL((double)x)); if (vc_priv->last_ch) { - xpos += priv->scale * stbtt_GetCodepointKernAdvance(font, - vc_priv->last_ch, ch); + kern_adv = stbtt_GetCodepointKernAdvance(font, vc_priv->last_ch, + ch); + xpos += priv->scale * kern_adv; + } else { + kern_adv = 0; } /* @@ -238,8 +241,8 @@ static int console_truetype_putc_xy(struct udevice *dev, uint x, uint y, */ x_shift = xpos - (double)tt_floor(xpos); xpos += advance * priv->scale; - width_frac = (int)VID_TO_POS(xpos); - if (x + width_frac >= vc_priv->xsize_frac) + width_frac = VID_TO_POS(priv->scale * (kern_adv + advance)); + if (x + (int)VID_TO_POS(xpos) >= vc_priv->xsize_frac) return -EAGAIN; /* Write the current cursor position into history */ @@ -591,20 +594,21 @@ static int console_truetype_probe(struct udevice *dev) struct udevice *vid_dev = dev->parent; struct video_priv *vid_priv = dev_get_uclass_priv(vid_dev); stbtt_fontinfo *font = &priv->font; - int ascent; + int advance, ascent, lsb; debug("%s: start\n", __func__); + if (vid_priv->font_size) priv->font_size = vid_priv->font_size; else priv->font_size = CONFIG_CONSOLE_TRUETYPE_SIZE; + priv->font_data = console_truetype_find_font(); if (!priv->font_data) { debug("%s: Could not find any fonts\n", __func__); return -EBFONT; } - vc_priv->x_charsize = priv->font_size; vc_priv->y_charsize = priv->font_size; vc_priv->xstart_frac = VID_TO_POS(2); vc_priv->cols = vid_priv->xsize / priv->font_size; @@ -618,6 +622,15 @@ static int console_truetype_probe(struct udevice *dev) /* Pre-calculate some things we will need regularly */ priv->scale = stbtt_ScaleForPixelHeight(font, priv->font_size); + + /* Assuming that 'W' is the widest character */ + stbtt_GetCodepointHMetrics(font, 'W', &advance, &lsb); + advance += stbtt_GetCodepointKernAdvance(font, 'W', 'W'); + vc_priv->cols = + (int)VID_TO_POS(vid_priv->xsize - 2) / + (int)VID_TO_POS(advance * priv->scale); + vc_priv->x_charsize = advance * priv->scale; + stbtt_GetFontVMetrics(font, &ascent, 0, 0); priv->baseline = (int)(ascent * priv->scale); debug("%s: ready\n", __func__); diff --git a/include/video_console.h b/include/video_console.h index 8747299d61..cf306e5ca2 100644 --- a/include/video_console.h +++ b/include/video_console.h @@ -68,7 +68,7 @@ struct vidconsole_priv { int ycur; int rows; int cols; - int x_charsize; + double x_charsize; int y_charsize; int tab_width_frac; int xsize_frac; -- 2.30.1

2 3

[PATCH] sunxi: Avoid duplicate reset_cpu with SYSRESET enabled
by Samuel Holland 27 Oct '21

27 Oct '21

The sysreset uclass unconditionally provides a definition of the reset_cpu() function. So does the sunxi board code. Omit our definition when SYSRESET is enabled. This allows the build to succeed, even though sysreset may not yet be functional due to a lack of back-end drivers. Signed-off-by: Samuel Holland <samuel(a)sholland.org> --- arch/arm/mach-sunxi/board.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c index d9b04f75fc4..f867a28c30c 100644 --- a/arch/arm/mach-sunxi/board.c +++ b/arch/arm/mach-sunxi/board.c @@ -347,6 +347,7 @@ void board_init_f(ulong dummy) } #endif +#if !CONFIG_IS_ENABLED(SYSRESET) void reset_cpu(void) { #if defined(CONFIG_SUNXI_GEN_SUN4I) || defined(CONFIG_MACH_SUN8I_R40) @@ -377,6 +378,7 @@ void reset_cpu(void) while (1) { } #endif } +#endif #if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) && !defined(CONFIG_ARM64) void enable_caches(void) -- 2.31.1

2 1

[PATCH] cmd: nand biterr - Add support for nand biterr command
by Balamanikandan Gunasundar 27 Oct '21

27 Oct '21

The command shall be used to induce bit errors in the nand page manually. The code flips a bit in the specified offset without changing the ECC. This helps to see how the software handles the error. The patch is ported from https://patchwork.ozlabs.org/project/uboot/patch/\ 1325691123-19565-1-git-send-email-holger.brunck(a)keymile.com The implementation is inspired from 'mtd-utils/nand-utils/nandflipbits.c' Signed-off-by: Balamanikandan Gunasundar <balamanikandan.gunasundar(a)microchip.com> --- cmd/nand.c | 127 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 124 insertions(+), 3 deletions(-) diff --git a/cmd/nand.c b/cmd/nand.c index 5bda69e819..ea1b0f9434 100644 --- a/cmd/nand.c +++ b/cmd/nand.c @@ -17,6 +17,10 @@ * and/or modified under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2 of the * License, or (at your option) any later version. + * + * The function nand_biterror() in this file is inspired from + * mtd-utils/nand-utils/nandflipbits.c which was released under GPLv2 + * only */ #include <common.h> @@ -40,6 +44,116 @@ int find_dev_and_part(const char *id, struct mtd_device **dev, u8 *part_num, struct part_info **part); #endif +#define MAX_NUM_PAGES 64 + +static int nand_biterror(struct mtd_info *mtd, ulong off, int bit) +{ + int ret = 0; + int page = 0; + ulong block_off; + u_char *datbuf[MAX_NUM_PAGES]; /* Data and OOB */ + u_char data; + int pages_per_blk = mtd->erasesize / mtd->writesize; + struct erase_info einfo; + + if (pages_per_blk > MAX_NUM_PAGES) { + printf("Too many pages in one erase block\n"); + return 1; + } + + if (bit < 0 || bit > 7) { + printf("bit position 0 to 7 is allowed\n"); + return 1; + } + + /* Allocate memory */ + memset(datbuf, 0, sizeof(datbuf)); + for (page = 0; page < pages_per_blk ; page++) { + datbuf[page] = malloc(mtd->writesize + mtd->oobsize); + if (!datbuf[page]) { + printf("No memory for page buffer\n"); + ret = -ENOMEM; + goto free_memory; + } + } + + /* Align to erase block boundary */ + block_off = off & (~(mtd->erasesize - 1)); + + /* Read out memory as first step */ + for (page = 0; page < pages_per_blk ; page++) { + struct mtd_oob_ops ops; + loff_t addr = (loff_t)block_off; + + memset(&ops, 0, sizeof(ops)); + ops.datbuf = datbuf[page]; + ops.oobbuf = datbuf[page] + mtd->writesize; + ops.len = mtd->writesize; + ops.ooblen = mtd->oobsize; + ops.mode = MTD_OPS_RAW; + ret = mtd_read_oob(mtd, addr, &ops); + if (ret < 0) { + printf("Error (%d) reading page %08lx\n", + ret, block_off); + ret = 1; + goto free_memory; + } + block_off += mtd->writesize; + } + + /* Erase the block */ + memset(&einfo, 0, sizeof(einfo)); + einfo.mtd = mtd; + /* Align to erase block boundary */ + einfo.addr = (loff_t)(off & (~(mtd->erasesize - 1))); + einfo.len = mtd->erasesize; + ret = mtd_erase(mtd, &einfo); + if (ret < 0) { + printf("Error (%d) nand_erase_nand page %08llx\n", + ret, einfo.addr); + ret = 1; + goto free_memory; + } + + /* Twist a bit in data part */ + block_off = off & (mtd->erasesize - 1); + data = datbuf[block_off / mtd->writesize][block_off % mtd->writesize]; + data ^= (1 << bit); + datbuf[block_off / mtd->writesize][block_off % mtd->writesize] = data; + + printf("Flip data at 0x%lx with xor 0x%02x (bit=%d) to value=0x%02x\n", + off, (1 << bit), bit, data); + + /* Write back twisted data and unmodified OOB */ + /* Align to erase block boundary */ + block_off = off & (~(mtd->erasesize - 1)); + for (page = 0; page < pages_per_blk; page++) { + struct mtd_oob_ops ops; + loff_t addr = (loff_t)block_off; + + memset(&ops, 0, sizeof(ops)); + ops.datbuf = datbuf[page]; + ops.oobbuf = datbuf[page] + mtd->writesize; + ops.len = mtd->writesize; + ops.ooblen = mtd->oobsize; + ops.mode = MTD_OPS_RAW; + ret = mtd_write_oob(mtd, addr, &ops); + if (ret < 0) { + printf("Error (%d) write page %08lx\n", ret, block_off); + ret = 1; + goto free_memory; + } + block_off += mtd->writesize; + } + +free_memory: + for (page = 0; page < pages_per_blk ; page++) { + if (datbuf[page]) + free(datbuf[page]); + } + return ret; +} + static int nand_dump(struct mtd_info *mtd, ulong off, int only_oob, int repeat) { @@ -728,8 +842,15 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } if (strcmp(cmd, "biterr") == 0) { - /* todo */ - return 1; + int bit; + + if (argc != 4) + goto usage; + + off = (int)simple_strtoul(argv[2], NULL, 16); + bit = (int)simple_strtoul(argv[3], NULL, 10); + ret = nand_biterror(mtd, off, bit); + return ret; } #ifdef CONFIG_CMD_NAND_LOCK_UNLOCK @@ -820,7 +941,7 @@ static char nand_help_text[] = "nand scrub [-y] off size | scrub.part partition | scrub.chip\n" " really clean NAND erasing bad blocks (UNSAFE)\n" "nand markbad off [...] - mark bad block(s) at offset (UNSAFE)\n" - "nand biterr off - make a bit error at offset (UNSAFE)" + "nand biterr off bit - make a bit error at offset and bit position (UNSAFE)" #ifdef CONFIG_CMD_NAND_LOCK_UNLOCK "\n" "nand lock [tight] [status]\n" -- 2.25.1

3 2

[PATCH] sunxi: Select SPL_SEPARATE_BSS
by Samuel Holland 25 Oct '21

25 Oct '21

sunxi-common.h defines CONFIG_SPL_BSS_START_ADDR to put SPL's BSS in DRAM. Due to this, we must select SPL_SEPARATE_BSS, or else SPL will attempt to load its DTB from the wrong address (after BSS in DRAM). This change fixes booting with SPL_OF_CONTROL=y. Signed-off-by: Samuel Holland <samuel(a)sholland.org> --- arch/arm/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index d692139199c..67011208a00 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1008,6 +1008,7 @@ config ARCH_SUNXI select OF_CONTROL select OF_SEPARATE select SPECIFY_CONSOLE_INDEX + select SPL_SEPARATE_BSS if SPL select SPL_STACK_R if SPL select SPL_SYS_MALLOC_SIMPLE if SPL select SPL_SYS_THUMB_BUILD if !ARM64 -- 2.31.1

2 1

[PATCH 0/4] power: axp: Move poweroff to DM_PMIC/SYSRESET driver
by Samuel Holland 25 Oct '21

25 Oct '21

This series replaces the do_poweroff() implementation from the non-DM AXP PMIC drivers with a sysreset uclass device, if sysreset is providing its own do_poweroff() definition. This depends on the following series, which adds the AXP DM_PMIC driver: https://patchwork.ozlabs.org/project/uboot/list/?series=259089 Congratulations for making it this far! :) If you apply this series, along with all of the other sysreset and watchdog series I sent this weekend, and further enable three Kconfig options: SYSRESET SYSRESET_WATCHDOG SYSRESET_WATCHDOG_AUTO you will have removed exactly one (1) call to pmic_bus_write() from U-Boot, hopefully without breaking anything else. Once all of these series land, I will send a patch enabling those options, and we will be one quarter of the way to removing pmic_bus from U-Boot proper. Note that because SYSRESET is disabled by default, each of the other series I sent can be applied independently. Samuel Holland (4): include: axp_pmic: Add missing header guard definition include: axp_pmic: Include headers for all variants power: axp: Avoid do_poweroff conflict with sysreset power: pmic: axp: Implement poweroff via sysreset drivers/power/axp152.c | 2 ++ drivers/power/axp209.c | 2 ++ drivers/power/axp221.c | 2 ++ drivers/power/axp305.c | 2 +- drivers/power/axp809.c | 2 ++ drivers/power/axp818.c | 2 ++ drivers/power/pmic/Kconfig | 2 ++ drivers/power/pmic/axp.c | 36 ++++++++++++++++++++++++++++++++++++ include/axp152.h | 2 ++ include/axp209.h | 2 ++ include/axp221.h | 2 ++ include/axp809.h | 2 ++ include/axp818.h | 2 ++ include/axp_pmic.h | 13 +------------ 14 files changed, 60 insertions(+), 13 deletions(-) -- 2.31.1

2 9