April 2022 - U-Boot

[PATCH] usb: dwc3: Add missing dependency on DWC3 for DWC3 gadget
by Michal Simek 20 Apr '22

20 Apr '22

There is not covered dependency on DWC3. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- drivers/usb/host/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 8f77412cc71b..48cbed15e104 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -19,6 +19,7 @@ if USB_XHCI_HCD config USB_XHCI_DWC3 bool "DesignWare USB3 DRD Core Support" + depends on DWC3 help Say Y or if your system has a Dual Role SuperSpeed USB controller based on the DesignWare USB3 IP Core. -- 2.35.1

2 1

[PATCH v2] image-fdt: save name of FIT configuration in '/chosen' node
by Daniel Golle 20 Apr '22

20 Apr '22

It can be useful for the OS (Linux) to know which configuration has been chosen by U-Boot when launching a FIT image. Store the name of the FIT configuration node used in a new string property called 'u-boot,bootconf' in the '/chosen' node in device tree. Signed-off-by: Daniel Golle <daniel(a)makrotopia.org> --- v2: change node name to 'u-boot,bootconf' instead of just 'bootconf' Sibling PR to dt-schema: https://github.com/devicetree-org/dt-schema/pull/71 boot/image-fdt.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/boot/image-fdt.c b/boot/image-fdt.c index 692a9ad3e4..fdb69926a2 100644 --- a/boot/image-fdt.c +++ b/boot/image-fdt.c @@ -601,6 +601,12 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob, goto err; } + /* Store name of configuration node as u-boot,bootconf in /chosen node */ + if (images->fit_uname_cfg) + fdt_find_and_setprop(blob, "/chosen", "u-boot,bootconf", + images->fit_uname_cfg, + strlen(images->fit_uname_cfg) + 1, 1); + /* Update ethernet nodes */ fdt_fixup_ethernet(blob); #if CONFIG_IS_ENABLED(CMD_PSTORE) -- 2.35.1

2 2

[PATCH] configs: Enable EXT4 and ISO partitions for the DeveloperBox
by Ilias Apalodimas 20 Apr '22

20 Apr '22

Since this box is SystemReady compliant enable ISO_PARTITION which is needed to start some installers (e.g Fedora). While at it enable EXT4 as well which is a common filesystem for targets Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- configs/synquacer_developerbox_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/synquacer_developerbox_defconfig b/configs/synquacer_developerbox_defconfig index fe12c74374f9..4b06b2a523fb 100644 --- a/configs/synquacer_developerbox_defconfig +++ b/configs/synquacer_developerbox_defconfig @@ -37,6 +37,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_MTDPARTS=y CONFIG_CMD_LOG=y +CONFIG_ISO_PARTITION=y CONFIG_PARTITION_TYPE_GUID=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y @@ -85,6 +86,7 @@ CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_PCI=y CONFIG_USB_STORAGE=y +CONFIG_FS_EXT4=y CONFIG_EFI_SET_TIME=y CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y CONFIG_EFI_CAPSULE_ON_DISK=y -- 2.32.0

3 2

[PATCH 1/1] image-fit: don't check free() argument
by Heinrich Schuchardt 20 Apr '22

20 Apr '22

* free() checks if its argument is NULL. Remove duplicate checks. * Remove duplicate free(ovcopy). Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- boot/image-fit.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/boot/image-fit.c b/boot/image-fit.c index f01cafe4e2..401cdd3b55 100644 --- a/boot/image-fit.c +++ b/boot/image-fit.c @@ -1885,8 +1885,7 @@ int fit_conf_get_node(const void *fit, const char *conf_uname) conf_uname, fdt_strerror(noffset)); } - if (conf_uname_copy) - free(conf_uname_copy); + free(conf_uname_copy); return noffset; } @@ -2420,9 +2419,6 @@ int boot_get_fdt_fit(bootm_headers_t *images, ulong addr, } fdt_pack(base); len = fdt_totalsize(base); - - free(ovcopy); - ovcopy = NULL; } #else printf("config with overlays but CONFIG_OF_LIBFDT_OVERLAY not set\n"); @@ -2440,11 +2436,9 @@ out: *fit_uname_configp = fit_uname_config; #ifdef CONFIG_OF_LIBFDT_OVERLAY - if (ovcopy) - free(ovcopy); + free(ovcopy); #endif - if (fit_uname_config_copy) - free(fit_uname_config_copy); + free(fit_uname_config_copy); return fdt_noffset; } #endif -- 2.34.1

2 1

