Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-27 15:24:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(rpi3): move mbedtls helper to common code

Browse source 
In order to support measured boot we need plat_get_mbedtls_heap,
this function currently resides in rpi3_trusted_boot.c, but we do
not need trusted board boot to use measured boot, so moving this
to common code removes the need to compile rpi3_trusted_boot.c

Change-Id: I6ac6dfa8c540e456d7cb6932098c921907ad086a
Signed-off-by: Tushar Khandelwal <tushar.khandelwal@arm.com>
Signed-off-by: Abhi Singh <abhi.singh@arm.com>
This commit is contained in:
Abhi Singh 2024-11-05 11:19:34 -06:00 • committed by Abhi Singh
parent 5c0cbb2faa
commit 1c8009035e
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plat/rpi/common/rpi3_common.c
View file

@ -14,6 +14,7 @@
#include <bl31/interrupt_mgmt.h> #include <bl31/interrupt_mgmt.h>
#include <drivers/console.h> #include <drivers/console.h>
#include <lib/xlat_tables/xlat_tables_v2.h> #include <lib/xlat_tables/xlat_tables_v2.h>
#include <plat/common/platform.h>
#include <rpi_hw.h> #include <rpi_hw.h>
#include <rpi_shared.h> #include <rpi_shared.h>
@ -225,3 +226,10 @@ uint32_t plat_interrupt_type_to_line(uint32_t type, uint32_t security_state)
/* Secure interrupts are signalled on the FIQ line always. */ /* Secure interrupts are signalled on the FIQ line always. */
return __builtin_ctz(SCR_FIQ_BIT); return __builtin_ctz(SCR_FIQ_BIT);
} }
#if MEASURED_BOOT || TRUSTED_BOARD_BOOT
int plat_get_mbedtls_heap(void **heap_addr, size_t *heap_size)
{
return get_mbedtls_heap_helper(heap_addr, heap_size);
}
#endif

7
plat/rpi/common/rpi3_trusted_boot.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017-2019, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2017-2024, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -29,8 +29,3 @@ int plat_set_nv_ctr(void *cookie, unsigned int nv_ctr)
{ {
return 1; return 1;
} }
int plat_get_mbedtls_heap(void **heap_addr, size_t *heap_size)
{
return get_mbedtls_heap_helper(heap_addr, heap_size);
}