commit 5a703c8d581f46012a35d8ac8d42b1e60d7a16d0
author Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no> Tue Nov 05 10:24:08 2019 +0100
committer Anas Nashif <anas.nashif@intel.com> Tue Dec 17 13:05:36 2019 -0500
tree 36929718075942bc00580c3dd9fd1cbc790eaf39
parent feac5c1c458eed9fc33a0ee055450caf02c13699

cmake: use zephyr_library_app_memory for mem partition placement

This commit removes the hard coded mbed TLS library name
`lib..__modules__crypto__mbedtls.a` in top-level CMakeLists.txt file
and instead uses zephyr_library_app_memory function.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 167c885..d7301b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1061,9 +1061,6 @@
   if(CONFIG_NEWLIB_LIBC_NANO)
     set(NEWLIB_PART -l libc_nano.a z_libc_partition)
   endif()
-  if(CONFIG_MBEDTLS)
-    set(MBEDTLS_PART -l lib..__modules__crypto__mbedtls.a k_mbedtls_partition)
-  endif()
 
   add_custom_command(
     OUTPUT ${APP_SMEM_UNALIGNED_LD}
@@ -1071,7 +1068,7 @@
     ${ZEPHYR_BASE}/scripts/gen_app_partitions.py
     -d ${OBJ_FILE_DIR}
     -o ${APP_SMEM_UNALIGNED_LD}
-    ${NEWLIB_PART} ${MBEDTLS_PART}
+    ${NEWLIB_PART}
     $<TARGET_PROPERTY:zephyr_property_target,COMPILE_OPTIONS>
     $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
     DEPENDS
@@ -1122,7 +1119,7 @@
     ${ZEPHYR_BASE}/scripts/gen_app_partitions.py
     -e $<TARGET_FILE:app_smem_unaligned_prebuilt>
     -o ${APP_SMEM_ALIGNED_LD}
-    ${NEWLIB_PART} ${MBEDTLS_PART}
+    ${NEWLIB_PART}
     $<TARGET_PROPERTY:zephyr_property_target,COMPILE_OPTIONS>
     $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
     DEPENDS

west.yml

diff --git a/west.yml b/west.yml
index a14e7b8..3c967d0 100644
--- a/west.yml
+++ b/west.yml
@@ -71,7 +71,7 @@
       revision: 74fc2e753a997bd71cefa34dd9c56dcb954b42e2
       path: modules/lib/gui/lvgl
     - name: mbedtls
-      revision: 4f1e8f5a78dc08aa42a47cc1ad059cce558c26c3
+      revision: 3776c158fe138a72c97c187e4d31c81c37884be9
       path: modules/crypto/mbedtls
     - name: mcuboot
       revision: c2bd757332bfde11c27019f937b0c61d5e9b9fd9