October 2022 - U-Boot

[PATCH] fdt_support: cosmetic: remove fdt_fixup_nor_flash_size prototype
by Patrick Delaunay 22 Oct '22

22 Oct '22

Remove prototype for the removed function fdt_fixup_nor_flash_size. This patch has no impact as the function is never used. Fixes: 98f705c9cefd ("powerpc: remove 4xx support") Signed-off-by: Patrick Delaunay <patrick.delaunay(a)foss.st.com> --- include/fdt_support.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/fdt_support.h b/include/fdt_support.h index b8380716f39..5638bd4f165 100644 --- a/include/fdt_support.h +++ b/include/fdt_support.h @@ -243,8 +243,6 @@ int fdt_increase_size(void *fdt, int add_len); int fdt_delete_disabled_nodes(void *blob); -int fdt_fixup_nor_flash_size(void *blob); - struct node_info; #if defined(CONFIG_FDT_FIXUP_PARTITIONS) void fdt_fixup_mtdparts(void *fdt, const struct node_info *node_info, -- 2.25.1

2 2

[PATCH 0/2] x86: fix longjmp() implementation
by Heinrich Schuchardt 22 Oct '22

22 Oct '22

longjmp() must be defined as void longjmp(jmp_buf env, int val) Add the missing jmp_buf type and fix the definition. This fixes building the longjmp unit test on qemu-x86_defconfig. If longjmp(jmp_buf env, int val) is invoked with val == 0, the setjmp() macro must return 1. We could have easily discovered this problem and others if unit tests (CONFIG_UNIT_TEST) were enabled for qemu-x86_defconfig. We should try to get there in the 2023.01 cycle. Heinrich Schuchardt (2): x86: fix longjmp() implementation x86: provide typedef jmp_buf arch/x86/cpu/i386/setjmp.S | 5 +++++ arch/x86/include/asm/setjmp.h | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) -- 2.37.2

2 7

[PATCH] gpio-uclass: fix gpio lookup by label
by Rasmus Villemoes 22 Oct '22

22 Oct '22

Matching anything that just happens to have the sought-for label as a prefix is wrong. For example, if the board designer has designated 10 lines for debug purposes, named "debug1" through "debug10", and we are looking up "debug1", if debug10 happens to be met first during the iteration we'd wrongly return that. In theory, this can break existing users that could rely on this quirk, but OTOH keeping the current broken semantics can cause a lot of grief for people hitting this in the future and not understanding why they don't find the line they expect. Considering how few in-tree defconfigs currently set DM_GPIO_LOOKUP_LABEL (ignoring sandbox, only four "real" boards), let's fix it before the use becomes more widespread. Signed-off-by: Rasmus Villemoes <rasmus.villemoes(a)prevas.dk> --- drivers/gpio/gpio-uclass.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c index 0ed32b7217..01342202fa 100644 --- a/drivers/gpio/gpio-uclass.c +++ b/drivers/gpio/gpio-uclass.c @@ -91,15 +91,13 @@ static int gpio_to_device(unsigned int gpio, struct gpio_desc *desc) static int dm_gpio_lookup_label(const char *name, struct gpio_dev_priv *uc_priv, ulong *offset) { - int len; int i; *offset = -1; - len = strlen(name); for (i = 0; i < uc_priv->gpio_count; i++) { if (!uc_priv->name[i]) continue; - if (!strncmp(name, uc_priv->name[i], len)) { + if (!strcmp(name, uc_priv->name[i])) { *offset = i; return 0; } -- 2.37.2

3 5

[PATCH] libfdt: Fix invalid version warning
by Michal Suchanek 22 Oct '22

22 Oct '22

