Normalize license headers

- add SPDX license identifier - add missing license headers - update year in license headers
2018-11-18 20:14:05 +02:00 · 2018-11-18 20:14:05 +02:00 · 9cc017fd48
parent aea01a86f6
commit 9cc017fd48
99 changed files with 334 additions and 103 deletions
--- a/TESTS/psa/prot_internal_storage/COMPONENT_SPE/psa_setup.c
+++ b/TESTS/psa/prot_internal_storage/COMPONENT_SPE/psa_setup.c
@ -1,4 +1,6 @@
-/* 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.
--- a/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_PSA_SRV_IPC/test_pits.c
+++ b/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_PSA_SRV_IPC/test_pits.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.
+ */
+
 #include "spm_client.h"
 #include "psa_prot_internal_storage.h"
 #include "test_pits.h"
--- a/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_SPE/psa_test_its_reset_partition.c
+++ b/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_SPE/psa_test_its_reset_partition.c
@ -1,4 +1,6 @@
-/* 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.
--- a/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_SPE/psa_test_its_reset_partition.h
+++ b/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_SPE/psa_test_its_reset_partition.h
@ -1,4 +1,6 @@
-/* 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.
--- a/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_SPE/test_pits_impl.cpp
+++ b/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_SPE/test_pits_impl.cpp
@ -1,4 +1,6 @@
 /* Copyright (c) 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.
--- a/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_SPE/test_pits_reset_partition.c
+++ b/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_SPE/test_pits_reset_partition.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>
--- a/TESTS/psa/prot_internal_storage/its_reset/psa_test_its_reset_ifs.h
+++ b/TESTS/psa/prot_internal_storage/its_reset/psa_test_its_reset_ifs.h
@ -1,4 +1,6 @@
-/* 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.
--- a/TESTS/psa/spm_client/COMPONENT_NSPE/client_ipc_tests.cpp
+++ b/TESTS/psa/spm_client/COMPONENT_NSPE/client_ipc_tests.cpp
@ -1,4 +1,6 @@
-/* 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.
--- a/TESTS/psa/spm_client/COMPONENT_SPE/psa_client_tests_part1_ifs.h
+++ b/TESTS/psa/spm_client/COMPONENT_SPE/psa_client_tests_part1_ifs.h
@ -1,4 +1,6 @@
-/* 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.
--- a/TESTS/psa/spm_client/COMPONENT_SPE/psa_client_tests_part1_partition.c
+++ b/TESTS/psa/spm_client/COMPONENT_SPE/psa_client_tests_part1_partition.c
@ -1,4 +1,6 @@
-/* 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.
--- a/TESTS/psa/spm_client/COMPONENT_SPE/psa_client_tests_part1_partition.h
+++ b/TESTS/psa/spm_client/COMPONENT_SPE/psa_client_tests_part1_partition.h
@ -1,4 +1,6 @@
-/* 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.
--- a/TESTS/psa/spm_client/COMPONENT_SPE/psa_setup.c
+++ b/TESTS/psa/spm_client/COMPONENT_SPE/psa_setup.c
@ -1,4 +1,6 @@
-/* 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.
--- a/TESTS/psa/spm_client/COMPONENT_SPE/server.c
+++ b/TESTS/psa/spm_client/COMPONENT_SPE/server.c
@ -1,4 +1,6 @@
-/* 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.
--- a/TESTS/psa/spm_client/psa_client_tests_part1_ifs.h
+++ b/TESTS/psa/spm_client/psa_client_tests_part1_ifs.h
@ -1,4 +1,6 @@
-/* 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.
--- a/TESTS/psa/spm_server/COMPONENT_NSPE/main.cpp
+++ b/TESTS/psa/spm_server/COMPONENT_NSPE/main.cpp
@ -1,4 +1,6 @@
-/* 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.
--- a/TESTS/psa/spm_server/COMPONENT_SPE/partition.c
+++ b/TESTS/psa/spm_server/COMPONENT_SPE/partition.c
@ -1,4 +1,6 @@
-/* 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.
--- a/TESTS/psa/spm_server/COMPONENT_SPE/partition2.c
+++ b/TESTS/psa/spm_server/COMPONENT_SPE/partition2.c
@ -1,4 +1,6 @@
-/* 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.
--- a/TESTS/psa/spm_server/COMPONENT_SPE/psa_server_test_part1_ifs.h
+++ b/TESTS/psa/spm_server/COMPONENT_SPE/psa_server_test_part1_ifs.h
@ -1,4 +1,6 @@
-/* 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.
--- a/TESTS/psa/spm_server/COMPONENT_SPE/psa_server_test_part1_partition.c
+++ b/TESTS/psa/spm_server/COMPONENT_SPE/psa_server_test_part1_partition.c
@ -1,4 +1,6 @@
-/* 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.
--- a/TESTS/psa/spm_server/COMPONENT_SPE/psa_server_test_part1_partition.h
+++ b/TESTS/psa/spm_server/COMPONENT_SPE/psa_server_test_part1_partition.h
@ -1,4 +1,6 @@
-/* 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.
--- a/TESTS/psa/spm_server/COMPONENT_SPE/psa_server_test_part2_ifs.h
+++ b/TESTS/psa/spm_server/COMPONENT_SPE/psa_server_test_part2_ifs.h
@ -1,4 +1,6 @@
-/* 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.
--- a/TESTS/psa/spm_server/COMPONENT_SPE/psa_server_test_part2_partition.c
+++ b/TESTS/psa/spm_server/COMPONENT_SPE/psa_server_test_part2_partition.c
@ -1,4 +1,6 @@
-/* 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.
--- a/TESTS/psa/spm_server/COMPONENT_SPE/psa_server_test_part2_partition.h
+++ b/TESTS/psa/spm_server/COMPONENT_SPE/psa_server_test_part2_partition.h
@ -1,4 +1,6 @@
-/* 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.
--- a/TESTS/psa/spm_server/COMPONENT_SPE/psa_setup.c
+++ b/TESTS/psa/spm_server/COMPONENT_SPE/psa_setup.c
@ -1,4 +1,6 @@
-/* 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.
--- a/TESTS/psa/spm_server/COMPONENT_SPE/server_tests.h
+++ b/TESTS/psa/spm_server/COMPONENT_SPE/server_tests.h
@ -1,4 +1,6 @@
-/* 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.
--- a/TESTS/psa/spm_server/COMPONENT_SPE/tests.c
+++ b/TESTS/psa/spm_server/COMPONENT_SPE/tests.c
@ -1,4 +1,6 @@
-/* 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.
--- a/TESTS/psa/spm_server/psa_server_test_part1_ifs.h
+++ b/TESTS/psa/spm_server/psa_server_test_part1_ifs.h
@ -1,4 +1,6 @@
-/* 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.
--- a/TESTS/psa/spm_server/psa_server_test_part2_ifs.h
+++ b/TESTS/psa/spm_server/psa_server_test_part2_ifs.h
@ -1,4 +1,6 @@
-/* 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.
--- a/TESTS/psa/spm_server/server_tests.h
+++ b/TESTS/psa/spm_server/server_tests.h
@ -1,4 +1,6 @@
-/* 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.
--- a/TESTS/psa/spm_smoke/COMPONENT_NSPE/main.cpp
+++ b/TESTS/psa/spm_smoke/COMPONENT_NSPE/main.cpp
@ -1,4 +1,6 @@
-/* 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.
--- a/TESTS/psa/spm_smoke/COMPONENT_SPE/psa_setup.c
+++ b/TESTS/psa/spm_smoke/COMPONENT_SPE/psa_setup.c
@ -1,4 +1,6 @@
-/* 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.
--- a/TESTS/psa/spm_smoke/COMPONENT_SPE/psa_smoke_test_part1_ifs.h
+++ b/TESTS/psa/spm_smoke/COMPONENT_SPE/psa_smoke_test_part1_ifs.h
@ -1,4 +1,6 @@
-/* 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.
--- a/TESTS/psa/spm_smoke/COMPONENT_SPE/psa_smoke_test_part1_partition.c
+++ b/TESTS/psa/spm_smoke/COMPONENT_SPE/psa_smoke_test_part1_partition.c
@ -1,4 +1,6 @@
-/* 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.
--- a/TESTS/psa/spm_smoke/COMPONENT_SPE/psa_smoke_test_part1_partition.h
+++ b/TESTS/psa/spm_smoke/COMPONENT_SPE/psa_smoke_test_part1_partition.h
@ -1,4 +1,6 @@
-/* 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.
--- a/TESTS/psa/spm_smoke/psa_smoke_test_part1_ifs.h
+++ b/TESTS/psa/spm_smoke/psa_smoke_test_part1_ifs.h
@ -1,4 +1,6 @@
-/* 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.
--- a/components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_PSA_SRV_IPC/psa_prot_internal_storage.c
+++ b/components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_PSA_SRV_IPC/psa_prot_internal_storage.c
@ -1,4 +1,6 @@
 /* Copyright (c) 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.
--- a/components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_SPE/its_partition.c
+++ b/components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_SPE/its_partition.c
@ -1,4 +1,6 @@
 /* Copyright (c) 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.
--- a/components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_SPE/psa_its_partition.c
+++ b/components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_SPE/psa_its_partition.c
@ -1,4 +1,6 @@
-/* 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.
--- a/components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_SPE/psa_its_partition.h
+++ b/components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_SPE/psa_its_partition.h
@ -1,4 +1,6 @@
-/* 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.
--- a/components/TARGET_PSA/services/psa_prot_internal_storage/psa_its_ifs.h
+++ b/components/TARGET_PSA/services/psa_prot_internal_storage/psa_its_ifs.h
@ -1,4 +1,6 @@
-/* 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.
--- a/components/TARGET_PSA/spm/COMPONENT_SPE/handles_manager.c
+++ b/components/TARGET_PSA/spm/COMPONENT_SPE/handles_manager.c
@ -1,16 +1,16 @@
-/*
- * Copyright (c) 2017, ARM Limited, All Rights Reserved
+/* 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.
+ * 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
+ *     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.
+ * 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.
 */
