[v2] DTB build housekeeping

[PATCH v2 0/3] DTB build housekeeping

Posted by Bernhard Beschow 4 months, 1 week ago

This series removes the bundled device tree blobs from the repository which are
redundant to the bundled device tree sources. To make this work, the device tree
compiler 'dtc' is now required whenever libfdt is used. Furthermore, dtc can now
be built from the bundled libfdt if needed.

v2:
* Allow building dtc from bundled libfdt (Paolo)
* Find dtc iff libfdt is used (Paolo)
* Remove dtc configure option (now obsolete)

Bernhard Beschow (3):
  hw/microblaze: Add missing FDT dependency
  configure: Ensure existance of dtc when libfdt is used
  pc-bios/dtb: Remove device tree blobs

 MAINTAINERS                                   |   2 +-
 meson.build                                   |  16 +++--
 hw/microblaze/Kconfig                         |   4 +-
 pc-bios/dtb/bamboo.dtb                        | Bin 3211 -> 0 bytes
 pc-bios/dtb/canyonlands.dtb                   | Bin 9779 -> 0 bytes
 pc-bios/dtb/meson.build                       |  17 ++---
 pc-bios/dtb/petalogix-ml605.dtb               | Bin 9882 -> 0 bytes
 pc-bios/dtb/petalogix-s3adsp1800.dtb          | Bin 8161 -> 0 bytes
 subprojects/dtc.wrap                          |   1 +
 .../packagefiles/dtc-meson-override.patch     |  62 ++++++++++++++++++
 10 files changed, 85 insertions(+), 17 deletions(-)
 delete mode 100644 pc-bios/dtb/bamboo.dtb
 delete mode 100644 pc-bios/dtb/canyonlands.dtb
 delete mode 100644 pc-bios/dtb/petalogix-ml605.dtb
 delete mode 100644 pc-bios/dtb/petalogix-s3adsp1800.dtb
 create mode 100644 subprojects/packagefiles/dtc-meson-override.patch

-- 
2.50.0

Re: [PATCH v2 0/3] DTB build housekeeping

Posted by Philippe Mathieu-Daudé 4 months ago

On 8/7/25 22:48, Bernhard Beschow wrote:
> This series removes the bundled device tree blobs from the repository which are
> redundant to the bundled device tree sources. To make this work, the device tree
> compiler 'dtc' is now required whenever libfdt is used. Furthermore, dtc can now
> be built from the bundled libfdt if needed.
> 
> v2:
> * Allow building dtc from bundled libfdt (Paolo)
> * Find dtc iff libfdt is used (Paolo)
> * Remove dtc configure option (now obsolete)
> 
> Bernhard Beschow (3):
>    hw/microblaze: Add missing FDT dependency
>    configure: Ensure existance of dtc when libfdt is used
>    pc-bios/dtb: Remove device tree blobs
> 
>   MAINTAINERS                                   |   2 +-
>   meson.build                                   |  16 +++--
>   hw/microblaze/Kconfig                         |   4 +-
>   pc-bios/dtb/bamboo.dtb                        | Bin 3211 -> 0 bytes
>   pc-bios/dtb/canyonlands.dtb                   | Bin 9779 -> 0 bytes
>   pc-bios/dtb/meson.build                       |  17 ++---
>   pc-bios/dtb/petalogix-ml605.dtb               | Bin 9882 -> 0 bytes
>   pc-bios/dtb/petalogix-s3adsp1800.dtb          | Bin 8161 -> 0 bytes
>   subprojects/dtc.wrap                          |   1 +
>   .../packagefiles/dtc-meson-override.patch     |  62 ++++++++++++++++++

Being not familiar enough with this meson fu, I'm only queuing the
first patch, being a good fix in its own.

Thanks,

Phil.

Re: [PATCH v2 0/3] DTB build housekeeping

Posted by Paolo Bonzini 3 months ago

