From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 27 Nov 2023 17:41:42 +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 1r7eg1-00B89n-1o for lore@lore.pengutronix.de; Mon, 27 Nov 2023 17:41:42 +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 1r7eg1-0006EU-OO; Mon, 27 Nov 2023 17:41:41 +0100 Received: from ptz.office.stw.pengutronix.de ([2a0a:edc0:0:900:1d::77] helo=[127.0.0.1]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1r7efu-0006EM-93 for ptxdist@pengutronix.de; Mon, 27 Nov 2023 17:41:34 +0100 Message-ID: <20d794f3-cd50-8afb-174e-6e75968ccea5@pengutronix.de> Date: Mon, 27 Nov 2023 17:41:34 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Content-Language: en-US To: ptxdist@pengutronix.de References: <20231122190525.2114139-1-a.fatoum@pengutronix.de> <20231122190525.2114139-2-a.fatoum@pengutronix.de> From: Ahmad Fatoum In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit 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 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 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. Thanks, Ahmad > >> 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 |