--- a/components/TARGET_PSA/spm/COMPONENT_SPE/handles_manager.h
+++ b/components/TARGET_PSA/spm/COMPONENT_SPE/handles_manager.h
@ -1,16 +1,16 @@
-/*
- * Copyright (c) 2017, ARM Limited, All Rights Reserved
+/* 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.
+ * 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
+ *     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.
+ * 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.
 */
--- a/components/TARGET_PSA/spm/COMPONENT_SPE/psa_setup.c
+++ b/components/TARGET_PSA/spm/COMPONENT_SPE/psa_setup.c
@ -1,4 +1,6 @@
-/* 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.
--- a/components/TARGET_PSA/spm/COMPONENT_SPE/spm_client.c
+++ b/components/TARGET_PSA/spm/COMPONENT_SPE/spm_client.c
@ -1,4 +1,6 @@
-/* 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.
--- a/components/TARGET_PSA/spm/COMPONENT_SPE/spm_common.c
+++ b/components/TARGET_PSA/spm/COMPONENT_SPE/spm_common.c
@ -1,4 +1,6 @@
-/* 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.
--- a/components/TARGET_PSA/spm/COMPONENT_SPE/spm_init.c
+++ b/components/TARGET_PSA/spm/COMPONENT_SPE/spm_init.c
@ -1,4 +1,6 @@
-/* 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.
--- a/components/TARGET_PSA/spm/COMPONENT_SPE/spm_internal.h
+++ b/components/TARGET_PSA/spm/COMPONENT_SPE/spm_internal.h
@ -1,4 +1,6 @@
-/* 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.
--- a/components/TARGET_PSA/spm/COMPONENT_SPE/spm_main.c
+++ b/components/TARGET_PSA/spm/COMPONENT_SPE/spm_main.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.
+ */
+
 #if defined(COMPONENT_SPM_MAILBOX)

 #include "ipc_queue.h"
