Re: [ptxdist] [PATCH 2/2] optee: make version configurable

[Ahmad Fatoum <a.fatoum@pengutronix.de>]

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 <a.fatoum@pengutronix.de>
>> ---
>>  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 |