February 2021 - U-Boot

[PATCH u-boot] cmd: pinmux: depend on PINCTRL
by Marek Behún 25 Feb '21

25 Feb '21

The pinmux command uses functions pinctrl_get_pin_*(), which are missing if PINCTRL config option is disabled. Signed-off-by: Marek Behún <marek.behun(a)nic.cz> Cc: Simon Glass <sjg(a)chromium.org> Cc: Tom Rini <trini(a)konsulko.com> --- cmd/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/Kconfig b/cmd/Kconfig index 928a2a0a2d..4defbd9cf9 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1188,6 +1188,7 @@ config CMD_PCI config CMD_PINMUX bool "pinmux - show pins muxing" + depends on PINCTRL default y if PINCTRL help Parse all available pin-controllers and show pins muxing. This -- 2.26.2

3 2

[PATCH 0/3] Misc fixes for SPL_FIT_SIGNATURE builds
by Klaus Heinrich Kiwi 25 Feb '21

25 Feb '21

This patch series contains a few fixes for issues found when experimenting with the SPL_FIT_SIGNATURE builds. Some of them are apparently necessary to properly integrate this U-boot feature with build systems such as Yocto, and by extension OpenBMC. -Klaus Klaus Heinrich Kiwi (3): Kconfig: SPL_FIT_SIGNATURE selects FIT_SIGNATURE Kconfig: SPL_FIT_SIGNATURE requires SPL_LOAD_FIT Makefile: Add (default) DEVICE_TREE to SPL FIT Makefile | 1 + common/Kconfig.boot | 2 ++ 2 files changed, 3 insertions(+) -- 2.25.1

2 6

[PATCH u-boot 1/2] fs: btrfs: skip xattrs in directory listing
by Marek Behún 25 Feb '21

25 Feb '21

