Date: Thu, 25 Apr 2024 17:09:24 -0500 From: Kyle Evans <kevans@FreeBSD.org> To: =?UTF-8?Q?Klaus_K=C3=BCchemann?= <maciphone2@googlemail.com>, cperciva@tarsnap.com, Warner Losh <imp@bsdimp.com>, src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 1bd4f769caf8 - main - add dtb support for RPI CM4, CM4s, CM4_ioBoard Message-ID: <142362e6-8a88-43f5-bff6-6ff90a12802e@FreeBSD.org> In-Reply-To: <7FA67865-F391-4773-86BA-9998B3EC855E@googlemail.com> References: <202404192311.43JNBiVS059729@gitrepo.freebsd.org> <0100018f169ec80a-47d419c2-2cd6-4ee1-89da-3f4782429089-000000@email.amazonses.com> <CANCZdfp0S4bqAMjj1HQt3gHwr56T%2B_tyo7w1xi5GG1pXPWAOzA@mail.gmail.com> <0100018f16c8f23a-eacbe781-3f6e-4f02-9b4d-d26468364b1f-000000@email.amazonses.com> <7473b5ed-433b-4d51-8a23-cf6464eb4416@FreeBSD.org> <7FA67865-F391-4773-86BA-9998B3EC855E@googlemail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On 4/25/24 16:44, Klaus Küchemann wrote: > > >> Am 25.04.2024 um 22:01 schrieb Kyle Evans <kevans@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 <cperciva@tarsnap.com >>>> <mailto:cperciva@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 <maciphone2@googlemail.com >>>> <mailto:maciphone2@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, Kyle Evans
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?142362e6-8a88-43f5-bff6-6ff90a12802e>