From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 01 Dec 2023 15:42:16 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1r94id-00G7W3-2m for lore@lore.pengutronix.de; Fri, 01 Dec 2023 15:42:16 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1r94ie-00074g-5O; Fri, 01 Dec 2023 15:42:16 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1r94iV-00073d-SH; Fri, 01 Dec 2023 15:42:07 +0100 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1r94iV-00CsJ9-Ft; Fri, 01 Dec 2023 15:42:07 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1r94iV-00CXEp-1S; Fri, 01 Dec 2023 15:42:07 +0100 Date: Fri, 1 Dec 2023 15:42:07 +0100 From: Michael Olbrich To: Ahmad Fatoum Message-ID: Mail-Followup-To: Ahmad Fatoum , ptxdist@pengutronix.de References: <20231122190525.2114139-1-a.fatoum@pengutronix.de> <20231122190525.2114139-2-a.fatoum@pengutronix.de> <20d794f3-cd50-8afb-174e-6e75968ccea5@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20d794f3-cd50-8afb-174e-6e75968ccea5@pengutronix.de> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain Subject: Re: [ptxdist] [PATCH 2/2] optee: make version configurable X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: ptxdist@pengutronix.de Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false On Mon, Nov 27, 2023 at 05:41:34PM +0100, Ahmad Fatoum wrote: > On 27.11.23 17:35, Michael Olbrich wrote: > > On Wed, Nov 22, 2023 at 08:05:25PM +0100, Ahmad Fatoum wrote: > >> Other bootloaders and firmware already have Kconfig-able version, so add > >> these options to optee as well. > > > > What about the optee-* packages. They seem to have the same version. I'm > > pretty sure they should be updated together, so they should probably share > > the version but have an _MD5 option each. > > It doesn't really hurt if they are older than OP-TEE itself. They should > remain compatible. Is it possible for them to share a version (across > platformconfig/ptxconfig), but still have their own MD5..? > > I'd prefer just to change optee itself though. So the API is guaranteed to be backwards and forward compatible? That seems unlikely. And it's a maintenance problem. If you can just configure the optee version the config then the other packages are never touched at all or I'll have to do blind updates myself because I have no easy way to test it. Michael > >> Signed-off-by: Ahmad Fatoum > >> --- > >> platforms/optee.in | 8 ++++++++ > >> rules/optee.make | 4 ++-- > >> 2 files changed, 10 insertions(+), 2 deletions(-) > >> > >> diff --git a/platforms/optee.in b/platforms/optee.in > >> index 371f5b237ffa..81f8a08b13aa 100644 > >> --- a/platforms/optee.in > >> +++ b/platforms/optee.in > >> @@ -19,6 +19,14 @@ menuconfig OPTEE > >> > >> if OPTEE > >> > >> +config OPTEE_VERSION > >> + string "OP-TEE Version" > >> + default "3.20.0" > >> + > >> +config OPTEE_MD5 > >> + string "OP-TEE Source MD5" > >> + default "4ffc0d561f9db90180575992beac5a9d" > >> + > >> config OPTEE_PLATFORM > >> string > >> prompt "OP-TEE Platform" > >> diff --git a/rules/optee.make b/rules/optee.make > >> index a3735dc0f605..d246a6922099 100644 > >> --- a/rules/optee.make > >> +++ b/rules/optee.make > >> @@ -16,8 +16,8 @@ endif > >> # > >> # Paths and names > >> # > >> -OPTEE_VERSION := 3.20.0 > >> -OPTEE_MD5 := 4ffc0d561f9db90180575992beac5a9d > >> +OPTEE_VERSION := $(call ptx/config-version, PTXCONF_OPTEE) > >> +OPTEE_MD5 := $(call ptx/config-md5, PTXCONF_OPTEE) > >> OPTEE := optee-$(OPTEE_VERSION) > >> OPTEE_SUFFIX := tar.gz > >> OPTEE_URL := https://github.com/OP-TEE/optee_os/archive/$(OPTEE_VERSION).$(OPTEE_SUFFIX) > >> -- > >> 2.39.2 > >> > >> > >> > > > > -- > Pengutronix e.K. | | > Steuerwalder Str. 21 | http://www.pengutronix.de/ | > 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |