mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-04-16 01:24:27 +00:00
Merge changes from topic "st_remove_shm" into integration
* changes: docs(stm32mp15): mark STM32MP15_OPTEE_RSV_SHM deprecated feat(stm32mp15): disable OP-TEE shared memory
This commit is contained in:
commit
17e0a8c5db
2 changed files with 2 additions and 2 deletions
|
@ -69,7 +69,7 @@ after which it will be removed.
|
|||
| | Date | after | |
|
||||
| | | Release | |
|
||||
+================================+=============+=========+=========================================================+
|
||||
| None at this time | | | |
|
||||
| STM32MP15_OPTEE_RSV_SHM | 2.10 | 3.0 | OP-TEE manages its own memory on STM32MP15 |
|
||||
+--------------------------------+-------------+---------+---------------------------------------------------------+
|
||||
|
||||
Removal of Deprecated Drivers
|
||||
|
|
|
@ -62,7 +62,7 @@ STM32_HEADER_VERSION_MAJOR:= 1
|
|||
STM32_HEADER_VERSION_MINOR:= 0
|
||||
|
||||
# Add OP-TEE reserved shared memory area in mapping
|
||||
STM32MP15_OPTEE_RSV_SHM := 1
|
||||
STM32MP15_OPTEE_RSV_SHM := 0
|
||||
$(eval $(call add_defines,STM32MP15_OPTEE_RSV_SHM))
|
||||
|
||||
STM32MP_CRYPTO_ROM_LIB := 1
|
||||
|
|
Loading…
Add table
Reference in a new issue