diff --git a/TESTS/mbed_hal/spm/fault_functions.h b/TESTS/mbed_hal/spm/fault_functions.h
index 9346bd1b0c..79029b536f 100644
--- a/TESTS/mbed_hal/spm/fault_functions.h
+++ b/TESTS/mbed_hal/spm/fault_functions.h
@@ -1,5 +1,6 @@
-/* mbed Microcontroller Library
- * Copyright (c) 2017 ARM Limited
+/* Copyright (c) 2017-2018 ARM Limited
+ *
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/spm/main.cpp b/TESTS/mbed_hal/spm/main.cpp
index 09e6266c5d..f040e7360f 100644
--- a/TESTS/mbed_hal/spm/main.cpp
+++ b/TESTS/mbed_hal/spm/main.cpp
@@ -1,5 +1,6 @@
-/* mbed Microcontroller Library
- * Copyright (c) 2017 ARM Limited
+/* Copyright (c) 2017-2018 ARM Limited
+ *
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/psa/spm_smoke/COMPONENT_SPE/partition1.c b/TESTS/psa/spm_smoke/COMPONENT_SPE/partition1.c
index bfae1aee1f..9cd19d6a1b 100644
--- a/TESTS/psa/spm_smoke/COMPONENT_SPE/partition1.c
+++ b/TESTS/psa/spm_smoke/COMPONENT_SPE/partition1.c
@@ -1,3 +1,20 @@
+/* Copyright (c) 2017-2018 ARM Limited
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 // -------------------------------------- Includes -----------------------------------
 
 #include <string.h>
diff --git a/components/TARGET_PSA/spm/COMPONENT_SPE/handles_manager.h b/components/TARGET_PSA/spm/COMPONENT_SPE/handles_manager.h
index 611c5cc1c1..8a1b7337ba 100644
--- a/components/TARGET_PSA/spm/COMPONENT_SPE/handles_manager.h
+++ b/components/TARGET_PSA/spm/COMPONENT_SPE/handles_manager.h
@@ -112,14 +112,14 @@ handles_pool
 
 /*
  * @brief create unique handle identifier
- * 
+ *
  * This function generates a unique handle identifier, and "couples" it with the received handle memory.
  * If there is no vacant space for the new handle, the function fails.
- * 
+ *
  * @note This function is expected to pass since it is always coupled with memory pool allocation of the same size.
  *       In case memory pool allocation fails, this function should not be called.
  *       This function will panic on non vacant space use case.
- * 
+ *
  * @param[in] handle_mgr   A pointer to the handle manager object
  * @param[in] handle_mem   A pointer to a pre-allocated handle memory to get a handle identifier for
  * @param[in] friend_pid   The partition id which is allowed to get_mem() and destroy() in addition to the handle owner.
@@ -131,7 +131,7 @@ psa_handle_t psa_hndl_mgr_handle_create(psa_handle_manager_t *handle_mgr, void *
 
 /*
  * @brief remove a handle from the handle manager.
- * 
+ *
  * @param handle_mgr   A pointer to the handle manager object
  * @param handle       The handle to be removed
  */
@@ -140,12 +140,12 @@ void psa_hndl_mgr_handle_destroy(psa_handle_manager_t *handle_mgr, psa_handle_t
 
 /*
  * @brief dereference handle
- * 
+ *
  * This function retrieves the pointer associated with the input <handle>.
- *  
+ *
  * @note  This function will panic in case caller not allowed to dereference the memory
  *         or handler does not correspond to a valid existing handle
- * 
+ *
  * @param handle_mgr   A pointer to the handle manager object.
  * @param handle       The handle for which we request the corresponding memory handle.
  * @return void*       A pointer to the memory corresponding to the handle.
diff --git a/hal/spm_api.h b/hal/spm_api.h
index da386278b5..e1c6afc947 100644
--- a/hal/spm_api.h
+++ b/hal/spm_api.h
@@ -1,4 +1,6 @@
-/* Copyright (c) 2018 ARM Limited
+/* Copyright (c) 2017-2018 ARM Limited
+ *
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tools/settings.py b/tools/settings.py
index c8ca8e504c..ba5d9ea16f 100644
--- a/tools/settings.py
+++ b/tools/settings.py
@@ -27,6 +27,8 @@ ROOT = abspath(join(dirname(__file__), ".."))
 ##############################################################################
 BUILD_DIR = abspath(join(ROOT, "BUILD"))
 
+# Default directory for dual-core and v8 targets
+# delivering secure binaries across builds
 DELIVERY_DIR = abspath(join(ROOT, "DELIVERY"))
 
 # ARM Compiler 5
diff --git a/tools/test/spm/test_data.py b/tools/test/spm/test_data.py
index 0374ab65a6..1c94b44a12 100644
--- a/tools/test/spm/test_data.py
+++ b/tools/test/spm/test_data.py
@@ -1,3 +1,19 @@
+# Copyright (c) 2017-2018 ARM Limited
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 manifests = [
     {
         'name': 'TEST_PARTITION',
diff --git a/tools/test/spm/test_generate_partition_code.py b/tools/test/spm/test_generate_partition_code.py
index 0d73ad0983..7726e3a84f 100644
--- a/tools/test/spm/test_generate_partition_code.py
+++ b/tools/test/spm/test_generate_partition_code.py
@@ -1,3 +1,19 @@
+# Copyright (c) 2017-2018 ARM Limited
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 import filecmp
 import re
 import shutil