[kirkstone][meta-arm][PATCH] optee.inc: update setting for OPTEE_ARCH

[kirkstone][meta-arm][PATCH] optee.inc: update setting for OPTEE_ARCH

[changqing.li]

From: Changqing Li <changqing.li@windriver.com>

lib32-optee-os do_compile failed since OPTEE_ARCH is not set correctly.
In file included from lib/libutee/include/link.h:9,
                 from lib/libutee/arch/arm/tcb.c:37:
lib/libutee/include/elf.h:67:2: error: #error Unknown architecture
   67 | #error Unknown architecture
      |  ^~~~~
In file included from lib/libutee/arch/arm/tcb.c:37:
lib/libutee/include/link.h:13:9: error: unknown type name 'Elf_Addr'
   13 |         Elf_Addr dlpi_addr;                     /* module relocation base */

Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
 meta-arm/recipes-security/optee/optee.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-arm/recipes-security/optee/optee.inc b/meta-arm/recipes-security/optee/optee.inc
index beae366..2ad7c95 100644
--- a/meta-arm/recipes-security/optee/optee.inc
+++ b/meta-arm/recipes-security/optee/optee.inc
@@ -9,7 +9,7 @@ OPTEEMACHINE ?= "${MACHINE}"
 OPTEEMACHINE:aarch64:qemuall ?= "vexpress-qemu_armv8a"
 
 OPTEE_ARCH = "null"
-OPTEE_ARCH:armv7a = "arm32"
+OPTEE_ARCH:arm = "arm32"
 OPTEE_ARCH:aarch64 = "arm64"
 OPTEE_CORE = "${@d.getVar('OPTEE_ARCH').upper()}"
 
-- 
2.25.1

Re: [kirkstone][meta-arm][PATCH] optee.inc: update setting for OPTEE_ARCH

[Jon Mason]

Is this needed on the master branch as well?

Thanks,
Jon

On Tue, Aug 02, 2022 at 02:28:07PM +0800, changqing.li@windriver.com wrote:
> From: Changqing Li <changqing.li@windriver.com>
> 
> lib32-optee-os do_compile failed since OPTEE_ARCH is not set correctly.
> In file included from lib/libutee/include/link.h:9,
>                  from lib/libutee/arch/arm/tcb.c:37:
> lib/libutee/include/elf.h:67:2: error: #error Unknown architecture
>    67 | #error Unknown architecture
>       |  ^~~~~
> In file included from lib/libutee/arch/arm/tcb.c:37:
> lib/libutee/include/link.h:13:9: error: unknown type name 'Elf_Addr'
>    13 |         Elf_Addr dlpi_addr;                     /* module relocation base */
> 
> Signed-off-by: Changqing Li <changqing.li@windriver.com>
> ---
>  meta-arm/recipes-security/optee/optee.inc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta-arm/recipes-security/optee/optee.inc b/meta-arm/recipes-security/optee/optee.inc
> index beae366..2ad7c95 100644
> --- a/meta-arm/recipes-security/optee/optee.inc
> +++ b/meta-arm/recipes-security/optee/optee.inc
> @@ -9,7 +9,7 @@ OPTEEMACHINE ?= "${MACHINE}"
>  OPTEEMACHINE:aarch64:qemuall ?= "vexpress-qemu_armv8a"
>  
>  OPTEE_ARCH = "null"
> -OPTEE_ARCH:armv7a = "arm32"
> +OPTEE_ARCH:arm = "arm32"
>  OPTEE_ARCH:aarch64 = "arm64"
>  OPTEE_CORE = "${@d.getVar('OPTEE_ARCH').upper()}"
>  
> -- 
> 2.25.1
> 
> 

Re: [kirkstone][meta-arm][PATCH] optee.inc: update setting for OPTEE_ARCH

[Changqing Li]

On 8/4/22 04:20, Jon Mason wrote:
> [Please note: This e-mail is from an EXTERNAL e-mail address]
>
> Is this needed on the master branch as well?

No,  master already have this fix.

Regards

Changqing

>
> Thanks,
> Jon
>
> On Tue, Aug 02, 2022 at 02:28:07PM +0800, changqing.li@windriver.com wrote:
>> From: Changqing Li <changqing.li@windriver.com>
>>
>> lib32-optee-os do_compile failed since OPTEE_ARCH is not set correctly.
>> In file included from lib/libutee/include/link.h:9,
>>                   from lib/libutee/arch/arm/tcb.c:37:
>> lib/libutee/include/elf.h:67:2: error: #error Unknown architecture
>>     67 | #error Unknown architecture
>>        |  ^~~~~
>> In file included from lib/libutee/arch/arm/tcb.c:37:
>> lib/libutee/include/link.h:13:9: error: unknown type name 'Elf_Addr'
>>     13 |         Elf_Addr dlpi_addr;                     /* module relocation base */
>>
>> Signed-off-by: Changqing Li <changqing.li@windriver.com>
>> ---
>>   meta-arm/recipes-security/optee/optee.inc | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta-arm/recipes-security/optee/optee.inc b/meta-arm/recipes-security/optee/optee.inc
>> index beae366..2ad7c95 100644
>> --- a/meta-arm/recipes-security/optee/optee.inc
>> +++ b/meta-arm/recipes-security/optee/optee.inc
>> @@ -9,7 +9,7 @@ OPTEEMACHINE ?= "${MACHINE}"
>>   OPTEEMACHINE:aarch64:qemuall ?= "vexpress-qemu_armv8a"
>>
>>   OPTEE_ARCH = "null"
>> -OPTEE_ARCH:armv7a = "arm32"
>> +OPTEE_ARCH:arm = "arm32"
>>   OPTEE_ARCH:aarch64 = "arm64"
>>   OPTEE_CORE = "${@d.getVar('OPTEE_ARCH').upper()}"
>>
>> --
>> 2.25.1
>>
>>

Re: [kirkstone][meta-arm][PATCH] optee.inc: update setting for OPTEE_ARCH

[Jon Mason]

On Tue, 2 Aug 2022 14:28:07 +0800, changqing.li@windriver.com wrote:
> lib32-optee-os do_compile failed since OPTEE_ARCH is not set correctly.
> In file included from lib/libutee/include/link.h:9,
>                  from lib/libutee/arch/arm/tcb.c:37:
> lib/libutee/include/elf.h:67:2: error: #error Unknown architecture
>    67 | #error Unknown architecture
>       |  ^~~~~
> In file included from lib/libutee/arch/arm/tcb.c:37:
> lib/libutee/include/link.h:13:9: error: unknown type name 'Elf_Addr'
>    13 |         Elf_Addr dlpi_addr;                     /* module relocation base */

Applied, thanks!

[1/1] optee.inc: update setting for OPTEE_ARCH
      commit: 653754d7913a566b16773b8a4925d4ae96456077

Best regards,
-- 
Jon Mason <jon.mason@arm.com>