November 2021 - U-Boot

[PATCH v2] riscv: ae350: Use #if defined instead of CONFIG_IS_ENABLED
by Leo Yu-Chi Liang 01 Nov '21

01 Nov '21

According to ./include/linux/kconfig.h, CONFIG_IS_ENABLED(OF_BOARD) expands to 0 when CONFIG_SPL_BUILD is defined because there is no CONFIG_SPL_OF_BOARD. Use #if defined instead. Fixes: 2e8d2f88439d ("riscv: Remove OF_PRIOR_STAGE from RISC-V boards") Signed-off-by: Leo Yu-Chi Liang <ycliang(a)andestech.com> Reviewed-by: Rick Chen <rick(a)andestech.com> Reviewed-by: Bin Meng <bmeng.cn(a)gmail.com> --- board/AndesTech/ax25-ae350/ax25-ae350.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/AndesTech/ax25-ae350/ax25-ae350.c b/board/AndesTech/ax25-ae350/ax25-ae350.c index b28894ed46..58bf236497 100644 --- a/board/AndesTech/ax25-ae350/ax25-ae350.c +++ b/board/AndesTech/ax25-ae350/ax25-ae350.c @@ -56,9 +56,9 @@ ulong board_flash_get_legacy(ulong base, int banknum, flash_info_t *info) void *board_fdt_blob_setup(void) { -#if CONFIG_IS_ENABLED(OF_BOARD) +#if defined(CONFIG_OF_BOARD) return (void *)(ulong)gd->arch.firmware_fdt_addr; -#elif CONFIG_IS_ENABLED(OF_SEPARATE) +#elif defined(CONFIG_OF_SEPARATE) return (void *)CONFIG_SYS_FDT_BASE; #else return NULL; -- 2.17.0

1 0

[PATCH] riscv: ae350: Use #if defined instead of CONFIG_IS_ENABLED
by Leo Yu-Chi Liang 01 Nov '21

01 Nov '21

According to ./include/linux/kconfig.h, CONFIG_IS_ENABLED(OF_BOARD) expands to 0 when CONFIG_SPL_BUILD is defined because there is no CONFIG_SPL_OF_BOARD. Use #if defined instead. Signed-off-by: Leo Yu-Chi Liang <ycliang(a)andestech.com> --- board/AndesTech/ax25-ae350/ax25-ae350.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/AndesTech/ax25-ae350/ax25-ae350.c b/board/AndesTech/ax25-ae350/ax25-ae350.c index b28894ed46..58bf236497 100644 --- a/board/AndesTech/ax25-ae350/ax25-ae350.c +++ b/board/AndesTech/ax25-ae350/ax25-ae350.c @@ -56,9 +56,9 @@ ulong board_flash_get_legacy(ulong base, int banknum, flash_info_t *info) void *board_fdt_blob_setup(void) { -#if CONFIG_IS_ENABLED(OF_BOARD) +#if defined(CONFIG_OF_BOARD) return (void *)(ulong)gd->arch.firmware_fdt_addr; -#elif CONFIG_IS_ENABLED(OF_SEPARATE) +#elif defined(CONFIG_OF_SEPARATE) return (void *)CONFIG_SYS_FDT_BASE; #else return NULL; -- 2.17.0

3 4

Re: [PATCH] image: fix select_ramdisk for raw initrd
by Art Nikpal 01 Nov '21

01 Nov '21

