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 03028C761A6 for ; Fri, 31 Mar 2023 19:06:48 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5F1D085B34; Fri, 31 Mar 2023 21:06:46 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="kBHLN5cB"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0315585B6E; Fri, 31 Mar 2023 21:06:44 +0200 (CEST) Received: from mail-yw1-x112b.google.com (mail-yw1-x112b.google.com [IPv6:2607:f8b0:4864:20::112b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 424D885AAB for ; Fri, 31 Mar 2023 21:06:40 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-yw1-x112b.google.com with SMTP id 00721157ae682-545cb3c9898so357637317b3.7 for ; Fri, 31 Mar 2023 12:06:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1680289599; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=yqgZ7K92QGaCV6tmaR3GjOQcSAKYG8z7WGyGS6ALuoU=; b=kBHLN5cB6hm71W1tr5Lon71rzOBJP4sKzGplDQitHKxI2hID+RPBuU5QqoBVG1qjsw jg/pk2vaM1EKceE0rZdWSsvatvAfPE27/vNM3B2hTj30oiH5qn2C6bwCFDffbrOWELUI cSFOxyxsp365M0vr1zlVJh5P7V5YDE+mWADd4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680289599; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=yqgZ7K92QGaCV6tmaR3GjOQcSAKYG8z7WGyGS6ALuoU=; b=XCxRrbAW3o/2pCcnK3kwTvK5N2waIL46kGyn4dcGAPkTeOjmI+lh74peHSKMWng2E6 T1C4fevaeKvv8Wcfe+0ZrukOukcpHy+sf5jculnLoExm1HwRD7kY/txu+R6z+dzRi3zm 7teyNA4xEpBq/31MrGd+e5gj0oKhKACit5HO4VIKS56l5PaoxATOHJhBtHnO5byqpINW +X4ocVj5K3G2gFp8z69IIuACFYSE32ukqc/muuwdhy2ohrCCfSWZ6sjXaB9wYXZ4ZfC7 6jYQU7SIJoVlP65+079UWQsu94W7EOD1Ht4spxkoJ0e06y1ncoDhpRHVx26ctSilR0w2 Xh1w== X-Gm-Message-State: AAQBX9cviAwa8n+B8o1SYzDqvSeU/C9f7wzRMIVLLpnH8n0Msgm7hlWh 7uX6dFJrTPg8ddl7HhhIuFAupg== X-Google-Smtp-Source: AKy350ZXetthinTD5j+cBo9JswFBuSOMKmX30t6/7Ph2Ee7bLa7jtFEgpchjsFzlcD/v9Sc/hR4L1g== X-Received: by 2002:a81:7586:0:b0:541:7939:e89d with SMTP id q128-20020a817586000000b005417939e89dmr28666192ywc.41.1680289598953; Fri, 31 Mar 2023 12:06:38 -0700 (PDT) Received: from bill-the-cat (2603-6081-7b00-6400-1500-2834-9def-41f1.res6.spectrum.com. [2603:6081:7b00:6400:1500:2834:9def:41f1]) by smtp.gmail.com with ESMTPSA id cg9-20020a05690c0a0900b00545a08184b8sm693373ywb.72.2023.03.31.12.06.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 12:06:38 -0700 (PDT) Date: Fri, 31 Mar 2023 15:06:36 -0400 From: Tom Rini To: Andrew Davis Cc: Nishanth Menon , Ryan Eatmon , Praneeth Bajjuri , Bryan Brattlof , u-boot@lists.denx.de Subject: Re: [PATCH] include: configs: Change dtb names in fitImage to match oe-core Message-ID: <20230331190636.GE13222@bill-the-cat> References: <20230330210613.17984-1-reatmon@ti.com> <20230331170416.djwalg37btxdaomm@stunned> <20230331181112.GC13222@bill-the-cat> <20230331183650.GD13222@bill-the-cat> <8a903e58-11d7-0c31-5085-42addda66aff@ti.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="rgHUkRnwVV/2pHAu" Content-Disposition: inline In-Reply-To: <8a903e58-11d7-0c31-5085-42addda66aff@ti.com> X-Clacks-Overhead: GNU Terry Pratchett 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 --rgHUkRnwVV/2pHAu Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Mar 31, 2023 at 01:52:44PM -0500, Andrew Davis wrote: > On 3/31/23 1:36 PM, Tom Rini wrote: > > On Fri, Mar 31, 2023 at 01:23:23PM -0500, Andrew Davis wrote: > > > On 3/31/23 1:11 PM, Tom Rini wrote: > > > > On Fri, Mar 31, 2023 at 12:19:14PM -0500, Andrew Davis wrote: > > > > > On 3/31/23 12:04 PM, Nishanth Menon wrote: > > > > > > On 16:06-20230330, Ryan Eatmon wrote: > > > > > > > The oe-core class for assembling the fitImage includes the ve= ndor > > > > > > > sub-directory (with the / changed to _) in the config section= s of > > > > > > > the fitImage. Our env var settings for chosing which section= to > > > > > > > boot from needs to be updated to agree with the fitImage. > > > > > > >=20 > > > > > > > Signed-off-by: Ryan Eatmon > > > > > > > --- > > > > > > > include/configs/am64x_evm.h | 4 ++-- > > > > > > > include/configs/am65x_evm.h | 2 +- > > > > > > > include/configs/j721e_evm.h | 6 +++--- > > > > > > > include/configs/j721s2_evm.h | 6 +++--- > > > > > > > 4 files changed, 9 insertions(+), 9 deletions(-) > > > > > > >=20 > > > > > > > diff --git a/include/configs/am64x_evm.h b/include/configs/am= 64x_evm.h > > > > > > > index 26a7f2521e..456a44730c 100644 > > > > > > > --- a/include/configs/am64x_evm.h > > > > > > > +++ b/include/configs/am64x_evm.h > > > > > > > @@ -26,9 +26,9 @@ > > > > > > > #define EXTRA_ENV_AM642_BOARD_SETTINGS \ > > > > > > > "findfdt=3D" \ > > > > > > > "if test $board_name =3D am64x_gpevm; then " \ > > > > > > > - "setenv fdtfile k3-am642-evm.dtb; fi; " \ > > > > > > > + "setenv fdtfile ti_k3-am642-evm.dtb; fi; " \ > > > > > > > "if test $board_name =3D am64x_skevm; then " \ > > > > > > > - "setenv fdtfile k3-am642-sk.dtb; fi;" \ > > > > > > > + "setenv fdtfile ti_k3-am642-sk.dtb; fi;" \ > > > > > >=20 > > > > > >=20 > > > > > > Kernel.org builds k3-am642-sk.dtb > > > > > >=20 > > > > >=20 > > > > > Nope, kernel.org build ti/k3-am642-sk.dtb > > > > >=20 > > > > > > Why would we want to go and fix it with non-standard? > > > > > >=20 > > > > >=20 > > > > > The dtbs need to have their dir prefixed or there could be collis= ions > > > >=20 > > > > The key here is we're talking about what's used in FIT images, and = not > > > > just loaded directly. All of the cases where fdtfile is used on arm= 64 > > > > platforms in tree today use "/" because it's loading a literal. In = this > > > > case, why again is OE mangling the name, and what are we using it f= or > > > > again here? In other words, why can't it be treated as "/" to match= the > > > > load a file case? And if it _must_ be mangled, must we still use fd= tfile > > > > and not something else? > > > >=20 > > >=20 > > > So to match other plats, we should: > > >=20 > > > setenv fdtfile ti/k3-am642-sk.dtb > > >=20 > > > That way loading works in the non-FIT case (and we just need to stop = moving > > > all the DTBs out of the ti/ to the root dir (which is probably broken= on our > > > part anyway..)) > >=20 > > Yes, this sounds right for the non-FIT case to match other platforms / > > etc. > >=20 > > > Then when we use "fdtfile" in the FIT case, we just mangle ("/"->"_")= it > > > at that point only before use. That work for everyone? > >=20 > > Well, what _is_ the FIT case and how does it go exactly? I still want to > > know why we're mangling things and come up with something that'll work > > for when someone says "I've got an imx8mm and I'm using a FIT image from > > OE and this doesn't work!". > >=20 >=20 > So what happens is when OE is packaging a dtb file into the FIT image > it names the node based on the dtb filename. Node names can't have > / so it is turned into _ [0]. We select our FIT config using the > "fdtfile" env var so we don't duplicate the above board_name to fdt > logic. Result is fdtfile needs mangled when used to select a config > node from OE made FIT image. OK, so the next step would be to use setexpr + regex to mangle fdtfile to get the node name to use, so you don't have to duplicate the logic. --=20 Tom --rgHUkRnwVV/2pHAu Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAABCgAdFiEEGjx/cOCPqxcHgJu/FHw5/5Y0tywFAmQnLzYACgkQFHw5/5Y0 tyzlhgv+PS92+HQhjHZDuyLX/YwaEZtuJA72ls0NtHovuJ6kn+BglukQONXS79pm oE35U5ff+Rd63T62h6NbI8cy1i313rqhn5cBMzGaXEv7Ik5eyqiXMHU1K4vcHll1 xb7Fm6JuCb2Ekp9RdTHW3vZCFO4kRUn3S7oVSZhjiD1x7YIrfuyq5rlqXtGHdJ/z fKuhL27O1AG/8RkFtWxXBKW6/NGiKpPqK4jE1qLjw6igiz0zpYiMyj/ad/eDY6Bo GDvkz4eWDicOmMqEvzGK/puSlKZ1ClDAWAtN3TlFAGmXKgx1qncKkmrqh9hB0qcs mxQha3uF3nYlvengck9pAxr6x5Y1n/0/ObKvY10fbfF42r9E3Y1oukkafj61l3ux HKGh6qWl8TKX9fsMBbTXu9WCdyCgZ0tg2iFBxyDZLvsP4WF+nvis1sHaZHPcg8dx g9bBs+YYh+QMqClg3RS+afvmqWJMY86lvRu+tx0m8SjfAwDDUciBzVWRCBtiiOnJ +KjdnfFa =PQZJ -----END PGP SIGNATURE----- --rgHUkRnwVV/2pHAu--