July 2024 - U-Boot

Please pull u-boot-dm/next
by Simon Glass 03 Jul '24

03 Jul '24

Hi Tom, This is for -next but we need to figure out the patch I just sent first. I can redo the pull if that patch is acceptable, or you can pick that up first. https://source.denx.de/u-boot/custodians/u-boot-dm/-/pipelines/21414 Note failure fixed by: https://patchwork.ozlabs.org/project/uboot/patch/20240702153739.2651815-1-s… https://dev.azure.com/simon0972/u-boot/_build/results?buildId=64&view=resul… (same failure) The following changes since commit b4cbd1a257d4027038b4f997d73bdb0a066db045: Merge tag 'u-boot-amlogic-20240701' of https://source.denx.de/u-boot/custodians/u-boot-amlogic into next (2024-07-01 08:44:28 -0600) are available in the Git repository at: git://git.denx.de/u-boot-dm.git tags/dm-next-2jul24 for you to fetch changes up to 001af73bdc4cd975f087bfef6ccff30d6f510c83: bootstd: cros: store partition type in an efi_guid_t (2024-07-02 07:32:30 +0100) ---------------------------------------------------------------- buildman CI improvements binman fixes and assumed size partial tools fixes for Python 3.12 patman enhancements ---------------------------------------------------------------- Brandon Maier (3): tools: binman: fix deprecated Python unittest methods tools: binman: fix deprecated Python ConfigParser methods tools: patman: fix deprecated Python ConfigParser methods Heinrich Schuchardt (2): sandbox: use sane access rights for files acpi: set creator_revision in acpi_fill_header Ilias Apalodimas (2): sandbox: cleanup linker scripts and sections configs: enable setvariable at runtime on sandbox Jonathan Liu (1): sandbox: enable support for the unlz4 command Quentin Schulz (4): dm: core: fix misleading debug message when matching compatible dm: core: fix signedness in debug messages dm: core: migrate debug() messages to use dm_warn dm: core: fix typo in SPL_DM_WARN prompt text Rasmus Villemoes (1): global_data.h: drop write-only field dm_root_f Sean Anderson (3): patman: Fix tests if add_maintainers is set to False patman: Add Commit-cc as an alias for Patch-cc patman: Add a tag for when a patch gets added to a series Simon Glass (19): binman: efi: Correct entry docs binman: Regenerate nxp docs binman: ti: Regenerate entry docs binman: Update the entrydocs header binman: Support an assumed size for missing binaries binman: Make Intel ME default to position 0x1000 x86: Set up some assumed sizes for binary blobs buildman: Make mrproper an argument to _reconfigure() buildman: Make mrproper an argument to _config_and_build() buildman: Make mrproper an argument to run_commit() buildman: Avoid rebuilding when --mrproper is used buildman: Add a flag to force mrproper on failure buildman: Retry the build for current source buildman: Add a way to limit the number of buildmans buildman: Add python3-coverage buildman: Add python3-pycryptodome buildman: Fix a few typos in toolchain code buildman: Always use the full path in CROSS_COMPILE u_boot_pylib: Use correct coverage tool within venv Vincent Stehlé (1): bootstd: cros: store partition type in an efi_guid_t arch/sandbox/cpu/os.c | 6 +- arch/sandbox/cpu/u-boot.lds | 20 ++---- arch/sandbox/lib/Makefile | 2 +- arch/sandbox/lib/sections.c | 13 ---- arch/x86/dts/u-boot.dtsi | 5 ++ arch/x86/lib/acpi_table.c | 2 - boot/bootmeth_cros.c | 4 +- cmd/unlz4.c | 4 +- common/board_r.c | 3 +- configs/sandbox64_defconfig | 1 + configs/sandbox_defconfig | 1 + drivers/core/Kconfig | 2 +- drivers/core/device.c | 2 +- drivers/core/fdtaddr.c | 7 +- drivers/core/lists.c | 7 +- drivers/core/of_access.c | 51 +++++++------- drivers/core/of_addr.c | 41 ++++++------ drivers/core/of_extra.c | 33 +++++----- drivers/core/ofnode.c | 81 ++++++++++++----------- drivers/core/regmap.c | 57 ++++++++-------- drivers/core/root.c | 14 ++-- drivers/core/uclass.c | 4 +- include/asm-generic/global_data.h | 4 -- lib/acpi/acpi_table.c | 2 +- lib/acpi/ssdt.c | 1 - test/dm/acpi.c | 3 +- test/dm/core.c | 1 - tools/binman/binman.rst | 7 ++ tools/binman/entries.rst | 115 ++++++++++++++++++++++++-------- tools/binman/entry.py | 3 +- tools/binman/entry_test.py | 6 +- tools/binman/etype/blob.py | 7 +- tools/binman/etype/efi_capsule.py | 40 +++++------ tools/binman/etype/efi_empty_capsule.py | 22 ++++--- tools/binman/etype/intel_descriptor.py | 2 +- tools/binman/etype/ti_secure.py | 45 ++++++------- tools/binman/fdt_test.py | 48 +++++++------- tools/binman/ftest.py | 70 ++++++++++++++------ tools/binman/test/326_assume_size.dts | 16 +++++ tools/binman/test/327_assume_size_ok.dts | 16 +++++ tools/buildman/bsettings.py | 5 +- tools/buildman/builder.py | 23 ++++--- tools/buildman/builderthread.py | 48 +++++++++----- tools/buildman/buildman.rst | 8 ++- tools/buildman/cmdline.py | 8 ++- tools/buildman/control.py | 145 ++++++++++++++++++++++++++++++++++++++-- tools/buildman/func_test.py | 74 ++++++++++----------- tools/buildman/pyproject.toml | 6 +- tools/buildman/requirements.txt | 2 + tools/buildman/test.py | 198 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- tools/buildman/toolchain.py | 24 ++++--- tools/patman/func_test.py | 10 ++- tools/patman/patchstream.py | 7 ++ tools/patman/patman.rst | 15 ++++- tools/patman/settings.py | 8 +-- tools/patman/test/0002-fdt-Correct-cast-for-sandbox-in-fdtdec_setup_mem_siz.patch | 2 + tools/patman/test/test01.txt | 2 + tools/u_boot_pylib/terminal.py | 7 +- tools/u_boot_pylib/test_util.py | 11 +++- 59 files changed, 942 insertions(+), 429 deletions(-) delete mode 100644 arch/sandbox/lib/sections.c create mode 100644 tools/binman/test/326_assume_size.dts create mode 100644 tools/binman/test/327_assume_size_ok.dts Regards, Simon