Hi Simon, Tom , and ... > Do we need this patch as well as the other one? If so, can you combine them? > Also, is it possible to drop the assignment to rd_addr at the top of the function? this patch must be replaced by another one https://patchwork.ozlabs.org/project/uboot/patch/20211016051915.4157293-1-a… ( last patch will be enough alone) On Mon, Nov 1, 2021 at 7:47 AM Simon Glass <sjg(a)chromium.org> wrote: > > Hi Artem, > > On Fri, 15 Oct 2021 at 04:15, Artem Lapkin <email2tema(a)gmail.com> wrote: > > > > Problem > > > > We have unbootable raw initrd images because, select_ramdisk for raw > > initrd images ignore submited select addr and setup rd_datap value to 0 > > > > Solution: setup rd_datap value from select > > > > Signed-off-by: Artem Lapkin <art(a)khadas.com> > > --- > > common/image-board.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > Do we need this patch as well as the other one? If so, can you combine them? > > Also, is it possible to drop the assignment to rd_addr at the top of > the function? > > > > > diff --git a/common/image-board.c b/common/image-board.c > > index e7660352e9..e3c6ea806a 100644 > > --- a/common/image-board.c > > +++ b/common/image-board.c > > @@ -439,7 +439,7 @@ static int select_ramdisk(bootm_headers_t *images, const char *select, u8 arch, > > end = strchr(select, ':'); > > if (end) { > > *rd_lenp = hextoul(++end, NULL); > > - *rd_datap = rd_addr; > > + *rd_datap = hextoul(select, NULL); > > processed = true; > > } > > } > > -- > > 2.25.1 > > > > Regards, > Simon

1 0

[PATCH v2 1/3] net: dsa: Use true instead of 1 in the set_promisc() call
by Bin Meng 01 Nov '21

01 Nov '21

set_promisc() call accepts the parameter of a bool type. Make it clear by using true instead of 1. Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> Reviewed-by: Vladimir Oltean <vladimir.oltean(a)nxp.com> Reviewed-by: Ramon Fried <rfried.dev(a)gmail.com> --- Changes in v2: - rebase on u-boot-net/next net/dsa-uclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/dsa-uclass.c b/net/dsa-uclass.c index 7a465b1099..606b1539a7 100644 --- a/net/dsa-uclass.c +++ b/net/dsa-uclass.c @@ -270,7 +270,7 @@ static void dsa_port_set_hwaddr(struct udevice *pdev, struct udevice *master) struct eth_ops *eth_ops = eth_get_ops(master); if (eth_ops->set_promisc) - eth_ops->set_promisc(master, 1); + eth_ops->set_promisc(master, true); return; } -- 2.25.1

1 2

Re: [PATCH] riscv: ae350: Use #if defined instead of CONFIG_IS_ENABLED
by Rick Chen 01 Nov '21

01 Nov '21

> From: Leo Yu-Chi Liang(梁育齊) <ycliang(a)andestech.com> > Sent: Wednesday, October 27, 2021 4:59 PM > To: Rick Jian-Zhi Chen(陳建志) <rick(a)andestech.com>; Leo Yu-Chi Liang(梁育齊) <ycliang(a)andestech.com> > Cc: u-boot(a)lists.denx.de > Subject: [PATCH] riscv: ae350: Use #if defined instead of CONFIG_IS_ENABLED > > According to ./include/linux/kconfig.h, > CONFIG_IS_ENABLED(OF_BOARD) expands to 0 when CONFIG_SPL_BUILD is defined because there is no CONFIG_SPL_OF_BOARD. > > Use #if defined instead. > > Signed-off-by: Leo Yu-Chi Liang <ycliang(a)andestech.com> > --- > board/AndesTech/ax25-ae350/ax25-ae350.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Rick Chen <rick(a)andestech.com>

1 0

Re: [PATCH 07/10] Convert CONFIG_OF_EMBED to Kconfig
by Rick Chen 01 Nov '21

01 Nov '21

> From: U-Boot <u-boot-bounces(a)lists.denx.de> On Behalf Of Tom Rini > Sent: Sunday, October 31, 2021 11:04 AM > To: u-boot(a)lists.denx.de > Subject: [PATCH 07/10] Convert CONFIG_OF_EMBED to Kconfig > > This converts the following to Kconfig: > CONFIG_OF_EMBED > > Signed-off-by: Tom Rini <trini(a)konsulko.com> > --- > README | 7 ------- > configs/adp-ae3xx_defconfig | 1 + > configs/adp-ag101p_defconfig | 1 + > include/configs/adp-ae3xx.h | 1 - > include/configs/adp-ag101p.h | 1 - > include/configs/cgtqmx8.h | 2 -- > include/configs/imx8qm_mek.h | 2 -- > include/configs/imx8qxp_mek.h | 2 -- > 8 files changed, 2 insertions(+), 15 deletions(-) Reviewed-by: Rick Chen <rick(a)andestech.com>

