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 15E67C433F5 for ; Thu, 26 May 2022 14:15:41 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C14DF8434B; Thu, 26 May 2022 16:15:39 +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="OQiqZ63R"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 92C3384353; Thu, 26 May 2022 16:15:38 +0200 (CEST) Received: from mail-qt1-x82e.google.com (mail-qt1-x82e.google.com [IPv6:2607:f8b0:4864:20::82e]) (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 A9D9F84349 for ; Thu, 26 May 2022 16:15:33 +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-qt1-x82e.google.com with SMTP id v29so1125874qtc.12 for ; Thu, 26 May 2022 07:15:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=7DGHdAWC1w/GJSqdXo6ZEnrFnjanWQia+vh19+9BA+8=; b=OQiqZ63RysdhqSCEuXFi84iNfvf5+elf15Di8xrdT4fEAhaTM/hgtb5rf2iKi0HCOU cm0nyPP/MHauwgBydxQVSlZN61rqjhaeF7pkkm7B7mPZuFCxjmAW05nQVp3HuqMA8hT1 AXhrPqaczZHsFEe2cOwtK6hV0k8juJDtHII2k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=7DGHdAWC1w/GJSqdXo6ZEnrFnjanWQia+vh19+9BA+8=; b=ONEjwwFMh2dFki5N5qetE7v3gV6qm97rq95slL0htUZGXgRGbLTuaXKez+lFl4CAUt c709UoxG0IRKI2FrmKIVNX+R/MZDJMnsmNVWYplt1iw97pRlgfEPb6KXxD1LIC3LOyTO OKgKv6OGK+xAesfEW1huq2VzpbOiHDqU5y+itJbkTbh5mz4S2RbfEmkX5Hkf8czsjEfN wiq5Sk/hE21k2/op2lsmH6BYC22sp7kZ0kFGtUUfiq1g0ZmnRODndifWPKNg0qBwycTB GaK9EijgJYyuCvs+R5YhZnuds/bJs7MGO8C+8piVTAaVNeYbgb12xOxSwfWnhdAMIhcr mIBw== X-Gm-Message-State: AOAM532NVTsmN65BA45+2jdQfJ0yATwbnDHvnXfoIyrjKAa0A0InNtmr BM0rFy+01MmW0poSDbnZAg7iPA== X-Google-Smtp-Source: ABdhPJygKibDeMGuICkqZOYuW2jj0tNwjUtuofyyzq/mig7chzENE8HYPdC832UdDrmh38+aYlQp0g== X-Received: by 2002:a05:622a:1a82:b0:2f3:b411:e016 with SMTP id s2-20020a05622a1a8200b002f3b411e016mr29234542qtc.218.1653574532233; Thu, 26 May 2022 07:15:32 -0700 (PDT) Received: from bill-the-cat (cpe-65-184-200-14.ec.res.rr.com. [65.184.200.14]) by smtp.gmail.com with ESMTPSA id n6-20020ac86746000000b002f91849bf20sm998144qtp.36.2022.05.26.07.15.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 May 2022 07:15:31 -0700 (PDT) Date: Thu, 26 May 2022 10:15:29 -0400 From: Tom Rini To: Roger Quadros , Alper Nebi Yasak Cc: Andrew Davis , sjg@chromium.org, vigneshr@ti.com, nm@ti.com, praneeth@ti.com, u-boot@lists.denx.de Subject: Re: [u-boot PATCH 3/3] k3-am642-evm-u-boot: Use binman to generate u-boot.img and tispl.bin Message-ID: <20220526141529.GV13239@bill-the-cat> References: <20220509072936.12899-1-rogerq@kernel.org> <20220509072936.12899-4-rogerq@kernel.org> <3dec7c74-e486-79da-e4e7-cad6205471a5@ti.com> <28124041-81c8-265f-5f54-57a7fb7562e4@ti.com> <3d5690e0-d77b-4592-dd55-0952d849a84b@kernel.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="x/TyKPcLwmKZr+b7" Content-Disposition: inline In-Reply-To: <3d5690e0-d77b-4592-dd55-0952d849a84b@kernel.org> 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.5 at phobos.denx.de X-Virus-Status: Clean --x/TyKPcLwmKZr+b7 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, May 26, 2022 at 10:28:45AM +0300, Roger Quadros wrote: > On 25/05/2022 18:14, Andrew Davis wrote: > > On 5/25/22 3:30 AM, Roger Quadros wrote: > >> Hi Andrew, > >> > >> On 25/05/2022 01:03, Andrew Davis wrote: > >>> On 5/9/22 2:29 AM, Roger Quadros wrote: > >>>> Introduce k3-am642-evm-binman.dtsi to provide binman configuration. > >>>> > >>>> R5 build is still not converted to use binman so restrict binman.dtsi > >>>> to A53 builds only. > >>>> > >>>> This patch also take care of building Secure (HS) images using > >>>> binman instead of tools/k3_fit_atf.sh if CONFIG_BINMAN is set. > >>>> > >>>> Signed-off-by: Roger Quadros > >>>> --- > >>>> =A0=A0 arch/arm/dts/k3-am642-evm-binman.dtsi | 230 +++++++++++++++++= +++++++++ > >>>> =A0=A0 arch/arm/dts/k3-am642-evm-u-boot.dtsi |=A0=A0 3 + > >>>> =A0=A0 arch/arm/mach-k3/Kconfig=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0= =A0 |=A0=A0 1 + > >>>> =A0=A0 arch/arm/mach-k3/config.mk=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 |= =A0=A0 7 + > >>>> =A0=A0 4 files changed, 241 insertions(+) > >>>> =A0=A0 create mode 100644 arch/arm/dts/k3-am642-evm-binman.dtsi > >>>> > >>>> diff --git a/arch/arm/dts/k3-am642-evm-binman.dtsi b/arch/arm/dts/k3= -am642-evm-binman.dtsi > >>>> new file mode 100644 > >>>> index 0000000000..9e85ef41b0 > >>>> --- /dev/null > >>>> +++ b/arch/arm/dts/k3-am642-evm-binman.dtsi > >>>> @@ -0,0 +1,230 @@ > >>>> +// SPDX-License-Identifier: GPL-2.0 > >>>> +/* > >>>> + * Copyright (C) 2021 Texas Instruments Incorporated - https://www.= ti.com/ > >>>> + */ > >>>> + > >>>> +/ { > >>>> +=A0=A0=A0 binman: binman { > >>>> +=A0=A0=A0=A0=A0=A0=A0 multiple-images; > >>>> +=A0=A0=A0 }; > >>>> +}; > >>>> + > >>>> +#ifdef CONFIG_TARGET_AM642_A53_EVM > >>>> + > >>>> +#ifdef CONFIG_TI_SECURE_DEVICE > >>>> +#define TISPL "tispl.bin_HS" > >>>> +#define UBOOT_IMG "u-boot.img_HS" > >>>> +#else > >>>> +#define TISPL "tispl.bin" > >>>> +#define UBOOT_IMG "u-boot.img" > >>>> +#endif > >>>> + > >>>> +#define SPL_NODTB "spl/u-boot-spl-nodtb.bin" > >>>> +#define SPL_AM642_EVM_DTB "spl/dts/k3-am642-evm.dtb" > >>>> +#define SPL_AM642_SK_DTB "spl/dts/k3-am642-sk.dtb" > >>>> + > >>>> +#define UBOOT_NODTB "u-boot-nodtb.bin" > >>>> +#define AM642_EVM_DTB "arch/arm/dts/k3-am642-evm.dtb" > >>>> +#define AM642_SK_DTB "arch/arm/dts/k3-am642-sk.dtb" > >>>> + > >>>> +&binman { > >>>> +=A0=A0=A0 ti-spl { > >>>> +=A0=A0=A0=A0=A0=A0=A0 filename =3D TISPL; > >>>> +=A0=A0=A0=A0=A0=A0=A0 pad-byte =3D <0xff>; > >>>> + > >>>> +=A0=A0=A0=A0=A0=A0=A0 fit { > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 description =3D "Configuration to= load ATF and SPL"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 #address-cells =3D <1>; > >>>> + > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 images { > >>>> + > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 atf { > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 descripti= on =3D "ARM Trusted Firmware"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 type =3D = "firmware"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 arch =3D = "arm64"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 compressi= on =3D "none"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 os =3D "a= rm-trusted-firmware"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 load =3D = ; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 entry =3D= ; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 atf-bl31 { > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0= =A0 filename =3D "bl31.bin"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 }; > >>> > >>> > >>> On HS, bl31.bin and the below TEE and DM images must also be signed > >>> before being packaged into tispl.bin. > >>> Can we add signing here? > >> > >> I'm wondering how this is working as is on HS boards. > >> > >=20 > >=20 > > Today we manually sign those two before we feed them to U-Boot build. > > I'd like to fix that and have them signed along with all the other > > parts here when packaging them together. > >=20 >=20 > OK. Then this is new feature. Do you mind if I make a separate patch for = it? > But first I need to figure out what to do ;) >=20 > >=20 > >> Another thing to note is that the atf and tee entries take into consid= eration > >> the below environment variables > >> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 -a atf-bl31-path=3D${= BL31} \ > >> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 -a tee-os-path=3D${TE= E} \ > >> > >> How do we continue to support that while adding the signing bits? > >> > >=20 > >=20 > > That's my question also, I'm not sure how we would make the type 'ti-se= cure' > > while also changing their path names, seems like a limitation currently > > of using etypes to do the signing, since we can do path renames from > > command line. >=20 > Simon, >=20 > Any thoughts on how to get the new ti-secure etype work with atf-bl31 and > tee-os etypes so that it can take the data output of those entries and cr= eate > a signed binary with filenames from those entries or atf-bl31-path and > tee-os-path? >=20 > Can something like this work? >=20 > ti-secure { > atf-bl31 { > filename =3D "bl31.bin"; > }; > } >=20 > We could probably get rid of filename property from ti-secure etype and u= se > blob for regular files. >=20 > ti-secure { > blob { > filename =3D "somefile.ext"; > } > } Adding in Alper as well.. >=20 > cheers, > -roger >=20 > >=20 > > Andrew > >=20 > >=20 > >> cheers, > >> -roger > >> > >>> > >>> Andrew > >>> > >>> > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 }; > >>>> + > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 tee { > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 descripti= on =3D "OPTEE"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 type =3D = "tee"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 arch =3D = "arm64"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 compressi= on =3D "none"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 os =3D "t= ee"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 load =3D = <0x9e800000>; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 entry =3D= <0x9e800000>; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 tee-os { > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0= =A0 filename =3D "tee-pager_v2.bin"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 }; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 }; > >>>> + > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 dm { > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 descripti= on =3D "DM binary"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 type =3D = "firmware"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 arch =3D = "arm32"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 compressi= on =3D "none"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 os =3D "D= M"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 load =3D = <0x89000000>; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 entry =3D= <0x89000000>; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 blob-ext { > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0= =A0 filename =3D "/dev/null"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 }; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 }; > >>>> + > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 spl { > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 descripti= on =3D "SPL (64-bit)"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 type =3D = "standalone"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 os =3D "U= -Boot"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 arch =3D = "arm64"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 compressi= on =3D "none"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 load =3D = <0x80080000>; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 entry =3D= <0x80080000>; > >>>> +#ifdef CONFIG_TI_SECURE_DEVICE > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 ti-secure= { > >>>> +#else > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 blob { > >>>> +#endif > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0= =A0 filename =3D SPL_NODTB; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 }; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 }; > >>>> + > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 fdt-1 { > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 descripti= on =3D "k3-am642-evm"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 type =3D = "flat_dt"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 arch =3D = "arm"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 compressi= on =3D "none"; > >>>> +#ifdef CONFIG_TI_SECURE_DEVICE > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 ti-secure= { > >>>> +#else > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 blob { > >>>> +#endif > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0= =A0 filename =3D SPL_AM642_EVM_DTB; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 }; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 }; > >>>> + > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 fdt-2 { > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 descripti= on =3D "k3-am642-sk"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 type =3D = "flat_dt"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 arch =3D = "arm"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 compressi= on =3D "none"; > >>>> +#ifdef CONFIG_TI_SECURE_DEVICE > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 ti-secure= { > >>>> +#else > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 blob { > >>>> +#endif > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0= =A0 filename =3D SPL_AM642_SK_DTB; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 }; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 }; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 }; > >>>> + > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 configurations { > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 default =3D "conf-1"; > >>>> + > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 conf-1 { > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 descripti= on =3D "k3-am642-evm"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 firmware = =3D "atf"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 loadables= =3D "tee", "dm", "spl"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 fdt =3D "= fdt-1"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 }; > >>>> + > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 conf-2 { > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 descripti= on =3D "k3-am642-sk"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 firmware = =3D "atf"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 loadables= =3D "tee", "dm", "spl"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 fdt =3D "= fdt-2"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 }; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 }; > >>>> +=A0=A0=A0=A0=A0=A0=A0 }; > >>>> +=A0=A0=A0 }; > >>>> +}; > >>>> + > >>>> +&binman { > >>>> +=A0=A0=A0 u-boot { > >>>> +=A0=A0=A0=A0=A0=A0=A0 filename =3D UBOOT_IMG; > >>>> +=A0=A0=A0=A0=A0=A0=A0 pad-byte =3D <0xff>; > >>>> + > >>>> +=A0=A0=A0=A0=A0=A0=A0 fit { > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 description =3D "FIT image with m= ultiple configurations"; > >>>> + > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 images { > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 uboot { > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 descripti= on =3D "U-Boot for am64x board"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 type =3D = "firmware"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 os =3D "u= -boot"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 arch =3D = "arm"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 compressi= on =3D "none"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 load =3D = ; > >>>> +#ifdef CONFIG_TI_SECURE_DEVICE > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 ti-secure= { > >>>> +#else > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 blob { > >>>> +#endif > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0= =A0 filename =3D UBOOT_NODTB; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 }; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 hash { > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0= =A0 algo =3D "crc32"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 }; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 }; > >>>> + > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 fdt-1 { > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 descripti= on =3D "k3-am642-evm"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 type =3D = "flat_dt"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 arch =3D = "arm"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 compressi= on =3D "none"; > >>>> +#ifdef CONFIG_TI_SECURE_DEVICE > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 ti-secure= { > >>>> +#else > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 blob { > >>>> +#endif > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0= =A0 filename =3D AM642_EVM_DTB; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 }; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 hash { > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0= =A0 algo =3D "crc32"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 }; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 }; > >>>> + > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 fdt-2 { > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 descripti= on =3D "k3-am642-sk"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 type =3D = "flat_dt"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 arch =3D = "arm"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 compressi= on =3D "none"; > >>>> +#ifdef CONFIG_TI_SECURE_DEVICE > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 ti-secure= { > >>>> +#else > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 blob { > >>>> +#endif > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0= =A0 filename =3D AM642_SK_DTB; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 }; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 hash { > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0= =A0 algo =3D "crc32"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 }; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 }; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 }; > >>>> + > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 configurations { > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 default =3D "conf-1"; > >>>> + > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 conf-1 { > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 descripti= on =3D "k3-am642-evm"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 firmware = =3D "uboot"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 loadables= =3D "uboot"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 fdt =3D "= fdt-1"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 }; > >>>> + > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 conf-2 { > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 descripti= on =3D "k3-am642-sk"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 firmware = =3D "uboot"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 loadables= =3D "uboot"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 fdt =3D "= fdt-2"; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 }; > >>>> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 }; > >>>> +=A0=A0=A0=A0=A0=A0=A0 }; > >>>> +=A0=A0=A0 }; > >>>> +}; > >>>> +#endif > >>>> diff --git a/arch/arm/dts/k3-am642-evm-u-boot.dtsi b/arch/arm/dts/k3= -am642-evm-u-boot.dtsi > >>>> index 03688a51a3..db0a529f0f 100644 > >>>> --- a/arch/arm/dts/k3-am642-evm-u-boot.dtsi > >>>> +++ b/arch/arm/dts/k3-am642-evm-u-boot.dtsi > >>>> @@ -2,6 +2,9 @@ > >>>> =A0=A0 /* > >>>> =A0=A0=A0 * Copyright (C) 2020-2021 Texas Instruments Incorporated -= https://www.ti.com/ > >>>> =A0=A0=A0 */ > >>>> +#include > >>>> + > >>>> +#include "k3-am642-evm-binman.dtsi" > >>>> =A0=A0 =A0 / { > >>>> =A0=A0=A0=A0=A0=A0 chosen { > >>>> diff --git a/arch/arm/mach-k3/Kconfig b/arch/arm/mach-k3/Kconfig > >>>> index a01bf23514..a4c561254d 100644 > >>>> --- a/arch/arm/mach-k3/Kconfig > >>>> +++ b/arch/arm/mach-k3/Kconfig > >>>> @@ -15,6 +15,7 @@ config SOC_K3_J721S2 > >>>> =A0=A0 =A0 config SOC_K3_AM642 > >>>> =A0=A0=A0=A0=A0=A0 bool "TI's K3 based AM642 SoC Family Support" > >>>> +=A0=A0=A0 select BINMAN if TARGET_AM642_A53_EVM > >>>> =A0=A0 =A0 endchoice > >>>> =A0=A0 diff --git a/arch/arm/mach-k3/config.mk b/arch/arm/mach-k3/co= nfig.mk > >>>> index da458bcfb2..d2c490818a 100644 > >>>> --- a/arch/arm/mach-k3/config.mk > >>>> +++ b/arch/arm/mach-k3/config.mk > >>>> @@ -47,6 +47,7 @@ tiboot3.bin: image_check FORCE > >>>> =A0=A0 INPUTS-y=A0=A0=A0 +=3D tiboot3.bin > >>>> =A0=A0 endif > >>>> =A0=A0 +ifndef CONFIG_BINMAN > >>>> =A0=A0 ifdef CONFIG_ARM64 > >>>> =A0=A0 =A0 ifeq ($(CONFIG_SOC_K3_J721E),) > >>>> @@ -77,9 +78,11 @@ cmd_k3_mkits =3D \ > >>>> =A0=A0 $(SPL_ITS): FORCE > >>>> =A0=A0=A0=A0=A0=A0 $(call cmd,k3_mkits) > >>>> =A0=A0 endif > >>>> +endif > >>>> =A0=A0 =A0 else > >>>> =A0=A0 +ifndef CONFIG_BINMAN > >>>> =A0=A0 ifeq ($(CONFIG_TI_SECURE_DEVICE),y) > >>>> =A0=A0 INPUTS-y=A0=A0=A0 +=3D u-boot.img_HS > >>>> =A0=A0 else > >>>> @@ -87,4 +90,8 @@ INPUTS-y=A0=A0=A0 +=3D u-boot.img > >>>> =A0=A0 endif > >>>> =A0=A0 endif > >>>> =A0=A0 +endif > >>>> + > >>>> +ifndef CONFIG_BINMAN > >>>> =A0=A0 include $(srctree)/arch/arm/mach-k3/config_secure.mk > >>>> +endif --=20 Tom --x/TyKPcLwmKZr+b7 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAABCgAdFiEEGjx/cOCPqxcHgJu/FHw5/5Y0tywFAmKPi4AACgkQFHw5/5Y0 tyy/SAv/dvq1vRyVdp+z/RLCR662nHjy5KiTEm49HwWlSV6D2/94Ds4zZDzXwptY 0qkuXveNUsHiK41RAwCCxuZd5lBM+VXdC/8iLHfYY9be4jdHt1zl+iZ6Na+/X9kB DX2kl9ZOrrL0MvAOjuLl0k9EgiL3SsZFToU2NAbZeN47sJ9WPAJomJOq9/oLkXYd JjM1jqn13mfDIHW8xkOl5p9Sa5Fi+Xx9GN2fVkixoWg0SY6cPDGlxejK+W/CYu2+ /jp7OiVy9a+g8ZsKnTpuluZBgkZ2XpUOBHew5K7W+fVAkmEM+1EjLYW4rk3IVyZc w9yOE+KxumO7vxy+w3OFc8JiZ/a2TPH+QdMz1fqTLN3zWmmxi02/wVGqzAySlfqN ia4yFlgxeCNC/FBGXwJyxAzJgniAVshAiA3Bfcd6H+qbv5DZWo9h/SYHT1j7F9n8 9ukloS2O6JVb1U4yyiyiF+pkPHcgUNMNNhcXNrowkEWbXVfK8UZVYZoa76LXbIKf NwJ1lWAr =MDGP -----END PGP SIGNATURE----- --x/TyKPcLwmKZr+b7--