python does not like the u-boot- prefix in the version, drop it. /usr/lib/python3.10/site-packages/setuptools/dist.py:544: UserWarning: The version specified ('u-boot-2022.10') is an invalid version, this may not work as expected with newer versions of setuptools, pip, and PyPI. Please see PEP 440 for more details. Signed-off-by: Michal Suchanek <msuchanek(a)suse.de> --- scripts/dtc/pylibfdt/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/dtc/pylibfdt/Makefile b/scripts/dtc/pylibfdt/Makefile index 493995e303..a7579f0c5f 100644 --- a/scripts/dtc/pylibfdt/Makefile +++ b/scripts/dtc/pylibfdt/Makefile @@ -17,7 +17,7 @@ quiet_cmd_pymod = PYMOD $@ cmd_pymod = unset CROSS_COMPILE; unset CFLAGS; \ CC="$(HOSTCC)" LDSHARED="$(HOSTCC) -shared " \ LDFLAGS="$(HOSTLDFLAGS)" \ - VERSION="u-boot-$(UBOOTVERSION)" \ + VERSION="$(UBOOTVERSION)" \ CPPFLAGS="$(HOSTCFLAGS) -I$(LIBFDT_srcdir)" OBJDIR=$(obj) \ SOURCES="$(PYLIBFDT_srcs)" \ SWIG_OPTS="-I$(LIBFDT_srcdir) -I$(LIBFDT_srcdir)/.." \ -- 2.37.3

2 2

[PATCH] libfdt: Fix build with python 3.10
by Michal Suchanek 22 Oct '22

22 Oct '22

Python 3.10 requires defining PY_SSIZE_T_CLEAN. This will be fixed in swig 4.10 but it is not clear when it will be released. There was a warning since python 3.8. Link: https://github.com/swig/swig/pull/2277 Signed-off-by: Michal Suchanek <msuchanek(a)suse.de> --- scripts/dtc/pylibfdt/libfdt.i_shipped | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/dtc/pylibfdt/libfdt.i_shipped b/scripts/dtc/pylibfdt/libfdt.i_shipped index 27c29ea260..56cc5d48f4 100644 --- a/scripts/dtc/pylibfdt/libfdt.i_shipped +++ b/scripts/dtc/pylibfdt/libfdt.i_shipped @@ -7,6 +7,10 @@ %module libfdt +%begin %{ +#define PY_SSIZE_T_CLEAN +%} + %include <stdint.i> %{ -- 2.37.3

2 2

[PATCH] dm: tpl: Add fdt address translation support in TPL
by William Zhang 22 Oct '22

22 Oct '22

This is needed in the platforms that use "ranges" node property for address translation in their dts for TPL. Signed-off-by: William Zhang <william.zhang(a)broadcom.com> --- drivers/core/Kconfig | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/core/Kconfig b/drivers/core/Kconfig index c9bf5de4332b..041d6c502690 100644 --- a/drivers/core/Kconfig +++ b/drivers/core/Kconfig @@ -350,6 +350,20 @@ config SPL_OF_TRANSLATE used for the address translation. This function is faster and smaller in size than fdt_translate_address(). +config TPL_OF_TRANSLATE + bool "Translate addresses using fdt_translate_address in TPL" + depends on TPL_DM && TPL_OF_CONTROL + help + If this option is enabled, the reg property will be translated + using the fdt_translate_address() function. This is necessary + on some platforms (e.g. MVEBU) using complex "ranges" + properties in many nodes. As this translation is not handled + correctly in the default simple_bus_translate() function. + + If this option is not enabled, simple_bus_translate() will be + used for the address translation. This function is faster and + smaller in size than fdt_translate_address() + config VPL_OF_TRANSLATE bool "Translate addresses using fdt_translate_address in SPL" depends on SPL_DM && VPL_OF_CONTROL -- 2.37.1

2 2

[PATCH 1/1] sandbox: typo Fictionnal
by Heinrich Schuchardt 22 Oct '22

22 Oct '22

%s/Fictionnal/Fictional/ Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- board/sandbox/sandbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/sandbox/sandbox.c b/board/sandbox/sandbox.c index ca9a2ca5b1..38cfa0832d 100644 --- a/board/sandbox/sandbox.c +++ b/board/sandbox/sandbox.c @@ -129,7 +129,7 @@ int extension_board_scan(struct list_head *extension_list) snprintf(extension->name, sizeof(extension->name), "extension board %d", i); snprintf(extension->owner, sizeof(extension->owner), "sandbox"); snprintf(extension->version, sizeof(extension->version), "1.1"); - snprintf(extension->other, sizeof(extension->other), "Fictionnal extension board"); + snprintf(extension->other, sizeof(extension->other), "Fictional extension board"); list_add_tail(&extension->list, extension_list); } -- 2.37.2

