mbox series

[0/1] arm-bsp/trusted-firmware-a: Fix BL32 path if usrmerge enabled

Message ID 20230925155140.133001-1-adam.johnston@arm.com
Headers show
Series arm-bsp/trusted-firmware-a: Fix BL32 path if usrmerge enabled | expand

Message

Adam Johnston Sept. 25, 2023, 3:51 p.m. UTC
From: Adam Johnston <adam.johnston@arm.com>

The optee recipe installs the tee image using `${nonarch_base_libdir}`
If usrmerge is enabled this is `/usr/lib`, otherwise it is `/lib`

Several platforms (corstone1000, n1sdp, tc) look for tee-pager_v2.bin in
the hard-coded `/lib/firmware`, hence if usrmerge is enabled it won't be
found.

Fix these platforms by using `${nonarch_base_libdir}` instead of `/lib`
as per the qemu platform code in the generic recipe.

Adam Johnston (1):
  arm-bsp/trusted-firmware-a: Fix BL32 binary path if `usrmerge` enabled

 .../trusted-firmware-a/trusted-firmware-a-corstone1000.inc      | 2 +-
 .../recipes-bsp/trusted-firmware-a/trusted-firmware-a-n1sdp.inc | 2 +-
 .../recipes-bsp/trusted-firmware-a/trusted-firmware-a-tc.inc    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Comments

Jon Mason Sept. 26, 2023, 1:34 a.m. UTC | #1
On Mon, 25 Sep 2023 16:51:39 +0100, adam.johnston@arm.com wrote:
> From: Adam Johnston <adam.johnston@arm.com>
> 
> The optee recipe installs the tee image using `${nonarch_base_libdir}`
> If usrmerge is enabled this is `/usr/lib`, otherwise it is `/lib`
> 
> Several platforms (corstone1000, n1sdp, tc) look for tee-pager_v2.bin in
> the hard-coded `/lib/firmware`, hence if usrmerge is enabled it won't be
> found.
> 
> [...]

Applied, thanks!

[1/1] arm-bsp/trusted-firmware-a: Fix BL32 path if usrmerge enabled
      commit: be9bbaa16ed0d60490fb8f915fc48e40d14478a5

Best regards,