1 0

[PATCH v1 1/2] x86: tangier: pinmux: Move is_protected assignment closer to its user
by Andy Shevchenko 01 Nov '21

01 Nov '21

Move is_protected assignment closer to its user. This increases readability and makes maintenance easier. Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- arch/x86/cpu/tangier/pinmux.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/x86/cpu/tangier/pinmux.c b/arch/x86/cpu/tangier/pinmux.c index 8385167b2b6b..883860f75e28 100644 --- a/arch/x86/cpu/tangier/pinmux.c +++ b/arch/x86/cpu/tangier/pinmux.c @@ -162,8 +162,6 @@ static int mrfld_pinctrl_cfg_pin(ofnode pin_node) u32 mask; int ret; - is_protected = ofnode_read_bool(pin_node, "protected"); - pad_offset = ofnode_read_s32_default(pin_node, "pad-offset", -1); if (pad_offset == -1) return -EINVAL; @@ -178,6 +176,7 @@ static int mrfld_pinctrl_cfg_pin(ofnode pin_node) if (mode & ~mask) return -ENOTSUPP; + is_protected = ofnode_read_bool(pin_node, "protected"); if (is_protected) ret = mrfld_pinconfig_protected(pad_offset, mask, mode); else -- 2.33.0

3 7

[PATCH v3] video: fix positioning in TrueType console
by Heinrich Schuchardt 01 Nov '21

01 Nov '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 for TrueType. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- v3: Use floating point only with the TrueType console. v2: Adjust hash values in tests --- drivers/video/console_truetype.c | 27 ++++++++++++++++++++------- include/video_console.h | 4 ++++ test/dm/video.c | 6 +++--- 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/drivers/video/console_truetype.c b/drivers/video/console_truetype.c index d9ad52cce0..6fe238eab3 100644 --- a/drivers/video/console_truetype.c +++ b/drivers/video/console_truetype.c @@ -209,7 +209,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; @@ -224,8 +224,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; } /* @@ -236,8 +239,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 */ @@ -585,20 +588,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; @@ -612,6 +616,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 06b798ef10..c339dc3956 100644 --- a/include/video_console.h +++ b/include/video_console.h @@ -68,7 +68,11 @@ struct vidconsole_priv { int ycur; int rows; int cols; +#ifdef CONFIG_CONSOLE_TRUETYPE + double x_charsize; +#else int x_charsize; +#endif int y_charsize; int tab_width_frac; int xsize_frac; diff --git a/test/dm/video.c b/test/dm/video.c index 1d29b2d61c..c0ad83521a 100644 --- a/test/dm/video.c +++ b/test/dm/video.c @@ -344,7 +344,7 @@ static int dm_test_video_truetype(struct unit_test_state *uts) ut_assertok(uclass_get_device(UCLASS_VIDEO, 0, &dev)); ut_assertok(uclass_get_device(UCLASS_VIDEO_CONSOLE, 0, &con)); vidconsole_put_string(con, test_string); - ut_asserteq(13001, compress_frame_buffer(uts, dev)); + ut_asserteq(12752, compress_frame_buffer(uts, dev)); return 0; } @@ -365,7 +365,7 @@ static int dm_test_video_truetype_scroll(struct unit_test_state *uts) ut_assertok(uclass_get_device(UCLASS_VIDEO, 0, &dev)); ut_assertok(uclass_get_device(UCLASS_VIDEO_CONSOLE, 0, &con)); vidconsole_put_string(con, test_string); - ut_asserteq(36952, compress_frame_buffer(uts, dev)); + ut_asserteq(36493, compress_frame_buffer(uts, dev)); return 0; } @@ -386,7 +386,7 @@ static int dm_test_video_truetype_bs(struct unit_test_state *uts) ut_assertok(uclass_get_device(UCLASS_VIDEO, 0, &dev)); ut_assertok(uclass_get_device(UCLASS_VIDEO_CONSOLE, 0, &con)); vidconsole_put_string(con, test_string); - ut_asserteq(30747, compress_frame_buffer(uts, dev)); + ut_asserteq(31117, compress_frame_buffer(uts, dev)); return 0; } -- 2.30.2