[PATCH 1/1] fs/squashfs: simplify sqfs_read()
by Heinrich Schuchardt 20 Apr '22

20 Apr '22

* Don't check argument of free(). Free does this itself. * Reduce scope of data_buffer. Remove duplicate free(). * Avoid superfluous NULL assignment. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- fs/squashfs/sqfs.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/fs/squashfs/sqfs.c b/fs/squashfs/sqfs.c index 5d9c52af80..b07c41e911 100644 --- a/fs/squashfs/sqfs.c +++ b/fs/squashfs/sqfs.c @@ -1310,7 +1310,7 @@ static int sqfs_get_lregfile_info(struct squashfs_lreg_inode *lreg, int sqfs_read(const char *filename, void *buf, loff_t offset, loff_t len, loff_t *actread) { - char *dir = NULL, *fragment_block, *datablock = NULL, *data_buffer = NULL; + char *dir = NULL, *fragment_block, *datablock = NULL; char *fragment = NULL, *file = NULL, *resolved, *data; u64 start, n_blks, table_size, data_offset, table_offset, sparse_size; int ret, j, i_number, datablk_count = 0; @@ -1440,6 +1440,8 @@ int sqfs_read(const char *filename, void *buf, loff_t offset, loff_t len, } for (j = 0; j < datablk_count; j++) { + char *data_buffer; + start = data_offset / ctxt.cur_dev->blksz; table_size = SQFS_BLOCK_SIZE(finfo.blk_sizes[j]); table_offset = data_offset - (start * ctxt.cur_dev->blksz); @@ -1501,9 +1503,7 @@ int sqfs_read(const char *filename, void *buf, loff_t offset, loff_t len, } data_offset += table_size; - if (data_buffer) - free(data_buffer); - data_buffer = NULL; + free(data_buffer); if (*actread >= len) break; } @@ -1563,10 +1563,7 @@ int sqfs_read(const char *filename, void *buf, loff_t offset, loff_t len, out: free(fragment); - if (datablk_count) { - free(data_buffer); - free(datablock); - } + free(datablock); free(file); free(dir); free(finfo.blk_sizes); -- 2.34.1

3 2

[PATCH] gpio: aspeed: Fix incorrect offset of read back register.
by Billy Tsai 20 Apr '22

20 Apr '22