--- a/components/TARGET_PSA/spm/COMPONENT_SPE/spm_panic.h
+++ b/components/TARGET_PSA/spm/COMPONENT_SPE/spm_panic.h
@ -1,4 +1,6 @@
-/* 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.
--- a/components/TARGET_PSA/spm/COMPONENT_SPE/spm_server.c
+++ b/components/TARGET_PSA/spm/COMPONENT_SPE/spm_server.c
@ -1,4 +1,6 @@
-/* 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.
--- a/components/TARGET_PSA/spm/COMPONENT_SPE/spm_server.h
+++ b/components/TARGET_PSA/spm/COMPONENT_SPE/spm_server.h
@ -1,4 +1,6 @@
-/* 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.
--- a/components/TARGET_PSA/spm/COMPONENT_SPM_MAILBOX/COMPONENT_NSPE/spm_client_proxy.c
+++ b/components/TARGET_PSA/spm/COMPONENT_SPM_MAILBOX/COMPONENT_NSPE/spm_client_proxy.c
@ -1,4 +1,6 @@
 /* Copyright (c) 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.
--- a/components/TARGET_PSA/spm/COMPONENT_SPM_MAILBOX/COMPONENT_NSPE/spm_mailbox_nspe.c
+++ b/components/TARGET_PSA/spm/COMPONENT_SPM_MAILBOX/COMPONENT_NSPE/spm_mailbox_nspe.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.
+ */
+
 #include "cmsis_os2.h"
 #include "psa_defs.h"
 #include "mbed_assert.h"
