Re: [PATCH v2] scripts/dtc: Update to upstream version v1.7.2-35-g52f07dcca47c

[<Jamie.Gibbons@microchip.com>]

Hi Marek,

On Fri, 2026-01-16 at 17:33 +0100, Marek Vasut wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you
> know the content is safe
> 
> On 1/16/26 5:13 PM, Jamie.Gibbons@microchip.com wrote:
> > Hi Tom, Marek,
> > On Tue, 2025-12-02 at 20:32 +0100, Marek Vasut wrote:
> > > Synchronize local copy of DTC with Linux 6.17 . This includes the
> > > following picked and squashed commits from Linux kernel. The
> > > squash
> > > was necessary, since the DTC here contains changes which were
> > > also
> > > part of DTC in Linux alraedy, and the squash helped resolve those
> > > without going back and forth with the changes.
> > > 
> > > The following commits from Linux are picked:
> > > 
> > > 8f324cd712df7 # scripts/dtc: consolidate include path options in
> > > Makefile
> > > b5b3d9b63b0ee # scripts/dtc: Add yamltree.c to dtc sources
> > > 7d97a76f226d6 # scripts/dtc: Update to upstream version v1.4.7-
> > > 14-
> > > gc86da84d30e4
> > > ea6f243be74e5 # scripts/dtc: Update to upstream version v1.4.7-
> > > 57-
> > > gf267e674d145
> > > 02d435d4eccd8 # scripts/dtc: Update to upstream version v1.5.0-
> > > 23-
> > > g87963ee20693
> > > 6e321b7637396 # scripts/dtc: Update to upstream version v1.5.0-
> > > 30-
> > > g702c1b6c0e73
> > > 9f19ec91a7a35 # scripts/dtc: dtx_diff - add color output support
> > > 8287d642f38d1 # scripts/dtc: Update to upstream version v1.5.1-
> > > 22-
> > > gc40aeb60b47a
> > > 4c52deef9225d # scripts/dtc: Revert "yamltree: Ensure consistent
> > > bracketing of properties with phandles"
> > > 5d3827e1452ed # scripts/dtc: Remove unused makefile fragments
> > > 40dd266887654 # scripts/dtc: Update to upstream version v1.6.0-2-
> > > g87a656ae5ff9
> > > 8d4cf6b6acb59 # scripts/dtc: use pkg-config to include <yaml.h>
> > > in
> > > non-standard path
> > > b9bf9ace5ae90 # scripts/dtc: Update to upstream version v1.6.0-
> > > 11-
> > > g9d7888cbf19c
> > > 69a883b6f5ac0 # scripts/dtc: dtx_diff - make help text formatting
> > > consistent
> > > 8f829108b8aed # scripts/dtc: only append to HOST_EXTRACFLAGS
> > > instead
> > > of overwriting
> > > b39b4342ac495 # scripts/dtc: Update to upstream version v1.6.0-
> > > 31-
> > > gcbca977ea121
> > > 93c6424c486b3 # scripts: dtc: Fetch fdtoverlay.c from external
> > > DTC
> > > project
> > > 0dd574a1d75c3 # scripts/dtc: Update to upstream version v1.6.0-
> > > 51-
> > > g183df9e9c2b9
> > > ec38b5df8a231 # scripts: dtc: Build fdtoverlay tool
> > > a0c8c431411f5 # scripts: dtc: Remove the unused fdtdump.c file
> > > e7dc653d4e890 # scripts/dtc: Add missing fdtoverlay to gitignore
> > > d2bf5d2e3f09c # scripts/dtc: Update to upstream version v1.6.1-
> > > 19-
> > > g0a3a9d3449c8
> > > a60878f5532d0 # scripts/dtc: dtx_diff: remove broken example from
> > > help
> > > text
> > > 8b739d8658a9b # scripts/dtc: Call pkg-config POSIXly correct
> > > b6eeafa67df00 # scripts/dtc: Update to upstream version v1.6.1-
> > > 63-
> > > g55778a03df61
> > > f96cc4c787588 # scripts/dtc: Update to upstream version v1.6.1-
> > > 66-
> > > gabbd523bae6e
> > > 09ab9c092ef2b # scripts/dtc: Update to upstream version v1.7.0-
> > > 93-
> > > g1df7b047fe43
> > > ded8a5a498f2d # scripts/dtc: Update to upstream version v1.7.0-
> > > 95-
> > > gbcd02b523429
> > > ee6ff6fca7e71 # scripts/dtc: Update to upstream version v1.7.2-
> > > 35-
> > > g52f07dcca47c
> > > 
> > > This also includes forward port of U-Boot commit
> > > e8c2d25845c7 ("libfdt: Revert 6dcb8ba4 from upstream libfdt")
> > > to avoid binary size growth.
> > > 
> > 
> > During testing I discovered the following error on Microchip's
> > PolarFire
> > SoC Icicle kit. I found it during a bisect between the v2026.01 tag
> > and
> > the master branch while looking to solve another issue. With these
> > other
> > issues solved I am left with this one still on master and I am
> > looking
> > for some help.
> > 
> > The error is: failed on fdt_open_into for DTO, i.e. overlay
> > application
> > fdt error. This was introduced by 0535e46d55d scripts/dtc: Update
> > to
> > upstream version v1.7.2-35-g52f07dcca47c, i.e. this patch. Please
> > see
> > the attached log which includes a `printenv` attached.
> Does this fix your problem ?
> 
> diff --git a/boot/image-fit.c b/boot/image-fit.c
> index 2d040e38d97..1163e837d7e 100644
> --- a/boot/image-fit.c
> +++ b/boot/image-fit.c
> @@ -2491,7 +2491,7 @@ int boot_get_fdt_fit(struct bootm_headers
> *images,
> ulong addr,
>                  ov = map_sysmem(ovload, ovlen);
> 
>                  ovcopylen = ALIGN(fdt_totalsize(ov), SZ_4K);
> -               ovcopy = malloc(ovcopylen);
> +               ovcopy = memalign(8, ovcopylen);
>                  if (!ovcopy) {
>                          printf("failed to duplicate DTO before
> application\n");
>                          fdt_noffset = -ENOMEM;
> 
Apologies for the delayed response. The above proposed solution did not
change/fix the issue. Any other suggestions would be greatly
appreciated.

Thanks again,
Jamie.