Skip xattrs in directory listing. U-Boot filesystem drivers do not list xattrs. Signed-off-by: Marek Behún <marek.behun(a)nic.cz> Cc: David Sterba <dsterba(a)suse.com> Cc: Qu Wenruo <wqu(a)suse.com> Cc: Tom Rini <trini(a)konsulko.com> --- fs/btrfs/btrfs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/btrfs/btrfs.c b/fs/btrfs/btrfs.c index 346b2c4341..6b4c5feb53 100644 --- a/fs/btrfs/btrfs.c +++ b/fs/btrfs/btrfs.c @@ -29,7 +29,6 @@ static int show_dir(struct btrfs_root *root, struct extent_buffer *eb, [BTRFS_FT_FIFO] = "FIFO", [BTRFS_FT_SOCK] = "SOCK", [BTRFS_FT_SYMLINK] = "SYMLINK", - [BTRFS_FT_XATTR] = "XATTR" }; u8 type = btrfs_dir_type(eb, di); char namebuf[BTRFS_NAME_LEN]; @@ -38,6 +37,10 @@ static int show_dir(struct btrfs_root *root, struct extent_buffer *eb, time_t mtime; int ret = 0; + /* skip XATTRs in directory listing */ + if (type == BTRFS_FT_XATTR) + return 0; + btrfs_dir_item_key_to_cpu(eb, di, &key); if (key.type == BTRFS_ROOT_ITEM_KEY) { -- 2.26.2

3 5

[PATCH v2] cmd: fdt: skip board specific fixup using env variable
by Wasim Khan 25 Feb '21

25 Feb '21

From: Wasim Khan <wasim.khan(a)nxp.com> Sometimes it is useful to boot OS with already fixed-up device tree. Check for env variable 'skip_board_fixup' before calling ft_board_setup(). Current behaviour is unchanged, additionally user can set skip_board_fixup to 1 to skip the fixup. Signed-off-by: Wasim Khan <wasim.khan(a)nxp.com> --- Changes in v2: - Added check for skip_board_fixup in checkpatch.pl common/image-fdt.c | 17 ++++++++++++----- scripts/checkpatch.pl | 6 ++++++ 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/common/image-fdt.c b/common/image-fdt.c index 327a8c4c39..0435176863 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -572,11 +572,18 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob, fdt_fixup_pstore(blob); #endif if (IMAGE_OF_BOARD_SETUP) { - fdt_ret = ft_board_setup(blob, gd->bd); - if (fdt_ret) { - printf("ERROR: board-specific fdt fixup failed: %s\n", - fdt_strerror(fdt_ret)); - goto err; + const char *skip_board_fixup; + + skip_board_fixup = env_get("skip_board_fixup"); + if (skip_board_fixup && ((int)simple_strtol(skip_board_fixup, NULL, 10) == 1)) { + printf("skip board fdt fixup\n"); + } else { + fdt_ret = ft_board_setup(blob, gd->bd); + if (fdt_ret) { + printf("ERROR: board-specific fdt fixup failed: %s\n", + fdt_strerror(fdt_ret)); + goto err; + } } } if (IMAGE_OF_SYSTEM_SETUP) { diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 4ed7e124c9..7b76894fb4 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2366,6 +2366,12 @@ sub u_boot_line { "fdt or initrd relocation disabled at boot time\n" . $herecurr); } + # make sure 'skip_board_fixup' is not + if ($rawline =~ /.*skip_board_fixup.*/) { + ERROR("SKIP_BOARD_FIXUP", + "Avoid setting skip_board_fixup env variable\n" . $herecurr); + } + # Do not use CONFIG_ prefix in CONFIG_IS_ENABLED() calls if ($line =~ /^\+.*CONFIG_IS_ENABLED$CONFIG_\w*$.*/) { ERROR("CONFIG_IS_ENABLED_CONFIG", -- 2.25.1

2 1

[PATCH 1/1] fs/squashfs: NULL dereference in sqfs_closedir()
by Heinrich Schuchardt 25 Feb '21

25 Feb '21

sqfs_opendir() called in sqfs_size(), sqfs_read(), sqfs_exists() may fail leading to sqfs_closedir(NULL) being called. Do not dereference NULL. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- fs/squashfs/sqfs.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/squashfs/sqfs.c b/fs/squashfs/sqfs.c index dca13bd1f1..29805c3c6f 100644 --- a/fs/squashfs/sqfs.c +++ b/fs/squashfs/sqfs.c @@ -1716,6 +1716,9 @@ void sqfs_closedir(struct fs_dir_stream *dirs) { struct squashfs_dir_stream *sqfs_dirs; + if (!dirs) + return; + sqfs_dirs = (struct squashfs_dir_stream *)dirs; free(sqfs_dirs->inode_table); free(sqfs_dirs->dir_table); -- 2.29.2

2 1

[PATCH] cmd: pwm: Rework argc sanity checking
by Tom Rini 25 Feb '21

25 Feb '21

Currently, we check argc in a number of places to make sure that we have all of the required arguments for each of the pwm sub-commands. However, there's at least one place where we've got dead code as we'll never have argc == 0, due to checking that argc was at least 4 earlier and having only subtracted 3. Rework things so that when we have determined our subcommand make sure we have the right number of arguments for it, or error out. This means we can stop checking against argc again later. Reported-by: Coverity (CID: 316601) Cc: Pragnesh Patel <pragnesh.patel(a)sifive.com> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- cmd/pwm.c | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/cmd/pwm.c b/cmd/pwm.c index 5849fc57b666..e1f97c759d2c 100644 --- a/cmd/pwm.c +++ b/cmd/pwm.c @@ -34,11 +34,9 @@ static int do_pwm(struct cmd_tbl *cmdtp, int flag, int argc, argc -= 2; argv += 2; - if (argc > 0) { - str_pwm = *argv; - argc--; - argv++; - } + str_pwm = *argv; + argc--; + argv++; if (!str_pwm) return CMD_RET_USAGE; @@ -46,15 +44,23 @@ static int do_pwm(struct cmd_tbl *cmdtp, int flag, int argc, switch (*str_cmd) { case 'i': sub_cmd = PWM_SET_INVERT; + if (argc != 2) + return CMD_RET_USAGE; break; case 'c': sub_cmd = PWM_SET_CONFIG; + if (argc != 3) + return CMD_RET_USAGE; break; case 'e': sub_cmd = PWM_SET_ENABLE; + if (argc != 1) + return CMD_RET_USAGE; break; case 'd': sub_cmd = PWM_SET_DISABLE; + if (argc != 1) + return CMD_RET_USAGE; break; default: return CMD_RET_USAGE; @@ -67,38 +73,29 @@ static int do_pwm(struct cmd_tbl *cmdtp, int flag, int argc, return cmd_process_error(cmdtp, ret); } - if (argc > 0) { - str_channel = *argv; - channel = simple_strtoul(str_channel, NULL, 10); - argc--; - argv++; - } else { - return CMD_RET_USAGE; - } + str_channel = *argv; + channel = simple_strtoul(str_channel, NULL, 10); + argc--; + argv++; - if (sub_cmd == PWM_SET_INVERT && argc > 0) { + if (sub_cmd == PWM_SET_INVERT) { str_enable = *argv; pwm_enable = simple_strtoul(str_enable, NULL, 10); ret = pwm_set_invert(dev, channel, pwm_enable); - } else if (sub_cmd == PWM_SET_CONFIG && argc == 2) { + } else if (sub_cmd == PWM_SET_CONFIG) { str_period = *argv; argc--; argv++; period_ns = simple_strtoul(str_period, NULL, 10); - if (argc > 0) { - str_duty = *argv; - duty_ns = simple_strtoul(str_duty, NULL, 10); - } + str_duty = *argv; + duty_ns = simple_strtoul(str_duty, NULL, 10); ret = pwm_set_config(dev, channel, period_ns, duty_ns); } else if (sub_cmd == PWM_SET_ENABLE) { ret = pwm_set_enable(dev, channel, 1); } else if (sub_cmd == PWM_SET_DISABLE) { ret = pwm_set_enable(dev, channel, 0); - } else { - printf("PWM arguments missing\n"); - return CMD_RET_FAILURE; } if (ret) { -- 2.17.1

1 1

[PATCH u-boot-marvell 00/18] Upgrade A38x DDR3 training to version 14.0.0
by Marek Behún 25 Feb '21

25 Feb '21

This syncs drivers/ddr/marvell/a38x/ with the mv-ddr-devel branch of https://github.com/MarvellEmbeddedProcessors/mv-ddr-marvell.git. There are some commits regarding DDR3 on top of version 14.0.0 in the mv-ddr-marvell repository (from Chris Packham), but these changes already are in U-Boot. Marek Marek Behún (18): ddr: marvell: a38x: fix write leveling suplementary algo ddr: marvell: a38x: import header change from upstream ddr: marvell: a38x: add ddr32 support ddr: marvell: a38x: add ddr 32bit ECC support ddr: marvell: a38x: import header change from upstream ddr: marvell: a38x: fix 32bit ddr: marvell: a38x: fix memory size calculation using 32bit bus width ddr: marvell: a38x: import header change from upstream ddr: marvell: a38x: allow board specific ODT configuration ddr: marvell: a38x: add 16Gbit memory devices support ddr: marvell: a38x: add support for twin-die combined memory device ddr: marvell: a38x: disable WL phase correction stage in case of bus_width=16bit ddr: marvell: a38x: import header change from upstream ddr: marvell: a38x: fix memory cs size function ddr: marvell: a38x: import code change from upstream ddr: marvell: a38x: enum mv_ddr_twin_die: change order ddr: marvell: a38x: bump version to 14.0.0 ddr: marvell: a38x: fix comment in conditional macro board/CZ.NIC/turris_omnia/turris_omnia.c | 2 ++ board/Marvell/db-88f6820-amc/db-88f6820-amc.c | 1 + board/Marvell/db-88f6820-gp/db-88f6820-gp.c | 1 + board/alliedtelesis/x530/x530.c | 1 + board/gdsys/a38x/controlcenterdc.c | 1 + board/kobol/helios4/helios4.c | 1 + board/solidrun/clearfog/clearfog.c | 1 + drivers/ddr/marvell/a38x/ddr3_init.c | 5 ++++ drivers/ddr/marvell/a38x/ddr3_training.c | 5 +++- drivers/ddr/marvell/a38x/ddr3_training_db.c | 3 +++ .../ddr/marvell/a38x/ddr3_training_ip_def.h | 2 ++ .../marvell/a38x/ddr3_training_ip_engine.c | 5 +++- drivers/ddr/marvell/a38x/ddr_topology_def.h | 23 ++++++++++++++++++- .../ddr/marvell/a38x/mv_ddr_build_message.c | 2 +- drivers/ddr/marvell/a38x/mv_ddr_plat.c | 9 ++++++-- drivers/ddr/marvell/a38x/mv_ddr_topology.c | 14 ++++++++--- drivers/ddr/marvell/a38x/mv_ddr_topology.h | 2 ++ drivers/ddr/marvell/a38x/xor.c | 6 ++--- 18 files changed, 72 insertions(+), 12 deletions(-) -- 2.26.2

6 39

Do U-boot Drivers Support this Marvell PHY Chip?
by Marr, Hayden (Platform COE - Software) 24 Feb '21

24 Feb '21

Hello, I need to know if u-boot currently supports the Marvell PHY 88X3540 device. (Product brief here: https://jp.marvell.com/content/dam/marvell/en/public-collateral/phys-transc…) I notice there exists driver code in the u-boot source that has been tested for similar Marvell PHY devices, but I wondering if those drivers can also apply to the 88X3540 device. We will be using u-boot on LX2160A-based hardware, containing this PHY chip. Please reach out with any information/guidance. Thanks! Hayden Marr Office: 602.436.0216 Hayden.Marr(a)Honeywell.com<mailto:Hayden.Marr@Honeywell.com>

1 0

Is it possible to place uImage in eMMC boot0 partition?
by Алексей Бе ляев 24 Feb '21

24 Feb '21

Hello! Is it possible to place uImage in eMMC boot0 partition? Now I had wrote U-Boot to mmcblk1boot0 and placed Environment in same partition. --

2 1

How to define CONFIG_SYS_MMC_ENV_PART?
by Алексей Бе ляев 24 Feb '21

24 Feb '21

Hello! How to define CONFIG_SYS_MMC_ENV_PART? Every time when I adding CONFIG_SYS_MMC_ENV_PART to .config file, it removed by make. --

2 1