On 7/15/25 08:06, Philippe Mathieu-Daudé wrote:
> On 8/7/25 22:48, Bernhard Beschow wrote:
>> This series removes the bundled device tree blobs from the repository 
>> which are
>> redundant to the bundled device tree sources. To make this work, the 
>> device tree
>> compiler 'dtc' is now required whenever libfdt is used. Furthermore, 
>> dtc can now
>> be built from the bundled libfdt if needed.
>>
>> v2:
>> * Allow building dtc from bundled libfdt (Paolo)
>> * Find dtc iff libfdt is used (Paolo)
>> * Remove dtc configure option (now obsolete)
>>
>> Bernhard Beschow (3):
>>    hw/microblaze: Add missing FDT dependency
>>    configure: Ensure existance of dtc when libfdt is used
>>    pc-bios/dtb: Remove device tree blobs
>>
>>   MAINTAINERS                                   |   2 +-
>>   meson.build                                   |  16 +++--
>>   hw/microblaze/Kconfig                         |   4 +-
>>   pc-bios/dtb/bamboo.dtb                        | Bin 3211 -> 0 bytes
>>   pc-bios/dtb/canyonlands.dtb                   | Bin 9779 -> 0 bytes
>>   pc-bios/dtb/meson.build                       |  17 ++---
>>   pc-bios/dtb/petalogix-ml605.dtb               | Bin 9882 -> 0 bytes
>>   pc-bios/dtb/petalogix-s3adsp1800.dtb          | Bin 8161 -> 0 bytes
>>   subprojects/dtc.wrap                          |   1 +
>>   .../packagefiles/dtc-meson-override.patch     |  62 ++++++++++++++++++
> 
> Being not familiar enough with this meson fu, I'm only queuing the
> first patch, being a good fix in its own.

I queued the rest for 10.2.

Paolo

Re: [PATCH v2 0/3] DTB build housekeeping

Posted by Paolo Bonzini 2 months, 2 weeks ago

On Thu, Aug 14, 2025 at 7:15 AM Paolo Bonzini <pbonzini@redhat.com> wrote:
> > Being not familiar enough with this meson fu, I'm only queuing the
> > first patch, being a good fix in its own.
>
> I queued the rest for 10.2.

Unfortunately this doesn't work because meson doesn't want to have dtc
from the subproject and libfdt from the system. As a result, I need to
add dtc to the containers, which I did, but then I have failures in
macOS and FreeBSD because they cannot use the libfdt (from
respectively homebrew or ports).

In both cases, dtc and libfdt should be packaged together though. For
macOS, I even downloaded the dtc "bottle" and checked that it has both
dtc and libfdt, but libfdt cannot be found.

So, the "simplest" way to get these patches unstuck is to remove
support for bundled libfdt altogether (and add libfdt to all the CI
environments).

Thanks for your understanding :)

Paolo

Re: [PATCH v2 0/3] DTB build housekeeping

Posted by Bernhard Beschow 4 months ago


Am 8. Juli 2025 20:48:03 UTC schrieb Bernhard Beschow <shentey@gmail.com>:
>This series removes the bundled device tree blobs from the repository which are
>redundant to the bundled device tree sources. To make this work, the device tree
>compiler 'dtc' is now required whenever libfdt is used. Furthermore, dtc can now
>be built from the bundled libfdt if needed.
>
>v2:
>* Allow building dtc from bundled libfdt (Paolo)
>* Find dtc iff libfdt is used (Paolo)
>* Remove dtc configure option (now obsolete)

Ping

>
>Bernhard Beschow (3):
>  hw/microblaze: Add missing FDT dependency
>  configure: Ensure existance of dtc when libfdt is used
>  pc-bios/dtb: Remove device tree blobs
>
> MAINTAINERS                                   |   2 +-
> meson.build                                   |  16 +++--
> hw/microblaze/Kconfig                         |   4 +-
> pc-bios/dtb/bamboo.dtb                        | Bin 3211 -> 0 bytes
> pc-bios/dtb/canyonlands.dtb                   | Bin 9779 -> 0 bytes
> pc-bios/dtb/meson.build                       |  17 ++---
> pc-bios/dtb/petalogix-ml605.dtb               | Bin 9882 -> 0 bytes
> pc-bios/dtb/petalogix-s3adsp1800.dtb          | Bin 8161 -> 0 bytes
> subprojects/dtc.wrap                          |   1 +
> .../packagefiles/dtc-meson-override.patch     |  62 ++++++++++++++++++
> 10 files changed, 85 insertions(+), 17 deletions(-)
> delete mode 100644 pc-bios/dtb/bamboo.dtb
> delete mode 100644 pc-bios/dtb/canyonlands.dtb
> delete mode 100644 pc-bios/dtb/petalogix-ml605.dtb
> delete mode 100644 pc-bios/dtb/petalogix-s3adsp1800.dtb
> create mode 100644 subprojects/packagefiles/dtc-meson-override.patch
>