3 3

Please pull u-boot-dm
by Simon Glass 01 Nov '21

01 Nov '21

Hi Tom, https://source.denx.de/u-boot/custodians/u-boot-dm/-/pipelines/9692 The following changes since commit 50bff6a6f86669a8652e2bf271eeb04f77911274: Merge branch '2021-10-31-assorted-platform-updates' (2021-10-31 12:21:12 -0400) are available in the Git repository at: git://git.denx.de/u-boot-dm.git tags/dm-pull-boo21 for you to fetch changes up to b55881ddb455af31b64038cf3b67f781909971cc: bootstage: Add SPL support (2021-10-31 12:26:44 -0600) ---------------------------------------------------------------- Environment tidy-ups patman 'postfix' support fix binman test race condition causing a timeout error ---------------------------------------------------------------- Alistair Delva (1): x86: Fix linking u-boot with ld.lld Hannu Lounento (1): image.h: make image_sign_info.fit point to const Marek Behún (14): env: sf: Cosmetic fix in env_sf_init_addr() env: sf: Use ENV_VALID enum names instead of literals env: sf: Put ENV_INVALID into gd->env_valid on CRC failure env: nand: Put ENV_INVALID into gd->env_valid if default environment env: nvram: Let generic env_init() assign default environment env: nvram: Cosmetic fix in env_nvram_init() env: nowhere: Let generic env_init() assign default environment env: nowhere: Cosmetic fix env: flash: Let generic env_init() assign default environment env: flash: Cosmetic fix board: synquacer: developerbox: Don't set gd->env_addr to default_environment board: freescale: various boards: Let env subsystem set gd->env_addr env: Always use char for default_environment env: Use static_assert() to check if default_environment is too large Marek Vasut (1): bootstage: Add SPL support Sean Anderson (1): patman: Add "postfix" support to patch subjects Simon Glass (1): binman: Allow timeout to occur in the image or its section Tom Rini (1): sandbox: Migrate ARCH_MAP_SYSMEM to Kconfig Makefile | 3 +++ arch/sandbox/Kconfig | 3 +++ arch/sandbox/config.mk | 1 - arch/x86/cpu/cpu.c | 2 +- board/Marvell/mvebu_armada-37xx/board.c | 2 +- board/freescale/ls1012afrdm/ls1012afrdm.c | 4 ---- board/freescale/ls1012aqds/ls1012aqds.c | 4 ---- board/freescale/ls1012ardb/ls1012ardb.c | 4 ---- board/freescale/ls1028a/ls1028a.c | 4 ---- board/freescale/ls1088a/ls1088a.c | 4 ---- board/freescale/ls2080aqds/ls2080aqds.c | 3 --- board/freescale/ls2080ardb/ls2080ardb.c | 3 --- board/freescale/lx2160a/lx2160a.c | 3 --- board/siemens/iot2050/board.c | 2 +- board/socionext/developerbox/developerbox.c | 2 -- common/Kconfig.boot | 9 +++++++++ common/image-fit-sig.c | 2 +- common/init/board_init.c | 2 +- common/spl/spl.c | 2 +- env/common.c | 11 +++-------- env/flash.c | 5 +---- env/nand.c | 3 +-- env/nowhere.c | 5 ++--- env/nvram.c | 7 +++---- env/sf.c | 7 +++---- include/bootstage.h | 2 +- include/env_default.h | 10 ++++++++-- include/env_internal.h | 4 ++-- include/image.h | 2 +- tools/binman/ftest.py | 3 +-- tools/patman/README | 5 +++++ tools/patman/func_test.py | 6 ++++-- tools/patman/patchstream.py | 2 ++ tools/patman/series.py | 9 +++++++-- tools/patman/test/test01.txt | 1 + 35 files changed, 66 insertions(+), 75 deletions(-) Regards, SImon

2 1