--- a/components/TARGET_PSA/spm/COMPONENT_SPM_MAILBOX/COMPONENT_SPE/spm_mailbox_spe.c
+++ b/components/TARGET_PSA/spm/COMPONENT_SPM_MAILBOX/COMPONENT_SPE/spm_mailbox_spe.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.
+ */
+
 #include "psa_defs.h"
 #include "spm_client.h"
 #include "spm_messages.h"
--- a/components/TARGET_PSA/spm/COMPONENT_SPM_MAILBOX/ipc_defs.h
+++ b/components/TARGET_PSA/spm/COMPONENT_SPM_MAILBOX/ipc_defs.h
@ -1,4 +1,6 @@
 /* Copyright (c) 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.
--- a/components/TARGET_PSA/spm/COMPONENT_SPM_MAILBOX/ipc_queue.c
+++ b/components/TARGET_PSA/spm/COMPONENT_SPM_MAILBOX/ipc_queue.c
@ -1,4 +1,6 @@
 /* Copyright (c) 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.
--- a/components/TARGET_PSA/spm/COMPONENT_SPM_MAILBOX/ipc_queue.h
+++ b/components/TARGET_PSA/spm/COMPONENT_SPM_MAILBOX/ipc_queue.h
@ -1,4 +1,6 @@
 /* Copyright (c) 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.
--- a/components/TARGET_PSA/spm/TARGET_IGNORE/neg_client_tests/NEG_CLIENT_PART1/psa_neg_client_part1_ifs.h
+++ b/components/TARGET_PSA/spm/TARGET_IGNORE/neg_client_tests/NEG_CLIENT_PART1/psa_neg_client_part1_ifs.h
@ -1,4 +1,4 @@
-/* Copyright (c) 2017 ARM Limited
+/* Copyright (c) 2017-2018 ARM Limited
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/components/TARGET_PSA/spm/TARGET_IGNORE/neg_client_tests/NEG_CLIENT_PART1/psa_neg_client_part1_partition.c
+++ b/components/TARGET_PSA/spm/TARGET_IGNORE/neg_client_tests/NEG_CLIENT_PART1/psa_neg_client_part1_partition.c
@ -1,4 +1,4 @@
-/* Copyright (c) 2017 ARM Limited
+/* Copyright (c) 2017-2018 ARM Limited
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/components/TARGET_PSA/spm/TARGET_IGNORE/neg_client_tests/NEG_CLIENT_PART1/psa_neg_client_part1_partition.h
+++ b/components/TARGET_PSA/spm/TARGET_IGNORE/neg_client_tests/NEG_CLIENT_PART1/psa_neg_client_part1_partition.h
@ -1,4 +1,4 @@
-/* Copyright (c) 2017 ARM Limited
+/* Copyright (c) 2017-2018 ARM Limited
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/components/TARGET_PSA/spm/TARGET_IGNORE/neg_client_tests/neg_ipc_tests.cpp
+++ b/components/TARGET_PSA/spm/TARGET_IGNORE/neg_client_tests/neg_ipc_tests.cpp
@ -1,4 +1,4 @@
-/* Copyright (c) 2017 ARM Limited
+/* Copyright (c) 2017-2018 ARM Limited
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/components/TARGET_PSA/spm/TARGET_IGNORE/neg_client_tests/neg_tests.h
+++ b/components/TARGET_PSA/spm/TARGET_IGNORE/neg_client_tests/neg_tests.h
@ -1,4 +1,4 @@
-/* Copyright (c) 2017 ARM Limited
+/* Copyright (c) 2017-2018 ARM Limited
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/components/TARGET_PSA/spm/TARGET_IGNORE/neg_client_tests/psa_setup.c
+++ b/components/TARGET_PSA/spm/TARGET_IGNORE/neg_client_tests/psa_setup.c
@ -1,4 +1,4 @@
-/* Copyright (c) 2017 ARM Limited
+/* Copyright (c) 2017-2018 ARM Limited
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/components/TARGET_PSA/spm/TARGET_IGNORE/neg_client_tests/server1.c
+++ b/components/TARGET_PSA/spm/TARGET_IGNORE/neg_client_tests/server1.c
@ -1,4 +1,4 @@
-/* Copyright (c) 2017 ARM Limited
+/* Copyright (c) 2017-2018 ARM Limited
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/components/TARGET_PSA/spm/TARGET_IGNORE/neg_client_tests/spm_reboot.c
+++ b/components/TARGET_PSA/spm/TARGET_IGNORE/neg_client_tests/spm_reboot.c
@ -1,4 +1,4 @@
-/* Copyright (c) 2017 ARM Limited
+/* Copyright (c) 2017-2018 ARM Limited
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/components/TARGET_PSA/spm/TARGET_IGNORE/neg_dual_partition/NEG_DUAL_PART1/psa_neg_dual_part1_ifs.h
+++ b/components/TARGET_PSA/spm/TARGET_IGNORE/neg_dual_partition/NEG_DUAL_PART1/psa_neg_dual_part1_ifs.h
@ -1,4 +1,4 @@
-/* Copyright (c) 2017 ARM Limited
+/* Copyright (c) 2017-2018 ARM Limited
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/components/TARGET_PSA/spm/TARGET_IGNORE/neg_dual_partition/NEG_DUAL_PART1/psa_neg_dual_part1_partition.c
+++ b/components/TARGET_PSA/spm/TARGET_IGNORE/neg_dual_partition/NEG_DUAL_PART1/psa_neg_dual_part1_partition.c
@ -1,4 +1,4 @@
-/* Copyright (c) 2017 ARM Limited
+/* Copyright (c) 2017-2018 ARM Limited
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/components/TARGET_PSA/spm/TARGET_IGNORE/neg_dual_partition/NEG_DUAL_PART1/psa_neg_dual_part1_partition.h
+++ b/components/TARGET_PSA/spm/TARGET_IGNORE/neg_dual_partition/NEG_DUAL_PART1/psa_neg_dual_part1_partition.h
@ -1,4 +1,4 @@
-/* Copyright (c) 2017 ARM Limited
+/* Copyright (c) 2017-2018 ARM Limited
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/components/TARGET_PSA/spm/TARGET_IGNORE/neg_dual_partition/NEG_DUAL_PART2/psa_neg_dual_part2_ifs.h
+++ b/components/TARGET_PSA/spm/TARGET_IGNORE/neg_dual_partition/NEG_DUAL_PART2/psa_neg_dual_part2_ifs.h
@ -1,4 +1,4 @@
-/* Copyright (c) 2017 ARM Limited
+/* Copyright (c) 2017-2018 ARM Limited
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/components/TARGET_PSA/spm/TARGET_IGNORE/neg_dual_partition/NEG_DUAL_PART2/psa_neg_dual_part2_partition.c
+++ b/components/TARGET_PSA/spm/TARGET_IGNORE/neg_dual_partition/NEG_DUAL_PART2/psa_neg_dual_part2_partition.c
@ -1,4 +1,4 @@
-/* Copyright (c) 2017 ARM Limited
+/* Copyright (c) 2017-2018 ARM Limited
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/components/TARGET_PSA/spm/TARGET_IGNORE/neg_dual_partition/NEG_DUAL_PART2/psa_neg_dual_part2_partition.h
+++ b/components/TARGET_PSA/spm/TARGET_IGNORE/neg_dual_partition/NEG_DUAL_PART2/psa_neg_dual_part2_partition.h
@ -1,4 +1,4 @@
-/* Copyright (c) 2017 ARM Limited
+/* Copyright (c) 2017-2018 ARM Limited
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/components/TARGET_PSA/spm/TARGET_IGNORE/neg_dual_partition/neg_dual_tests.cpp
+++ b/components/TARGET_PSA/spm/TARGET_IGNORE/neg_dual_partition/neg_dual_tests.cpp
@ -1,4 +1,4 @@
-/* Copyright (c) 2017 ARM Limited
+/* Copyright (c) 2017-2018 ARM Limited
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/components/TARGET_PSA/spm/TARGET_IGNORE/neg_dual_partition/neg_tests.h
+++ b/components/TARGET_PSA/spm/TARGET_IGNORE/neg_dual_partition/neg_tests.h
@ -1,4 +1,4 @@
-/* Copyright (c) 2017 ARM Limited
+/* Copyright (c) 2017-2018 ARM Limited
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/components/TARGET_PSA/spm/TARGET_IGNORE/neg_dual_partition/psa_setup.c
+++ b/components/TARGET_PSA/spm/TARGET_IGNORE/neg_dual_partition/psa_setup.c
@ -1,4 +1,4 @@
-/* Copyright (c) 2017 ARM Limited
+/* Copyright (c) 2017-2018 ARM Limited
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/components/TARGET_PSA/spm/TARGET_IGNORE/neg_dual_partition/server1.c
+++ b/components/TARGET_PSA/spm/TARGET_IGNORE/neg_dual_partition/server1.c
@ -1,4 +1,4 @@
-/* Copyright (c) 2017 ARM Limited
+/* Copyright (c) 2017-2018 ARM Limited
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/components/TARGET_PSA/spm/TARGET_IGNORE/neg_dual_partition/server2.c
+++ b/components/TARGET_PSA/spm/TARGET_IGNORE/neg_dual_partition/server2.c
@ -1,4 +1,4 @@
-/* Copyright (c) 2017 ARM Limited
+/* Copyright (c) 2017-2018 ARM Limited
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/components/TARGET_PSA/spm/TARGET_IGNORE/neg_dual_partition/spm_reboot.c
+++ b/components/TARGET_PSA/spm/TARGET_IGNORE/neg_dual_partition/spm_reboot.c
@ -1,4 +1,4 @@
-/* Copyright (c) 2017 ARM Limited
+/* Copyright (c) 2017-2018 ARM Limited
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/components/TARGET_PSA/spm/TARGET_IGNORE/neg_server_tests/NEG_SERVER_PART1/psa_neg_server_part1_ifs.h
+++ b/components/TARGET_PSA/spm/TARGET_IGNORE/neg_server_tests/NEG_SERVER_PART1/psa_neg_server_part1_ifs.h
@ -1,4 +1,4 @@
-/* Copyright (c) 2017 ARM Limited
+/* Copyright (c) 2017-2018 ARM Limited
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/components/TARGET_PSA/spm/TARGET_IGNORE/neg_server_tests/NEG_SERVER_PART1/psa_neg_server_part1_partition.c
+++ b/components/TARGET_PSA/spm/TARGET_IGNORE/neg_server_tests/NEG_SERVER_PART1/psa_neg_server_part1_partition.c
@ -1,4 +1,4 @@
-/* Copyright (c) 2017 ARM Limited
+/* Copyright (c) 2017-2018 ARM Limited
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/components/TARGET_PSA/spm/TARGET_IGNORE/neg_server_tests/NEG_SERVER_PART1/psa_neg_server_part1_partition.h
+++ b/components/TARGET_PSA/spm/TARGET_IGNORE/neg_server_tests/NEG_SERVER_PART1/psa_neg_server_part1_partition.h
@ -1,4 +1,4 @@
-/* Copyright (c) 2017 ARM Limited
+/* Copyright (c) 2017-2018 ARM Limited
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/components/TARGET_PSA/spm/TARGET_IGNORE/neg_server_tests/NEG_SERVER_PART2/psa_neg_server_part2_ifs.h
+++ b/components/TARGET_PSA/spm/TARGET_IGNORE/neg_server_tests/NEG_SERVER_PART2/psa_neg_server_part2_ifs.h
@ -1,4 +1,4 @@
-/* Copyright (c) 2017 ARM Limited
+/* Copyright (c) 2017-2018 ARM Limited
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/components/TARGET_PSA/spm/TARGET_IGNORE/neg_server_tests/NEG_SERVER_PART2/psa_neg_server_part2_partition.c
+++ b/components/TARGET_PSA/spm/TARGET_IGNORE/neg_server_tests/NEG_SERVER_PART2/psa_neg_server_part2_partition.c
@ -1,4 +1,4 @@
-/* Copyright (c) 2017 ARM Limited
+/* Copyright (c) 2017-2018 ARM Limited
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/components/TARGET_PSA/spm/TARGET_IGNORE/neg_server_tests/NEG_SERVER_PART2/psa_neg_server_part2_partition.h
+++ b/components/TARGET_PSA/spm/TARGET_IGNORE/neg_server_tests/NEG_SERVER_PART2/psa_neg_server_part2_partition.h
@ -1,4 +1,4 @@
-/* Copyright (c) 2017 ARM Limited
+/* Copyright (c) 2017-2018 ARM Limited
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/components/TARGET_PSA/spm/TARGET_IGNORE/neg_server_tests/neg_ipc_tests.cpp
+++ b/components/TARGET_PSA/spm/TARGET_IGNORE/neg_server_tests/neg_ipc_tests.cpp
@ -1,4 +1,4 @@
-/* Copyright (c) 2017 ARM Limited
+/* Copyright (c) 2017-2018 ARM Limited
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/components/TARGET_PSA/spm/TARGET_IGNORE/neg_server_tests/neg_tests.h
+++ b/components/TARGET_PSA/spm/TARGET_IGNORE/neg_server_tests/neg_tests.h
@ -1,4 +1,4 @@
-/* Copyright (c) 2017 ARM Limited
+/* Copyright (c) 2017-2018 ARM Limited
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/components/TARGET_PSA/spm/TARGET_IGNORE/neg_server_tests/psa_setup.c
+++ b/components/TARGET_PSA/spm/TARGET_IGNORE/neg_server_tests/psa_setup.c
@ -1,4 +1,4 @@
-/* Copyright (c) 2017 ARM Limited
+/* Copyright (c) 2017-2018 ARM Limited
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/components/TARGET_PSA/spm/TARGET_IGNORE/neg_server_tests/server1.c
+++ b/components/TARGET_PSA/spm/TARGET_IGNORE/neg_server_tests/server1.c
@ -1,4 +1,4 @@
-/* Copyright (c) 2017 ARM Limited
+/* Copyright (c) 2017-2018 ARM Limited
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/components/TARGET_PSA/spm/TARGET_IGNORE/neg_server_tests/server2.c
+++ b/components/TARGET_PSA/spm/TARGET_IGNORE/neg_server_tests/server2.c
@ -1,4 +1,4 @@
-/* Copyright (c) 2017 ARM Limited
+/* Copyright (c) 2017-2018 ARM Limited
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/components/TARGET_PSA/spm/TARGET_IGNORE/neg_server_tests/spm_reboot.c
+++ b/components/TARGET_PSA/spm/TARGET_IGNORE/neg_server_tests/spm_reboot.c
@ -1,4 +1,4 @@
-/* Copyright (c) 2017 ARM Limited
+/* Copyright (c) 2017-2018 ARM Limited
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/components/TARGET_PSA/spm/psa_defs.h
+++ b/components/TARGET_PSA/spm/psa_defs.h
@ -1,4 +1,6 @@
-/* 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.
--- a/components/TARGET_PSA/spm/spm_client.h
+++ b/components/TARGET_PSA/spm/spm_client.h
@ -1,4 +1,6 @@
-/* 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.
--- a/components/TARGET_PSA/spm/spm_init.h
+++ b/components/TARGET_PSA/spm/spm_init.h
@ -1,4 +1,6 @@
-/* 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.
--- a/components/TARGET_PSA/spm/spm_messages.h
+++ b/components/TARGET_PSA/spm/spm_messages.h
@ -1,16 +1,16 @@
-/*
- * Copyright (c) 2017, ARM Limited, All Rights Reserved
+/* 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.
+ * 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
+ *     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.
+ * 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.
 */