2 2

[PATCH v2] binman: Add support for symlinking images
by Neha Malcom Francis 22 Oct '22

22 Oct '22

Adding support to symlink an image packaged using binman. Signed-off-by: Neha Malcom Francis <n-francis(a)ti.com> --- Changes in v2: - added testing for symlink support - moved from tools.Run('ln',...) to os.symlink() tools/binman/binman.rst | 3 +++ tools/binman/ftest.py | 9 +++++++++ tools/binman/image.py | 6 ++++++ tools/binman/test/259_symlink.dts | 16 ++++++++++++++++ 4 files changed, 34 insertions(+) create mode 100644 tools/binman/test/259_symlink.dts diff --git a/tools/binman/binman.rst b/tools/binman/binman.rst index 4ee6f41f35..d8a3d776f4 100644 --- a/tools/binman/binman.rst +++ b/tools/binman/binman.rst @@ -780,6 +780,9 @@ align-default: This means that each section must specify its own default alignment, if required. +symlink: + Adds a symlink to the image with string given in the symlink property. + Examples of the above options can be found in the tests. See the tools/binman/test directory. diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 261107b335..232ac2cf18 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -5995,6 +5995,15 @@ fdt fdtmap Extract the devicetree blob from the fdtmap self.assertIn('Expected __bss_size symbol in vpl/u-boot-vpl', str(e.exception)) + def testSymlink(self): + """Test that image files can be named""" + retcode = self._DoTestFile('259_symlink.dts', debug=True, map=True) + self.assertEqual(0, retcode) + image = control.images['test_image'] + fname = tools.get_output_filename('test_image.bin') + sname = tools.get_output_filename('symlink_to_test.bin') + self.assertTrue(os.path.islink(sname)) + self.assertEqual(os.readlink(sname), fname) if __name__ == "__main__": unittest.main() diff --git a/tools/binman/image.py b/tools/binman/image.py index afc4b4d643..6d4bff5843 100644 --- a/tools/binman/image.py +++ b/tools/binman/image.py @@ -38,6 +38,7 @@ class Image(section.Entry_section): repacked later test_section_timeout: Use a zero timeout for section multi-threading (for testing) + symlink: Name of symlink to image Args: copy_to_orig: Copy offset/size to orig_offset/orig_size after reading @@ -97,6 +98,7 @@ class Image(section.Entry_section): if filename: self._filename = filename self.allow_repack = fdt_util.GetBool(self._node, 'allow-repack') + self._symlink = fdt_util.GetString(self._node, 'symlink') @classmethod def FromFile(cls, fname): @@ -180,6 +182,10 @@ class Image(section.Entry_section): data = self.GetPaddedData() fd.write(data) tout.info("Wrote %#x bytes" % len(data)) + # Create symlink to file if symlink given + if self._symlink is not None: + sname = tools.get_output_filename(self._symlink) + os.symlink(fname, sname) def WriteMap(self): """Write a map of the image to a .map file diff --git a/tools/binman/test/259_symlink.dts b/tools/binman/test/259_symlink.dts new file mode 100644 index 0000000000..2ee1f7f05e --- /dev/null +++ b/tools/binman/test/259_symlink.dts @@ -0,0 +1,16 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + multiple-images; + test_image { + filename = "test_image.bin"; + symlink = "symlink_to_test.bin"; + u-boot { + }; + }; + }; +}; -- 2.34.1

2 2

[PATCH] thermal: sandbox: Enable thermal uclass for sandbox64 variant
by Sughosh Ganu 22 Oct '22

22 Oct '22

