Updated examples/trustzone

Author: felipe-iar

examples/trustzone/CMakeLists.txt

@@ -1,11 +1,8 @@
-cmake_minimum_required(VERSION 3.20)
+# See: https://cmake.org/cmake/help/latest/prop_sf/GENERATED.html
+cmake_minimum_required(VERSION 3.30)
 
 project(TrustZone LANGUAGES C)
 
 add_subdirectory(secure)
 add_subdirectory(non-secure)
 
-# TODO 1: Add `secure-import-lib` as a dependency for `non-secure`
-add_custom_target()
-add_dependencies()
-

examples/trustzone/non-secure/CMakeLists.txt

@@ -1,20 +1,27 @@
 add_executable(non-secure)
 
-target_sources(non-secure PRIVATE non-secure-hello.c)
+# TODO 5: Add `secure-import-lib` as a dependency for `non-secure`
 
+
+target_sources(non-secure PRIVATE
+  non-secure-hello.c
+)
 target_compile_options(non-secure PRIVATE
   --cpu=$<TARGET_PROPERTY:secure,CPU>
   --no_wrap_diagnostics
 )
 
 target_include_directories(non-secure PRIVATE
-  # TODO 4: Make use of the `secure` include directories
+  # TODO 6: Make use of the `secure` include directories
+
 )
 
 target_link_options(non-secure PRIVATE
   --cpu=$<TARGET_PROPERTY:secure,CPU>
   --config ${CMAKE_CURRENT_SOURCE_DIR}/v2m-mps2_ns.icf
   --semihosting
-  # TODO 5: Link against the import library generated from the `secure` target
-  # TODO 6: Specify "no entry point" for the `non-secure` target
+  # TODO 7a: Add the generated import library to the `non-secure` target
+
+  # TODO 7b: Specify "no entry point" for the `non-secure` target
+
 )

examples/trustzone/secure/CMakeLists.txt

@@ -3,12 +3,13 @@ add_executable(secure)
 target_sources(secure PRIVATE secure-hello.c)
 
 set_target_properties(secure PROPERTIES
-  CPU    cortex-m33
+  CPU cortex-m33
 )
 
 target_compile_options(secure PRIVATE
   --cpu=$<TARGET_PROPERTY:CPU> 
-# TODO 2: Enable the CMSE in the compiler flags
+  # TODO 1: Enable the CMSE in the compiler flags
+
 )
 
 target_include_directories(secure PUBLIC
@@ -19,5 +20,20 @@ target_link_options(secure PRIVATE
   --semihosting
   --cpu=$<TARGET_PROPERTY:CPU>
   --config ${CMAKE_CURRENT_SOURCE_DIR}/v2m-mps2_s.icf
-# TODO 3: Set the linker to produce an import library, consumed by the `non-secure` target
+  # TODO 2: Set the linker to produce an import library object file
+
 )
+
+# TODO 3: Add a custom target for explicitly marking the secure import library as `GENERATED`
+#         (required for Ninja targets)
+
+
+
+
+
+
+# TODO 4: Include the secure import library in the generator's clean target
+#         (clean with: cmake --build build --target clean)
+
+
+