From nobody Thu Apr 25 22:27:57 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQVqM5CX3z5JgqK; Thu, 25 Apr 2024 22:27:59 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VQVqM4KTdz46Tx; Thu, 25 Apr 2024 22:27:59 +0000 (UTC) (envelope-from kevans@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714084079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4lDrKQcy0Fx61Y4n1YHs+kGgQSXEWsVhOC+ib8waH1U=; b=yLSUiDRCZUYaKID5lQlki/WlDtHdZnKhWxocv58Wv5NsEhWXgmujDHqhrCjmFJzy9yTtcN Y3lL6Bec3Hn4cll7qNMQQPTwUqMwqW9tkMMegpfgYqDLmREatBY+8VNW+3igp3QWZSoFze v+I1DQdnT+fux7b8j7uyFdNS83E1eYn/+3jbgrtTPw5qZReQSrKs4buQqpF0hAtoySiM19 rWyV3+L2JxjQ5mlBmiVsGrXVY/vBmkyOGNgpej78ePm8TGZp8LTKVWckfKAvRs04lDCBqf TkuK6bkqHdFif8D7UXStw3TDxNvezOTpZnyveeJ0t6+gQziwk9aN7p3/Mf50Qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714084079; a=rsa-sha256; cv=none; b=iqjTyAmkObyfyrBfpj/8m2T7SsXK4XdL1d2NGUk/9lVIfw2vT0MYaAAsGyJsZvlvK96gTd abLHJUeBnrG1Xiuit8bDcmV8B9iK1niAjVd8uYbjkig2fUeErHMEg6pOxZGz7E3XNX7aEC ldRTJDjShckf85tXM1f6Q4xE6EXjMfvxs8T4xv7dbqipV5TWobnW/fW3ISPsRpxlZ8C6kx 1dMNDYKXuEzEBR/8DFANK2U55L25BinhAx52/hP4ls79eiznk2vQJIIMPCm7HyEXlm3J5R o9GeL2xsUrWGAdXt5v9+034zeintJgDBMmcjUm9JKLd2Y+5qazFatocwBf4MFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714084079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4lDrKQcy0Fx61Y4n1YHs+kGgQSXEWsVhOC+ib8waH1U=; b=WZgpgBaBPTbu0mCHdLQ0CfyruQP56TL1yArHnaQg51uttD/SpDIQx+M2sBvBwpkClcvVxT tWF8e0RJIUj9zEKzVIjYlfIxrP0WxgEhZGYLlE0gCvjKChfU54h33ZZDFtCUtbKnHueciR /6/k6jQEzkPkr2zJZef9AaOlbFmdBmEo4ECFV1O/6EskdXTmshmCkKLVVNGR8oJyOLblVb weLnqIQgPtxi5LCqmP9MRe5cq/Puox9w0HLcvHL0hNJnAld/1DmSydr/kBC3jlW8+GteZL A+x7OqpFKmqLCnc5Qkj1WjrfgrnkWuhnygo16gM8SeB402l7Lpj+uSRbiCx8pw== Received: from [10.9.4.95] (unknown [209.182.120.176]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) (Authenticated sender: kevans/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4VQVqL5tDfz127R; Thu, 25 Apr 2024 22:27:58 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Message-ID: <89871449-6893-4bfa-8f21-76dca37adb09@FreeBSD.org> Date: Thu, 25 Apr 2024 17:27:57 -0500 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 1bd4f769caf8 - main - add dtb support for RPI CM4, CM4s, CM4_ioBoard Content-Language: en-US To: =?UTF-8?Q?Klaus_K=C3=BCchemann?= , Warner Losh , cperciva@tarsnap.com, src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, hp@tmm.cx References: <202404192311.43JNBiVS059729@gitrepo.freebsd.org> <0100018f169ec80a-47d419c2-2cd6-4ee1-89da-3f4782429089-000000@email.amazonses.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> <142362e6-8a88-43f5-bff6-6ff90a12802e@FreeBSD.org> From: Kyle Evans In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 4/25/24 17:19, Klaus Küchemann wrote: > > >> Am 26.04.2024 um 00:09 schrieb Kyle Evans : >> >> On 4/25/24 16:44, Klaus Küchemann wrote: >>>> Am 25.04.2024 um 22:01 schrieb Kyle Evans : >>>> >>>> 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 >>>>>> > 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 >>>>> > >>>>>> >      Reviewed by: imp >>>>>> >      Pull Request: 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 > > Yes, better at the moment , because > Updating the port would require to test every rpi-model again because > the provided dtb-files >  can sometimes be very „sensitive“ or critical in behavior  . > You are over-complicating this... you don't need to actually update the port to a different version of the rpi-firmware repository. 055e044 is what's currently used, and the .dtb is there; it just needs to be added to the pkg-plist[0] so that it gets sucked into the package. We apparently stage all of boot/* into $DATADIR already (kind of ugly, but whatever floats the port's goat, man) so it shouldn't need anything else and won't invalidate any of the other blobs we package. [0] https://cgit.freebsd.org/ports/tree/sysutils/rpi-firmware/pkg-plist#n22