On Thu, Apr 25, 2024, 4:09 PM Kyle Evans <kev...@freebsd.org> wrote:
> On 4/25/24 16:44, Klaus Küchemann wrote: > > > > > >> Am 25.04.2024 um 22:01 schrieb Kyle Evans <kev...@freebsd.org>: > >> > >> On 4/25/24 14:43, Colin Percival wrote: > >>> On 4/25/24 12:24, Warner Losh wrote: > >>>> On Thu, Apr 25, 2024, 12:57 PM Colin Percival <cperc...@tarsnap.com > >>>> <mailto:cperc...@tarsnap.com>> wrote: > >>>> On 4/19/24 16:11, Warner Losh wrote: > >>>> > add dtb support for RPI CM4, CM4s, CM4_ioBoard > >>>> > > >>>> > Signed-off-by: Klaus Küchemann <macipho...@googlemail.com > >>>> <mailto:macipho...@googlemail.com>> > >>>> > Reviewed by: imp > >>>> > Pull Request: > >>>> https://github.com/freebsd/freebsd-src/pull/1182 > >>>> <https://github.com/freebsd/freebsd-src/pull/1182> > >>>> > --- > >>>> > --- a/release/arm64/RPI.conf > >>>> > +++ b/release/arm64/RPI.conf > >>>> > -DTB="bcm2710-rpi-2-b.dtb bcm2710-rpi-3-b.dtb > >>>> bcm2710-rpi-3-b-plus.dtb > >>>> bcm2710-rpi-cm3.dtb bcm2711-rpi-4-b.dtb" > >>>> > +DTB="bcm2710-rpi-2-b.dtb bcm2710-rpi-3-b.dtb > >>>> bcm2710-rpi-3-b-plus.dtb > >>>> bcm2710-rpi-cm3.dtb \ > >>>> > + bcm2711-rpi-4-b.dtb bcm2711-rpi-cm4-io.dtb > >>>> bcm2711-rpi-cm4.dtb > >>>> bcm2711-rpi-cm4s.dtb" > >>>> > >>>> This broke the RPI release build, since bcm2711-rpi-cm4s.dtb > >>>> doesn't exist. > >>>> Is it provided by a port which we should add to the RPI build? > >>>> > >>>> I thought it was in tree. I'll look into this and report back. > >>> Entirely possible. The release-building code is trying to copy it from > >>> /usr/local/share/rpi-firmware/bcm2711-rpi-cm4s.dtb > >>> so if it's somewhere else we need to adjust that code. > >> > >> The rpi-firmware port is supposed to provide all .dtb used here, but > >> we've never installed that one. It really shouldn't have been > >> included in the list to begin with, but I guess if there's demand we > >> should fix the port to include it. > >> > >> Thanks, > >> > >> Kyle Evans > > > > we only have tested/fixed the CM4-model, not forceably need the > > cm4s.dtb , so no objections to remove cm4s.dtb from the dtb-list at > > least temporarily. > > > > But please hold cm4.dtb and the cm4_io_.dtb, which will then hopefully > > not break the rpi-release anymore. > > > > I'm going to go ahead and remove just the rpi-cm4s.dtb, feel free to > update the port (sysutils/rpi-firmware) to grab it then try again once > new packages are available with it so that we don't break the snapshot > again from the same file. > Thanks. Warner Thanks, > > Kyle Evans >