The offset of the current read back register is the value of the gpio pin, not the value written for the gpio output. This patch fix it to avoid the other gpio output value controlled by the same register being set incorrectly. Fixes: 7ad889b0f37a ("gpio: Add Aspeed GPIO driver") Signed-off-by: Billy Tsai <billy_tsai(a)aspeedtech.com> --- drivers/gpio/gpio-aspeed.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c index a8a2afcb5c..2c5415c671 100644 --- a/drivers/gpio/gpio-aspeed.c +++ b/drivers/gpio/gpio-aspeed.c @@ -211,7 +211,7 @@ static int aspeed_gpio_direction_output(struct udevice *dev, unsigned int offset struct aspeed_gpio_priv *priv = dev_get_priv(dev); const struct aspeed_gpio_bank *bank = to_bank(offset); u32 dir = readl(bank_reg(priv, bank, reg_dir)); - u32 output = readl(bank_reg(priv, bank, reg_val)); + u32 output = readl(bank_reg(priv, bank, reg_rdata)); dir |= GPIO_BIT(offset); writel(dir, bank_reg(priv, bank, reg_dir)); @@ -239,7 +239,7 @@ aspeed_gpio_set_value(struct udevice *dev, unsigned int offset, int value) { struct aspeed_gpio_priv *priv = dev_get_priv(dev); const struct aspeed_gpio_bank *bank = to_bank(offset); - u32 data = readl(bank_reg(priv, bank, reg_val)); + u32 data = readl(bank_reg(priv, bank, reg_rdata)); if (value) data |= GPIO_BIT(offset); -- 2.25.1

3 2

[PATCH] .mailmap: Start to use new amd.com email address
by Michal Simek 20 Apr '22

20 Apr '22

Xilinx has been acquired by AMD that's why emails should be also updated. The patch is updating .mailmap file and also MAINTAINERS files as was done by commit 5cd1ecb99490 ("ppc: qemu: Update MAINTAINERS for correct email address"). The rest of my emails are not going to change. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- .mailmap | 1 + MAINTAINERS | 8 ++++---- board/xilinx/versal/MAINTAINERS | 2 +- board/xilinx/zynqmp/MAINTAINERS | 2 +- board/xilinx/zynqmp_r5/MAINTAINERS | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.mailmap b/.mailmap index 1f88ea953cec..3910e056f0de 100644 --- a/.mailmap +++ b/.mailmap @@ -43,6 +43,7 @@ Marek Vasut <marex(a)denx.de> <marex at denx.de> Markus Klotzbuecher <mk(a)denx.de> Masahiro Yamada <yamada.masahiro(a)socionext.com> <yamada.m(a)jp.panasonic.com> Masahiro Yamada <yamada.masahiro(a)socionext.com> <masahiroy(a)kernel.org> +Michal Simek <michal.simek(a)amd.com> <michal.simek(a)xilinx.com> Michal Simek <michal.simek(a)xilinx.com> <monstr(a)monstr.eu> Michal Simek <michal.simek(a)xilinx.com> <Monstr(a)seznam.cz> Michal Simek <michal.simek(a)xilinx.com> <root(a)monstr.eu> diff --git a/MAINTAINERS b/MAINTAINERS index 7a9e3156f42c..a0d326c84e1a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -594,7 +594,7 @@ F: configs/uniphier_*_defconfig N: uniphier ARM VERSAL -M: Michal Simek <michal.simek(a)xilinx.com> +M: Michal Simek <michal.simek(a)amd.com> S: Maintained T: git https://source.denx.de/u-boot/custodians/u-boot-microblaze.git F: arch/arm/mach-versal/ @@ -639,7 +639,7 @@ F: tools/zynqimage.c N: zynq ARM ZYNQMP -M: Michal Simek <michal.simek(a)xilinx.com> +M: Michal Simek <michal.simek(a)amd.com> S: Maintained T: git https://source.denx.de/u-boot/custodians/u-boot-microblaze.git F: arch/arm/mach-zynqmp/ @@ -676,7 +676,7 @@ N: ultra96 N: zynqmp ARM ZYNQMP R5 -M: Michal Simek <michal.simek(a)xilinx.com> +M: Michal Simek <michal.simek(a)amd.com> S: Maintained T: git https://source.denx.de/u-boot/custodians/u-boot-microblaze.git F: arch/arm/mach-zynqmp-r5/ @@ -852,7 +852,7 @@ F: net/fastboot.c F: test/dm/fastboot.c FPGA -M: Michal Simek <michal.simek(a)xilinx.com> +M: Michal Simek <michal.simek(a)amd.com> S: Maintained T: git https://source.denx.de/u-boot/custodians/u-boot-microblaze.git F: drivers/fpga/ diff --git a/board/xilinx/versal/MAINTAINERS b/board/xilinx/versal/MAINTAINERS index bbab05136669..a13b65661646 100644 --- a/board/xilinx/versal/MAINTAINERS +++ b/board/xilinx/versal/MAINTAINERS @@ -1,5 +1,5 @@ XILINX_VERSAL BOARDS -M: Michal Simek <michal.simek(a)xilinx.com> +M: Michal Simek <michal.simek(a)amd.com> S: Maintained T: git https://source.denx.de/u-boot/custodians/u-boot-microblaze.git F: arch/arm/dts/versal* diff --git a/board/xilinx/zynqmp/MAINTAINERS b/board/xilinx/zynqmp/MAINTAINERS index 56c637943f6e..17a2766413c6 100644 --- a/board/xilinx/zynqmp/MAINTAINERS +++ b/board/xilinx/zynqmp/MAINTAINERS @@ -1,5 +1,5 @@ XILINX_ZYNQMP BOARDS -M: Michal Simek <michal.simek(a)xilinx.com> +M: Michal Simek <michal.simek(a)amd.com> S: Maintained T: git https://source.denx.de/u-boot/custodians/u-boot-microblaze.git F: arch/arm/dts/zynqmp-* diff --git a/board/xilinx/zynqmp_r5/MAINTAINERS b/board/xilinx/zynqmp_r5/MAINTAINERS index ac267649781a..aa50e6dae5f5 100644 --- a/board/xilinx/zynqmp_r5/MAINTAINERS +++ b/board/xilinx/zynqmp_r5/MAINTAINERS @@ -1,5 +1,5 @@ XILINX_ZYNQMP_R5 BOARDS -M: Michal Simek <michal.simek(a)xilinx.com> +M: Michal Simek <michal.simek(a)amd.com> S: Maintained F: arch/arm/dts/zynqmp-r5* F: board/xilinx/zynqmp_r5/ -- 2.35.1

2 1

[PATCH] tools: add boot/ to .gitignore
by Du Huanpeng 20 Apr '22

20 Apr '22

/tools/boot/ is a build product. Add it to .gitignore Signed-off-by: Du Huanpeng <dhu(a)hodcarrier.org> --- tools/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/.gitignore b/tools/.gitignore index a88453f64d..d3a93ff294 100644 --- a/tools/.gitignore +++ b/tools/.gitignore @@ -36,3 +36,4 @@ /update_octeon_header /version.h /xway-swap-bytes +/boot -- 2.25.1

2 1

[PATCH] fs: Allow to compile FS_BTRFS when SPL is enabled
by Pali Rohár 20 Apr '22

20 Apr '22

Currently there is no btrfs support in SPL. But macro CONFIG_FS_BTRFS is defined also when building SPL. When both FS_BTRFS and SPL are enabled then build process throw compile error. Fix check for btrfs code in fstypes[] to allow compiling FS_BTRFS only in proper U-Boot. Signed-off-by: Pali Rohár <pali(a)kernel.org> --- fs/fs.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/fs.c b/fs/fs.c index b4306cf8499e..100a2a63810a 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -267,6 +267,7 @@ static struct fstype_info fstypes[] = { }, #endif #endif +#ifndef CONFIG_SPL_BUILD #ifdef CONFIG_FS_BTRFS { .fstype = FS_TYPE_BTRFS, @@ -286,6 +287,7 @@ static struct fstype_info fstypes[] = { .ln = fs_ln_unsupported, }, #endif +#endif #if CONFIG_IS_ENABLED(FS_SQUASHFS) { .fstype = FS_TYPE_SQUASHFS, -- 2.20.1

2 1

[PATCH] btrfs: Fix compilation on big endian systems
by Pali Rohár 20 Apr '22

20 Apr '22

Fix following two compile errors on big endian systems: CC fs/btrfs/btrfs.o In file included from include/linux/byteorder/big_endian.h:107, from ./arch/powerpc/include/asm/byteorder.h:82, from ./arch/powerpc/include/asm/bitops.h:8, from include/linux/bitops.h:152, from include/uuid.h:9, from fs/btrfs/btrfs.c:10: fs/btrfs/conv-funcs.h: In function ‘btrfs_key_to_disk’: include/linux/byteorder/generic.h:90:21: error: ‘__cpu_to_le16’ undeclared (first use in this function); did you mean ‘__cpu_to_le16p’? #define cpu_to_le16 __cpu_to_le16 ^~~~~~~~~~~~~ fs/btrfs/conv-funcs.h:79:10: note: in expansion of macro ‘cpu_to_le16’ __u16: cpu_to_le16, \ ^~~~~~~~~~~ CC fs/btrfs/compression.o In file included from ./arch/powerpc/include/asm/unaligned.h:9, from fs/btrfs/compression.c:16: include/linux/unaligned/access_ok.h:6:19: error: redefinition of ‘get_unaligned_le16’ static inline u16 get_unaligned_le16(const void *p) ^~~~~~~~~~~~~~~~~~ In file included from fs/btrfs/ctree.h:16, from fs/btrfs/btrfs.h:12, from fs/btrfs/compression.c:8: include/linux/unaligned/le_byteshift.h:40:19: note: previous definition of ‘get_unaligned_le16’ was here static inline u16 get_unaligned_le16(const void *p) ^~~~~~~~~~~~~~~~~~ Include file asm/unaligned.h contains arch specific macros and functions for unaligned access as opposite to linux/unaligned le_byteshift.h which contains macros and functions specific to little endian systems only. Signed-off-by: Pali Rohár <pali(a)kernel.org> --- fs/btrfs/btrfs.h | 2 +- fs/btrfs/ctree.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/btrfs.h b/fs/btrfs/btrfs.h index 7d8b395b2646..a52587e0637a 100644 --- a/fs/btrfs/btrfs.h +++ b/fs/btrfs/btrfs.h @@ -9,7 +9,7 @@ #define __BTRFS_BTRFS_H__ #include <linux/rbtree.h> -#include "conv-funcs.h" +#include "ctree.h" extern struct btrfs_info btrfs_info; extern struct btrfs_fs_info *current_fs_info; diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 219c410b189f..55112318a330 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -13,7 +13,7 @@ #include <compiler.h> #include <linux/rbtree.h> #include <linux/bug.h> -#include <linux/unaligned/le_byteshift.h> +#include <asm/unaligned.h> #include <u-boot/crc.h> #include "kernel-shared/btrfs_tree.h" #include "crypto/hash.h" -- 2.20.1

4 3