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

Merge changes from topic "dtpm_poc" into integration

Browse source 
* changes:
  refactor(rpi3): move mbedtls helper to common code
  fix(rpi3): use correct name for include guards
This commit is contained in:
Manish V Badarkhe 2024-11-28 10:36:28 +01:00 • committed by TrustedFirmware Code Review
commit 87e9ee87ed
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plat/rpi/common/include/rpi_shared.h
View file

@ -52,4 +52,4 @@ int plat_rpi_get_model(void);
void plat_rpi_bl31_custom_setup(void); void plat_rpi_bl31_custom_setup(void);
#endif /* RPI3_PRIVATE_H */ #endif /* RPI3_SHARED_H */

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);
}