From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 94F97C83030 for ; Thu, 3 Jul 2025 10:10:26 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F0DE2822D7; Thu, 3 Jul 2025 12:10:24 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=quarantine dis=none) header.from=andestech.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 816D582E08; Thu, 3 Jul 2025 12:10:24 +0200 (CEST) Received: from Atcsqr.andestech.com (60-248-80-70.hinet-ip.hinet.net [60.248.80.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id A8A2882103 for ; Thu, 3 Jul 2025 12:10:20 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=quarantine dis=none) header.from=andestech.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ycliang@andestech.com Received: from mail.andestech.com (ATCPCS34.andestech.com [10.0.1.134]) by Atcsqr.andestech.com with ESMTPS id 563A9vvF003595 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=OK); Thu, 3 Jul 2025 18:09:57 +0800 (+08) (envelope-from ycliang@andestech.com) Received: from swlinux02 (10.0.15.183) by ATCPCS34.andestech.com (10.0.1.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Thu, 3 Jul 2025 18:09:57 +0800 Date: Thu, 3 Jul 2025 18:09:53 +0800 From: Leo Liang To: Conor Dooley CC: , Conor Dooley , Ivan Griffin , Cyril Jean , Tom Rini , Ilias Apalodimas , Simon Glass , Subject: Re: [PATCH v2] board: mpfs_icicle: implement board_fdt_blob_setup()/board_fit_config_name_match() Message-ID: References: <20250623115137.4017059-1-conor@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <20250623115137.4017059-1-conor@kernel.org> User-Agent: Mutt/2.2.10 (e0e92c31) (2023-03-25) X-Originating-IP: [10.0.15.183] X-ClientProxiedBy: ATCPCS33.andestech.com (10.0.1.100) To ATCPCS34.andestech.com (10.0.1.134) X-DKIM-Results: atcpcs34.andestech.com; dkim=none; X-DNSRBL: X-MAIL: Atcsqr.andestech.com 563A9vvF003595 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean On Mon, Jun 23, 2025 at 12:51:36PM +0100, Conor Dooley wrote: > From: Conor Dooley > > The firmware on the Icicle is capable of providing a devicetree in a1 to > U-Boot, but until now the devicetree has been packaged in a "payload" [1] > alongside U-Boot (or other bootloaders/RTOSes) and appended to the image. > The address of this appended devicetree is placed in a1 by the firmware. > This meant that the mechanism used by OF_SEPARATE to locate the > devicetree at the end of the image would pick up the one provided by the > firmware when u-boot-nodtb.bin was in the payload and U-Boot's devicetree > when u-boot.bin was. > > The firmware is now going to be capable of providing a minimal devicetree > (quite cut down due to severe space constraints), but this devicetree is > linked into the firmware that runs out of the L2 rather than at the end > of the U-Boot image. > > Implement board_fdt_blob_setup() so that this devicetree can be > optionally used, and the devicetree provided in the "payload" can be > used without relying on "happening" to implement the same strategy as > OF_SEPARATE expects in combination with u-boot-nodtb.bin. > Unlike other RISC-V boards, the firmware provided devicetree is only > used when OF_BOARD is set, so that the almost certainly more complete > devicetree in U-Boot will be used unless explicitly requested otherwise. > > Implement board_fit_config_name_match(), so that, using the firmware > provided cut-down/minimal dtb, U-Boot can select one of several > devicetrees when MULTI_DTB_FIT is enabled. > > Enabling both MULTI_DTB_FIT and OF_BOARD will lead to a conflict > between the two options, with the latter taking priority due to > board_fdt_blob_setup() being executed before board_fit_config_name_match(), > which causes gd->fdt_blob to be overwritten with a pointer to the > minimal devicetree rather than the location of the fit image containing > the multiple dtbs. Let MULTI_DTB_FIT take priority in this case, by > explicitly blocking the override when MULTI_DTB_FIT is enabled. > > Link: https://github.com/polarfire-soc/hart-software-services/blob/master/tools/hss-payload-generator/README.md [1] > Signed-off-by: Conor Dooley > --- > > v2: > - implement MULTI_DTB_FIT too > > v1 was a year ago here: > https://lore.kernel.org/u-boot/20240625090806.1787287-2-conor.dooley@microchip.com/ > > There was some discussion on that thread, but ultimately I didn't find > what was mentioned to be worth implementing. Heinrich suggested to me, I > guess on IRC or something since it's not in that thread, implementing > MULTI_DTB_FIT, which I have done. A lot of the reason for the patch when > I wrote it was speculative, but we have some actual users for OF_BOARD > now - hence the v2 after about a year's gap. > > CC: Ivan Griffin > CC: Cyril Jean > CC: Tom Rini > CC: Ilias Apalodimas > CC: Simon Glass > CC: Jamie.Gibbons@microchip.com > CC: u-boot@lists.denx.de > --- > board/microchip/mpfs_icicle/mpfs_icicle.c | 63 +++++++++++++++++++++++ > 1 file changed, 63 insertions(+) Acked-by: Leo Yu-Chi Liang