The sandbox64 variant is currently building the sandbox thermal driver but not the corresponding uclass driver. This results in the sandbox64 variant not booting with the test device tree. Enable building the thermal uclass for the sandbox64 variant as well. Also enable the temperature command to allow the test to be run on the sandbox64 variant. Signed-off-by: Sughosh Ganu <sughosh.ganu(a)linaro.org> --- configs/sandbox64_defconfig | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig index ade1505439..2badf1c386 100644 --- a/configs/sandbox64_defconfig +++ b/configs/sandbox64_defconfig @@ -22,12 +22,12 @@ CONFIG_CONSOLE_RECORD=y CONFIG_CONSOLE_RECORD_OUT_SIZE=0x1000 CONFIG_PRE_CONSOLE_BUFFER=y CONFIG_DISPLAY_BOARDINFO_LATE=y -CONFIG_CMD_CAT=y CONFIG_CMD_CPU=y CONFIG_CMD_LICENSE=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_BOOTEFI_HELLO=y # CONFIG_CMD_ELF is not set +CONFIG_CMD_XXD=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y CONFIG_CMD_ERASEENV=y @@ -54,8 +54,9 @@ CONFIG_CMD_PCI=y CONFIG_CMD_READ=y CONFIG_CMD_REMOTEPROC=y CONFIG_CMD_SPI=y +CONFIG_CMD_TEMPERATURE=y CONFIG_CMD_USB=y -CONFIG_CMD_XXD=y +CONFIG_CMD_CAT=y CONFIG_BOOTP_DNS2=y CONFIG_CMD_TFTPPUT=y CONFIG_CMD_TFTPSRV=y @@ -219,6 +220,7 @@ CONFIG_SYSINFO=y CONFIG_SYSINFO_SANDBOX=y CONFIG_SYSINFO_GPIO=y CONFIG_SYSRESET=y +CONFIG_DM_THERMAL=y CONFIG_TIMER=y CONFIG_TIMER_EARLY=y CONFIG_SANDBOX_TIMER=y -- 2.34.1

2 2

[PATCH v2 1/2] image: Fix string truncation warning
by Michal Suchanek 22 Oct '22

22 Oct '22

In file included from ../tools/imagetool.h:24, from ../tools/default_image.c:16: In function ‘image_set_name’, inlined from ‘image_set_header’ at ../tools/default_image.c:133:2: ../include/image.h:786:9: warning: ‘strncpy’ specified bound 32 equals destination size [-Wstringop-truncation] 786 | strncpy(image_get_name(hdr), name, IH_NMLEN); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Michal Suchanek <msuchanek(a)suse.de> --- Changes in v2: Use __nonstring instead of suppressing the warning --- include/image.h | 3 ++- tools/kwbimage.h | 6 ------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/include/image.h b/include/image.h index d7d6a3fe5b..82b447aeb7 100644 --- a/include/image.h +++ b/include/image.h @@ -18,6 +18,7 @@ #include "compiler.h" #include <asm/byteorder.h> #include <stdbool.h> +#include <linux/compiler_attributes.h> /* Define this to avoid #ifdefs later on */ struct lmb; @@ -275,7 +276,7 @@ struct legacy_img_hdr { uint8_t ih_arch; /* CPU architecture */ uint8_t ih_type; /* Image Type */ uint8_t ih_comp; /* Compression Type */ - uint8_t ih_name[IH_NMLEN]; /* Image Name */ + uint8_t ih_name[IH_NMLEN] __nonstring; /* Image Name */ }; struct image_info { diff --git a/tools/kwbimage.h b/tools/kwbimage.h index 505522332b..327ca34494 100644 --- a/tools/kwbimage.h +++ b/tools/kwbimage.h @@ -11,12 +11,6 @@ #include <compiler.h> #include <stdint.h> -#ifdef __GNUC__ -#define __packed __attribute((packed)) -#else -#define __packed -#endif - #define KWBIMAGE_MAX_CONFIG ((0x1dc - 0x20)/sizeof(struct reg_config)) #define MAX_TEMPBUF_LEN 32 -- 2.37.3

4 4