2 2

[PATCH v2] ext4: Improve feature checking
by Richard Weinberger 02 Jul '24

02 Jul '24

Evaluate the filesystem incompat and ro_compat bit fields to judge whether the filesystem can be read or written. For the read side only a scary warning is shown so far. I'd love to abort mounting too, but I fear this will break some setups where the driver works by chance. Signed-off-by: Richard Weinberger <richard(a)nod.at> --- changes since v1: - Spelling errors - Coding style - Better log messages --- fs/ext4/ext4_common.c | 14 ++++++++++++ fs/ext4/ext4_write.c | 12 ++++++++-- include/ext4fs.h | 52 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 75 insertions(+), 3 deletions(-) diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c index 2ff0dca249..2c42aff06d 100644 --- a/fs/ext4/ext4_common.c +++ b/fs/ext4/ext4_common.c @@ -2386,6 +2386,20 @@ int ext4fs_mount(void) fs->inodesz = 128; fs->gdsize = 32; } else { + int missing = __le32_to_cpu(data->sblock.feature_incompat) & + ~(EXT4_FEATURE_INCOMPAT_SUPP | + EXT4_FEATURE_INCOMPAT_SUPP_LAZY_RO); + + if (missing) { + /* + * This code used to be relaxed about feature flags. + * We don't stop the mount to avoid breaking existing setups. + * But, incompatible features can cause serious read errors. + */ + log_err("fs uses incompatible features: %08x, ignoring\n", + missing); + } + debug("EXT4 features COMPAT: %08x INCOMPAT: %08x RO_COMPAT: %08x\n", __le32_to_cpu(data->sblock.feature_compatibility), __le32_to_cpu(data->sblock.feature_incompat), diff --git a/fs/ext4/ext4_write.c b/fs/ext4/ext4_write.c index d057f6b5a7..4aae3c5f7f 100644 --- a/fs/ext4/ext4_write.c +++ b/fs/ext4/ext4_write.c @@ -869,6 +869,7 @@ int ext4fs_write(const char *fname, const char *buffer, ALLOC_CACHE_ALIGN_BUFFER(char, filename, 256); bool store_link_in_inode = false; memset(filename, 0x00, 256); + int missing_feat; if (type != FILETYPE_REG && type != FILETYPE_SYMLINK) return -1; @@ -882,8 +883,15 @@ int ext4fs_write(const char *fname, const char *buffer, return -1; } - if (le32_to_cpu(fs->sb->feature_ro_compat) & EXT4_FEATURE_RO_COMPAT_METADATA_CSUM) { - printf("Unsupported feature metadata_csum found, not writing.\n"); + missing_feat = le32_to_cpu(fs->sb->feature_incompat) & ~EXT4_FEATURE_INCOMPAT_SUPP; + if (missing_feat) { + log_err("Unsupported features found %08x, not writing.\n", missing_feat); + return -1; + } + + missing_feat = le32_to_cpu(fs->sb->feature_ro_compat) & ~EXT4_FEATURE_RO_COMPAT_SUPP; + if (missing_feat) { + log_err("Unsupported RO compat features found %08x, not writing.\n", missing_feat); return -1; } diff --git a/include/ext4fs.h b/include/ext4fs.h index d96edfd057..79d087b6f9 100644 --- a/include/ext4fs.h +++ b/include/ext4fs.h @@ -34,12 +34,62 @@ struct disk_partition; #define EXT4_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/ #define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */ #define EXT4_EXT_MAGIC 0xf30a -#define EXT4_FEATURE_RO_COMPAT_GDT_CSUM 0x0010 + +#define EXT4_FEATURE_RO_COMPAT_SPARSE_SUPER 0x0001 +#define EXT4_FEATURE_RO_COMPAT_LARGE_FILE 0x0002 +#define EXT4_FEATURE_RO_COMPAT_BTREE_DIR 0x0004 +#define EXT4_FEATURE_RO_COMPAT_HUGE_FILE 0x0008 +#define EXT4_FEATURE_RO_COMPAT_GDT_CSUM 0x0010 +#define EXT4_FEATURE_RO_COMPAT_DIR_NLINK 0x0020 +#define EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE 0x0040 +#define EXT4_FEATURE_RO_COMPAT_QUOTA 0x0100 +#define EXT4_FEATURE_RO_COMPAT_BIGALLOC 0x0200 #define EXT4_FEATURE_RO_COMPAT_METADATA_CSUM 0x0400 + +#define EXT4_FEATURE_INCOMPAT_FILETYPE 0x0002 +#define EXT4_FEATURE_INCOMPAT_RECOVER 0x0004 #define EXT4_FEATURE_INCOMPAT_EXTENTS 0x0040 #define EXT4_FEATURE_INCOMPAT_64BIT 0x0080 +#define EXT4_FEATURE_INCOMPAT_MMP 0x0100 +#define EXT4_FEATURE_INCOMPAT_FLEX_BG 0x0200 +#define EXT4_FEATURE_INCOMPAT_CSUM_SEED 0x2000 +#define EXT4_FEATURE_INCOMPAT_ENCRYPT 0x10000 + #define EXT4_INDIRECT_BLOCKS 12 +/* + * Incompat features supported by this implementation. + */ +#define EXT4_FEATURE_INCOMPAT_SUPP (EXT4_FEATURE_INCOMPAT_FILETYPE | \ + EXT4_FEATURE_INCOMPAT_RECOVER | \ + EXT4_FEATURE_INCOMPAT_EXTENTS | \ + EXT4_FEATURE_INCOMPAT_64BIT | \ + EXT4_FEATURE_INCOMPAT_FLEX_BG) + +/* + * Incompat features supported by this implementation only in a lazy + * way, good enough for reading files. + * + * - Multi mount protection (mmp) is not supported, but for read-only + * we get away with it. + * - Same for metadata_csum_seed and metadata_csum. + * - The implementation has also no clue about fscrypt, but it can read + * unencrypted files. Reading encrypted files will read garbage. + */ +#define EXT4_FEATURE_INCOMPAT_SUPP_LAZY_RO (EXT4_FEATURE_INCOMPAT_MMP | \ + EXT4_FEATURE_INCOMPAT_CSUM_SEED | \ + EXT4_FEATURE_INCOMPAT_ENCRYPT) + +/* + * Read-only compat features we support. + * If unknown ro compat features are detected, writing to the fs is denied. + */ +#define EXT4_FEATURE_RO_COMPAT_SUPP (EXT4_FEATURE_RO_COMPAT_SPARSE_SUPER | \ + EXT4_FEATURE_RO_COMPAT_LARGE_FILE | \ + EXT4_FEATURE_RO_COMPAT_HUGE_FILE | \ + EXT4_FEATURE_RO_COMPAT_DIR_NLINK | \ + EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE) + #define EXT4_BG_INODE_UNINIT 0x0001 #define EXT4_BG_BLOCK_UNINIT 0x0002 #define EXT4_BG_INODE_ZEROED 0x0004 -- 2.35.3

1 0

[RFC v2 0/2] FIT documentation link vs copy
by Sam Povilus 02 Jul '24

02 Jul '24

I'm proposing linking the FIT documentation instead of double book keeping it, it does have the disadvantage of making it more difficult to see the documentation especially if offline. v2: update table of contents instead of removing Sam Povilus (2): doc: Remove FIT documentation that is elsewhere doc: add missing table of content links doc/usage/fit/index.rst | 25 +- doc/usage/fit/source_file_format.rst | 682 +-------------------------- 2 files changed, 25 insertions(+), 682 deletions(-) -- 2.34.1

2 3

[PATCH 1/1] doc: fix heading level of itest examples
by Heinrich Schuchardt 02 Jul '24

02 Jul '24

The Examples section should be on the second heading level. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- doc/usage/cmd/itest.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/usage/cmd/itest.rst b/doc/usage/cmd/itest.rst index 9c307fb4bf4..adcad05b2d4 100644 --- a/doc/usage/cmd/itest.rst +++ b/doc/usage/cmd/itest.rst @@ -58,7 +58,7 @@ op ======== ====================== Examples -======== +-------- The itest command sets the result variable $? to true (0) or false (1): -- 2.45.2

2 1

[PATCH] sandbox: Fix LTO to work with STACKPROTECTOR
by Andrew Goodbody 02 Jul '24

02 Jul '24

Add the STACKPROTECTOR symbols to the script that generates the symbols that should not be removed by the use of LTO when linking a shared object. This prevents a fail to build due to link errors. https://source.denx.de/u-boot/u-boot/-/issues/35 Signed-off-by: Andrew Goodbody <andrew.goodbody(a)linaro.org> --- scripts/gen_ll_addressable_symbols.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/gen_ll_addressable_symbols.sh b/scripts/gen_ll_addressable_symbols.sh index d0864804aa..ebf89b04bf 100755 --- a/scripts/gen_ll_addressable_symbols.sh +++ b/scripts/gen_ll_addressable_symbols.sh @@ -13,3 +13,5 @@ set -e echo '#include <common.h>' $@ 2>/dev/null | grep -oe '_u_boot_list_2_[a-zA-Z0-9_]*_2_[a-zA-Z0-9_]*' | \ sort -u | sed -e 's/^$.*$/extern char \1[];\n__ADDRESSABLE(\1);/' +$@ 2>/dev/null | grep -oe '__stack_chk_.*' | \ + sort -u | sed -e 's/^$.*$/extern char \1[];\n__ADDRESSABLE(\1);/' -- 2.39.2

2 3

[PATCH] usb: cdns3: continue probe even when USB PHY device does not exist
by Siddharth Vadapalli 02 Jul '24

02 Jul '24

Prior to commit cd295286c786 ("usb: cdns3: avoid error messages if phys don't exist"), cdns3_probe() errors out only on failing to initialize the USB2/USB3 PHY. However, since commit cd295286c786, absence of the PHY device is also treated as an error, resulting in a regression. Extend commit cd295286c786 to treat -ENODEV as an acceptable return value of generic_phy_get_by_name() and continue device probe as was the case prior to the commit. Fixes: cd295286c786 ("usb: cdns3: avoid error messages if phys don't exist") Signed-off-by: Siddharth Vadapalli <s-vadapalli(a)ti.com> --- Hello, This patch is based on commit b4cbd1a257 Merge tag 'u-boot-amlogic-20240701' of https://source.denx.de/u-boot/custodians/u-boot-amlogic into next of the next branch of U-Boot. Regards, Siddharth. drivers/usb/cdns3/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/cdns3/core.c b/drivers/usb/cdns3/core.c index b4e931646b..5b3e32953e 100644 --- a/drivers/usb/cdns3/core.c +++ b/drivers/usb/cdns3/core.c @@ -338,7 +338,7 @@ static int cdns3_probe(struct cdns3 *cdns) dev_err(dev, "USB2 PHY init failed: %d\n", ret); return ret; } - } else if (ret != -ENOENT && ret != -ENODATA) { + } else if (ret != -ENOENT && ret != -ENODATA && ret != -ENODEV) { dev_err(dev, "Couldn't get USB2 PHY: %d\n", ret); return ret; } @@ -350,7 +350,7 @@ static int cdns3_probe(struct cdns3 *cdns) dev_err(dev, "USB3 PHY init failed: %d\n", ret); return ret; } - } else if (ret != -ENOENT && ret != -ENODATA) { + } else if (ret != -ENOENT && ret != -ENODATA && ret != -ENODEV) { dev_err(dev, "Couldn't get USB3 PHY: %d\n", ret); return ret; } -- 2.40.1

2 3

[PATCH v3 0/7] efi: CapsuleUpdate: support for dynamic UUIDs
by Caleb Connolly 02 Jul '24

02 Jul '24

As more boards adopt support for the EFI CapsuleUpdate mechanism, there is a growing issue of being able to target updates to them properly. The current mechanism of hardcoding UUIDs for each board at compile time is unsustainable, and maintaining lists of GUIDs is similarly cumbersome. In this series, I propose that we adopt v5 GUIDs, these are generated by using a well-known salt GUID as well as board specific information (like the model/revision), these are hashed together and the result is truncated to form a new UUID. The well-known salt GUID can be specific to the architecture (SoC vendor), or OEM. It is defined in the board defconfig so that vendors can easily bring their own. Specifically, the following fields are used to generate a GUID for a particular fw_image: * namespace salt * board compatible (usually the first entry in the dt root compatible array). * fw_image name (the string identifying the specific image, especially relevant for board that can update multiple images). == Usage == Boards can integrate dynamic UUID support as follows: 1. Adjust Kconfig to depend on EFI_CAPSULE_DYNAMIC_UUIDS if EFI_HAVE_CAPSULE_SUPPORT. 2. Skip setting the fw_images image_type_id property. 3. Generate a UUID and set CONFIG_EFI_CAPSULE_NAMESPACE_UUID in your defconfig. == Limitations == * Changing GUIDs The primary limitation with this approach is that if any of the source fields change, so will the GUID for the board. It is therefore pretty important to ensure that GUID changes are caught during development. * Supporting multiple boards with a single image This now requires having an entry with the GUID for every board which might lead to larger UpdateCapsule images. == Tooling == This series introduces a new tool: genguid. This can be used to generate the same GUIDs that the board would at runtime. This series follows a related discussion started by Ilias: https://lore.kernel.org/u-boot/CAC_iWjJNHa4gMF897MqYZNdbgjFG8K4kwGsTXWuy72W… --- Changes in v3: - Add manpage for genguid - Add dedicated CONFIG_TOOLS_GENGUID option - Minor code fixes addressing v2 feedback - Link to v2: https://lore.kernel.org/r/20240529-b4-dynamic-uuid-v2-0-c26f31057bbe@linaro… Changes in v2: - Move namespace UUID to be defined in defconfig - Add tests and tooling - Only use the first board compatible to generate UUID. - Link to v1: https://lore.kernel.org/r/20240426-b4-dynamic-uuid-v1-0-e8154e00ec44@linaro… --- Caleb Connolly (7): lib: uuid: add UUID v5 support efi: add a helper to generate dynamic UUIDs doc: uefi: document dynamic UUID generation sandbox: switch to dynamic UUIDs lib: uuid: supporting building as part of host tools tools: add genguid tool test: lib/uuid: add unit tests for dynamic UUIDs arch/Kconfig | 1 + board/sandbox/sandbox.c | 16 --- configs/sandbox_defconfig | 1 + configs/sandbox_flattree_defconfig | 1 + doc/develop/uefi/uefi.rst | 31 +++++ doc/genguid.1 | 52 +++++++ include/sandbox_efi_capsule.h | 6 +- include/uuid.h | 21 ++- lib/Kconfig | 8 ++ lib/efi_loader/Kconfig | 23 +++ lib/efi_loader/efi_capsule.c | 1 + lib/efi_loader/efi_firmware.c | 66 +++++++++ lib/uuid.c | 81 +++++++++-- test/lib/uuid.c | 88 ++++++++++++ .../test_efi_capsule/test_capsule_firmware_fit.py | 2 +- .../test_efi_capsule/test_capsule_firmware_raw.py | 8 +- .../test_capsule_firmware_signed_fit.py | 2 +- .../test_capsule_firmware_signed_raw.py | 4 +- test/py/tests/test_efi_capsule/version.dts | 6 +- tools/Kconfig | 7 + tools/Makefile | 3 + tools/binman/etype/efi_capsule.py | 2 +- tools/binman/ftest.py | 2 +- tools/genguid.c | 154 +++++++++++++++++++++ 24 files changed, 538 insertions(+), 48 deletions(-) --- change-id: 20240422-b4-dynamic-uuid-1a5ab1486c27 base-commit: 2e682a4a406fc81ef32e05c28542cc8067f1e15f // Caleb (they/them)

5 35

[PATCH 1/2] spi: soft_spi: fix miso gpio property name
by Mikhail Kshevetskiy 02 Jul '24

02 Jul '24

Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy(a)iopsys.eu> --- drivers/spi/soft_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/soft_spi.c b/drivers/spi/soft_spi.c index 0fa14339bdc..3fe62818a44 100644 --- a/drivers/spi/soft_spi.c +++ b/drivers/spi/soft_spi.c @@ -272,7 +272,7 @@ static int soft_spi_probe(struct udevice *dev) ret = gpio_request_by_name(dev, "gpio-miso", 0, &plat->miso, GPIOD_IS_IN); if (ret) - ret = gpio_request_by_name(dev, "gpio-miso", 0, &plat->miso, + ret = gpio_request_by_name(dev, "miso-gpios", 0, &plat->miso, GPIOD_IS_IN); if (ret) plat->flags |= SPI_MASTER_NO_RX; -- 2.43.0

3 4

[PATCH] ARM: socfpga: fix broken function call for arria10
by Lothar Rubusch 02 Jul '24

02 Jul '24

Remove obsolete arguments in the function call. The call's argument list differs from its more recent definition. This breaks compilation of the 'socfpga_arria10_defconfig' target, with additionally enabled: CONFIG_CADENCE_QSPI=y' The removed arguments are obtained from device-tree declaration. Signed-off-by: Lothar Rubusch <l.rubusch(a)gmail.com> --- The patch makes the problem disappear. While messing with some old Intels, it looked to me as if this usually turned off code region of the misc_arria10.c still contains legacy arguments in the call. Thus broke my compilation. I'm unsure. Please verify. --- arch/arm/mach-socfpga/misc_arria10.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/arm/mach-socfpga/misc_arria10.c b/arch/arm/mach-socfpga/misc_arria10.c index 93c9e8b0..5c782f6b 100644 --- a/arch/arm/mach-socfpga/misc_arria10.c +++ b/arch/arm/mach-socfpga/misc_arria10.c @@ -211,11 +211,9 @@ int qspi_flash_software_reset(void) struct udevice *flash; int ret; - /* Get the flash info */ + /* Get the flash info, speed and mode will be read from DT */ ret = spi_flash_probe_bus_cs(CONFIG_SF_DEFAULT_BUS, CONFIG_SF_DEFAULT_CS, - CONFIG_SF_DEFAULT_SPEED, - CONFIG_SF_DEFAULT_MODE, &flash); if (ret) { -- 2.25.1

2 2

[PATCH] ARM: socfpga: fix broken function call for arria10
by Lothar Rubusch 02 Jul '24

02 Jul '24

Remove obsolete arguments in the function call. The call's argument list differs from its more recent definition. This breaks compilation of the 'socfpga_arria10_defconfig' target, with additionally enabled: CONFIG_CADENCE_QSPI=y' The removed arguments are obtained from device-tree declaration. Signed-off-by: Lothar Rubusch <l.rubusch(a)gmail.com> --- The patch makes the problem disappear. While messing with some old Intels, it looked to me as if this usually turned off code region of the misc_arria10.c still contains legacy arguments in the call. Thus broke my compilation. I'm unsure. Please verify. --- arch/arm/mach-socfpga/misc_arria10.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/arm/mach-socfpga/misc_arria10.c b/arch/arm/mach-socfpga/misc_arria10.c index 93c9e8b0..5c782f6b 100644 --- a/arch/arm/mach-socfpga/misc_arria10.c +++ b/arch/arm/mach-socfpga/misc_arria10.c @@ -211,11 +211,9 @@ int qspi_flash_software_reset(void) struct udevice *flash; int ret; - /* Get the flash info */ + /* Get the flash info, speed and mode will be read from DT */ ret = spi_flash_probe_bus_cs(CONFIG_SF_DEFAULT_BUS, CONFIG_SF_DEFAULT_CS, - CONFIG_SF_DEFAULT_SPEED, - CONFIG_SF_DEFAULT_MODE, &flash); if (ret) { -- 2.25.1

1 1