--- a/tools/spm/init.py
+++ b/tools/spm/init.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.
+
 from .generate_partition_code import \
    generate_partitions_sources, generate_psa_setup

--- a/tools/spm/generate_partition_code.py
+++ b/tools/spm/generate_partition_code.py
@ -1,4 +1,20 @@
 #!/usr/bin/python
+# 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 fnmatch
 import itertools
 import json
--- a/tools/spm/templates/COMPONENT_SPE/psa_NAME_partition.c.tpl
+++ b/tools/spm/templates/COMPONENT_SPE/psa_NAME_partition.c.tpl
@ -1,4 +1,6 @@
-/* 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.
--- a/tools/spm/templates/COMPONENT_SPE/psa_NAME_partition.h.tpl
+++ b/tools/spm/templates/COMPONENT_SPE/psa_NAME_partition.h.tpl
@ -1,4 +1,6 @@
-/* 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.
--- a/tools/spm/templates/COMPONENT_SPE/psa_setup.c.tpl
+++ b/tools/spm/templates/COMPONENT_SPE/psa_setup.c.tpl
@ -1,4 +1,6 @@
-/* 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.
--- a/tools/spm/templates/psa_NAME_ifs.h.tpl
+++ b/tools/spm/templates/psa_NAME_ifs.h.tpl
@ -1,4 +1,6 @@
-/* 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.