Re: git: b2d2a78ad80e - main - Import device-tree files from Linux 6.12

On 1/4/25 03:39, Emmanuel Vadot wrote:
> On Thu, 2 Jan 2025 12:04:15 -0500
> John Baldwin <jhb@FreeBSD.org> wrote:
> 
>> On 1/2/25 04:12, Emmanuel Vadot wrote:
>>> The branch main has been updated by manu:
>>>
>>> URL: https://cgit.FreeBSD.org/src/commit/?id=b2d2a78ad80ec68d4a17f5aef97d21686cb1e29b
>>>
>>> commit b2d2a78ad80ec68d4a17f5aef97d21686cb1e29b
>>> Merge: 0e8011faf58b cd989bfc73f7
>>> Author:     Emmanuel Vadot <manu@FreeBSD.org>
>>> AuthorDate: 2025-01-02 09:12:13 +0000
>>> Commit:     Emmanuel Vadot <manu@FreeBSD.org>
>>> CommitDate: 2025-01-02 09:12:13 +0000
>>>
>>>       Import device-tree files from Linux 6.12
>>
>> Not sure which update triggered this, but I am now getting this failure
>> building an arm64 GENERIC kernel.  The second build "works" but presumably
>> with a busted fdt (I wonder if we have an error there where we need to
>> be removing partially built files on error)?
>>
>> /freebsd/main/sys/tools/fdt/make_dtb.sh /freebsd/main/sys /freebsd/main/sys/contrib/device-tree/src/arm/allwinner/sun8i-h2-plus-orangepi-r1.dts /usr/obj/freebsd/main/arm.armv7/sys/GENERIC/modules/freebsd/main/sys/modules/dtb/allwinner
>> Assertion failed: (sorted_phandles.size() == fixups.size()), function resolve_cross_references, file /freebsd/main/usr.bin/dtc/fdt.cc, line 1421.
>> Abort trap (core dumped)
>>
>> -- 
>> John Baldwin
>>
> 
>   This is caused by some delete-node I think, I've removed the dtb from
> the build for now.
>   But it's weird that you got it when building a arm64 kernel as we
> don't build this one for arm64, also the path in your build seems to
> indicate that this was for an armv7 one.
>   Anyway, I'll investigate later.

That was a typo in my e-mail, sorry, it was for armv7 (I had separate
breakage for arm64 for the GENERIC-UP kernel I had sent a mail on at
the same time which is probably why I mistyped).

-- 
John Baldwin