Browse Source

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
pull/1993/merge
Manish Pandey 1 year ago
committed by TrustedFirmware Code Review
parent
commit
17e0a8c5db
  1. 2
      docs/about/release-information.rst
  2. 2
      plat/st/stm32mp1/platform.mk

2
docs/about/release-information.rst

@ -69,7 +69,7 @@ after which it will be removed.
| | Date | after | | | | Date | after | |
| | | Release | | | | | 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 Removal of Deprecated Drivers

2
plat/st/stm32mp1/platform.mk

@ -62,7 +62,7 @@ STM32_HEADER_VERSION_MAJOR:= 1
STM32_HEADER_VERSION_MINOR:= 0 STM32_HEADER_VERSION_MINOR:= 0
# Add OP-TEE reserved shared memory area in mapping # 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)) $(eval $(call add_defines,STM32MP15_OPTEE_RSV_SHM))
STM32MP_CRYPTO_ROM_LIB := 1 STM32MP_CRYPTO_ROM_LIB := 1

Loading…
Cancel
Save