commit de3e1215af7deb3fbc0da70dba5b4a71aced358b
author Bence Balogh <bence.balogh@arm.com> Fri Jul 07 13:07:38 2023 +0200
committer David Hu <david.hu@arm.com> Thu Jul 13 05:11:29 2023 +0200
tree d030e285cb4ee36000f61d056014bb779e15938b
parent a557fb214f9b21d1ced040ce00a94b55366673a6

cmake: Install the bl2's secure signing key

The secure key was not installed in case of
PLATFORM_DEFAULT_IMAGE_SIGNING because of
an unaligned endif() statement.

Change-Id: Id35cb029e4f3582adb5bff0ec6f2b7cfac7403c9
Signed-off-by: Bence Balogh <bence.balogh@arm.com>

cmake/install.cmake

diff --git a/cmake/install.cmake b/cmake/install.cmake
index ac42715..064fc5b 100644
--- a/cmake/install.cmake
+++ b/cmake/install.cmake
@@ -180,17 +180,14 @@
     if (PLATFORM_DEFAULT_IMAGE_SIGNING)
         install(FILES $<TARGET_OBJECTS:signing_layout_s>
             DESTINATION ${INSTALL_IMAGE_SIGNING_DIR}/layout_files)
-
+        install(FILES ${MCUBOOT_KEY_S}
+            DESTINATION ${INSTALL_IMAGE_SIGNING_DIR}/keys)
         if(MCUBOOT_IMAGE_NUMBER GREATER 1)
             install(FILES $<TARGET_OBJECTS:signing_layout_ns>
                     DESTINATION ${INSTALL_IMAGE_SIGNING_DIR}/layout_files)
-    endif()
-
-        install(FILES ${MCUBOOT_KEY_NS}
-                DESTINATION ${INSTALL_IMAGE_SIGNING_DIR}/keys)
-    else()
-        install(FILES ${MCUBOOT_KEY_S}
-                DESTINATION ${INSTALL_IMAGE_SIGNING_DIR}/keys)
+            install(FILES ${MCUBOOT_KEY_NS}
+                    DESTINATION ${INSTALL_IMAGE_SIGNING_DIR}/keys)
+        endif()
     endif()
 endif()