diff --git a/.cmake-format.yaml b/.cmake-format.yaml
index eb93d3998..476fdd4c9 100644
--- a/.cmake-format.yaml
+++ b/.cmake-format.yaml
@@ -1,14 +1,9 @@
 #
-# Copyright 2019, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
+
 additional_commands:
   add_sources:
     kwargs:
diff --git a/.gitignore b/.gitignore
index c66f7ca47..58cf6e02b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,7 @@
 #
 # Copyright 2014, General Dynamics C4 Systems
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(GD_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 # generated python bytecode
diff --git a/CAVEATS-generic.txt b/CAVEATS-generic.txt
index 12a828b53..f7135991d 100644
--- a/CAVEATS-generic.txt
+++ b/CAVEATS-generic.txt
@@ -1,11 +1,7 @@
 #
 # Copyright 2014, General Dynamics C4 Systems
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(GD_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 This file lists known caveats in the seL4 API and implementation.
diff --git a/CAVEATS-ia32.txt b/CAVEATS-ia32.txt
index 86bf22943..29e0c634b 100644
--- a/CAVEATS-ia32.txt
+++ b/CAVEATS-ia32.txt
@@ -1,11 +1,7 @@
 #
 # Copyright 2014, General Dynamics C4 Systems
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(GD_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 * Intel VT-d (I/O MMU) support
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb5878ca7..8d6167807 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.8.2)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4c42c9491..937c357d1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,13 +1,7 @@
 <!--
-  Copyright 2017, Data61
-  Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-  ABN 41 687 119 230.
+     Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 
-  This software may be distributed and modified according to the terms of
-  the GNU General Public License version 2. Note that NO WARRANTY is provided.
-  See "LICENSE_GPLv2.txt" for details.
-
-  @TAG(DATA61_GPL)
+     SPDX-License-Identifier: GPL-2.0-only
 -->
 
 Contributions to the seL4 kernel repository are welcome!
diff --git a/FindseL4.cmake b/FindseL4.cmake
index 3febc46d9..8844fbd8a 100644
--- a/FindseL4.cmake
+++ b/FindseL4.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2019, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 set(KERNEL_PATH "${CMAKE_CURRENT_LIST_DIR}" CACHE STRING "")
diff --git a/README.md b/README.md
index b32cee9b5..832408df4 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,7 @@
 <!--
-  Copyright 2014, General Dynamics C4 Systems
+     Copyright 2014, General Dynamics C4 Systems
 
-  This software may be distributed and modified according to the terms of
-  the GNU General Public License version 2. Note that NO WARRANTY is provided.
-  See "LICENSE_GPLv2.txt" for details.
-
-  @TAG(GD_GPL)
+     SPDX-License-Identifier: GPL-2.0-only
 -->
 
 The seL4 Repository
diff --git a/config.cmake b/config.cmake
index 2a5a0518c..48023e8f8 100644
--- a/config.cmake
+++ b/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/configs/ARM_HYP_verified.cmake b/configs/ARM_HYP_verified.cmake
index 1b73e6199..9538d3a40 100755
--- a/configs/ARM_HYP_verified.cmake
+++ b/configs/ARM_HYP_verified.cmake
@@ -1,15 +1,10 @@
 #!/usr/bin/env -S cmake -P
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
+
 # If this file is executed then build the kernel.elf and kernel_all_pp.c file
 include(${CMAKE_CURRENT_LIST_DIR}/../tools/helpers.cmake)
 cmake_script_build_kernel()
diff --git a/configs/ARM_MCS_verified.cmake b/configs/ARM_MCS_verified.cmake
index 39e238ed5..0bf2a3da8 100755
--- a/configs/ARM_MCS_verified.cmake
+++ b/configs/ARM_MCS_verified.cmake
@@ -1,15 +1,10 @@
 #!/usr/bin/env -S cmake -P
 #
-# Copyright 2019, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
+
 # If this file is executed then build the kernel.elf and kernel_all_pp.c file
 include(${CMAKE_CURRENT_LIST_DIR}/../tools/helpers.cmake)
 cmake_script_build_kernel()
diff --git a/configs/ARM_verified.cmake b/configs/ARM_verified.cmake
index 52baa2ab3..574f38044 100755
--- a/configs/ARM_verified.cmake
+++ b/configs/ARM_verified.cmake
@@ -1,14 +1,8 @@
 #!/usr/bin/env -S cmake -P
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 # If this file is executed then build the kernel.elf and kernel_all_pp.c file
diff --git a/configs/RISCV64_verified.cmake b/configs/RISCV64_verified.cmake
index eb237fffc..a9397bb80 100755
--- a/configs/RISCV64_verified.cmake
+++ b/configs/RISCV64_verified.cmake
@@ -1,15 +1,10 @@
 #!/usr/bin/env -S cmake -P
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
+
 # If this file is executed then build the kernel.elf and kernel_all_pp.c file
 include(${CMAKE_CURRENT_LIST_DIR}/../tools/helpers.cmake)
 cmake_script_build_kernel()
diff --git a/configs/X64_verified.cmake b/configs/X64_verified.cmake
index 7abbd3eac..195d40eba 100755
--- a/configs/X64_verified.cmake
+++ b/configs/X64_verified.cmake
@@ -1,15 +1,10 @@
 #!/usr/bin/env -S cmake -P
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
+
 # If this file is executed then build the kernel.elf and kernel_all_pp.c file
 include(${CMAKE_CURRENT_LIST_DIR}/../tools/helpers.cmake)
 cmake_script_build_kernel()
diff --git a/configs/seL4Config.cmake b/configs/seL4Config.cmake
index b46553b8c..2f41e35d5 100644
--- a/configs/seL4Config.cmake
+++ b/configs/seL4Config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2019, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 #
diff --git a/gcc.cmake b/gcc.cmake
index 9261b38d3..4141f1873 100644
--- a/gcc.cmake
+++ b/gcc.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/gdb-macros b/gdb-macros
index 11f690bd6..b05ccafb2 100644
--- a/gdb-macros
+++ b/gdb-macros
@@ -1,11 +1,7 @@
 #
 # Copyright 2014, General Dynamics C4 Systems
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(GD_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 #GDB macros for displaying seL4 data structures. Currently a work in progress.
diff --git a/include/32/mode/api/ipc_buffer.h b/include/32/mode/api/ipc_buffer.h
index 505dacc9f..683111029 100644
--- a/include/32/mode/api/ipc_buffer.h
+++ b/include/32/mode/api/ipc_buffer.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __IPC_BUFFER_H
diff --git a/include/32/mode/config.cmake b/include/32/mode/config.cmake
index 015e949ff..9897979d2 100644
--- a/include/32/mode/config.cmake
+++ b/include/32/mode/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/include/32/mode/stdint.h b/include/32/mode/stdint.h
index c6b132410..062721123 100644
--- a/include/32/mode/stdint.h
+++ b/include/32/mode/stdint.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __MODE_STDINT_H
diff --git a/include/32/mode/util.h b/include/32/mode/util.h
index 838098204..ba10f548c 100644
--- a/include/32/mode/util.h
+++ b/include/32/mode/util.h
@@ -1,14 +1,9 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
+
 #ifndef __MODE_UTIL_H
 #define __MODE_UTIL_H
 
diff --git a/include/64/mode/api/ipc_buffer.h b/include/64/mode/api/ipc_buffer.h
index 164cabe5e..eac094374 100644
--- a/include/64/mode/api/ipc_buffer.h
+++ b/include/64/mode/api/ipc_buffer.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __IPC_BUFFER_H
diff --git a/include/64/mode/config.cmake b/include/64/mode/config.cmake
index cb5522f69..6a6789513 100644
--- a/include/64/mode/config.cmake
+++ b/include/64/mode/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/include/64/mode/stdint.h b/include/64/mode/stdint.h
index 01d6d6780..6e38b5329 100644
--- a/include/64/mode/stdint.h
+++ b/include/64/mode/stdint.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __MODE_STDINT_H
diff --git a/include/64/mode/util.h b/include/64/mode/util.h
index 573eb5d37..67446f2c6 100644
--- a/include/64/mode/util.h
+++ b/include/64/mode/util.h
@@ -1,14 +1,9 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
+
 #ifndef __MODE_UTIL_H
 #define __MODE_UTIL_H
 
diff --git a/include/api.h b/include/api.h
index 090603aeb..b310d5658 100644
--- a/include/api.h
+++ b/include/api.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __API_H
diff --git a/include/api/debug.h b/include/api/debug.h
index 69a7f5f39..f979817c9 100644
--- a/include/api/debug.h
+++ b/include/api/debug.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/include/api/failures.h b/include/api/failures.h
index 1b32d2690..11339b5ec 100644
--- a/include/api/failures.h
+++ b/include/api/failures.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __FAILURES_H
diff --git a/include/api/faults.h b/include/api/faults.h
index c83aa6a77..3445969a7 100644
--- a/include/api/faults.h
+++ b/include/api/faults.h
@@ -1,14 +1,9 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
+
 #ifndef __API_FAULTS_H
 #define __API_FAULTS_H
 
diff --git a/include/api/syscall.h b/include/api/syscall.h
index f3384b453..14c14e0ac 100644
--- a/include/api/syscall.h
+++ b/include/api/syscall.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __API_SYSCALL_H
diff --git a/include/api/types.h b/include/api/types.h
index d24cc7ac4..583b0e8cb 100644
--- a/include/api/types.h
+++ b/include/api/types.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __API_TYPES_H
diff --git a/include/arch/arm/arch/32/mode/fastpath/fastpath.h b/include/arch/arm/arch/32/mode/fastpath/fastpath.h
index e382cfffd..ffea565c4 100644
--- a/include/arch/arm/arch/32/mode/fastpath/fastpath.h
+++ b/include/arch/arm/arch/32/mode/fastpath/fastpath.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_FASTPATH_32_H
diff --git a/include/arch/arm/arch/32/mode/hardware.h b/include/arch/arm/arch/32/mode/hardware.h
index b528bfc62..53893f729 100644
--- a/include/arch/arm/arch/32/mode/hardware.h
+++ b/include/arch/arm/arch/32/mode/hardware.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_HARDWARE_32_H
diff --git a/include/arch/arm/arch/32/mode/kernel/stack.h b/include/arch/arm/arch/32/mode/kernel/stack.h
index 8e22def83..ee2a75f36 100644
--- a/include/arch/arm/arch/32/mode/kernel/stack.h
+++ b/include/arch/arm/arch/32/mode/kernel/stack.h
@@ -1,14 +1,9 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
+
 #ifndef __KERNEL_MODE_STACK_H
 #define __KERNEL_MODE_STACK_H
 
diff --git a/include/arch/arm/arch/32/mode/kernel/thread.h b/include/arch/arm/arch/32/mode/kernel/thread.h
index d4caae4ff..3ef3686d8 100644
--- a/include/arch/arm/arch/32/mode/kernel/thread.h
+++ b/include/arch/arm/arch/32/mode/kernel/thread.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2017, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __MODE_KERNEL_THREAD_H
diff --git a/include/arch/arm/arch/32/mode/kernel/vspace.h b/include/arch/arm/arch/32/mode/kernel/vspace.h
index fe8781ad6..f0720043e 100644
--- a/include/arch/arm/arch/32/mode/kernel/vspace.h
+++ b/include/arch/arm/arch/32/mode/kernel/vspace.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODE_KERNEL_VSPACE_H
diff --git a/include/arch/arm/arch/32/mode/machine.h b/include/arch/arm/arch/32/mode/machine.h
index 53dc752b1..d55229bf6 100644
--- a/include/arch/arm/arch/32/mode/machine.h
+++ b/include/arch/arm/arch/32/mode/machine.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MACHINE_32_H
diff --git a/include/arch/arm/arch/32/mode/machine/debug.h b/include/arch/arm/arch/32/mode/machine/debug.h
index 7fb194022..d483b1a39 100644
--- a/include/arch/arm/arch/32/mode/machine/debug.h
+++ b/include/arch/arm/arch/32/mode/machine/debug.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODE_MACHINE_DEBUG_H_
diff --git a/include/arch/arm/arch/32/mode/machine/fpu.h b/include/arch/arm/arch/32/mode/machine/fpu.h
index 07db35f66..6e5e71438 100644
--- a/include/arch/arm/arch/32/mode/machine/fpu.h
+++ b/include/arch/arm/arch/32/mode/machine/fpu.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __MODE_MACHINE_FPU_H
diff --git a/include/arch/arm/arch/32/mode/machine/hardware.h b/include/arch/arm/arch/32/mode/machine/hardware.h
index 76354e37c..578c787ee 100644
--- a/include/arch/arm/arch/32/mode/machine/hardware.h
+++ b/include/arch/arm/arch/32/mode/machine/hardware.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MACHINE_HARDWARE_32_H
diff --git a/include/arch/arm/arch/32/mode/machine/registerset.h b/include/arch/arm/arch/32/mode/machine/registerset.h
index 193498d32..d636802d2 100644
--- a/include/arch/arm/arch/32/mode/machine/registerset.h
+++ b/include/arch/arm/arch/32/mode/machine/registerset.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MACHINE_REGISTERSET_32_H
diff --git a/include/arch/arm/arch/32/mode/machine/timer.h b/include/arch/arm/arch/32/mode/machine/timer.h
index 2b393f92b..44a929667 100644
--- a/include/arch/arm/arch/32/mode/machine/timer.h
+++ b/include/arch/arm/arch/32/mode/machine/timer.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODE_MACHINE_TIMER_H_
diff --git a/include/arch/arm/arch/32/mode/machine_pl2.h b/include/arch/arm/arch/32/mode/machine_pl2.h
index 13f962dd9..c33aef51e 100644
--- a/include/arch/arm/arch/32/mode/machine_pl2.h
+++ b/include/arch/arm/arch/32/mode/machine_pl2.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MACHINE_PL2_32_H
diff --git a/include/arch/arm/arch/32/mode/model/statedata.h b/include/arch/arm/arch/32/mode/model/statedata.h
index 970c895ee..5a1828810 100644
--- a/include/arch/arm/arch/32/mode/model/statedata.h
+++ b/include/arch/arm/arch/32/mode/model/statedata.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODEL_STATEDATA_32_H
diff --git a/include/arch/arm/arch/32/mode/object/structures.bf b/include/arch/arm/arch/32/mode/object/structures.bf
index 693ae6649..076a95d94 100644
--- a/include/arch/arm/arch/32/mode/object/structures.bf
+++ b/include/arch/arm/arch/32/mode/object/structures.bf
@@ -1,11 +1,7 @@
 --
 -- Copyright 2014, General Dynamics C4 Systems
 --
--- This software may be distributed and modified according to the terms of
--- the GNU General Public License version 2. Note that NO WARRANTY is provided.
--- See "LICENSE_GPLv2.txt" for details.
---
--- @TAG(GD_GPL)
+-- SPDX-License-Identifier: GPL-2.0-only
 --
 
 #include <config.h>
diff --git a/include/arch/arm/arch/32/mode/object/structures.h b/include/arch/arm/arch/32/mode/object/structures.h
index e79196c61..ab30a04ec 100644
--- a/include/arch/arm/arch/32/mode/object/structures.h
+++ b/include/arch/arm/arch/32/mode/object/structures.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_OBJECT_STRUCTURES_32_H
diff --git a/include/arch/arm/arch/32/mode/smp/ipi.h b/include/arch/arm/arch/32/mode/smp/ipi.h
index a81ed1222..bae61956b 100644
--- a/include/arch/arm/arch/32/mode/smp/ipi.h
+++ b/include/arch/arm/arch/32/mode/smp/ipi.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __MODE_SMP_IPI_H
diff --git a/include/arch/arm/arch/32/mode/smp/smp.h b/include/arch/arm/arch/32/mode/smp/smp.h
index 29ba0e276..1b2432432 100644
--- a/include/arch/arm/arch/32/mode/smp/smp.h
+++ b/include/arch/arm/arch/32/mode/smp/smp.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __MODE_SMP_H_
diff --git a/include/arch/arm/arch/32/mode/types.h b/include/arch/arm/arch/32/mode/types.h
index 414b30043..58d3351ca 100644
--- a/include/arch/arm/arch/32/mode/types.h
+++ b/include/arch/arm/arch/32/mode/types.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODE_TYPES_H_
diff --git a/include/arch/arm/arch/64/mode/fastpath/fastpath.h b/include/arch/arm/arch/64/mode/fastpath/fastpath.h
index fb2efb553..e1c93042f 100644
--- a/include/arch/arm/arch/64/mode/fastpath/fastpath.h
+++ b/include/arch/arm/arch/64/mode/fastpath/fastpath.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_FASTPATH_64_H
diff --git a/include/arch/arm/arch/64/mode/hardware.h b/include/arch/arm/arch/64/mode/hardware.h
index dbfb2bf0c..8418f7e80 100644
--- a/include/arch/arm/arch/64/mode/hardware.h
+++ b/include/arch/arm/arch/64/mode/hardware.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODE_HARDWARE_H
diff --git a/include/arch/arm/arch/64/mode/kernel/stack.h b/include/arch/arm/arch/64/mode/kernel/stack.h
index ba0f0b16d..4bf346aee 100644
--- a/include/arch/arm/arch/64/mode/kernel/stack.h
+++ b/include/arch/arm/arch/64/mode/kernel/stack.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __KERNEL_MODE_STACK_H
diff --git a/include/arch/arm/arch/64/mode/kernel/thread.h b/include/arch/arm/arch/64/mode/kernel/thread.h
index d0ccdfdb1..6e6baadef 100644
--- a/include/arch/arm/arch/64/mode/kernel/thread.h
+++ b/include/arch/arm/arch/64/mode/kernel/thread.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2017, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __MODE_KERNEL_THREAD_H
diff --git a/include/arch/arm/arch/64/mode/kernel/vspace.h b/include/arch/arm/arch/64/mode/kernel/vspace.h
index 352a15202..99f729681 100644
--- a/include/arch/arm/arch/64/mode/kernel/vspace.h
+++ b/include/arch/arm/arch/64/mode/kernel/vspace.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODE_KERNEL_VSPACE_H_
diff --git a/include/arch/arm/arch/64/mode/machine.h b/include/arch/arm/arch/64/mode/machine.h
index ef4fea064..51db33dd0 100644
--- a/include/arch/arm/arch/64/mode/machine.h
+++ b/include/arch/arm/arch/64/mode/machine.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODE_MACHINE_H
diff --git a/include/arch/arm/arch/64/mode/machine/debug.h b/include/arch/arm/arch/64/mode/machine/debug.h
index a6f8673f8..1ff88427c 100644
--- a/include/arch/arm/arch/64/mode/machine/debug.h
+++ b/include/arch/arm/arch/64/mode/machine/debug.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODE_MACHINE_DEBUG_H_
diff --git a/include/arch/arm/arch/64/mode/machine/fpu.h b/include/arch/arm/arch/64/mode/machine/fpu.h
index 8e02cc2d8..cf970c5d9 100644
--- a/include/arch/arm/arch/64/mode/machine/fpu.h
+++ b/include/arch/arm/arch/64/mode/machine/fpu.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __MODE_MACHINE_FPU_H
diff --git a/include/arch/arm/arch/64/mode/machine/hardware.h b/include/arch/arm/arch/64/mode/machine/hardware.h
index cfb6c0434..e6559b3ea 100644
--- a/include/arch/arm/arch/64/mode/machine/hardware.h
+++ b/include/arch/arm/arch/64/mode/machine/hardware.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MACHINE_HARDWARE_64_H
diff --git a/include/arch/arm/arch/64/mode/machine/registerset.h b/include/arch/arm/arch/64/mode/machine/registerset.h
index 17c91eb07..ed44e140b 100644
--- a/include/arch/arm/arch/64/mode/machine/registerset.h
+++ b/include/arch/arm/arch/64/mode/machine/registerset.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MACHINE_REGISTERSET_64_H
diff --git a/include/arch/arm/arch/64/mode/machine/timer.h b/include/arch/arm/arch/64/mode/machine/timer.h
index 5f67e5e5a..2b17ed101 100644
--- a/include/arch/arm/arch/64/mode/machine/timer.h
+++ b/include/arch/arm/arch/64/mode/machine/timer.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODE_MACHINE_TIMER_H_
diff --git a/include/arch/arm/arch/64/mode/machine_pl2.h b/include/arch/arm/arch/64/mode/machine_pl2.h
index 0fb00d114..936255e57 100644
--- a/include/arch/arm/arch/64/mode/machine_pl2.h
+++ b/include/arch/arm/arch/64/mode/machine_pl2.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODE_MACHINE_PL2_H
diff --git a/include/arch/arm/arch/64/mode/model/statedata.h b/include/arch/arm/arch/64/mode/model/statedata.h
index a6c76ef65..958acb223 100644
--- a/include/arch/arm/arch/64/mode/model/statedata.h
+++ b/include/arch/arm/arch/64/mode/model/statedata.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODEL_STATEDATA_64_H
diff --git a/include/arch/arm/arch/64/mode/object/structures.bf b/include/arch/arm/arch/64/mode/object/structures.bf
index 312f16c9d..936d9b185 100644
--- a/include/arch/arm/arch/64/mode/object/structures.bf
+++ b/include/arch/arm/arch/64/mode/object/structures.bf
@@ -1,13 +1,7 @@
 --
--- Copyright 2017, Data61
--- Commonwealth Scientific and Industrial Research Organisation (CSIRO)
--- ABN 41 687 119 230.
+-- Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 --
--- This software may be distributed and modified according to the terms of
--- the GNU General Public License version 2. Note that NO WARRANTY is provided.
--- See "LICENSE_GPLv2.txt" for details.
---
--- @TAG(DATA61_GPL)
+-- SPDX-License-Identifier: GPL-2.0-only
 --
 
 #include <config.h>
diff --git a/include/arch/arm/arch/64/mode/object/structures.h b/include/arch/arm/arch/64/mode/object/structures.h
index 0695f1c28..524797dcf 100644
--- a/include/arch/arm/arch/64/mode/object/structures.h
+++ b/include/arch/arm/arch/64/mode/object/structures.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_OBJECT_STRUCTURES_64_H
diff --git a/include/arch/arm/arch/64/mode/smp/ipi.h b/include/arch/arm/arch/64/mode/smp/ipi.h
index 94249e55d..9c2f0b59f 100644
--- a/include/arch/arm/arch/64/mode/smp/ipi.h
+++ b/include/arch/arm/arch/64/mode/smp/ipi.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __MODE_SMP_IPI_H
diff --git a/include/arch/arm/arch/64/mode/smp/smp.h b/include/arch/arm/arch/64/mode/smp/smp.h
index 2e145a971..047dc50a2 100644
--- a/include/arch/arm/arch/64/mode/smp/smp.h
+++ b/include/arch/arm/arch/64/mode/smp/smp.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __MODE_SMP_H_
diff --git a/include/arch/arm/arch/64/mode/types.h b/include/arch/arm/arch/64/mode/types.h
index 934555ad7..5face8d4f 100644
--- a/include/arch/arm/arch/64/mode/types.h
+++ b/include/arch/arm/arch/64/mode/types.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODE_TYPES_H_
diff --git a/include/arch/arm/arch/api/types.h b/include/arch/arm/arch/api/types.h
index ef192f90e..4c25f2824 100644
--- a/include/arch/arm/arch/api/types.h
+++ b/include/arch/arm/arch/api/types.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_API_TYPES_H
diff --git a/include/arch/arm/arch/benchmark.h b/include/arch/arm/arch/benchmark.h
index d55d26e5a..641b07a22 100644
--- a/include/arch/arm/arch/benchmark.h
+++ b/include/arch/arm/arch/benchmark.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef ARCH_BENCHMARK_H
diff --git a/include/arch/arm/arch/bootinfo.h b/include/arch/arm/arch/bootinfo.h
index a8832585d..515cadd97 100644
--- a/include/arch/arm/arch/bootinfo.h
+++ b/include/arch/arm/arch/bootinfo.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_BOOTINFO_H
diff --git a/include/arch/arm/arch/fastpath/fastpath.h b/include/arch/arm/arch/fastpath/fastpath.h
index d5b9b8084..c7a5c32be 100644
--- a/include/arch/arm/arch/fastpath/fastpath.h
+++ b/include/arch/arm/arch/fastpath/fastpath.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_FASTPATH_H
diff --git a/include/arch/arm/arch/kernel/boot.h b/include/arch/arm/arch/kernel/boot.h
index 1a5259dce..074abeefe 100644
--- a/include/arch/arm/arch/kernel/boot.h
+++ b/include/arch/arm/arch/kernel/boot.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_KERNEL_BOOT_H
diff --git a/include/arch/arm/arch/kernel/thread.h b/include/arch/arm/arch/kernel/thread.h
index 896b09f1a..54b7cab16 100644
--- a/include/arch/arm/arch/kernel/thread.h
+++ b/include/arch/arm/arch/kernel/thread.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_KERNEL_THREAD_H
diff --git a/include/arch/arm/arch/kernel/traps.h b/include/arch/arm/arch/kernel/traps.h
index 168aac673..e72d403b6 100644
--- a/include/arch/arm/arch/kernel/traps.h
+++ b/include/arch/arm/arch/kernel/traps.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2016, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __KERNEL_ARM_TRAPS_H
diff --git a/include/arch/arm/arch/kernel/vspace.h b/include/arch/arm/arch/kernel/vspace.h
index 1dd3c3c15..5598863d6 100644
--- a/include/arch/arm/arch/kernel/vspace.h
+++ b/include/arch/arm/arch/kernel/vspace.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_KERNEL_VSPACE_H
diff --git a/include/arch/arm/arch/linker.h b/include/arch/arm/arch/linker.h
index 6e929cac0..59b58904f 100644
--- a/include/arch/arm/arch/linker.h
+++ b/include/arch/arm/arch/linker.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __ARCH_LINKER_H
diff --git a/include/arch/arm/arch/machine.h b/include/arch/arm/arch/machine.h
index 3e44cdab1..62073ae02 100644
--- a/include/arch/arm/arch/machine.h
+++ b/include/arch/arm/arch/machine.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MACHINE_H
diff --git a/include/arch/arm/arch/machine/capdl.h b/include/arch/arm/arch/machine/capdl.h
index abbe25516..847012f84 100644
--- a/include/arch/arm/arch/machine/capdl.h
+++ b/include/arch/arm/arch/machine/capdl.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MACHINE_CAPDL_H
diff --git a/include/arch/arm/arch/machine/debug.h b/include/arch/arm/arch/machine/debug.h
index a00d7c76c..de090cc1f 100644
--- a/include/arch/arm/arch/machine/debug.h
+++ b/include/arch/arm/arch/machine/debug.h
@@ -1,14 +1,9 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
+
 #ifndef __ARCH_MACHINE_DEBUG_H
 #define __ARCH_MACHINE_DEBUG_H
 
diff --git a/include/arch/arm/arch/machine/debug_conf.h b/include/arch/arm/arch/machine/debug_conf.h
index 566d7120f..07b94e704 100644
--- a/include/arch/arm/arch/machine/debug_conf.h
+++ b/include/arch/arm/arch/machine/debug_conf.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef ARCH_MACHINE_DEBUG_CONF_H
diff --git a/include/arch/arm/arch/machine/fpu.h b/include/arch/arm/arch/machine/fpu.h
index 761c45242..e3445878f 100644
--- a/include/arch/arm/arch/machine/fpu.h
+++ b/include/arch/arm/arch/machine/fpu.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MACHINE_FPU_H
diff --git a/include/arch/arm/arch/machine/gic_common.h b/include/arch/arm/arch/machine/gic_common.h
index 3606dc295..64f671ae8 100644
--- a/include/arch/arm/arch/machine/gic_common.h
+++ b/include/arch/arm/arch/machine/gic_common.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MACHINE_GIC_COMMON_H
diff --git a/include/arch/arm/arch/machine/gic_v2.h b/include/arch/arm/arch/machine/gic_v2.h
index 1a05f0dd0..17366e09b 100644
--- a/include/arch/arm/arch/machine/gic_v2.h
+++ b/include/arch/arm/arch/machine/gic_v2.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 /*
diff --git a/include/arch/arm/arch/machine/gic_v3.h b/include/arch/arm/arch/machine/gic_v3.h
index faaaa117d..b3907b2cd 100644
--- a/include/arch/arm/arch/machine/gic_v3.h
+++ b/include/arch/arm/arch/machine/gic_v3.h
@@ -1,14 +1,8 @@
 /*
  * Copyright 2019, DornerWorks
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_DORNERWORKS_BSD)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 /*
diff --git a/include/arch/arm/arch/machine/hardware.h b/include/arch/arm/arch/machine/hardware.h
index 8db0775a1..8de402ea3 100644
--- a/include/arch/arm/arch/machine/hardware.h
+++ b/include/arch/arm/arch/machine/hardware.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MACHINE_HARDWARE_H
diff --git a/include/arch/arm/arch/machine/l2c_310.h b/include/arch/arm/arch/machine/l2c_310.h
index e1c4ece79..0edfdf7b8 100644
--- a/include/arch/arm/arch/machine/l2c_310.h
+++ b/include/arch/arm/arch/machine/l2c_310.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 /*
diff --git a/include/arch/arm/arch/machine/registerset.h b/include/arch/arm/arch/machine/registerset.h
index f30cad8f8..b743ff6ca 100644
--- a/include/arch/arm/arch/machine/registerset.h
+++ b/include/arch/arm/arch/machine/registerset.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MACHINE_REGISTERSET_H
diff --git a/include/arch/arm/arch/machine/timer.h b/include/arch/arm/arch/machine/timer.h
index 43c7b78ab..0973a4ba9 100644
--- a/include/arch/arm/arch/machine/timer.h
+++ b/include/arch/arm/arch/machine/timer.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MACHINE_TIMER_H_
diff --git a/include/arch/arm/arch/machine/tlb.h b/include/arch/arm/arch/machine/tlb.h
index dbccb4d24..662503887 100644
--- a/include/arch/arm/arch/machine/tlb.h
+++ b/include/arch/arm/arch/machine/tlb.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MACHINE_TLB_H
diff --git a/include/arch/arm/arch/model/smp.h b/include/arch/arm/arch/model/smp.h
index 087dc1620..b8027259a 100644
--- a/include/arch/arm/arch/model/smp.h
+++ b/include/arch/arm/arch/model/smp.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODEL_SMP_H_
diff --git a/include/arch/arm/arch/model/statedata.h b/include/arch/arm/arch/model/statedata.h
index 2f87be154..452af0f62 100644
--- a/include/arch/arm/arch/model/statedata.h
+++ b/include/arch/arm/arch/model/statedata.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODEL_STATEDATA_H
diff --git a/include/arch/arm/arch/object/interrupt.h b/include/arch/arm/arch/object/interrupt.h
index c257e66ae..beb90668b 100644
--- a/include/arch/arm/arch/object/interrupt.h
+++ b/include/arch/arm/arch/object/interrupt.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_OBJECT_INTERRUPT_H
diff --git a/include/arch/arm/arch/object/iospace.h b/include/arch/arm/arch/object/iospace.h
index 8ed98e2de..b1f24979d 100644
--- a/include/arch/arm/arch/object/iospace.h
+++ b/include/arch/arm/arch/object/iospace.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2016, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_OBJECT_IOSPACE_H
diff --git a/include/arch/arm/arch/object/objecttype.h b/include/arch/arm/arch/object/objecttype.h
index 6c0dea0b9..c1e1b4def 100644
--- a/include/arch/arm/arch/object/objecttype.h
+++ b/include/arch/arm/arch/object/objecttype.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_OBJECT_OBJECTTYPE_H
diff --git a/include/arch/arm/arch/object/structures.bf b/include/arch/arm/arch/object/structures.bf
index 2eab0dc80..e554c6067 100644
--- a/include/arch/arm/arch/object/structures.bf
+++ b/include/arch/arm/arch/object/structures.bf
@@ -1,11 +1,7 @@
 --
 -- Copyright 2014, General Dynamics C4 Systems
 --
--- This software may be distributed and modified according to the terms of
--- the GNU General Public License version 2. Note that NO WARRANTY is provided.
--- See "LICENSE_GPLv2.txt" for details.
---
--- @TAG(GD_GPL)
+-- SPDX-License-Identifier: GPL-2.0-only
 --
 
 #include <mode/object/structures.bf>
diff --git a/include/arch/arm/arch/object/structures.h b/include/arch/arm/arch/object/structures.h
index f2df6a7f4..a6c8bf8a5 100644
--- a/include/arch/arm/arch/object/structures.h
+++ b/include/arch/arm/arch/object/structures.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_OBJECT_STRUCTURES_H
diff --git a/include/arch/arm/arch/object/vcpu.h b/include/arch/arm/arch/object/vcpu.h
index e7e15c266..616df2709 100644
--- a/include/arch/arm/arch/object/vcpu.h
+++ b/include/arch/arm/arch/object/vcpu.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_OBJECT_VCPU_H
diff --git a/include/arch/arm/arch/smp/ipi.h b/include/arch/arm/arch/smp/ipi.h
index 3aaac89c5..26d04bd19 100644
--- a/include/arch/arm/arch/smp/ipi.h
+++ b/include/arch/arm/arch/smp/ipi.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_SMP_IPI_H
diff --git a/include/arch/arm/arch/smp/ipi_inline.h b/include/arch/arm/arch/smp/ipi_inline.h
index 3ee653e7c..9cf6e8caf 100644
--- a/include/arch/arm/arch/smp/ipi_inline.h
+++ b/include/arch/arm/arch/smp/ipi_inline.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_SMP_IPI_INLINE_H
diff --git a/include/arch/arm/arch/types.h b/include/arch/arm/arch/types.h
index 678d24ac2..4d020c19c 100644
--- a/include/arch/arm/arch/types.h
+++ b/include/arch/arm/arch/types.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_TYPES_H
diff --git a/include/arch/arm/arch/user_access.h b/include/arch/arm/arch/user_access.h
index 928b91c58..8f1e587d0 100644
--- a/include/arch/arm/arch/user_access.h
+++ b/include/arch/arm/arch/user_access.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef ARCH_USER_ACCESS_H
diff --git a/include/arch/arm/armv/armv6/armv/benchmark.h b/include/arch/arm/armv/armv6/armv/benchmark.h
index 4266023c4..683ed7dd3 100644
--- a/include/arch/arm/armv/armv6/armv/benchmark.h
+++ b/include/arch/arm/armv/armv6/armv/benchmark.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef ARMV_BENCHMARK_H
diff --git a/include/arch/arm/armv/armv6/armv/context_switch.h b/include/arch/arm/armv/armv6/armv/context_switch.h
index 848862843..702f38afe 100644
--- a/include/arch/arm/armv/armv6/armv/context_switch.h
+++ b/include/arch/arm/armv/armv6/armv/context_switch.h
@@ -1,12 +1,9 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
+
 #ifndef __ARMV_CONTEXT_SWITCH_H__
 #define __ARMV_CONTEXT_SWITCH_H__
 
diff --git a/include/arch/arm/armv/armv6/armv/debug.h b/include/arch/arm/armv/armv6/armv/debug.h
index e5a3ebe8c..9fc731239 100644
--- a/include/arch/arm/armv/armv6/armv/debug.h
+++ b/include/arch/arm/armv/armv6/armv/debug.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_ARMV_DEBUG_H_
diff --git a/include/arch/arm/armv/armv6/armv/machine.h b/include/arch/arm/armv/armv6/armv/machine.h
index 64b2b2968..3c3436598 100644
--- a/include/arch/arm/armv/armv6/armv/machine.h
+++ b/include/arch/arm/armv/armv6/armv/machine.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_ARMV6_MACHINE_H
diff --git a/include/arch/arm/armv/armv7-a/armv/benchmark.h b/include/arch/arm/armv/armv7-a/armv/benchmark.h
index 79e2225db..65681339b 100644
--- a/include/arch/arm/armv/armv7-a/armv/benchmark.h
+++ b/include/arch/arm/armv/armv7-a/armv/benchmark.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef ARMV_BENCHMARK_H
diff --git a/include/arch/arm/armv/armv7-a/armv/context_switch.h b/include/arch/arm/armv/armv7-a/armv/context_switch.h
index 32f9a8863..d04b88a31 100644
--- a/include/arch/arm/armv/armv7-a/armv/context_switch.h
+++ b/include/arch/arm/armv/armv7-a/armv/context_switch.h
@@ -1,12 +1,9 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
+
 #ifndef __ARMV_CONTEXT_SWITCH_H__
 #define __ARMV_CONTEXT_SWITCH_H__
 
diff --git a/include/arch/arm/armv/armv7-a/armv/debug.h b/include/arch/arm/armv/armv7-a/armv/debug.h
index 130d7cb8f..5f21bec49 100644
--- a/include/arch/arm/armv/armv7-a/armv/debug.h
+++ b/include/arch/arm/armv/armv7-a/armv/debug.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_ARMV_DEBUG_H_
diff --git a/include/arch/arm/armv/armv7-a/armv/machine.h b/include/arch/arm/armv/armv7-a/armv/machine.h
index 5e4cdd3d6..4448b91b7 100644
--- a/include/arch/arm/armv/armv7-a/armv/machine.h
+++ b/include/arch/arm/armv/armv7-a/armv/machine.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_ARMV7A_MACHINE_H
diff --git a/include/arch/arm/armv/armv7-a/armv/vcpu.h b/include/arch/arm/armv/armv7-a/armv/vcpu.h
index 4561a4ffe..443a1ea25 100644
--- a/include/arch/arm/armv/armv7-a/armv/vcpu.h
+++ b/include/arch/arm/armv/armv7-a/armv/vcpu.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_ARMV_VCPU_H_
diff --git a/include/arch/arm/armv/armv8-a/64/armv/benchmark.h b/include/arch/arm/armv/armv8-a/64/armv/benchmark.h
index acb30a39b..07462c777 100644
--- a/include/arch/arm/armv/armv8-a/64/armv/benchmark.h
+++ b/include/arch/arm/armv/armv8-a/64/armv/benchmark.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef ARMV_BENCHMARK_H
diff --git a/include/arch/arm/armv/armv8-a/64/armv/context_switch.h b/include/arch/arm/armv/armv8-a/64/armv/context_switch.h
index a72407dd4..642cdcf9d 100644
--- a/include/arch/arm/armv/armv8-a/64/armv/context_switch.h
+++ b/include/arch/arm/armv/armv8-a/64/armv/context_switch.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARMV_CONTEXT_SWITCH_H__
diff --git a/include/arch/arm/armv/armv8-a/64/armv/debug.h b/include/arch/arm/armv/armv8-a/64/armv/debug.h
index 37c750b08..a56c4008d 100644
--- a/include/arch/arm/armv/armv8-a/64/armv/debug.h
+++ b/include/arch/arm/armv/armv8-a/64/armv/debug.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_ARMV_DEBUG_H_
diff --git a/include/arch/arm/armv/armv8-a/64/armv/machine.h b/include/arch/arm/armv/armv8-a/64/armv/machine.h
index 0aaf6490e..ca25884e7 100644
--- a/include/arch/arm/armv/armv8-a/64/armv/machine.h
+++ b/include/arch/arm/armv/armv8-a/64/armv/machine.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_ARMV_MACHINE_H
diff --git a/include/arch/arm/armv/armv8-a/64/armv/tlb.h b/include/arch/arm/armv/armv8-a/64/armv/tlb.h
index 370d64d7c..502af3046 100644
--- a/include/arch/arm/armv/armv8-a/64/armv/tlb.h
+++ b/include/arch/arm/armv/armv8-a/64/armv/tlb.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_ARMV_TLB_H
diff --git a/include/arch/arm/armv/armv8-a/64/armv/vcpu.h b/include/arch/arm/armv/armv8-a/64/armv/vcpu.h
index ee5b44dbc..540912d4c 100644
--- a/include/arch/arm/armv/armv8-a/64/armv/vcpu.h
+++ b/include/arch/arm/armv/armv8-a/64/armv/vcpu.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_ARMV_VCPU_H_
diff --git a/include/arch/riscv/arch/32/mode/hardware.h b/include/arch/riscv/arch/32/mode/hardware.h
index f9d7d0f7f..818d3f1ec 100644
--- a/include/arch/riscv/arch/32/mode/hardware.h
+++ b/include/arch/riscv/arch/32/mode/hardware.h
@@ -1,18 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODE_HARDWARE_H
diff --git a/include/arch/riscv/arch/32/mode/kernel/stack.h b/include/arch/riscv/arch/32/mode/kernel/stack.h
index 29b0a7832..b00f9cd32 100644
--- a/include/arch/riscv/arch/32/mode/kernel/stack.h
+++ b/include/arch/riscv/arch/32/mode/kernel/stack.h
@@ -1,18 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __KERNEL_MODE_STACK_H
diff --git a/include/arch/riscv/arch/32/mode/machine.h b/include/arch/riscv/arch/32/mode/machine.h
index fa7f964e8..d7bbacd4e 100644
--- a/include/arch/riscv/arch/32/mode/machine.h
+++ b/include/arch/riscv/arch/32/mode/machine.h
@@ -1,18 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODE_MACHINE_H
diff --git a/include/arch/riscv/arch/32/mode/object/structures.bf b/include/arch/riscv/arch/32/mode/object/structures.bf
index 460d1d9e3..09c99df45 100644
--- a/include/arch/riscv/arch/32/mode/object/structures.bf
+++ b/include/arch/riscv/arch/32/mode/object/structures.bf
@@ -1,18 +1,9 @@
 --
--- Copyright 2018, Data61
--- Commonwealth Scientific and Industrial Research Organisation (CSIRO)
--- ABN 41 687 119 230.
---
--- This software may be distributed and modified according to the terms of
--- the GNU General Public License version 2. Note that NO WARRANTY is provided.
--- See "LICENSE_GPLv2.txt" for details.
---
--- @TAG(DATA61_GPL)
---
-
---
--- Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+-- Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 -- Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+--
+-- SPDX-License-Identifier: GPL-2.0-only
+--
 
 #include <config.h>
 
diff --git a/include/arch/riscv/arch/32/mode/object/structures.h b/include/arch/riscv/arch/32/mode/object/structures.h
index 54494838f..10e5c072f 100644
--- a/include/arch/riscv/arch/32/mode/object/structures.h
+++ b/include/arch/riscv/arch/32/mode/object/structures.h
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_OBJECT_STRUCTURES_32_H
diff --git a/include/arch/riscv/arch/32/mode/types.h b/include/arch/riscv/arch/32/mode/types.h
index 8acabcc62..9839d849d 100644
--- a/include/arch/riscv/arch/32/mode/types.h
+++ b/include/arch/riscv/arch/32/mode/types.h
@@ -1,18 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODE_TYPES_H
diff --git a/include/arch/riscv/arch/64/mode/hardware.h b/include/arch/riscv/arch/64/mode/hardware.h
index 28151c23c..e2653610f 100644
--- a/include/arch/riscv/arch/64/mode/hardware.h
+++ b/include/arch/riscv/arch/64/mode/hardware.h
@@ -1,18 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODE_HARDWARE_H
diff --git a/include/arch/riscv/arch/64/mode/kernel/stack.h b/include/arch/riscv/arch/64/mode/kernel/stack.h
index ec5c58b3b..4bbcf7176 100644
--- a/include/arch/riscv/arch/64/mode/kernel/stack.h
+++ b/include/arch/riscv/arch/64/mode/kernel/stack.h
@@ -1,18 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __KERNEL_MODE_STACK_H
diff --git a/include/arch/riscv/arch/64/mode/machine.h b/include/arch/riscv/arch/64/mode/machine.h
index 4de4c502e..615f38a0e 100644
--- a/include/arch/riscv/arch/64/mode/machine.h
+++ b/include/arch/riscv/arch/64/mode/machine.h
@@ -1,18 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODE_MACHINE_H
diff --git a/include/arch/riscv/arch/64/mode/object/structures.bf b/include/arch/riscv/arch/64/mode/object/structures.bf
index 619e12c85..8859b33d7 100644
--- a/include/arch/riscv/arch/64/mode/object/structures.bf
+++ b/include/arch/riscv/arch/64/mode/object/structures.bf
@@ -1,19 +1,9 @@
 --
--- Copyright 2018, Data61
--- Commonwealth Scientific and Industrial Research Organisation (CSIRO)
--- ABN 41 687 119 230.
---
--- This software may be distributed and modified according to the terms of
--- the GNU General Public License version 2. Note that NO WARRANTY is provided.
--- See "LICENSE_GPLv2.txt" for details.
---
--- @TAG(DATA61_GPL)
---
-
---
--- Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+-- Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 -- Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
-
+--
+-- SPDX-License-Identifier: GPL-2.0-only
+--
 
 #include <config.h>
 
diff --git a/include/arch/riscv/arch/64/mode/object/structures.h b/include/arch/riscv/arch/64/mode/object/structures.h
index 9565d5412..fd9bdb3cf 100644
--- a/include/arch/riscv/arch/64/mode/object/structures.h
+++ b/include/arch/riscv/arch/64/mode/object/structures.h
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_OBJECT_STRUCTURES_64_H
diff --git a/include/arch/riscv/arch/64/mode/smp/ipi.h b/include/arch/riscv/arch/64/mode/smp/ipi.h
index c9818c720..73a3a2a81 100644
--- a/include/arch/riscv/arch/64/mode/smp/ipi.h
+++ b/include/arch/riscv/arch/64/mode/smp/ipi.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __MODE_SMP_IPI_H
diff --git a/include/arch/riscv/arch/64/mode/types.h b/include/arch/riscv/arch/64/mode/types.h
index b95175a47..51acec274 100644
--- a/include/arch/riscv/arch/64/mode/types.h
+++ b/include/arch/riscv/arch/64/mode/types.h
@@ -1,18 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODE_TYPES_H
diff --git a/include/arch/riscv/arch/api/types.h b/include/arch/riscv/arch/api/types.h
index 0ff6a824a..8881e3c3d 100644
--- a/include/arch/riscv/arch/api/types.h
+++ b/include/arch/riscv/arch/api/types.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 /*
diff --git a/include/arch/riscv/arch/benchmark.h b/include/arch/riscv/arch/benchmark.h
index f9c40a2c5..938a13421 100644
--- a/include/arch/riscv/arch/benchmark.h
+++ b/include/arch/riscv/arch/benchmark.h
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef ARCH_BENCHMARK_H
diff --git a/include/arch/riscv/arch/bootinfo.h b/include/arch/riscv/arch/bootinfo.h
index cbcefbb5d..2306b9470 100644
--- a/include/arch/riscv/arch/bootinfo.h
+++ b/include/arch/riscv/arch/bootinfo.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_BOOTINFO_H
diff --git a/include/arch/riscv/arch/fastpath/fastpath.h b/include/arch/riscv/arch/fastpath/fastpath.h
index 789917977..3296ea4a2 100644
--- a/include/arch/riscv/arch/fastpath/fastpath.h
+++ b/include/arch/riscv/arch/fastpath/fastpath.h
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_FASTPATH_H
diff --git a/include/arch/riscv/arch/kernel/boot.h b/include/arch/riscv/arch/kernel/boot.h
index de17af65f..01bc74a64 100644
--- a/include/arch/riscv/arch/kernel/boot.h
+++ b/include/arch/riscv/arch/kernel/boot.h
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_KERNEL_BOOT_H
diff --git a/include/arch/riscv/arch/kernel/thread.h b/include/arch/riscv/arch/kernel/thread.h
index 4b79ec6af..1a193bea6 100644
--- a/include/arch/riscv/arch/kernel/thread.h
+++ b/include/arch/riscv/arch/kernel/thread.h
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_KERNEL_THREAD_H
diff --git a/include/arch/riscv/arch/kernel/traps.h b/include/arch/riscv/arch/kernel/traps.h
index 9a02161d6..04bdff992 100644
--- a/include/arch/riscv/arch/kernel/traps.h
+++ b/include/arch/riscv/arch/kernel/traps.h
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __KERNEL_RISCV_TRAPS_H
diff --git a/include/arch/riscv/arch/kernel/vspace.h b/include/arch/riscv/arch/kernel/vspace.h
index 5a051d88a..151e07bcb 100644
--- a/include/arch/riscv/arch/kernel/vspace.h
+++ b/include/arch/riscv/arch/kernel/vspace.h
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_KERNEL_VSPACE_H
diff --git a/include/arch/riscv/arch/linker.h b/include/arch/riscv/arch/linker.h
index cde9025de..6f99b1320 100644
--- a/include/arch/riscv/arch/linker.h
+++ b/include/arch/riscv/arch/linker.h
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_LINKER_H
diff --git a/include/arch/riscv/arch/machine.h b/include/arch/riscv/arch/machine.h
index 99a24648b..0381e6f96 100644
--- a/include/arch/riscv/arch/machine.h
+++ b/include/arch/riscv/arch/machine.h
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MACHINE_H
diff --git a/include/arch/riscv/arch/machine/capdl.h b/include/arch/riscv/arch/machine/capdl.h
index abbe25516..847012f84 100644
--- a/include/arch/riscv/arch/machine/capdl.h
+++ b/include/arch/riscv/arch/machine/capdl.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MACHINE_CAPDL_H
diff --git a/include/arch/riscv/arch/machine/fpu.h b/include/arch/riscv/arch/machine/fpu.h
index 189f6b99a..814885121 100644
--- a/include/arch/riscv/arch/machine/fpu.h
+++ b/include/arch/riscv/arch/machine/fpu.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MACHINE_FPU_H
diff --git a/include/arch/riscv/arch/machine/hardware.h b/include/arch/riscv/arch/machine/hardware.h
index f14827e81..70697a408 100644
--- a/include/arch/riscv/arch/machine/hardware.h
+++ b/include/arch/riscv/arch/machine/hardware.h
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MACHINE_HARDWARE_H
diff --git a/include/arch/riscv/arch/machine/plic.h b/include/arch/riscv/arch/machine/plic.h
index 25be97edc..3ef78feab 100644
--- a/include/arch/riscv/arch/machine/plic.h
+++ b/include/arch/riscv/arch/machine/plic.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MACHINE_PLIC_H
diff --git a/include/arch/riscv/arch/machine/registerset.h b/include/arch/riscv/arch/machine/registerset.h
index 188bdd32e..64115ca8a 100644
--- a/include/arch/riscv/arch/machine/registerset.h
+++ b/include/arch/riscv/arch/machine/registerset.h
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MACHINE_REGISTERSET_H
diff --git a/include/arch/riscv/arch/machine/timer.h b/include/arch/riscv/arch/machine/timer.h
index 4226ad169..def1260a9 100644
--- a/include/arch/riscv/arch/machine/timer.h
+++ b/include/arch/riscv/arch/machine/timer.h
@@ -1,14 +1,9 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
+
 #ifndef __ARCH_MACHINE_TIMER_H
 #define __ARCH_MACHINE_TIMER_H
 
diff --git a/include/arch/riscv/arch/model/smp.h b/include/arch/riscv/arch/model/smp.h
index 7be504433..0e29fd92d 100644
--- a/include/arch/riscv/arch/model/smp.h
+++ b/include/arch/riscv/arch/model/smp.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODEL_SMP_H_
diff --git a/include/arch/riscv/arch/model/statedata.h b/include/arch/riscv/arch/model/statedata.h
index e3e72429b..b9d19d3fb 100644
--- a/include/arch/riscv/arch/model/statedata.h
+++ b/include/arch/riscv/arch/model/statedata.h
@@ -1,21 +1,9 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * Copyright 2018, DornerWorks
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_DORNERWORKS_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, DornerWorks
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODEL_STATEDATA_H
diff --git a/include/arch/riscv/arch/object/interrupt.h b/include/arch/riscv/arch/object/interrupt.h
index cee408289..6775d93fe 100644
--- a/include/arch/riscv/arch/object/interrupt.h
+++ b/include/arch/riscv/arch/object/interrupt.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_OBJECT_INTERRUPT_H
diff --git a/include/arch/riscv/arch/object/objecttype.h b/include/arch/riscv/arch/object/objecttype.h
index 8ffb82589..72c2894f1 100644
--- a/include/arch/riscv/arch/object/objecttype.h
+++ b/include/arch/riscv/arch/object/objecttype.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_OBJECT_OBJECTTYPE_H
diff --git a/include/arch/riscv/arch/object/structures.bf b/include/arch/riscv/arch/object/structures.bf
index 4bd9ccb67..abd7dd58a 100644
--- a/include/arch/riscv/arch/object/structures.bf
+++ b/include/arch/riscv/arch/object/structures.bf
@@ -1,16 +1,8 @@
 --
--- Copyright 2018, Data61
--- Commonwealth Scientific and Industrial Research Organisation (CSIRO)
--- ABN 41 687 119 230.
---
--- This software may be distributed and modified according to the terms of
--- the GNU General Public License version 2. Note that NO WARRANTY is provided.
--- See "LICENSE_GPLv2.txt" for details.
---
--- @TAG(DATA61_GPL)
-
---
--- Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+-- Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 -- Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+--
+-- SPDX-License-Identifier: GPL-2.0-only
+--
 
 #include <mode/object/structures.bf>
diff --git a/include/arch/riscv/arch/object/structures.h b/include/arch/riscv/arch/object/structures.h
index ffbc8c715..74a643be8 100644
--- a/include/arch/riscv/arch/object/structures.h
+++ b/include/arch/riscv/arch/object/structures.h
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_OBJECT_STRUCTURES_H
diff --git a/include/arch/riscv/arch/smp/ipi.h b/include/arch/riscv/arch/smp/ipi.h
index eb30f6f11..24c40febd 100644
--- a/include/arch/riscv/arch/smp/ipi.h
+++ b/include/arch/riscv/arch/smp/ipi.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_SMP_IPI_H
diff --git a/include/arch/riscv/arch/smp/ipi_inline.h b/include/arch/riscv/arch/smp/ipi_inline.h
index ba2712ed9..264514eba 100644
--- a/include/arch/riscv/arch/smp/ipi_inline.h
+++ b/include/arch/riscv/arch/smp/ipi_inline.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_SMP_IPI_INLINE_H
diff --git a/include/arch/riscv/arch/types.h b/include/arch/riscv/arch/types.h
index 86ea52c3d..c9d4f7f6d 100644
--- a/include/arch/riscv/arch/types.h
+++ b/include/arch/riscv/arch/types.h
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_TYPES_H
diff --git a/include/arch/x86/arch/32/mode/fastpath/fastpath.h b/include/arch/x86/arch/32/mode/fastpath/fastpath.h
index d7aa8acba..4bafb4256 100644
--- a/include/arch/x86/arch/32/mode/fastpath/fastpath.h
+++ b/include/arch/x86/arch/32/mode/fastpath/fastpath.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_FASTPATH_32_H
diff --git a/include/arch/x86/arch/32/mode/hardware.h b/include/arch/x86/arch/32/mode/hardware.h
index b0591d9e3..ca6e1eacc 100644
--- a/include/arch/x86/arch/32/mode/hardware.h
+++ b/include/arch/x86/arch/32/mode/hardware.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_HARDWARE_32_H
diff --git a/include/arch/x86/arch/32/mode/kernel/elf.h b/include/arch/x86/arch/32/mode/kernel/elf.h
index 54b611606..17bdb6910 100644
--- a/include/arch/x86/arch/32/mode/kernel/elf.h
+++ b/include/arch/x86/arch/32/mode/kernel/elf.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODE_KERNEL_ELF_H_
diff --git a/include/arch/x86/arch/32/mode/kernel/stack.h b/include/arch/x86/arch/32/mode/kernel/stack.h
index 5778979c0..98527b24a 100644
--- a/include/arch/x86/arch/32/mode/kernel/stack.h
+++ b/include/arch/x86/arch/32/mode/kernel/stack.h
@@ -1,14 +1,9 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
+
 #ifndef __KERNEL_MODE_STACK_H
 #define __KERNEL_MODE_STACK_H
 
diff --git a/include/arch/x86/arch/32/mode/kernel/tlb.h b/include/arch/x86/arch/32/mode/kernel/tlb.h
index e4419d35d..8e790caca 100644
--- a/include/arch/x86/arch/32/mode/kernel/tlb.h
+++ b/include/arch/x86/arch/32/mode/kernel/tlb.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __MODE_KERNEL_TLB_H
diff --git a/include/arch/x86/arch/32/mode/kernel/vspace.h b/include/arch/x86/arch/32/mode/kernel/vspace.h
index 77ffba51b..166022de9 100644
--- a/include/arch/x86/arch/32/mode/kernel/vspace.h
+++ b/include/arch/x86/arch/32/mode/kernel/vspace.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __MODE_KERNEL_VSPACE_H
diff --git a/include/arch/x86/arch/32/mode/machine.h b/include/arch/x86/arch/32/mode/machine.h
index 0d63f0488..e32f3f35f 100644
--- a/include/arch/x86/arch/32/mode/machine.h
+++ b/include/arch/x86/arch/32/mode/machine.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __MODE_MACHINE_H
diff --git a/include/arch/x86/arch/32/mode/machine/cpu_registers.h b/include/arch/x86/arch/32/mode/machine/cpu_registers.h
index 364137a13..75af80eee 100644
--- a/include/arch/x86/arch/32/mode/machine/cpu_registers.h
+++ b/include/arch/x86/arch/32/mode/machine/cpu_registers.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __MODE_MACHINE_CPU_REGISTERS_H
diff --git a/include/arch/x86/arch/32/mode/machine/debug.h b/include/arch/x86/arch/32/mode/machine/debug.h
index 3d52c4ee5..278f4d157 100644
--- a/include/arch/x86/arch/32/mode/machine/debug.h
+++ b/include/arch/x86/arch/32/mode/machine/debug.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODE_MACHINE_DEBUG_H_
diff --git a/include/arch/x86/arch/32/mode/machine/registerset.h b/include/arch/x86/arch/32/mode/machine/registerset.h
index 684f9d489..ac26bf84e 100644
--- a/include/arch/x86/arch/32/mode/machine/registerset.h
+++ b/include/arch/x86/arch/32/mode/machine/registerset.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __MODE_MACHINE_REGISTERSET_H
diff --git a/include/arch/x86/arch/32/mode/model/smp.h b/include/arch/x86/arch/32/mode/model/smp.h
index 7fe90fe3a..d9e2972aa 100644
--- a/include/arch/x86/arch/32/mode/model/smp.h
+++ b/include/arch/x86/arch/32/mode/model/smp.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __MODE_MODEL_SMP_H_
diff --git a/include/arch/x86/arch/32/mode/model/statedata.h b/include/arch/x86/arch/32/mode/model/statedata.h
index 4dba78b15..4c73d1164 100644
--- a/include/arch/x86/arch/32/mode/model/statedata.h
+++ b/include/arch/x86/arch/32/mode/model/statedata.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODEL_STATEDATA_32_H
diff --git a/include/arch/x86/arch/32/mode/object/structures.bf b/include/arch/x86/arch/32/mode/object/structures.bf
index f00e3e775..98c6b2d61 100644
--- a/include/arch/x86/arch/32/mode/object/structures.bf
+++ b/include/arch/x86/arch/32/mode/object/structures.bf
@@ -1,11 +1,7 @@
 --
 -- Copyright 2014, General Dynamics C4 Systems
 --
--- This software may be distributed and modified according to the terms of
--- the GNU General Public License version 2. Note that NO WARRANTY is provided.
--- See "LICENSE_GPLv2.txt" for details.
---
--- @TAG(GD_GPL)
+-- SPDX-License-Identifier: GPL-2.0-only
 --
 
 #include <config.h>
diff --git a/include/arch/x86/arch/32/mode/object/structures.h b/include/arch/x86/arch/32/mode/object/structures.h
index 2896c558b..b902da9e3 100644
--- a/include/arch/x86/arch/32/mode/object/structures.h
+++ b/include/arch/x86/arch/32/mode/object/structures.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __MODE_OBJECT_STRUCTURES_H
diff --git a/include/arch/x86/arch/32/mode/smp/ipi.h b/include/arch/x86/arch/32/mode/smp/ipi.h
index c78ef842e..6f307f0fc 100644
--- a/include/arch/x86/arch/32/mode/smp/ipi.h
+++ b/include/arch/x86/arch/32/mode/smp/ipi.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __MODE_SMP_IPI_H
diff --git a/include/arch/x86/arch/32/mode/stack.h b/include/arch/x86/arch/32/mode/stack.h
index e8e7f1c25..42e7b8670 100644
--- a/include/arch/x86/arch/32/mode/stack.h
+++ b/include/arch/x86/arch/32/mode/stack.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODE_STACK_H_
diff --git a/include/arch/x86/arch/32/mode/types.h b/include/arch/x86/arch/32/mode/types.h
index 8d11b1b4d..1e18cc69c 100644
--- a/include/arch/x86/arch/32/mode/types.h
+++ b/include/arch/x86/arch/32/mode/types.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODE_TYPES_H_
diff --git a/include/arch/x86/arch/64/mode/fastpath/fastpath.h b/include/arch/x86/arch/64/mode/fastpath/fastpath.h
index 7ba432906..882339163 100644
--- a/include/arch/x86/arch/64/mode/fastpath/fastpath.h
+++ b/include/arch/x86/arch/64/mode/fastpath/fastpath.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODE_FASTPATH_FASTPATH_H_
diff --git a/include/arch/x86/arch/64/mode/hardware.h b/include/arch/x86/arch/64/mode/hardware.h
index a236975f1..0fb8ac9e1 100644
--- a/include/arch/x86/arch/64/mode/hardware.h
+++ b/include/arch/x86/arch/64/mode/hardware.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_HARDWARE_32_H
diff --git a/include/arch/x86/arch/64/mode/kernel/elf.h b/include/arch/x86/arch/64/mode/kernel/elf.h
index 7088d8ccf..ddafdc8dc 100644
--- a/include/arch/x86/arch/64/mode/kernel/elf.h
+++ b/include/arch/x86/arch/64/mode/kernel/elf.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODE_KERNEL_ELF_H_
diff --git a/include/arch/x86/arch/64/mode/kernel/stack.h b/include/arch/x86/arch/64/mode/kernel/stack.h
index 8e22def83..ee2a75f36 100644
--- a/include/arch/x86/arch/64/mode/kernel/stack.h
+++ b/include/arch/x86/arch/64/mode/kernel/stack.h
@@ -1,14 +1,9 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
+
 #ifndef __KERNEL_MODE_STACK_H
 #define __KERNEL_MODE_STACK_H
 
diff --git a/include/arch/x86/arch/64/mode/kernel/tlb.h b/include/arch/x86/arch/64/mode/kernel/tlb.h
index e0082a55e..6e8462123 100644
--- a/include/arch/x86/arch/64/mode/kernel/tlb.h
+++ b/include/arch/x86/arch/64/mode/kernel/tlb.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __MODE_KERNEL_TLB_H
diff --git a/include/arch/x86/arch/64/mode/kernel/vspace.h b/include/arch/x86/arch/64/mode/kernel/vspace.h
index 69b601142..8aa6e0f1f 100644
--- a/include/arch/x86/arch/64/mode/kernel/vspace.h
+++ b/include/arch/x86/arch/64/mode/kernel/vspace.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __MODE_KERNEL_VSPACE_H
diff --git a/include/arch/x86/arch/64/mode/machine.h b/include/arch/x86/arch/64/mode/machine.h
index 8dd88ca26..e3d95b97f 100644
--- a/include/arch/x86/arch/64/mode/machine.h
+++ b/include/arch/x86/arch/64/mode/machine.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODE_MACHINE_H_
diff --git a/include/arch/x86/arch/64/mode/machine/cpu_registers.h b/include/arch/x86/arch/64/mode/machine/cpu_registers.h
index bb550736c..ee7fa610a 100644
--- a/include/arch/x86/arch/64/mode/machine/cpu_registers.h
+++ b/include/arch/x86/arch/64/mode/machine/cpu_registers.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODE_MACHINE_CPU_REGISTERS_H_
diff --git a/include/arch/x86/arch/64/mode/machine/debug.h b/include/arch/x86/arch/64/mode/machine/debug.h
index 544811044..96ff615c0 100644
--- a/include/arch/x86/arch/64/mode/machine/debug.h
+++ b/include/arch/x86/arch/64/mode/machine/debug.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODE_MACHINE_DEBUG_H_
diff --git a/include/arch/x86/arch/64/mode/machine/registerset.h b/include/arch/x86/arch/64/mode/machine/registerset.h
index e84603b67..641c5dcaf 100644
--- a/include/arch/x86/arch/64/mode/machine/registerset.h
+++ b/include/arch/x86/arch/64/mode/machine/registerset.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODE_MACHINE_REGISTERSET_H_
diff --git a/include/arch/x86/arch/64/mode/model/smp.h b/include/arch/x86/arch/64/mode/model/smp.h
index 40b8e6079..6e9c5ae14 100644
--- a/include/arch/x86/arch/64/mode/model/smp.h
+++ b/include/arch/x86/arch/64/mode/model/smp.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __MODE_MODEL_SMP_H_
diff --git a/include/arch/x86/arch/64/mode/model/statedata.h b/include/arch/x86/arch/64/mode/model/statedata.h
index 4bc50436c..16613a027 100644
--- a/include/arch/x86/arch/64/mode/model/statedata.h
+++ b/include/arch/x86/arch/64/mode/model/statedata.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODE_MODEL_STATEDATA_H_
diff --git a/include/arch/x86/arch/64/mode/object/structures.bf b/include/arch/x86/arch/64/mode/object/structures.bf
index 04fa39cca..c16c68789 100644
--- a/include/arch/x86/arch/64/mode/object/structures.bf
+++ b/include/arch/x86/arch/64/mode/object/structures.bf
@@ -1,13 +1,7 @@
 --
--- Copyright 2017, Data61
--- Commonwealth Scientific and Industrial Research Organisation (CSIRO)
--- ABN 41 687 119 230.
+-- Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 --
--- This software may be distributed and modified according to the terms of
--- the GNU General Public License version 2. Note that NO WARRANTY is provided.
--- See "LICENSE_GPLv2.txt" for details.
---
--- @TAG(DATA61_GPL)
+-- SPDX-License-Identifier: GPL-2.0-only
 --
 
 #include <config.h>
diff --git a/include/arch/x86/arch/64/mode/object/structures.h b/include/arch/x86/arch/64/mode/object/structures.h
index ada9d3664..c4217eb7e 100644
--- a/include/arch/x86/arch/64/mode/object/structures.h
+++ b/include/arch/x86/arch/64/mode/object/structures.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODE_OBJECT_STRUCTURES_H_
diff --git a/include/arch/x86/arch/64/mode/smp/ipi.h b/include/arch/x86/arch/64/mode/smp/ipi.h
index 33979f9fc..fe194a426 100644
--- a/include/arch/x86/arch/64/mode/smp/ipi.h
+++ b/include/arch/x86/arch/64/mode/smp/ipi.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __MODE_SMP_IPI_H
diff --git a/include/arch/x86/arch/64/mode/types.h b/include/arch/x86/arch/64/mode/types.h
index a552c967d..759d4ad58 100644
--- a/include/arch/x86/arch/64/mode/types.h
+++ b/include/arch/x86/arch/64/mode/types.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODE_TYPES_H_
diff --git a/include/arch/x86/arch/api/types.h b/include/arch/x86/arch/api/types.h
index bda8beaba..202b63605 100644
--- a/include/arch/x86/arch/api/types.h
+++ b/include/arch/x86/arch/api/types.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_API_TYPES
diff --git a/include/arch/x86/arch/benchmark.h b/include/arch/x86/arch/benchmark.h
index 6bb462c32..0b6071f2b 100644
--- a/include/arch/x86/arch/benchmark.h
+++ b/include/arch/x86/arch/benchmark.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef ARCH_BENCHMARK_H
diff --git a/include/arch/x86/arch/bootinfo.h b/include/arch/x86/arch/bootinfo.h
index 847c6feb6..9948c8adc 100644
--- a/include/arch/x86/arch/bootinfo.h
+++ b/include/arch/x86/arch/bootinfo.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_BOOTINFO_H
diff --git a/include/arch/x86/arch/fastpath/fastpath.h b/include/arch/x86/arch/fastpath/fastpath.h
index 1d0d4cf3e..45ca4c3d6 100644
--- a/include/arch/x86/arch/fastpath/fastpath.h
+++ b/include/arch/x86/arch/fastpath/fastpath.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_FASTPATH_H
diff --git a/include/arch/x86/arch/kernel/apic.h b/include/arch/x86/arch/kernel/apic.h
index ba52e16f3..016b4ea43 100644
--- a/include/arch/x86/arch/kernel/apic.h
+++ b/include/arch/x86/arch/kernel/apic.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_KERNEL_APIC_H
diff --git a/include/arch/x86/arch/kernel/boot.h b/include/arch/x86/arch/kernel/boot.h
index cd3e711ea..a01ffbeea 100644
--- a/include/arch/x86/arch/kernel/boot.h
+++ b/include/arch/x86/arch/kernel/boot.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_KERNEL_BOOT_NODE_H
diff --git a/include/arch/x86/arch/kernel/boot_sys.h b/include/arch/x86/arch/kernel/boot_sys.h
index e2aba15a2..c2650c166 100644
--- a/include/arch/x86/arch/kernel/boot_sys.h
+++ b/include/arch/x86/arch/kernel/boot_sys.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_KERNEL_BOOT_SYS_H
diff --git a/include/arch/x86/arch/kernel/cmdline.h b/include/arch/x86/arch/kernel/cmdline.h
index 63736cb20..660beeee7 100644
--- a/include/arch/x86/arch/kernel/cmdline.h
+++ b/include/arch/x86/arch/kernel/cmdline.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_KERNEL_CMDLINE_H
diff --git a/include/arch/x86/arch/kernel/elf.h b/include/arch/x86/arch/kernel/elf.h
index 75fdeb5b6..ae9fb58b9 100644
--- a/include/arch/x86/arch/kernel/elf.h
+++ b/include/arch/x86/arch/kernel/elf.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_KERNEL_ELF_H_
diff --git a/include/arch/x86/arch/kernel/ept.h b/include/arch/x86/arch/kernel/ept.h
index 4c5b584ac..f2e4910f4 100644
--- a/include/arch/x86/arch/kernel/ept.h
+++ b/include/arch/x86/arch/kernel/ept.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_KERNEL_EPT_H
diff --git a/include/arch/x86/arch/kernel/multiboot.h b/include/arch/x86/arch/kernel/multiboot.h
index 7423d910c..7a1b3b5cc 100644
--- a/include/arch/x86/arch/kernel/multiboot.h
+++ b/include/arch/x86/arch/kernel/multiboot.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_KERNEL_MULTIBOOT_H
diff --git a/include/arch/x86/arch/kernel/multiboot2.h b/include/arch/x86/arch/kernel/multiboot2.h
index b0c837731..babcbac53 100644
--- a/include/arch/x86/arch/kernel/multiboot2.h
+++ b/include/arch/x86/arch/kernel/multiboot2.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2017, Genode Labs GmbH
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GENODE_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_KERNEL_MULTIBOOT2_H
diff --git a/include/arch/x86/arch/kernel/smp_sys.h b/include/arch/x86/arch/kernel/smp_sys.h
index 16a41353a..4d6890970 100644
--- a/include/arch/x86/arch/kernel/smp_sys.h
+++ b/include/arch/x86/arch/kernel/smp_sys.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_KERNEL_SMP_SYS_H_
diff --git a/include/arch/x86/arch/kernel/thread.h b/include/arch/x86/arch/kernel/thread.h
index 8117b05d2..81cf6bc1e 100644
--- a/include/arch/x86/arch/kernel/thread.h
+++ b/include/arch/x86/arch/kernel/thread.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_KERNEL_THREAD_H
diff --git a/include/arch/x86/arch/kernel/tlb.h b/include/arch/x86/arch/kernel/tlb.h
index c4fd0653b..c0e054b9a 100644
--- a/include/arch/x86/arch/kernel/tlb.h
+++ b/include/arch/x86/arch/kernel/tlb.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_KERNEL_TLB_H
diff --git a/include/arch/x86/arch/kernel/tlb_bitmap.h b/include/arch/x86/arch/kernel/tlb_bitmap.h
index cdcd31b1a..12278f999 100644
--- a/include/arch/x86/arch/kernel/tlb_bitmap.h
+++ b/include/arch/x86/arch/kernel/tlb_bitmap.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_KERNEL_TLB_BITMAP_H_
diff --git a/include/arch/x86/arch/kernel/tlb_bitmap_defs.h b/include/arch/x86/arch/kernel/tlb_bitmap_defs.h
index 4f98121c1..780b45486 100644
--- a/include/arch/x86/arch/kernel/tlb_bitmap_defs.h
+++ b/include/arch/x86/arch/kernel/tlb_bitmap_defs.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_KERNEL_TLB_BITMAP_DEFS_H_
diff --git a/include/arch/x86/arch/kernel/traps.h b/include/arch/x86/arch/kernel/traps.h
index ce237a58a..383a857bb 100644
--- a/include/arch/x86/arch/kernel/traps.h
+++ b/include/arch/x86/arch/kernel/traps.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2016, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __KERNEL_X86_TRAPS_H
diff --git a/include/arch/x86/arch/kernel/vspace.h b/include/arch/x86/arch/kernel/vspace.h
index 111ab9b63..12d4cf798 100644
--- a/include/arch/x86/arch/kernel/vspace.h
+++ b/include/arch/x86/arch/kernel/vspace.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_KERNEL_VSPACE_H
diff --git a/include/arch/x86/arch/kernel/x2apic.h b/include/arch/x86/arch/kernel/x2apic.h
index 509a6b838..b417eadbe 100644
--- a/include/arch/x86/arch/kernel/x2apic.h
+++ b/include/arch/x86/arch/kernel/x2apic.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_KERNEL_X2APIC_H_
diff --git a/include/arch/x86/arch/kernel/xapic.h b/include/arch/x86/arch/kernel/xapic.h
index 36a3becb8..1fb9131c7 100644
--- a/include/arch/x86/arch/kernel/xapic.h
+++ b/include/arch/x86/arch/kernel/xapic.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_KERNEL_XAPIC_H_
diff --git a/include/arch/x86/arch/linker.h b/include/arch/x86/arch/linker.h
index 9f4eaace8..897dfe0c0 100644
--- a/include/arch/x86/arch/linker.h
+++ b/include/arch/x86/arch/linker.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __ARCH_LINKER_H
diff --git a/include/arch/x86/arch/machine.h b/include/arch/x86/arch/machine.h
index 2396a523f..49ca7b43d 100644
--- a/include/arch/x86/arch/machine.h
+++ b/include/arch/x86/arch/machine.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MACHINE_H
diff --git a/include/arch/x86/arch/machine/capdl.h b/include/arch/x86/arch/machine/capdl.h
index abbe25516..847012f84 100644
--- a/include/arch/x86/arch/machine/capdl.h
+++ b/include/arch/x86/arch/machine/capdl.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MACHINE_CAPDL_H
diff --git a/include/arch/x86/arch/machine/cpu_registers.h b/include/arch/x86/arch/machine/cpu_registers.h
index 7e3037123..acda55e06 100644
--- a/include/arch/x86/arch/machine/cpu_registers.h
+++ b/include/arch/x86/arch/machine/cpu_registers.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MACHINE_CPU_REGISTERS_H
diff --git a/include/arch/x86/arch/machine/debug.h b/include/arch/x86/arch/machine/debug.h
index a5a1ffca1..3dc79c407 100644
--- a/include/arch/x86/arch/machine/debug.h
+++ b/include/arch/x86/arch/machine/debug.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MACHINE_DEBUG_H_
diff --git a/include/arch/x86/arch/machine/fpu.h b/include/arch/x86/arch/machine/fpu.h
index 4657e885b..92f22edaa 100644
--- a/include/arch/x86/arch/machine/fpu.h
+++ b/include/arch/x86/arch/machine/fpu.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MACHINE_FPU_H
diff --git a/include/arch/x86/arch/machine/hardware.h b/include/arch/x86/arch/machine/hardware.h
index 186f4d190..01850b45a 100644
--- a/include/arch/x86/arch/machine/hardware.h
+++ b/include/arch/x86/arch/machine/hardware.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MACHINE_HARDWARE_H
diff --git a/include/arch/x86/arch/machine/pat.h b/include/arch/x86/arch/machine/pat.h
index d24879b73..4f1f08c93 100644
--- a/include/arch/x86/arch/machine/pat.h
+++ b/include/arch/x86/arch/machine/pat.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MACHINE_PAT_H
diff --git a/include/arch/x86/arch/machine/registerset.h b/include/arch/x86/arch/machine/registerset.h
index 3f7badff5..ef4b2784d 100644
--- a/include/arch/x86/arch/machine/registerset.h
+++ b/include/arch/x86/arch/machine/registerset.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MACHINE_REGISTERSET_H
diff --git a/include/arch/x86/arch/machine/timer.h b/include/arch/x86/arch/machine/timer.h
index b9c7f2364..0be9202fa 100644
--- a/include/arch/x86/arch/machine/timer.h
+++ b/include/arch/x86/arch/machine/timer.h
@@ -1,14 +1,9 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
+
 #ifndef __ARCH_MACHINE_TIMER_H
 #define __ARCH_MACHINE_TIMER_H
 
diff --git a/include/arch/x86/arch/model/smp.h b/include/arch/x86/arch/model/smp.h
index fc2e1bcf2..2193c9a60 100644
--- a/include/arch/x86/arch/model/smp.h
+++ b/include/arch/x86/arch/model/smp.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODEL_SMP_H_
diff --git a/include/arch/x86/arch/model/statedata.h b/include/arch/x86/arch/model/statedata.h
index d8a43a4d8..64b993927 100644
--- a/include/arch/x86/arch/model/statedata.h
+++ b/include/arch/x86/arch/model/statedata.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_MODEL_STATEDATA_H
diff --git a/include/arch/x86/arch/object/interrupt.h b/include/arch/x86/arch/object/interrupt.h
index f6f8a7d54..f796c630a 100644
--- a/include/arch/x86/arch/object/interrupt.h
+++ b/include/arch/x86/arch/object/interrupt.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_OBJECT_INTERRUPT_H
diff --git a/include/arch/x86/arch/object/ioport.h b/include/arch/x86/arch/object/ioport.h
index 66df644df..d203ffc81 100644
--- a/include/arch/x86/arch/object/ioport.h
+++ b/include/arch/x86/arch/object/ioport.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_OBJECT_IOPORT_H
diff --git a/include/arch/x86/arch/object/iospace.h b/include/arch/x86/arch/object/iospace.h
index 7e5f74936..507efdef0 100644
--- a/include/arch/x86/arch/object/iospace.h
+++ b/include/arch/x86/arch/object/iospace.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_OBJECT_IOSPACE_H
diff --git a/include/arch/x86/arch/object/objecttype.h b/include/arch/x86/arch/object/objecttype.h
index 6d4b33556..8464e7d27 100644
--- a/include/arch/x86/arch/object/objecttype.h
+++ b/include/arch/x86/arch/object/objecttype.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_OBJECT_OBJECTTYPE_H
diff --git a/include/arch/x86/arch/object/structures.bf b/include/arch/x86/arch/object/structures.bf
index 0c85170bc..17b3a798f 100644
--- a/include/arch/x86/arch/object/structures.bf
+++ b/include/arch/x86/arch/object/structures.bf
@@ -1,11 +1,7 @@
 --
 -- Copyright 2014, General Dynamics C4 Systems
 --
--- This software may be distributed and modified according to the terms of
--- the GNU General Public License version 2. Note that NO WARRANTY is provided.
--- See "LICENSE_GPLv2.txt" for details.
---
--- @TAG(GD_GPL)
+-- SPDX-License-Identifier: GPL-2.0-only
 --
 
 #include <mode/object/structures.bf>
diff --git a/include/arch/x86/arch/object/structures.h b/include/arch/x86/arch/object/structures.h
index 188cd9ed9..7367a9025 100644
--- a/include/arch/x86/arch/object/structures.h
+++ b/include/arch/x86/arch/object/structures.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_OBJECT_STRUCTURES_H
diff --git a/include/arch/x86/arch/object/tcb.h b/include/arch/x86/arch/object/tcb.h
index 34e21c5f3..e95b827ce 100644
--- a/include/arch/x86/arch/object/tcb.h
+++ b/include/arch/x86/arch/object/tcb.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_OBJECT_TCB_H
diff --git a/include/arch/x86/arch/object/vcpu.h b/include/arch/x86/arch/object/vcpu.h
index b5a42373d..26810d3dc 100644
--- a/include/arch/x86/arch/object/vcpu.h
+++ b/include/arch/x86/arch/object/vcpu.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2016, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_OBJECT_VCPU_H
diff --git a/include/arch/x86/arch/smp/ipi.h b/include/arch/x86/arch/smp/ipi.h
index 9f0837817..833ac55d9 100644
--- a/include/arch/x86/arch/smp/ipi.h
+++ b/include/arch/x86/arch/smp/ipi.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2016, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_SMP_IPI_H
diff --git a/include/arch/x86/arch/smp/ipi_inline.h b/include/arch/x86/arch/smp/ipi_inline.h
index 5d4a96e67..3d09a7456 100644
--- a/include/arch/x86/arch/smp/ipi_inline.h
+++ b/include/arch/x86/arch/smp/ipi_inline.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_KERNEL_IPI_INLINE_H
diff --git a/include/arch/x86/arch/types.h b/include/arch/x86/arch/types.h
index 308cb4424..a14fc1673 100644
--- a/include/arch/x86/arch/types.h
+++ b/include/arch/x86/arch/types.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_TYPES_H
diff --git a/include/assert.h b/include/assert.h
index 0299df670..cec30f957 100644
--- a/include/assert.h
+++ b/include/assert.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ASSERT_H
diff --git a/include/basic_types.h b/include/basic_types.h
index 2ec7e94c1..bdd34a032 100644
--- a/include/basic_types.h
+++ b/include/basic_types.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __BASIC_TYPES_H
diff --git a/include/benchmark/benchmark.h b/include/benchmark/benchmark.h
index a5e37bd21..b2ed12caf 100644
--- a/include/benchmark/benchmark.h
+++ b/include/benchmark/benchmark.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef BENCHMARK_H
diff --git a/include/benchmark/benchmark_track.h b/include/benchmark/benchmark_track.h
index f48fc70c3..f1a2ff6ab 100644
--- a/include/benchmark/benchmark_track.h
+++ b/include/benchmark/benchmark_track.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2016, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef BENCHMARK_TRACK_H
diff --git a/include/benchmark/benchmark_utilisation.h b/include/benchmark/benchmark_utilisation.h
index fa104a4b2..1f8bd67a5 100644
--- a/include/benchmark/benchmark_utilisation.h
+++ b/include/benchmark/benchmark_utilisation.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2016, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef BENCHMARK_UTILISATION_H
diff --git a/include/benchmark/benchmark_utilisation_.h b/include/benchmark/benchmark_utilisation_.h
index 73c6f5b07..3175a7f97 100644
--- a/include/benchmark/benchmark_utilisation_.h
+++ b/include/benchmark/benchmark_utilisation_.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef _BENCHMARK_UTILISATION_H
diff --git a/include/bootinfo.h b/include/bootinfo.h
index 6a368ac04..ca115b9f0 100644
--- a/include/bootinfo.h
+++ b/include/bootinfo.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __BOOTINFO_H
diff --git a/include/compound_types.h b/include/compound_types.h
index 6bf16ba0f..dfb91132f 100644
--- a/include/compound_types.h
+++ b/include/compound_types.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __COMPOUND_TYPES_H
diff --git a/include/config.h b/include/config.h
index 1bfeb0c6d..a378a85c1 100644
--- a/include/config.h
+++ b/include/config.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __CONFIG_H
diff --git a/include/drivers/irq/am335x.h b/include/drivers/irq/am335x.h
index 0e796c03e..9c41ff972 100644
--- a/include/drivers/irq/am335x.h
+++ b/include/drivers/irq/am335x.h
@@ -1,12 +1,9 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
+
 #ifndef __DRIVERS_IRQ_AM335X_H
 #define __DRIVERS_IRQ_AM335X_H
 
diff --git a/include/drivers/irq/bcm2836-armctrl-ic.h b/include/drivers/irq/bcm2836-armctrl-ic.h
index 25c171017..104a99afa 100644
--- a/include/drivers/irq/bcm2836-armctrl-ic.h
+++ b/include/drivers/irq/bcm2836-armctrl-ic.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __DRIVERS_IRQ_BCM_H
diff --git a/include/drivers/irq/hifive.h b/include/drivers/irq/hifive.h
index 3e208a473..e714c3960 100644
--- a/include/drivers/irq/hifive.h
+++ b/include/drivers/irq/hifive.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __DRIVER_IRQ_HIFIVE_H
diff --git a/include/drivers/irq/imx31.h b/include/drivers/irq/imx31.h
index 74d05e9e1..f1897eb75 100644
--- a/include/drivers/irq/imx31.h
+++ b/include/drivers/irq/imx31.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __DRIVER_IRQ_IMX31_H
diff --git a/include/drivers/irq/omap3.h b/include/drivers/irq/omap3.h
index 6d675827a..497790f15 100644
--- a/include/drivers/irq/omap3.h
+++ b/include/drivers/irq/omap3.h
@@ -1,12 +1,9 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
+
 #ifndef __DRIVER_IRQ_OMAP3_H
 #define __DRIVER_IRQ_OMAP3_H
 
diff --git a/include/drivers/timer/allwinner.h b/include/drivers/timer/allwinner.h
index adcf6ef48..e450b3051 100644
--- a/include/drivers/timer/allwinner.h
+++ b/include/drivers/timer/allwinner.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __DRIVER_TIMER_ALLWINNER_H
diff --git a/include/drivers/timer/am335x.h b/include/drivers/timer/am335x.h
index d1f12ca3e..0f5b5c99b 100644
--- a/include/drivers/timer/am335x.h
+++ b/include/drivers/timer/am335x.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __DRIVER_TIMER_AM335X_H
diff --git a/include/drivers/timer/arm_generic.h b/include/drivers/timer/arm_generic.h
index 0ab1f4d19..5534f206e 100644
--- a/include/drivers/timer/arm_generic.h
+++ b/include/drivers/timer/arm_generic.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __DRIVERS_TIMER_ARM_GENERIC_H_
diff --git a/include/drivers/timer/arm_global.h b/include/drivers/timer/arm_global.h
index 250a47a95..bf81d4f40 100644
--- a/include/drivers/timer/arm_global.h
+++ b/include/drivers/timer/arm_global.h
@@ -1,14 +1,9 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
+
 #ifndef __DRIVERS_TIMER_ARM_GLOBAL_H
 #define __DRIVERS_TIMER_ARM_GLOBAL_H
 
diff --git a/include/drivers/timer/arm_priv.h b/include/drivers/timer/arm_priv.h
index ed272498e..3fa2fd08f 100644
--- a/include/drivers/timer/arm_priv.h
+++ b/include/drivers/timer/arm_priv.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __DRIVERS_TIMER_ARM_PRIV_H_
diff --git a/include/drivers/timer/exynos4412-mct.h b/include/drivers/timer/exynos4412-mct.h
index f62fedcad..666f85dd6 100644
--- a/include/drivers/timer/exynos4412-mct.h
+++ b/include/drivers/timer/exynos4412-mct.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __DRIVER_TIMER_MCT_EXYNOS4412_H
diff --git a/include/drivers/timer/imx31-epit.bf b/include/drivers/timer/imx31-epit.bf
index 73ca1fde0..72bbade58 100644
--- a/include/drivers/timer/imx31-epit.bf
+++ b/include/drivers/timer/imx31-epit.bf
@@ -1,11 +1,7 @@
 --
 -- Copyright 2014, General Dynamics C4 Systems
 --
--- This software may be distributed and modified according to the terms of
--- the GNU General Public License version 2. Note that NO WARRANTY is provided.
--- See "LICENSE_GPLv2.txt" for details.
---
--- @TAG(GD_GPL)
+-- SPDX-License-Identifier: GPL-2.0-only
 --
 
 base 32
diff --git a/include/drivers/timer/imx31-epit.h b/include/drivers/timer/imx31-epit.h
index 17558a365..80c266e30 100644
--- a/include/drivers/timer/imx31-epit.h
+++ b/include/drivers/timer/imx31-epit.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __DRIVERS_TIMER_IMX31_EPIT_H
diff --git a/include/drivers/timer/imx31-gpt.h b/include/drivers/timer/imx31-gpt.h
index 6781df145..ad008078e 100644
--- a/include/drivers/timer/imx31-gpt.h
+++ b/include/drivers/timer/imx31-gpt.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __DRIVERS_TIMER_IMX31_GPT_H
diff --git a/include/drivers/timer/mct.h b/include/drivers/timer/mct.h
index 8157f8502..9c3b26714 100644
--- a/include/drivers/timer/mct.h
+++ b/include/drivers/timer/mct.h
@@ -1,12 +1,9 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
+
 #ifndef __DRIVERS_TIMER_MCT_H
 #define __DRIVERS_TIMER_MCT_H
 
diff --git a/include/drivers/timer/omap3430.h b/include/drivers/timer/omap3430.h
index 61de62d6b..aea66884d 100644
--- a/include/drivers/timer/omap3430.h
+++ b/include/drivers/timer/omap3430.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __DRIVER_TIMER_OMAP3_H
diff --git a/include/fastpath/fastpath.h b/include/fastpath/fastpath.h
index c0fcdb336..1120e69a9 100644
--- a/include/fastpath/fastpath.h
+++ b/include/fastpath/fastpath.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __FASTPATH_H
diff --git a/include/kernel/boot.h b/include/kernel/boot.h
index 0eafb2fa9..252b5c6d3 100644
--- a/include/kernel/boot.h
+++ b/include/kernel/boot.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __KERNEL_BOOT_H
diff --git a/include/kernel/cspace.h b/include/kernel/cspace.h
index 2f923b92a..513005042 100644
--- a/include/kernel/cspace.h
+++ b/include/kernel/cspace.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __KERNEL_CSPACE_H
diff --git a/include/kernel/faulthandler.h b/include/kernel/faulthandler.h
index 42eb718cf..500eee135 100644
--- a/include/kernel/faulthandler.h
+++ b/include/kernel/faulthandler.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __KERNEL_FAULTHANDLER_H
diff --git a/include/kernel/sporadic.h b/include/kernel/sporadic.h
index 42c71eb16..63fd47107 100644
--- a/include/kernel/sporadic.h
+++ b/include/kernel/sporadic.h
@@ -1,14 +1,9 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
+
 #ifndef __KERNEL_SPORADIC_H
 #define __KERNEL_SPORADIC_H
 /* This header presents the interface for sporadic servers,
diff --git a/include/kernel/stack.h b/include/kernel/stack.h
index f96abf15a..dd10d6a96 100644
--- a/include/kernel/stack.h
+++ b/include/kernel/stack.h
@@ -1,14 +1,9 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
+
 #ifndef __KERNEL_STACK_H
 #define __KERNEL_STACK_H
 
diff --git a/include/kernel/thread.h b/include/kernel/thread.h
index acfdb0f24..a6da340c5 100644
--- a/include/kernel/thread.h
+++ b/include/kernel/thread.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __KERNEL_THREAD_H
diff --git a/include/kernel/traps.h b/include/kernel/traps.h
index 3c58880b3..019b3c088 100644
--- a/include/kernel/traps.h
+++ b/include/kernel/traps.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2016, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __KERNEL_TRAPS_H
diff --git a/include/kernel/vspace.h b/include/kernel/vspace.h
index 8b94837d4..21fb949a6 100644
--- a/include/kernel/vspace.h
+++ b/include/kernel/vspace.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __KERNEL_VSPACE_H
diff --git a/include/linker.h b/include/linker.h
index 88aab73a6..1d76792de 100644
--- a/include/linker.h
+++ b/include/linker.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __LINKER_H
diff --git a/include/machine.h b/include/machine.h
index fffddfb3c..73c00d67e 100644
--- a/include/machine.h
+++ b/include/machine.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __MACHINE_H
diff --git a/include/machine/assembler.h b/include/machine/assembler.h
index 4deea883b..87c590538 100644
--- a/include/machine/assembler.h
+++ b/include/machine/assembler.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __MACHINE_ASSEMBLER_H__
diff --git a/include/machine/capdl.h b/include/machine/capdl.h
index 3af50babe..e12634acd 100644
--- a/include/machine/capdl.h
+++ b/include/machine/capdl.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __MACHINE_CAPDL_H
diff --git a/include/machine/debug.h b/include/machine/debug.h
index be3db4dd3..8b3ab554d 100644
--- a/include/machine/debug.h
+++ b/include/machine/debug.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __MACHINE_DEBUG_H_
diff --git a/include/machine/fpu.h b/include/machine/fpu.h
index 27cee96cc..f2f343016 100644
--- a/include/machine/fpu.h
+++ b/include/machine/fpu.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __MACHINE_FPU_H
diff --git a/include/machine/interrupt.h b/include/machine/interrupt.h
index 83f0afff7..7d7b37221 100644
--- a/include/machine/interrupt.h
+++ b/include/machine/interrupt.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __MACHINE_INTERRUPT_H
diff --git a/include/machine/io.h b/include/machine/io.h
index 179abd533..108250448 100644
--- a/include/machine/io.h
+++ b/include/machine/io.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __MACHINE_IO_H_
diff --git a/include/machine/profiler.h b/include/machine/profiler.h
index bc682abaa..790e1e853 100644
--- a/include/machine/profiler.h
+++ b/include/machine/profiler.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 /*
diff --git a/include/machine/registerset.h b/include/machine/registerset.h
index d3cb88444..5f45bb36b 100644
--- a/include/machine/registerset.h
+++ b/include/machine/registerset.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __MACHINE_REGISTERSET_H
diff --git a/include/machine/timer.h b/include/machine/timer.h
index d13d96f61..3fc50fd28 100644
--- a/include/machine/timer.h
+++ b/include/machine/timer.h
@@ -1,14 +1,9 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
+
 #ifndef __MACHINE_TIMER_H
 #define __MACHINE_TIMER_H
 
diff --git a/include/model/preemption.h b/include/model/preemption.h
index d8e7d21d8..7b49f0632 100644
--- a/include/model/preemption.h
+++ b/include/model/preemption.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __MODEL_PREEMPTION_H
diff --git a/include/model/smp.h b/include/model/smp.h
index 71c67b84e..61dba9c55 100644
--- a/include/model/smp.h
+++ b/include/model/smp.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __MODEL_SMP_H_
diff --git a/include/model/statedata.h b/include/model/statedata.h
index bdd1ba0fb..4082df1bc 100644
--- a/include/model/statedata.h
+++ b/include/model/statedata.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __MODEL_STATEDATA_H_
diff --git a/include/object.h b/include/object.h
index 5c76177b1..cbc2a9b76 100644
--- a/include/object.h
+++ b/include/object.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __OBJECT_H
diff --git a/include/object/cap.h b/include/object/cap.h
index 790ebd905..540db63ae 100644
--- a/include/object/cap.h
+++ b/include/object/cap.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __OBJECT_CAP_H
diff --git a/include/object/cnode.h b/include/object/cnode.h
index 0e7b099df..c26a5ba33 100644
--- a/include/object/cnode.h
+++ b/include/object/cnode.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __OBJECT_CNODE_H
diff --git a/include/object/endpoint.h b/include/object/endpoint.h
index 6c91696f0..5cdb9c368 100644
--- a/include/object/endpoint.h
+++ b/include/object/endpoint.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __OBJECT_ENDPOINT_H
diff --git a/include/object/interrupt.h b/include/object/interrupt.h
index b51a1c90c..d1b9c2f05 100644
--- a/include/object/interrupt.h
+++ b/include/object/interrupt.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __OBJECT_INTERRUPT_H
diff --git a/include/object/notification.h b/include/object/notification.h
index 512043c88..d08b0d804 100644
--- a/include/object/notification.h
+++ b/include/object/notification.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __OBJECT_NOTIFICATION_H
diff --git a/include/object/objecttype.h b/include/object/objecttype.h
index 8fa53d73d..a4b1854ab 100644
--- a/include/object/objecttype.h
+++ b/include/object/objecttype.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __OBJECT_OBJECTTYPE_H
diff --git a/include/object/reply.h b/include/object/reply.h
index e8cff3c86..cc4f395f9 100644
--- a/include/object/reply.h
+++ b/include/object/reply.h
@@ -1,14 +1,9 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
+
 #ifndef __OBJECT_REPLY_H
 #define __OBJECT_REPLY_H
 
diff --git a/include/object/schedcontext.h b/include/object/schedcontext.h
index 1a9ecbc6e..b52c7e2aa 100644
--- a/include/object/schedcontext.h
+++ b/include/object/schedcontext.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __OBJECT_SCHED_CONTEXT_H
diff --git a/include/object/schedcontrol.h b/include/object/schedcontrol.h
index ec8dfa7c8..2d2c2b5a8 100644
--- a/include/object/schedcontrol.h
+++ b/include/object/schedcontrol.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __OBJECT_SCHED_CONTROL_H
diff --git a/include/object/structures.h b/include/object/structures.h
index d55cfd953..3baa052a7 100644
--- a/include/object/structures.h
+++ b/include/object/structures.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __OBJECT_STRUCTURES_H
diff --git a/include/object/structures_32.bf b/include/object/structures_32.bf
index 7fbb84d05..c1ff7af18 100644
--- a/include/object/structures_32.bf
+++ b/include/object/structures_32.bf
@@ -1,11 +1,7 @@
 --
 -- Copyright 2014, General Dynamics C4 Systems
 --
--- This software may be distributed and modified according to the terms of
--- the GNU General Public License version 2. Note that NO WARRANTY is provided.
--- See "LICENSE_GPLv2.txt" for details.
---
--- @TAG(GD_GPL)
+-- SPDX-License-Identifier: GPL-2.0-only
 --
 
 -- Default base size: uint32_t
diff --git a/include/object/structures_64.bf b/include/object/structures_64.bf
index 6fc01bb38..808d2d161 100644
--- a/include/object/structures_64.bf
+++ b/include/object/structures_64.bf
@@ -1,13 +1,7 @@
 --
--- Copyright 2017, Data61
--- Commonwealth Scientific and Industrial Research Organisation (CSIRO)
--- ABN 41 687 119 230.
+-- Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 --
--- This software may be distributed and modified according to the terms of
--- the GNU General Public License version 2. Note that NO WARRANTY is provided.
--- See "LICENSE_GPLv2.txt" for details.
---
--- @TAG(DATA61_GPL)
+-- SPDX-License-Identifier: GPL-2.0-only
 --
 
 block null_cap {
diff --git a/include/object/tcb.h b/include/object/tcb.h
index 4bb277455..e5c78b989 100644
--- a/include/object/tcb.h
+++ b/include/object/tcb.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __OBJECT_TCB_H
diff --git a/include/object/untyped.h b/include/object/untyped.h
index 55d5bcc8f..2333dbdd0 100644
--- a/include/object/untyped.h
+++ b/include/object/untyped.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __OBJECT_UNTYPED_H
diff --git a/include/plat/default/plat/machine.h b/include/plat/default/plat/machine.h
index 8cb9b5e4b..30fabcbc4 100644
--- a/include/plat/default/plat/machine.h
+++ b/include/plat/default/plat/machine.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <plat/machine/devices_gen.h>
diff --git a/include/plat/default/plat/machine/hardware.h b/include/plat/default/plat/machine/hardware.h
index 27452a0d6..dc5e8dfb3 100644
--- a/include/plat/default/plat/machine/hardware.h
+++ b/include/plat/default/plat/machine/hardware.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __PLAT_MACHINE_HARDWARE_H
diff --git a/include/plat/pc99/plat/32/plat_mode/machine/hardware.bf b/include/plat/pc99/plat/32/plat_mode/machine/hardware.bf
index 6eb8f87a0..14652b18b 100644
--- a/include/plat/pc99/plat/32/plat_mode/machine/hardware.bf
+++ b/include/plat/pc99/plat/32/plat_mode/machine/hardware.bf
@@ -1,11 +1,7 @@
 --
 -- Copyright 2014, General Dynamics C4 Systems
 --
--- This software may be distributed and modified according to the terms of
--- the GNU General Public License version 2. Note that NO WARRANTY is provided.
--- See "LICENSE_GPLv2.txt" for details.
---
--- @TAG(GD_GPL)
+-- SPDX-License-Identifier: GPL-2.0-only
 --
 
 #include <config.h>
diff --git a/include/plat/pc99/plat/32/plat_mode/machine/hardware.h b/include/plat/pc99/plat/32/plat_mode/machine/hardware.h
index 50d78e464..a05060996 100644
--- a/include/plat/pc99/plat/32/plat_mode/machine/hardware.h
+++ b/include/plat/pc99/plat/32/plat_mode/machine/hardware.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __PLAT_MODE_MACHINE_HARDWARE_H
diff --git a/include/plat/pc99/plat/64/plat_mode/machine/hardware.bf b/include/plat/pc99/plat/64/plat_mode/machine/hardware.bf
index f8460b717..3fe944605 100644
--- a/include/plat/pc99/plat/64/plat_mode/machine/hardware.bf
+++ b/include/plat/pc99/plat/64/plat_mode/machine/hardware.bf
@@ -1,11 +1,7 @@
 --
 -- Copyright 2014, General Dynamics C4 Systems
 --
--- This software may be distributed and modified according to the terms of
--- the GNU General Public License version 2. Note that NO WARRANTY is provided.
--- See "LICENSE_GPLv2.txt" for details.
---
--- @TAG(GD_GPL)
+-- SPDX-License-Identifier: GPL-2.0-only
 --
 
 #include <config.h>
diff --git a/include/plat/pc99/plat/64/plat_mode/machine/hardware.h b/include/plat/pc99/plat/64/plat_mode/machine/hardware.h
index 7e6acc0a2..2ea9819fa 100644
--- a/include/plat/pc99/plat/64/plat_mode/machine/hardware.h
+++ b/include/plat/pc99/plat/64/plat_mode/machine/hardware.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __PLAT_MODE_MACHINE_HARDWARE_H_
diff --git a/include/plat/pc99/plat/machine.h b/include/plat/pc99/plat/machine.h
index f0ade0f99..974d8e214 100644
--- a/include/plat/pc99/plat/machine.h
+++ b/include/plat/pc99/plat/machine.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __PLAT_MACHINE_H
diff --git a/include/plat/pc99/plat/machine/acpi.h b/include/plat/pc99/plat/machine/acpi.h
index 07d6dbaf4..d118f69db 100644
--- a/include/plat/pc99/plat/machine/acpi.h
+++ b/include/plat/pc99/plat/machine/acpi.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __PLAT_MACHINE_ACPI_H
diff --git a/include/plat/pc99/plat/machine/devices.h b/include/plat/pc99/plat/machine/devices.h
index e7a2657e9..87a9e6d62 100644
--- a/include/plat/pc99/plat/machine/devices.h
+++ b/include/plat/pc99/plat/machine/devices.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __PLAT_MACHINE_DEVICES_H
diff --git a/include/plat/pc99/plat/machine/hardware.h b/include/plat/pc99/plat/machine/hardware.h
index 15bad99b2..50d8030df 100644
--- a/include/plat/pc99/plat/machine/hardware.h
+++ b/include/plat/pc99/plat/machine/hardware.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __PLAT_MACHINE_HARDWARE_H
diff --git a/include/plat/pc99/plat/machine/intel-vtd.h b/include/plat/pc99/plat/machine/intel-vtd.h
index 5b5bc8819..86524e083 100644
--- a/include/plat/pc99/plat/machine/intel-vtd.h
+++ b/include/plat/pc99/plat/machine/intel-vtd.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __PLAT_MACHINE_INTEL_VTD_H
diff --git a/include/plat/pc99/plat/machine/interrupt.h b/include/plat/pc99/plat/machine/interrupt.h
index 60d1059ed..e76f4a2e0 100644
--- a/include/plat/pc99/plat/machine/interrupt.h
+++ b/include/plat/pc99/plat/machine/interrupt.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __PLAT_MACHINE_INTERRUPT_H
diff --git a/include/plat/pc99/plat/machine/io.h b/include/plat/pc99/plat/machine/io.h
index f37e25958..82bd4cd48 100644
--- a/include/plat/pc99/plat/machine/io.h
+++ b/include/plat/pc99/plat/machine/io.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __PLAT_MACHINE_IO_H_
diff --git a/include/plat/pc99/plat/machine/ioapic.h b/include/plat/pc99/plat/machine/ioapic.h
index 4ebe473b5..2d38dffe5 100644
--- a/include/plat/pc99/plat/machine/ioapic.h
+++ b/include/plat/pc99/plat/machine/ioapic.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __PLAT_MACHINE_IOAPIC_H
diff --git a/include/plat/pc99/plat/machine/pci.h b/include/plat/pc99/plat/machine/pci.h
index 8da918189..414d9b8ed 100644
--- a/include/plat/pc99/plat/machine/pci.h
+++ b/include/plat/pc99/plat/machine/pci.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __PLAT_MACHINE_PCI_H
diff --git a/include/plat/pc99/plat/machine/pic.h b/include/plat/pc99/plat/machine/pic.h
index 0c4d68e35..4e8b37ab4 100644
--- a/include/plat/pc99/plat/machine/pic.h
+++ b/include/plat/pc99/plat/machine/pic.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __PLAT_MACHINE_PIC_H
diff --git a/include/plat/pc99/plat/machine/pit.h b/include/plat/pc99/plat/machine/pit.h
index ac38f6c76..2ed1a0173 100644
--- a/include/plat/pc99/plat/machine/pit.h
+++ b/include/plat/pc99/plat/machine/pit.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __PLAT_MACHINE_PIT_H
diff --git a/include/plat/spike/plat/instance/rocket-chip/hardware.h b/include/plat/spike/plat/instance/rocket-chip/hardware.h
index b07bdfae9..4e3bd169e 100644
--- a/include/plat/spike/plat/instance/rocket-chip/hardware.h
+++ b/include/plat/spike/plat/instance/rocket-chip/hardware.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __PLAT_INSTANCE_HARDWARE_H
diff --git a/include/plat/tk1/plat/machine/hardware.bf b/include/plat/tk1/plat/machine/hardware.bf
index c7053d75d..052c5e64d 100644
--- a/include/plat/tk1/plat/machine/hardware.bf
+++ b/include/plat/tk1/plat/machine/hardware.bf
@@ -1,11 +1,7 @@
 --
 -- Copyright 2016, General Dynamics C4 Systems
 --
--- This software may be distributed and modified according to the terms of
--- the GNU General Public License version 2. Note that NO WARRANTY is provided.
--- See "LICENSE_GPLv2.txt" for details.
---
--- @TAG(GD_GPL)
+-- SPDX-License-Identifier: GPL-2.0-only
 --
 
 base 32
diff --git a/include/plat/tk1/plat/machine/smmu.h b/include/plat/tk1/plat/machine/smmu.h
index 1bcaa9d6c..875b627b5 100644
--- a/include/plat/tk1/plat/machine/smmu.h
+++ b/include/plat/tk1/plat/machine/smmu.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2016, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __PLAT_SMMU_H
diff --git a/include/smp/ipi.h b/include/smp/ipi.h
index 1946242f5..1f2845923 100644
--- a/include/smp/ipi.h
+++ b/include/smp/ipi.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __IPI_H
diff --git a/include/smp/lock.h b/include/smp/lock.h
index 39e833bff..1fa7d51fb 100644
--- a/include/smp/lock.h
+++ b/include/smp/lock.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __SMP_LOCK_H_
diff --git a/include/stdarg.h b/include/stdarg.h
index 874597880..70487ac43 100644
--- a/include/stdarg.h
+++ b/include/stdarg.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __STDARG_H
diff --git a/include/stdint.h b/include/stdint.h
index 19f0d8871..cffbe71da 100644
--- a/include/stdint.h
+++ b/include/stdint.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __STDINT_H
diff --git a/include/string.h b/include/string.h
index 4bfd780ab..3fd282f1e 100644
--- a/include/string.h
+++ b/include/string.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __STRING_H
diff --git a/include/types.h b/include/types.h
index 28ae3817c..53c645bfb 100644
--- a/include/types.h
+++ b/include/types.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __TYPES_H
diff --git a/include/util.h b/include/util.h
index dd8b17b1a..76c6a5a54 100644
--- a/include/util.h
+++ b/include/util.h
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __UTIL_H
diff --git a/libsel4/CMakeLists.txt b/libsel4/CMakeLists.txt
index aa644732e..665d7bd10 100644
--- a/libsel4/CMakeLists.txt
+++ b/libsel4/CMakeLists.txt
@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/libsel4/arch_include/arm/interfaces/sel4arch.xml b/libsel4/arch_include/arm/interfaces/sel4arch.xml
index 831c0cf80..e9120f94c 100644
--- a/libsel4/arch_include/arm/interfaces/sel4arch.xml
+++ b/libsel4/arch_include/arm/interfaces/sel4arch.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" ?>
 <!--
-  Copyright 2017, Data61
-  Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-  ABN 41 687 119 230.
+     Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 
-  This software may be distributed and modified according to the terms of
-  the BSD 2-Clause license. Note that NO WARRANTY is provided.
-  See "LICENSE_BSD2.txt" for details.
+     SPDX-License-Identifier: BSD-2-Clause
+-->
 
-     @TAG(DATA61_BSD)
-  -->
 <api name="ObjectApiArm" label_prefix="arm_">
     <interface name="seL4_ARM_PageTable" manual_name="Page Table"
         cap_description="Capability to the page table being operated on.">
diff --git a/libsel4/arch_include/arm/sel4/arch/constants.h b/libsel4/arch_include/arm/sel4/arch/constants.h
index 6c9701458..08265e3b3 100644
--- a/libsel4/arch_include/arm/sel4/arch/constants.h
+++ b/libsel4/arch_include/arm/sel4/arch/constants.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_ARCH_CONSTANTS_H
diff --git a/libsel4/arch_include/arm/sel4/arch/deprecated.h b/libsel4/arch_include/arm/sel4/arch/deprecated.h
index 72955e0a8..c205fb503 100644
--- a/libsel4/arch_include/arm/sel4/arch/deprecated.h
+++ b/libsel4/arch_include/arm/sel4/arch/deprecated.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_ARCH_SEL4_DEPRECATED_H
diff --git a/libsel4/arch_include/arm/sel4/arch/mapping.h b/libsel4/arch_include/arm/sel4/arch/mapping.h
index 0f9d64467..b752cc28c 100644
--- a/libsel4/arch_include/arm/sel4/arch/mapping.h
+++ b/libsel4/arch_include/arm/sel4/arch/mapping.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_ARCH_MAPPING
diff --git a/libsel4/arch_include/arm/sel4/arch/objecttype.h b/libsel4/arch_include/arm/sel4/arch/objecttype.h
index e3ab93f6a..99c0e19e4 100644
--- a/libsel4/arch_include/arm/sel4/arch/objecttype.h
+++ b/libsel4/arch_include/arm/sel4/arch/objecttype.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __ARCH_OBJECTTYPE_H
diff --git a/libsel4/arch_include/arm/sel4/arch/pfIPC.h b/libsel4/arch_include/arm/sel4/arch/pfIPC.h
index d2bcb181f..3a4f39dc2 100644
--- a/libsel4/arch_include/arm/sel4/arch/pfIPC.h
+++ b/libsel4/arch_include/arm/sel4/arch/pfIPC.h
@@ -1,12 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
+
 #include <sel4/deprecated.h>
diff --git a/libsel4/arch_include/arm/sel4/arch/shared_types.bf b/libsel4/arch_include/arm/sel4/arch/shared_types.bf
index 53451e4dd..a1d7e8eb9 100644
--- a/libsel4/arch_include/arm/sel4/arch/shared_types.bf
+++ b/libsel4/arch_include/arm/sel4/arch/shared_types.bf
@@ -1,13 +1,7 @@
 --
--- Copyright 2017, Data61
--- Commonwealth Scientific and Industrial Research Organisation (CSIRO)
--- ABN 41 687 119 230.
+-- Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 --
--- This software may be distributed and modified according to the terms of
--- the BSD 2-Clause license. Note that NO WARRANTY is provided.
--- See "LICENSE_BSD2.txt" for details.
---
--- @TAG(DATA61_BSD)
+-- SPDX-License-Identifier: BSD-2-Clause
 --
 
 -- this file contains types shared between libsel4 and the kernel
diff --git a/libsel4/arch_include/arm/sel4/arch/shared_types.h b/libsel4/arch_include/arm/sel4/arch/shared_types.h
index 1e9eff355..73aea079c 100644
--- a/libsel4/arch_include/arm/sel4/arch/shared_types.h
+++ b/libsel4/arch_include/arm/sel4/arch/shared_types.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_ARCH_SHARED_TYPES_H
diff --git a/libsel4/arch_include/arm/sel4/arch/simple_types.h b/libsel4/arch_include/arm/sel4/arch/simple_types.h
index 2774ad434..64b261f82 100644
--- a/libsel4/arch_include/arm/sel4/arch/simple_types.h
+++ b/libsel4/arch_include/arm/sel4/arch/simple_types.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_ARCH_SIMPLE_TYPES_H_
diff --git a/libsel4/arch_include/arm/sel4/arch/syscalls.h b/libsel4/arch_include/arm/sel4/arch/syscalls.h
index ebb13395d..05ea377e1 100644
--- a/libsel4/arch_include/arm/sel4/arch/syscalls.h
+++ b/libsel4/arch_include/arm/sel4/arch/syscalls.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_ARCH_SYSCALLS_H
diff --git a/libsel4/arch_include/arm/sel4/arch/types.h b/libsel4/arch_include/arm/sel4/arch/types.h
index ff4f529c4..709fa84b9 100644
--- a/libsel4/arch_include/arm/sel4/arch/types.h
+++ b/libsel4/arch_include/arm/sel4/arch/types.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_ARCH_TYPES_H
diff --git a/libsel4/arch_include/riscv/interfaces/sel4arch.xml b/libsel4/arch_include/riscv/interfaces/sel4arch.xml
index b534e237e..613771aa1 100644
--- a/libsel4/arch_include/riscv/interfaces/sel4arch.xml
+++ b/libsel4/arch_include/riscv/interfaces/sel4arch.xml
@@ -1,20 +1,11 @@
 <?xml version="1.0" ?>
 <!--
-  Copyright 2018, Data61
-  Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-  ABN 41 687 119 230.
+     Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
+     Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
 
-  This software may be distributed and modified according to the terms of
-  the BSD 2-Clause license. Note that NO WARRANTY is provided.
-  See "LICENSE_BSD2.txt" for details.
+     SPDX-License-Identifier: BSD-2-Clause
+-->
 
-     @TAG(DATA61_BSD)
-  -->
-<!--
-
-  Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
-  Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
-  -->
 <api name="ObjectApiRISCV" label_prefix="riscv_">
 
     <struct name="seL4_UserContext">
diff --git a/libsel4/arch_include/riscv/sel4/arch/bootinfo.h b/libsel4/arch_include/riscv/sel4/arch/bootinfo.h
index fa3ada26c..cb9f357e8 100644
--- a/libsel4/arch_include/riscv/sel4/arch/bootinfo.h
+++ b/libsel4/arch_include/riscv/sel4/arch/bootinfo.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_ARCH_BOOTINFO_H
diff --git a/libsel4/arch_include/riscv/sel4/arch/constants.h b/libsel4/arch_include/riscv/sel4/arch/constants.h
index fdfbe739a..08265e3b3 100644
--- a/libsel4/arch_include/riscv/sel4/arch/constants.h
+++ b/libsel4/arch_include/riscv/sel4/arch/constants.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_ARCH_CONSTANTS_H
diff --git a/libsel4/arch_include/riscv/sel4/arch/deprecated.h b/libsel4/arch_include/riscv/sel4/arch/deprecated.h
index 342236433..ea43976bd 100644
--- a/libsel4/arch_include/riscv/sel4/arch/deprecated.h
+++ b/libsel4/arch_include/riscv/sel4/arch/deprecated.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_ARCH_DEPRECATED_H
diff --git a/libsel4/arch_include/riscv/sel4/arch/exIPC.h b/libsel4/arch_include/riscv/sel4/arch/exIPC.h
index d38ab69e4..22d4ca466 100644
--- a/libsel4/arch_include/riscv/sel4/arch/exIPC.h
+++ b/libsel4/arch_include/riscv/sel4/arch/exIPC.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_ARCH_EXCEPTION_IPC
diff --git a/libsel4/arch_include/riscv/sel4/arch/mapping.h b/libsel4/arch_include/riscv/sel4/arch/mapping.h
index 26abe6831..b906c1630 100644
--- a/libsel4/arch_include/riscv/sel4/arch/mapping.h
+++ b/libsel4/arch_include/riscv/sel4/arch/mapping.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_ARCH_MAPPING
diff --git a/libsel4/arch_include/riscv/sel4/arch/objecttype.h b/libsel4/arch_include/riscv/sel4/arch/objecttype.h
index e6cd47b98..6c27a82a6 100644
--- a/libsel4/arch_include/riscv/sel4/arch/objecttype.h
+++ b/libsel4/arch_include/riscv/sel4/arch/objecttype.h
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARCH_OBJECTTYPE_H
diff --git a/libsel4/arch_include/riscv/sel4/arch/pfIPC.h b/libsel4/arch_include/riscv/sel4/arch/pfIPC.h
index 9246839f1..6f648c049 100644
--- a/libsel4/arch_include/riscv/sel4/arch/pfIPC.h
+++ b/libsel4/arch_include/riscv/sel4/arch/pfIPC.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_ARCH_PAGEFAULT_IPC
diff --git a/libsel4/arch_include/riscv/sel4/arch/shared_types.bf b/libsel4/arch_include/riscv/sel4/arch/shared_types.bf
index f7154a25e..54036ff43 100644
--- a/libsel4/arch_include/riscv/sel4/arch/shared_types.bf
+++ b/libsel4/arch_include/riscv/sel4/arch/shared_types.bf
@@ -1,14 +1,9 @@
 --
--- Copyright 2018, Data61
--- Commonwealth Scientific and Industrial Research Organisation (CSIRO)
--- ABN 41 687 119 230
+-- Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 --
--- This software may be distributed and modified according to the terms of
--- the BSD 2-Clause license. Note that NO WARRANTY is provided.
--- See "LICENSE_BSD2.txt" for details.
---
--- @TAG(DATA61_BSD)
+-- SPDX-License-Identifier: BSD-2-Clause
 --
+
 -- this file contains sel4arch specific types shared between libsel4 and the kernel
 
 tagged_union seL4_Fault seL4_FaultType {
diff --git a/libsel4/arch_include/riscv/sel4/arch/shared_types.h b/libsel4/arch_include/riscv/sel4/arch/shared_types.h
index efc755010..73aea079c 100644
--- a/libsel4/arch_include/riscv/sel4/arch/shared_types.h
+++ b/libsel4/arch_include/riscv/sel4/arch/shared_types.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_ARCH_SHARED_TYPES_H
diff --git a/libsel4/arch_include/riscv/sel4/arch/simple_types.h b/libsel4/arch_include/riscv/sel4/arch/simple_types.h
index 8b338d8f3..275c98323 100644
--- a/libsel4/arch_include/riscv/sel4/arch/simple_types.h
+++ b/libsel4/arch_include/riscv/sel4/arch/simple_types.h
@@ -1,18 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __LIBSEL4_ARCH_SIMPLE_TYPES_H_
diff --git a/libsel4/arch_include/riscv/sel4/arch/syscalls.h b/libsel4/arch_include/riscv/sel4/arch/syscalls.h
index 1ec050ccf..7e01f3171 100644
--- a/libsel4/arch_include/riscv/sel4/arch/syscalls.h
+++ b/libsel4/arch_include/riscv/sel4/arch/syscalls.h
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __LIBSEL4_ARCH_SYSCALLS_H
diff --git a/libsel4/arch_include/riscv/sel4/arch/types.h b/libsel4/arch_include/riscv/sel4/arch/types.h
index 0673f2fd4..a5e7cdb65 100644
--- a/libsel4/arch_include/riscv/sel4/arch/types.h
+++ b/libsel4/arch_include/riscv/sel4/arch/types.h
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __LIBSEL4_ARCH_TYPES_H
diff --git a/libsel4/arch_include/x86/interfaces/sel4arch.xml b/libsel4/arch_include/x86/interfaces/sel4arch.xml
index b6048c013..9722b2cf5 100644
--- a/libsel4/arch_include/x86/interfaces/sel4arch.xml
+++ b/libsel4/arch_include/x86/interfaces/sel4arch.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" ?>
 <!--
-  Copyright 2017, Data61
-  Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-  ABN 41 687 119 230.
+     Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 
-  This software may be distributed and modified according to the terms of
-  the BSD 2-Clause license. Note that NO WARRANTY is provided.
-  See "LICENSE_BSD2.txt" for details.
+     SPDX-License-Identifier: BSD-2-Clause
+-->
 
-     @TAG(DATA61_BSD)
-  -->
 <api name="ObjectApiX86" label_prefix="x86_">
     <struct name="seL4_VCPUContext">
         <member name="eax"/>
diff --git a/libsel4/arch_include/x86/sel4/arch/bootinfo_types.h b/libsel4/arch_include/x86/sel4/arch/bootinfo_types.h
index 18713ba5d..ec78d2214 100644
--- a/libsel4/arch_include/x86/sel4/arch/bootinfo_types.h
+++ b/libsel4/arch_include/x86/sel4/arch/bootinfo_types.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_ARCH_BOOTINFO_TYPES_H
diff --git a/libsel4/arch_include/x86/sel4/arch/constants.h b/libsel4/arch_include/x86/sel4/arch/constants.h
index de247020c..5613351c4 100644
--- a/libsel4/arch_include/x86/sel4/arch/constants.h
+++ b/libsel4/arch_include/x86/sel4/arch/constants.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_ARCH_CONSTANTS_H
diff --git a/libsel4/arch_include/x86/sel4/arch/deprecated.h b/libsel4/arch_include/x86/sel4/arch/deprecated.h
index 13470deee..d7310cca3 100644
--- a/libsel4/arch_include/x86/sel4/arch/deprecated.h
+++ b/libsel4/arch_include/x86/sel4/arch/deprecated.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_ARCH_DEPRECATED_H
diff --git a/libsel4/arch_include/x86/sel4/arch/exIPC.h b/libsel4/arch_include/x86/sel4/arch/exIPC.h
index d2bcb181f..3a4f39dc2 100644
--- a/libsel4/arch_include/x86/sel4/arch/exIPC.h
+++ b/libsel4/arch_include/x86/sel4/arch/exIPC.h
@@ -1,12 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
+
 #include <sel4/deprecated.h>
diff --git a/libsel4/arch_include/x86/sel4/arch/mapping.h b/libsel4/arch_include/x86/sel4/arch/mapping.h
index 842eb5325..e9834f1a9 100644
--- a/libsel4/arch_include/x86/sel4/arch/mapping.h
+++ b/libsel4/arch_include/x86/sel4/arch/mapping.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_ARCH_MAPPING
diff --git a/libsel4/arch_include/x86/sel4/arch/objecttype.h b/libsel4/arch_include/x86/sel4/arch/objecttype.h
index ffdf9ade0..d2552cb01 100644
--- a/libsel4/arch_include/x86/sel4/arch/objecttype.h
+++ b/libsel4/arch_include/x86/sel4/arch/objecttype.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __ARCH_OBJECT_TYPE_H
diff --git a/libsel4/arch_include/x86/sel4/arch/pfIPC.h b/libsel4/arch_include/x86/sel4/arch/pfIPC.h
index d2bcb181f..3a4f39dc2 100644
--- a/libsel4/arch_include/x86/sel4/arch/pfIPC.h
+++ b/libsel4/arch_include/x86/sel4/arch/pfIPC.h
@@ -1,12 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
+
 #include <sel4/deprecated.h>
diff --git a/libsel4/arch_include/x86/sel4/arch/shared_types.bf b/libsel4/arch_include/x86/sel4/arch/shared_types.bf
index 9b05cb30b..2563abe21 100644
--- a/libsel4/arch_include/x86/sel4/arch/shared_types.bf
+++ b/libsel4/arch_include/x86/sel4/arch/shared_types.bf
@@ -1,14 +1,9 @@
 --
--- Copyright 2017, Data61
--- Commonwealth Scientific and Industrial Research Organisation (CSIRO)
--- ABN 41 687 119 230.
+-- Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 --
--- This software may be distributed and modified according to the terms of
--- the BSD 2-Clause license. Note that NO WARRANTY is provided.
--- See "LICENSE_BSD2.txt" for details.
---
--- @TAG(DATA61_BSD)
+-- SPDX-License-Identifier: BSD-2-Clause
 --
+
 -- this file contains sel4arch specific types shared between libsel4 and the kernel
 
 tagged_union seL4_Fault seL4_FaultType {
diff --git a/libsel4/arch_include/x86/sel4/arch/simple_types.h b/libsel4/arch_include/x86/sel4/arch/simple_types.h
index f8c52a98b..9353bc714 100644
--- a/libsel4/arch_include/x86/sel4/arch/simple_types.h
+++ b/libsel4/arch_include/x86/sel4/arch/simple_types.h
@@ -1,12 +1,6 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
diff --git a/libsel4/arch_include/x86/sel4/arch/syscalls.h b/libsel4/arch_include/x86/sel4/arch/syscalls.h
index 1b74a41df..bfef0b303 100644
--- a/libsel4/arch_include/x86/sel4/arch/syscalls.h
+++ b/libsel4/arch_include/x86/sel4/arch/syscalls.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_ARCH_SYSCALLS_H
diff --git a/libsel4/arch_include/x86/sel4/arch/types.h b/libsel4/arch_include/x86/sel4/arch/types.h
index f7be80129..f77ed6488 100644
--- a/libsel4/arch_include/x86/sel4/arch/types.h
+++ b/libsel4/arch_include/x86/sel4/arch/types.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_ARCH_TYPES_H
diff --git a/libsel4/arch_include/x86/sel4/arch/vmenter.h b/libsel4/arch_include/x86/sel4/arch/vmenter.h
index c5d9883e1..9b0f839f2 100644
--- a/libsel4/arch_include/x86/sel4/arch/vmenter.h
+++ b/libsel4/arch_include/x86/sel4/arch/vmenter.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_ARCH_VMENTER
diff --git a/libsel4/include/api/syscall.xml b/libsel4/include/api/syscall.xml
index 93f2c12a3..dc484856d 100644
--- a/libsel4/include/api/syscall.xml
+++ b/libsel4/include/api/syscall.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" ?>
 <!--
-  Copyright 2017, Data61
-  Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-  ABN 41 687 119 230.
+     Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 
-  This software may be distributed and modified according to the terms of
-  the BSD 2-Clause license. Note that NO WARRANTY is provided.
-  See "LICENSE_BSD2.txt" for details.
+     SPDX-License-Identifier: BSD-2-Clause
+-->
 
-     @TAG(DATA61_BSD)
-  -->
 <!-- Please see syscalls.xsd to see the format of this file -->
 <syscalls>
     <!-- official API syscalls -->
diff --git a/libsel4/include/api/syscall.xsd b/libsel4/include/api/syscall.xsd
index 0ff38f66a..87bfbbdc9 100644
--- a/libsel4/include/api/syscall.xsd
+++ b/libsel4/include/api/syscall.xsd
@@ -1,15 +1,9 @@
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 <!--
-  Copyright 2017, Data61
-  Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-  ABN 41 687 119 230.
+     Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 
-  This software may be distributed and modified according to the terms of
-  the BSD 2-Clause license. Note that NO WARRANTY is provided.
-  See "LICENSE_BSD2.txt" for details.
-
-     @TAG(DATA61_BSD)
-  -->
+     SPDX-License-Identifier: BSD-2-Clause
+-->
 
     <xsd:annotation>
         <xsd:documentation xml:lang="en">
diff --git a/libsel4/include/interfaces/sel4.xml b/libsel4/include/interfaces/sel4.xml
index 36de02e2f..6392b2869 100644
--- a/libsel4/include/interfaces/sel4.xml
+++ b/libsel4/include/interfaces/sel4.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" ?>
 <!--
-  Copyright 2017, Data61
-  Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-  ABN 41 687 119 230.
+     Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 
-  This software may be distributed and modified according to the terms of
-  the BSD 2-Clause license. Note that NO WARRANTY is provided.
-  See "LICENSE_BSD2.txt" for details.
+     SPDX-License-Identifier: BSD-2-Clause
+-->
 
-     @TAG(DATA61_BSD)
-  -->
 <api name="ObjectApi">
 
     <interface name="seL4_Untyped" manual_name="Untyped" cap_description="CPTR to an untyped object.">
diff --git a/libsel4/include/sel4/assert.h b/libsel4/include/sel4/assert.h
index 17a0f3f5d..58a509a7c 100644
--- a/libsel4/include/sel4/assert.h
+++ b/libsel4/include/sel4/assert.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 /**
diff --git a/libsel4/include/sel4/benchmark_tracepoints_types.h b/libsel4/include/sel4/benchmark_tracepoints_types.h
index 5d3cb3d26..eaa303e60 100644
--- a/libsel4/include/sel4/benchmark_tracepoints_types.h
+++ b/libsel4/include/sel4/benchmark_tracepoints_types.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef BENCHMARK_TRACE_POINTS_TYPES_H
diff --git a/libsel4/include/sel4/benchmark_track_types.h b/libsel4/include/sel4/benchmark_track_types.h
index 6ce3a3ae9..ace30fb0f 100644
--- a/libsel4/include/sel4/benchmark_track_types.h
+++ b/libsel4/include/sel4/benchmark_track_types.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef BENCHMARK_TRACK_TYPES_H
diff --git a/libsel4/include/sel4/benchmark_utilisation_types.h b/libsel4/include/sel4/benchmark_utilisation_types.h
index 24d581133..e39f7a2ad 100644
--- a/libsel4/include/sel4/benchmark_utilisation_types.h
+++ b/libsel4/include/sel4/benchmark_utilisation_types.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef BENCHMARK_TRACK_UTIL_TYPES_H
diff --git a/libsel4/include/sel4/bootinfo.h b/libsel4/include/sel4/bootinfo.h
index 82e76e0b2..339902623 100644
--- a/libsel4/include/sel4/bootinfo.h
+++ b/libsel4/include/sel4/bootinfo.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_BOOTINFO_H
diff --git a/libsel4/include/sel4/bootinfo_types.h b/libsel4/include/sel4/bootinfo_types.h
index dcae7da2f..87936cea2 100644
--- a/libsel4/include/sel4/bootinfo_types.h
+++ b/libsel4/include/sel4/bootinfo_types.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_BOOTINFO_TYPES_H
diff --git a/libsel4/include/sel4/constants.h b/libsel4/include/sel4/constants.h
index 14e35adb8..ba0f91e17 100644
--- a/libsel4/include/sel4/constants.h
+++ b/libsel4/include/sel4/constants.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __API_CONSTANTS_H
diff --git a/libsel4/include/sel4/debug_assert.h b/libsel4/include/sel4/debug_assert.h
index f50edc888..326851e23 100644
--- a/libsel4/include/sel4/debug_assert.h
+++ b/libsel4/include/sel4/debug_assert.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 /**
diff --git a/libsel4/include/sel4/deprecated.h b/libsel4/include/sel4/deprecated.h
index 18893eedf..1c0063cfa 100644
--- a/libsel4/include/sel4/deprecated.h
+++ b/libsel4/include/sel4/deprecated.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_DEPRECATED_H
diff --git a/libsel4/include/sel4/errors.h b/libsel4/include/sel4/errors.h
index e9703e432..f2360c2d1 100644
--- a/libsel4/include/sel4/errors.h
+++ b/libsel4/include/sel4/errors.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __ERRORS_H
diff --git a/libsel4/include/sel4/faults.h b/libsel4/include/sel4/faults.h
index be4d23cc8..ec9689de7 100644
--- a/libsel4/include/sel4/faults.h
+++ b/libsel4/include/sel4/faults.h
@@ -1,14 +1,9 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
+
 #pragma once
 
 #include <autoconf.h>
diff --git a/libsel4/include/sel4/functions.h b/libsel4/include/sel4/functions.h
index 0940bb5a2..8961394da 100644
--- a/libsel4/include/sel4/functions.h
+++ b/libsel4/include/sel4/functions.h
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __LIBSEL4_ARCH_FUNCTIONS_H
diff --git a/libsel4/include/sel4/macros.h b/libsel4/include/sel4/macros.h
index 2157bf217..3cdf47e17 100644
--- a/libsel4/include/sel4/macros.h
+++ b/libsel4/include/sel4/macros.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_MACROS_H
diff --git a/libsel4/include/sel4/messages.h b/libsel4/include/sel4/messages.h
index d2bcb181f..3a4f39dc2 100644
--- a/libsel4/include/sel4/messages.h
+++ b/libsel4/include/sel4/messages.h
@@ -1,12 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
+
 #include <sel4/deprecated.h>
diff --git a/libsel4/include/sel4/objecttype.h b/libsel4/include/sel4/objecttype.h
index a86b35d97..a9ee3700d 100644
--- a/libsel4/include/sel4/objecttype.h
+++ b/libsel4/include/sel4/objecttype.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __API_OBJECTTYPE_H
diff --git a/libsel4/include/sel4/sel4.h b/libsel4/include/sel4/sel4.h
index 73ae271ca..365412928 100644
--- a/libsel4/include/sel4/sel4.h
+++ b/libsel4/include/sel4/sel4.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_H
diff --git a/libsel4/include/sel4/shared_types.h b/libsel4/include/sel4/shared_types.h
index 6008f2141..13302dc4c 100644
--- a/libsel4/include/sel4/shared_types.h
+++ b/libsel4/include/sel4/shared_types.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SHARED_TYPES_H
diff --git a/libsel4/include/sel4/simple_types.h b/libsel4/include/sel4/simple_types.h
index 43553242a..b7e766fc4 100644
--- a/libsel4/include/sel4/simple_types.h
+++ b/libsel4/include/sel4/simple_types.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SIMPLE_TYPES_H
diff --git a/libsel4/include/sel4/syscalls.h b/libsel4/include/sel4/syscalls.h
index ffd788ffd..efd3857f2 100644
--- a/libsel4/include/sel4/syscalls.h
+++ b/libsel4/include/sel4/syscalls.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SYSCALLS_H
diff --git a/libsel4/include/sel4/syscalls_master.h b/libsel4/include/sel4/syscalls_master.h
index bb74a54e4..b6bb489d0 100644
--- a/libsel4/include/sel4/syscalls_master.h
+++ b/libsel4/include/sel4/syscalls_master.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_MASTER_SYSCALLSH
diff --git a/libsel4/include/sel4/syscalls_mcs.h b/libsel4/include/sel4/syscalls_mcs.h
index f55ef160b..99980d667 100644
--- a/libsel4/include/sel4/syscalls_mcs.h
+++ b/libsel4/include/sel4/syscalls_mcs.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_MCS_SYSCALLSH
diff --git a/libsel4/include/sel4/types.h b/libsel4/include/sel4/types.h
index 5f1e3ff65..1001dc27e 100644
--- a/libsel4/include/sel4/types.h
+++ b/libsel4/include/sel4/types.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_TYPES_H
diff --git a/libsel4/mode_include/32/sel4/mode/types.h b/libsel4/mode_include/32/sel4/mode/types.h
index e51094f0e..7ea1b1990 100644
--- a/libsel4/mode_include/32/sel4/mode/types.h
+++ b/libsel4/mode_include/32/sel4/mode/types.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_MODE_TYPES_H
diff --git a/libsel4/mode_include/32/sel4/shared_types.bf b/libsel4/mode_include/32/sel4/shared_types.bf
index 828098bcf..86abc4dc5 100644
--- a/libsel4/mode_include/32/sel4/shared_types.bf
+++ b/libsel4/mode_include/32/sel4/shared_types.bf
@@ -1,13 +1,7 @@
 --
--- Copyright 2017, Data61
--- Commonwealth Scientific and Industrial Research Organisation (CSIRO)
--- ABN 41 687 119 230.
+-- Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 --
--- This software may be distributed and modified according to the terms of
--- the BSD 2-Clause license. Note that NO WARRANTY is provided.
--- See "LICENSE_BSD2.txt" for details.
---
--- @TAG(DATA61_BSD)
+-- SPDX-License-Identifier: BSD-2-Clause
 --
 
 -- this file contains types shared between libsel4 and the kernel
diff --git a/libsel4/mode_include/64/sel4/mode/types.h b/libsel4/mode_include/64/sel4/mode/types.h
index c8f4daa26..0288d02d8 100644
--- a/libsel4/mode_include/64/sel4/mode/types.h
+++ b/libsel4/mode_include/64/sel4/mode/types.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_MODE_TYPES_H
diff --git a/libsel4/mode_include/64/sel4/shared_types.bf b/libsel4/mode_include/64/sel4/shared_types.bf
index 86105fd46..e68e33ac4 100644
--- a/libsel4/mode_include/64/sel4/shared_types.bf
+++ b/libsel4/mode_include/64/sel4/shared_types.bf
@@ -1,13 +1,7 @@
 --
--- Copyright 2017, Data61
--- Commonwealth Scientific and Industrial Research Organisation (CSIRO)
--- ABN 41 687 119 230.
+-- Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 --
--- This software may be distributed and modified according to the terms of
--- the BSD 2-Clause license. Note that NO WARRANTY is provided.
--- See "LICENSE_BSD2.txt" for details.
---
--- @TAG(DATA61_BSD)
+-- SPDX-License-Identifier: BSD-2-Clause
 --
 
 -- this file contains types shared between libsel4 and the kernel
diff --git a/libsel4/sel4_arch_include/aarch32/interfaces/sel4arch.xml b/libsel4/sel4_arch_include/aarch32/interfaces/sel4arch.xml
index ede25c97b..38e3bfe7a 100644
--- a/libsel4/sel4_arch_include/aarch32/interfaces/sel4arch.xml
+++ b/libsel4/sel4_arch_include/aarch32/interfaces/sel4arch.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" ?>
 <!--
-  Copyright 2017, Data61
-  Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-  ABN 41 687 119 230.
+     Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 
-  This software may be distributed and modified according to the terms of
-  the BSD 2-Clause license. Note that NO WARRANTY is provided.
-  See "LICENSE_BSD2.txt" for details.
+     SPDX-License-Identifier: BSD-2-Clause
+-->
 
-     @TAG(DATA61_BSD)
-  -->
 <api name="ObjectApiAarch32" label_prefix="aarch32_">
     <struct name="seL4_UserContext">
         <member name="pc"/>
diff --git a/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/constants.h b/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/constants.h
index d0ce741e4..fd7c168ea 100644
--- a/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/constants.h
+++ b/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/constants.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_ARCH_CONSTANTS_H
diff --git a/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/deprecated.h b/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/deprecated.h
index 58be0a7e9..bae6eb873 100644
--- a/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/deprecated.h
+++ b/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/deprecated.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_ARCH_SEL4_DEPRECATED_H
diff --git a/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/exIPC.h b/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/exIPC.h
index d2bcb181f..3a4f39dc2 100644
--- a/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/exIPC.h
+++ b/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/exIPC.h
@@ -1,12 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
+
 #include <sel4/deprecated.h>
diff --git a/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/faults.h b/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/faults.h
index 1f3fbd8ad..27b3cfc7a 100644
--- a/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/faults.h
+++ b/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/faults.h
@@ -1,14 +1,9 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
+
 #pragma once
 
 #include <autoconf.h>
diff --git a/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/mapping.h b/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/mapping.h
index 44af44cb5..47acfbf66 100644
--- a/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/mapping.h
+++ b/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/mapping.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_ARCH_MAPPING
diff --git a/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/objecttype.h b/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/objecttype.h
index 30c8300fd..dcadd7f25 100644
--- a/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/objecttype.h
+++ b/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/objecttype.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __SEL4_ARCH_OBJECT_TYPE_H
diff --git a/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/pfIPC.h b/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/pfIPC.h
index d2bcb181f..3a4f39dc2 100644
--- a/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/pfIPC.h
+++ b/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/pfIPC.h
@@ -1,12 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
+
 #include <sel4/deprecated.h>
diff --git a/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/simple_types.h b/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/simple_types.h
index c620bdde5..ce1ec339a 100644
--- a/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/simple_types.h
+++ b/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/simple_types.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_ARCH_SIMPLE_TYPES_H_
diff --git a/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/syscalls.h b/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/syscalls.h
index 6e689d4f3..26daad324 100644
--- a/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/syscalls.h
+++ b/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/syscalls.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_ARCH_SYSCALLS_H
diff --git a/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/types.bf b/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/types.bf
index de3384829..9473591cf 100644
--- a/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/types.bf
+++ b/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/types.bf
@@ -1,13 +1,7 @@
 --
--- Copyright 2017, Data61
--- Commonwealth Scientific and Industrial Research Organisation (CSIRO)
--- ABN 41 687 119 230.
+-- Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 --
--- This software may be distributed and modified according to the terms of
--- the BSD 2-Clause license. Note that NO WARRANTY is provided.
--- See "LICENSE_BSD2.txt" for details.
---
--- @TAG(DATA61_BSD)
+-- SPDX-License-Identifier: BSD-2-Clause
 --
 
 #include <autoconf.h>
diff --git a/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/types.h b/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/types.h
index 82237d580..69ee14572 100644
--- a/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/types.h
+++ b/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/types.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_ARCH_TYPES_H
diff --git a/libsel4/sel4_arch_include/aarch64/interfaces/sel4arch.xml b/libsel4/sel4_arch_include/aarch64/interfaces/sel4arch.xml
index f7cce4a17..ca17106b9 100644
--- a/libsel4/sel4_arch_include/aarch64/interfaces/sel4arch.xml
+++ b/libsel4/sel4_arch_include/aarch64/interfaces/sel4arch.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" ?>
 <!--
-  Copyright 2017, Data61
-  Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-  ABN 41 687 119 230.
+     Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 
-  This software may be distributed and modified according to the terms of
-  the BSD 2-Clause license. Note that NO WARRANTY is provided.
-  See "LICENSE_BSD2.txt" for details.
+     SPDX-License-Identifier: BSD-2-Clause
+-->
 
-    @TAG(DATA61_BSD)
- -->
 <api name="ObjectApiAarch64" label_prefix="aarch64_">
     <struct name="seL4_UserContext">
         <member name="pc"/>
diff --git a/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/constants.h b/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/constants.h
index 8112a9d82..9b3710184 100644
--- a/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/constants.h
+++ b/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/constants.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_ARCH_CONSTANTS_H
diff --git a/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/deprecated.h b/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/deprecated.h
index c5a5cc114..0097e4cb7 100644
--- a/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/deprecated.h
+++ b/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/deprecated.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_ARCH_SEL4_DEPRECATED_H
diff --git a/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/exIPC.h b/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/exIPC.h
index 145f471d3..3a4f39dc2 100644
--- a/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/exIPC.h
+++ b/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/exIPC.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <sel4/deprecated.h>
diff --git a/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/faults.h b/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/faults.h
index 058320030..02d053e01 100644
--- a/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/faults.h
+++ b/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/faults.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_ARCH_FAULTS_H
diff --git a/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/mapping.h b/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/mapping.h
index 778478d06..94bbd33cf 100644
--- a/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/mapping.h
+++ b/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/mapping.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_SEL4_ARCH_MAPPING_H_
diff --git a/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/objecttype.h b/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/objecttype.h
index a239c8b3c..6dd906a87 100644
--- a/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/objecttype.h
+++ b/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/objecttype.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_SEL4_ARCH_OBJECTTYPE_H_
diff --git a/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/pfIPC.h b/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/pfIPC.h
index 0d63b592a..2ac8bc710 100644
--- a/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/pfIPC.h
+++ b/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/pfIPC.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_SEL4_ARCH_PFIPC_H_
diff --git a/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/simple_types.h b/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/simple_types.h
index c25bc49c5..afce00fb1 100644
--- a/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/simple_types.h
+++ b/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/simple_types.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_ARCH_SIMPLE_TYPES_H_
diff --git a/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/syscalls.h b/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/syscalls.h
index d7cb8edea..1e6ef018c 100644
--- a/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/syscalls.h
+++ b/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/syscalls.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_SEL4_ARCH_SYSCALLS_H_
diff --git a/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/types.bf b/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/types.bf
index e22e1e47c..c3dd7f430 100644
--- a/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/types.bf
+++ b/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/types.bf
@@ -1,14 +1,8 @@
 --
--- Copyright 2017, Data61
--- Commonwealth Scientific and Industrial Research Organisation (CSIRO)
--- ABN 41 687 119 230.
+-- Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 --
--- This software may be distributed and modified according to the terms of
--- the BSD 2-Clause license. Note that NO WARRANTY is provided.
--- See "LICENSE_BSD2.txt" for details.
+-- SPDX-License-Identifier: BSD-2-Clause
 --
- -- @TAG(DATA61_BSD)
- --
 
 #include <autoconf.h>
 
diff --git a/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/types.h b/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/types.h
index 26fec49ed..309893161 100644
--- a/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/types.h
+++ b/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/types.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_SEL4_ARCH_TYPES_H_
diff --git a/libsel4/sel4_arch_include/ia32/interfaces/sel4arch.xml b/libsel4/sel4_arch_include/ia32/interfaces/sel4arch.xml
index 8b91f21ea..3814f982a 100644
--- a/libsel4/sel4_arch_include/ia32/interfaces/sel4arch.xml
+++ b/libsel4/sel4_arch_include/ia32/interfaces/sel4arch.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" ?>
 <!--
-  Copyright 2017, Data61
-  Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-  ABN 41 687 119 230.
+     Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 
-  This software may be distributed and modified according to the terms of
-  the BSD 2-Clause license. Note that NO WARRANTY is provided.
-  See "LICENSE_BSD2.txt" for details.
+     SPDX-License-Identifier: BSD-2-Clause
+-->
 
-     @TAG(DATA61_BSD)
-  -->
 <api name="ObjectApiIa32">
     <struct name="seL4_UserContext">
         <member name="eip"/>
diff --git a/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/constants.h b/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/constants.h
index 12de2a13a..c8a7fe071 100644
--- a/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/constants.h
+++ b/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/constants.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_ARCH_CONSTANTS_H
diff --git a/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/deprecated.h b/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/deprecated.h
index 3f2eb4a3d..90a2e6239 100644
--- a/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/deprecated.h
+++ b/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/deprecated.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_ARCH_SEL4_DEPRECATED_H
diff --git a/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/exIPC.h b/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/exIPC.h
index d2bcb181f..3a4f39dc2 100644
--- a/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/exIPC.h
+++ b/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/exIPC.h
@@ -1,12 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
+
 #include <sel4/deprecated.h>
diff --git a/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/faults.h b/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/faults.h
index f37c77c04..98d2254e1 100644
--- a/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/faults.h
+++ b/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/faults.h
@@ -1,14 +1,9 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
+
 #pragma once
 
 #include <autoconf.h>
diff --git a/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/mapping.h b/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/mapping.h
index 1bbee9ad4..4f4dc94dd 100644
--- a/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/mapping.h
+++ b/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/mapping.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_ARCH_MAPPING
diff --git a/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/objecttype.h b/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/objecttype.h
index 75862b68e..5bbcc27fa 100644
--- a/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/objecttype.h
+++ b/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/objecttype.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __SEL4_ARCH_OBJECT_TYPE_H
diff --git a/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/pfIPC.h b/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/pfIPC.h
index d2bcb181f..3a4f39dc2 100644
--- a/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/pfIPC.h
+++ b/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/pfIPC.h
@@ -1,12 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
+
 #include <sel4/deprecated.h>
diff --git a/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/simple_types.h b/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/simple_types.h
index 9799d2797..79766f1ce 100644
--- a/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/simple_types.h
+++ b/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/simple_types.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_ARCH_SIMPLE_TYPES_H_
diff --git a/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/syscalls.h b/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/syscalls.h
index b72a4b904..8b407de1c 100644
--- a/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/syscalls.h
+++ b/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/syscalls.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_ARCH_SYSCALLS_H
diff --git a/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/types.bf b/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/types.bf
index d3bcd82dd..296c84840 100644
--- a/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/types.bf
+++ b/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/types.bf
@@ -1,13 +1,7 @@
 --
--- Copyright 2017, Data61
--- Commonwealth Scientific and Industrial Research Organisation (CSIRO)
--- ABN 41 687 119 230.
+-- Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 --
--- This software may be distributed and modified according to the terms of
--- the BSD 2-Clause license. Note that NO WARRANTY is provided.
--- See "LICENSE_BSD2.txt" for details.
---
--- @TAG(DATA61_BSD)
+-- SPDX-License-Identifier: BSD-2-Clause
 --
 
 #include <autoconf.h>
diff --git a/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/types.h b/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/types.h
index 8413a6434..d162320ae 100644
--- a/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/types.h
+++ b/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/types.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_ARCH_TYPES_H
diff --git a/libsel4/sel4_arch_include/riscv32/interfaces/sel4arch.xml b/libsel4/sel4_arch_include/riscv32/interfaces/sel4arch.xml
index df1585b99..ee8a77f7f 100644
--- a/libsel4/sel4_arch_include/riscv32/interfaces/sel4arch.xml
+++ b/libsel4/sel4_arch_include/riscv32/interfaces/sel4arch.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" ?>
- <!--
-   Copyright 2018, Data61
-   Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-   ABN 41 687 119 230.
+<!--
+     Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 
-   This software may be distributed and modified according to the terms of
-   the BSD 2-Clause license. Note that NO WARRANTY is provided.
-   See "LICENSE_BSD2.txt" for details.
+     SPDX-License-Identifier: BSD-2-Clause
+-->
 
-      @TAG(DATA61_BSD)
-   -->
 <api>
 </api>
 
diff --git a/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/constants.h b/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/constants.h
index 4d23cfa9f..b2ed477ea 100644
--- a/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/constants.h
+++ b/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/constants.h
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __LIBSEL4_SEL4_ARCH_CONSTANTS_H
diff --git a/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/deprecated.h b/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/deprecated.h
index 3b32dd6d5..804e59615 100644
--- a/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/deprecated.h
+++ b/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/deprecated.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_ARCH_DEPRECATED_H
diff --git a/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/faults.h b/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/faults.h
index cd90b1760..2b08805dc 100644
--- a/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/faults.h
+++ b/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/faults.h
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __LIBSEL4_SEL4_ARCH_FAULTS_H
diff --git a/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/mapping.h b/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/mapping.h
index 59dc18c5d..7f69601c3 100644
--- a/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/mapping.h
+++ b/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/mapping.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_ARCH_MAPPING
diff --git a/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/objecttype.h b/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/objecttype.h
index 7cd1abe36..fd9ad7e1c 100644
--- a/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/objecttype.h
+++ b/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/objecttype.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __SEL4_ARCH_OBJECT_TYPE_H
diff --git a/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/simple_types.h b/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/simple_types.h
index 465ad0e6a..edcf574ce 100644
--- a/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/simple_types.h
+++ b/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/simple_types.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_ARCH_SIMPLE_TYPES_H_
diff --git a/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/syscalls.h b/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/syscalls.h
index b963b0b07..0fb809659 100644
--- a/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/syscalls.h
+++ b/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/syscalls.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_ARCH_SYSCALLS_H
diff --git a/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/types.bf b/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/types.bf
index 5fc7668b8..9c87ab450 100644
--- a/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/types.bf
+++ b/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/types.bf
@@ -1,18 +1,9 @@
 --
--- Copyright 2016, Data61
--- Commonwealth Scientific and Industrial Research Organisation (CSIRO)
--- ABN 41 687 119 230
---
--- This software may be distributed and modified according to the terms of
--- the BSD 2-Clause license. Note that NO WARRANTY is provided.
--- See "LICENSE_BSD2.txt" for details.
---
--- @TAG(DATA61_BSD)
---
-
---
--- Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+-- Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 -- Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+--
+-- SPDX-License-Identifier: BSD-2-Clause
+--
 
 #include <autoconf.h>
 
diff --git a/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/types.h b/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/types.h
index e2c425161..fdc620f02 100644
--- a/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/types.h
+++ b/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/types.h
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __LIBSEL4_SEL4_ARCH_TYPES_H
diff --git a/libsel4/sel4_arch_include/riscv64/interfaces/sel4arch.xml b/libsel4/sel4_arch_include/riscv64/interfaces/sel4arch.xml
index df1585b99..ee8a77f7f 100644
--- a/libsel4/sel4_arch_include/riscv64/interfaces/sel4arch.xml
+++ b/libsel4/sel4_arch_include/riscv64/interfaces/sel4arch.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" ?>
- <!--
-   Copyright 2018, Data61
-   Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-   ABN 41 687 119 230.
+<!--
+     Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 
-   This software may be distributed and modified according to the terms of
-   the BSD 2-Clause license. Note that NO WARRANTY is provided.
-   See "LICENSE_BSD2.txt" for details.
+     SPDX-License-Identifier: BSD-2-Clause
+-->
 
-      @TAG(DATA61_BSD)
-   -->
 <api>
 </api>
 
diff --git a/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/constants.h b/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/constants.h
index eb66fc97c..eef3e1fef 100644
--- a/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/constants.h
+++ b/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/constants.h
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __LIBSEL4_SEL4_ARCH_CONSTANTS_H
diff --git a/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/deprecated.h b/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/deprecated.h
index 3b32dd6d5..804e59615 100644
--- a/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/deprecated.h
+++ b/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/deprecated.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_ARCH_DEPRECATED_H
diff --git a/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/faults.h b/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/faults.h
index 00ca6b754..986ae4d15 100644
--- a/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/faults.h
+++ b/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/faults.h
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __LIBSEL4_SEL4_ARCH_FAULTS_H
diff --git a/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/mapping.h b/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/mapping.h
index 21ddf33a5..bffafdf6d 100644
--- a/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/mapping.h
+++ b/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/mapping.h
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __LIBSEL4_SEL4_ARCH_MAPPING
diff --git a/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/objecttype.h b/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/objecttype.h
index dabb4159a..3f56237f1 100644
--- a/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/objecttype.h
+++ b/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/objecttype.h
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __SEL4_ARCH_OBJECT_TYPE_H
diff --git a/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/simple_types.h b/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/simple_types.h
index 5a53fc496..8f8037fbe 100644
--- a/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/simple_types.h
+++ b/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/simple_types.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_ARCH_SIMPLE_TYPES_H_
diff --git a/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/syscalls.h b/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/syscalls.h
index b963b0b07..0fb809659 100644
--- a/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/syscalls.h
+++ b/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/syscalls.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_ARCH_SYSCALLS_H
diff --git a/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/types.bf b/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/types.bf
index 13b6d5ebe..eb55f82a6 100644
--- a/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/types.bf
+++ b/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/types.bf
@@ -1,18 +1,9 @@
 --
--- Copyright 2016, Data61
--- Commonwealth Scientific and Industrial Research Organisation (CSIRO)
--- ABN 41 687 119 230
---
--- This software may be distributed and modified according to the terms of
--- the BSD 2-Clause license. Note that NO WARRANTY is provided.
--- See "LICENSE_BSD2.txt" for details.
---
--- @TAG(DATA61_BSD)
---
-
---
--- Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+-- Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 -- Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+--
+-- SPDX-License-Identifier: BSD-2-Clause
+--
 
 #include <autoconf.h>
 
diff --git a/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/types.h b/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/types.h
index 09ef65210..cb1f72178 100644
--- a/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/types.h
+++ b/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/types.h
@@ -1,18 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __LIBSEL4_SEL4_ARCH_TYPES_H
diff --git a/libsel4/sel4_arch_include/x86_64/interfaces/sel4arch.xml b/libsel4/sel4_arch_include/x86_64/interfaces/sel4arch.xml
index bd5c5a1bb..0b1ea7c38 100644
--- a/libsel4/sel4_arch_include/x86_64/interfaces/sel4arch.xml
+++ b/libsel4/sel4_arch_include/x86_64/interfaces/sel4arch.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" ?>
 <!--
-  Copyright 2017, Data61
-  Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-  ABN 41 687 119 230.
+     Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 
-  This software may be distributed and modified according to the terms of
-  the BSD 2-Clause license. Note that NO WARRANTY is provided.
-  See "LICENSE_BSD2.txt" for details.
+     SPDX-License-Identifier: BSD-2-Clause
+-->
 
-     @TAG(DATA61_BSD)
-  -->
 <api name="ObjectApiX64" label_prefix="x86_64_">
     <struct name="seL4_UserContext">
         <member name="rip"/>
diff --git a/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/constants.h b/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/constants.h
index da14c757f..c109db8da 100644
--- a/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/constants.h
+++ b/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/constants.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_SEL4_ARCH_CONSTANTS_H_
diff --git a/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/deprecated.h b/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/deprecated.h
index f12f6693f..ad7677a52 100644
--- a/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/deprecated.h
+++ b/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/deprecated.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_SEL4_ARCH_DEPRECATED_H_
diff --git a/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/exIPC.h b/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/exIPC.h
index b3aa9ed6a..5d3cf8cde 100644
--- a/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/exIPC.h
+++ b/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/exIPC.h
@@ -1,13 +1,8 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
+
 #include <sel4/deprecated.h>
 
diff --git a/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/faults.h b/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/faults.h
index 21f997954..9f7216091 100644
--- a/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/faults.h
+++ b/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/faults.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_ARCH_FAULTS_H
diff --git a/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/mapping.h b/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/mapping.h
index 3b7016f6c..eb5fb60a2 100644
--- a/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/mapping.h
+++ b/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/mapping.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_SEL4_ARCH_MAPPING_H_
diff --git a/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/objecttype.h b/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/objecttype.h
index 2264e4485..d85457407 100644
--- a/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/objecttype.h
+++ b/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/objecttype.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_SEL4_ARCH_OBJECTTYPE_H_
diff --git a/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/pfIPC.h b/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/pfIPC.h
index 4015c4d57..733abad62 100644
--- a/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/pfIPC.h
+++ b/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/pfIPC.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_SEL4_ARCH_PFIPC_H_
diff --git a/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/simple_types.h b/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/simple_types.h
index 491918b68..c06a23238 100644
--- a/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/simple_types.h
+++ b/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/simple_types.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_SEL4_ARCH_SIMPLE_TYPES_H_
diff --git a/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/syscalls.h b/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/syscalls.h
index 45c8f6dcb..42197670f 100644
--- a/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/syscalls.h
+++ b/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/syscalls.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_SEL4_ARCH_SYSCALLS_H_
diff --git a/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/syscalls_syscall.h b/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/syscalls_syscall.h
index 6f4cf1e9f..641b7666d 100644
--- a/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/syscalls_syscall.h
+++ b/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/syscalls_syscall.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_SEL4_ARCH_SYSCALLS_SYSCALL_H_
diff --git a/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/syscalls_sysenter.h b/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/syscalls_sysenter.h
index c306abb61..08a708e20 100644
--- a/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/syscalls_sysenter.h
+++ b/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/syscalls_sysenter.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_SEL4_ARCH_SYSCALLS_SYSENTER_H_
diff --git a/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/types.bf b/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/types.bf
index ef46321bd..af8db8cd8 100644
--- a/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/types.bf
+++ b/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/types.bf
@@ -1,13 +1,7 @@
 --
--- Copyright 2017, Data61
--- Commonwealth Scientific and Industrial Research Organisation (CSIRO)
--- ABN 41 687 119 230.
+-- Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 --
--- This software may be distributed and modified according to the terms of
--- the BSD 2-Clause license. Note that NO WARRANTY is provided.
--- See "LICENSE_BSD2.txt" for details.
---
--- @TAG(DATA61_BSD)
+-- SPDX-License-Identifier: BSD-2-Clause
 --
 
 #include <autoconf.h>
diff --git a/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/types.h b/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/types.h
index 1080a6738..3464f1e87 100644
--- a/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/types.h
+++ b/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/types.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_SEL4_ARCH_TYPES_H_
diff --git a/libsel4/sel4_plat_include/allwinnerA20/sel4/plat/api/constants.h b/libsel4/sel4_plat_include/allwinnerA20/sel4/plat/api/constants.h
index 018512468..a528412da 100644
--- a/libsel4/sel4_plat_include/allwinnerA20/sel4/plat/api/constants.h
+++ b/libsel4/sel4_plat_include/allwinnerA20/sel4/plat/api/constants.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_PLAT_API_CONSTANTS_H_
diff --git a/libsel4/sel4_plat_include/am335x/sel4/plat/api/constants.h b/libsel4/sel4_plat_include/am335x/sel4/plat/api/constants.h
index 111c5b520..6f3480521 100644
--- a/libsel4/sel4_plat_include/am335x/sel4/plat/api/constants.h
+++ b/libsel4/sel4_plat_include/am335x/sel4/plat/api/constants.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_PLAT_API_CONSTANTS_H_
diff --git a/libsel4/sel4_plat_include/apq8064/sel4/plat/api/constants.h b/libsel4/sel4_plat_include/apq8064/sel4/plat/api/constants.h
index 284889e6c..4e34b4f2b 100644
--- a/libsel4/sel4_plat_include/apq8064/sel4/plat/api/constants.h
+++ b/libsel4/sel4_plat_include/apq8064/sel4/plat/api/constants.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_PLAT_API_CONSTANTS_H_
diff --git a/libsel4/sel4_plat_include/ariane/sel4/plat/api/constants.h b/libsel4/sel4_plat_include/ariane/sel4/plat/api/constants.h
index fa609ccab..d55c59984 100644
--- a/libsel4/sel4_plat_include/ariane/sel4/plat/api/constants.h
+++ b/libsel4/sel4_plat_include/ariane/sel4/plat/api/constants.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_PLAT_API_CONSTANTS_H_
diff --git a/libsel4/sel4_plat_include/bcm2837/sel4/plat/api/constants.h b/libsel4/sel4_plat_include/bcm2837/sel4/plat/api/constants.h
index 26df38ccf..227191af2 100644
--- a/libsel4/sel4_plat_include/bcm2837/sel4/plat/api/constants.h
+++ b/libsel4/sel4_plat_include/bcm2837/sel4/plat/api/constants.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_PLAT_API_CONSTANTS_H_
diff --git a/libsel4/sel4_plat_include/exynos4/sel4/plat/api/constants.h b/libsel4/sel4_plat_include/exynos4/sel4/plat/api/constants.h
index 85aca10a3..f1a1ce214 100644
--- a/libsel4/sel4_plat_include/exynos4/sel4/plat/api/constants.h
+++ b/libsel4/sel4_plat_include/exynos4/sel4/plat/api/constants.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_PLAT_API_CONSTANTS_H_
diff --git a/libsel4/sel4_plat_include/exynos5/sel4/plat/api/constants.h b/libsel4/sel4_plat_include/exynos5/sel4/plat/api/constants.h
index 284889e6c..4e34b4f2b 100644
--- a/libsel4/sel4_plat_include/exynos5/sel4/plat/api/constants.h
+++ b/libsel4/sel4_plat_include/exynos5/sel4/plat/api/constants.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_PLAT_API_CONSTANTS_H_
diff --git a/libsel4/sel4_plat_include/exynos_common/sel4/plat/api/constants.h b/libsel4/sel4_plat_include/exynos_common/sel4/plat/api/constants.h
index f3eb7566f..02fe8fc55 100644
--- a/libsel4/sel4_plat_include/exynos_common/sel4/plat/api/constants.h
+++ b/libsel4/sel4_plat_include/exynos_common/sel4/plat/api/constants.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_PLAT_API_CONSTANTS_H_
diff --git a/libsel4/sel4_plat_include/fvp/sel4/plat/api/constants.h b/libsel4/sel4_plat_include/fvp/sel4/plat/api/constants.h
index 297acadf8..32b0692e1 100644
--- a/libsel4/sel4_plat_include/fvp/sel4/plat/api/constants.h
+++ b/libsel4/sel4_plat_include/fvp/sel4/plat/api/constants.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_PLAT_API_CONSTANTS_H_
diff --git a/libsel4/sel4_plat_include/hifive/sel4/plat/api/constants.h b/libsel4/sel4_plat_include/hifive/sel4/plat/api/constants.h
index 74b156899..d55c59984 100644
--- a/libsel4/sel4_plat_include/hifive/sel4/plat/api/constants.h
+++ b/libsel4/sel4_plat_include/hifive/sel4/plat/api/constants.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_PLAT_API_CONSTANTS_H_
diff --git a/libsel4/sel4_plat_include/hikey/sel4/plat/api/constants.h b/libsel4/sel4_plat_include/hikey/sel4/plat/api/constants.h
index 2efd33fb7..52151c924 100644
--- a/libsel4/sel4_plat_include/hikey/sel4/plat/api/constants.h
+++ b/libsel4/sel4_plat_include/hikey/sel4/plat/api/constants.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_PLAT_API_CONSTANTS_H_
diff --git a/libsel4/sel4_plat_include/imx31/sel4/plat/api/constants.h b/libsel4/sel4_plat_include/imx31/sel4/plat/api/constants.h
index fcff5689e..671f1c874 100644
--- a/libsel4/sel4_plat_include/imx31/sel4/plat/api/constants.h
+++ b/libsel4/sel4_plat_include/imx31/sel4/plat/api/constants.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_PLAT_API_CONSTANTS_H_
diff --git a/libsel4/sel4_plat_include/imx6/sel4/plat/api/constants.h b/libsel4/sel4_plat_include/imx6/sel4/plat/api/constants.h
index 85aca10a3..f1a1ce214 100644
--- a/libsel4/sel4_plat_include/imx6/sel4/plat/api/constants.h
+++ b/libsel4/sel4_plat_include/imx6/sel4/plat/api/constants.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_PLAT_API_CONSTANTS_H_
diff --git a/libsel4/sel4_plat_include/imx7/sel4/plat/api/constants.h b/libsel4/sel4_plat_include/imx7/sel4/plat/api/constants.h
index 5659e1a23..3ef7649dd 100644
--- a/libsel4/sel4_plat_include/imx7/sel4/plat/api/constants.h
+++ b/libsel4/sel4_plat_include/imx7/sel4/plat/api/constants.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_PLAT_API_CONSTANTS_H_
diff --git a/libsel4/sel4_plat_include/imx8mq-evk/sel4/plat/api/constants.h b/libsel4/sel4_plat_include/imx8mq-evk/sel4/plat/api/constants.h
index 193e36f44..d26aa0c35 100644
--- a/libsel4/sel4_plat_include/imx8mq-evk/sel4/plat/api/constants.h
+++ b/libsel4/sel4_plat_include/imx8mq-evk/sel4/plat/api/constants.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_PLAT_API_CONSTANTS_H_
diff --git a/libsel4/sel4_plat_include/odroidc2/sel4/plat/api/constants.h b/libsel4/sel4_plat_include/odroidc2/sel4/plat/api/constants.h
index 861cd60ea..7e7dea1a7 100644
--- a/libsel4/sel4_plat_include/odroidc2/sel4/plat/api/constants.h
+++ b/libsel4/sel4_plat_include/odroidc2/sel4/plat/api/constants.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_PLAT_API_CONSTANTS_H_
diff --git a/libsel4/sel4_plat_include/omap3/sel4/plat/api/constants.h b/libsel4/sel4_plat_include/omap3/sel4/plat/api/constants.h
index b5a3f76a1..67149d320 100644
--- a/libsel4/sel4_plat_include/omap3/sel4/plat/api/constants.h
+++ b/libsel4/sel4_plat_include/omap3/sel4/plat/api/constants.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_PLAT_API_CONSTANTS_H_
diff --git a/libsel4/sel4_plat_include/pc99/sel4/plat/api/constants.h b/libsel4/sel4_plat_include/pc99/sel4/plat/api/constants.h
index 70aeffa81..7d8f1aeee 100644
--- a/libsel4/sel4_plat_include/pc99/sel4/plat/api/constants.h
+++ b/libsel4/sel4_plat_include/pc99/sel4/plat/api/constants.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_PLAT_API_CONSTANTS_H_
diff --git a/libsel4/sel4_plat_include/qemu-arm-virt/sel4/plat/api/constants.h b/libsel4/sel4_plat_include/qemu-arm-virt/sel4/plat/api/constants.h
index dac0dd59a..a20675837 100644
--- a/libsel4/sel4_plat_include/qemu-arm-virt/sel4/plat/api/constants.h
+++ b/libsel4/sel4_plat_include/qemu-arm-virt/sel4/plat/api/constants.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_PLAT_API_CONSTANTS_H_
diff --git a/libsel4/sel4_plat_include/rocketchip/sel4/plat/api/constants.h b/libsel4/sel4_plat_include/rocketchip/sel4/plat/api/constants.h
index fa609ccab..d55c59984 100644
--- a/libsel4/sel4_plat_include/rocketchip/sel4/plat/api/constants.h
+++ b/libsel4/sel4_plat_include/rocketchip/sel4/plat/api/constants.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_PLAT_API_CONSTANTS_H_
diff --git a/libsel4/sel4_plat_include/rockpro64/sel4/plat/api/constants.h b/libsel4/sel4_plat_include/rockpro64/sel4/plat/api/constants.h
index 3ca047ad5..5fc29fda7 100644
--- a/libsel4/sel4_plat_include/rockpro64/sel4/plat/api/constants.h
+++ b/libsel4/sel4_plat_include/rockpro64/sel4/plat/api/constants.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_PLAT_API_CONSTANTS_H_
diff --git a/libsel4/sel4_plat_include/spike/sel4/plat/api/constants.h b/libsel4/sel4_plat_include/spike/sel4/plat/api/constants.h
index 74b156899..d55c59984 100644
--- a/libsel4/sel4_plat_include/spike/sel4/plat/api/constants.h
+++ b/libsel4/sel4_plat_include/spike/sel4/plat/api/constants.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_PLAT_API_CONSTANTS_H_
diff --git a/libsel4/sel4_plat_include/tk1/sel4/plat/api/constants.h b/libsel4/sel4_plat_include/tk1/sel4/plat/api/constants.h
index 284889e6c..4e34b4f2b 100644
--- a/libsel4/sel4_plat_include/tk1/sel4/plat/api/constants.h
+++ b/libsel4/sel4_plat_include/tk1/sel4/plat/api/constants.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_PLAT_API_CONSTANTS_H_
diff --git a/libsel4/sel4_plat_include/tx1/sel4/plat/api/constants.h b/libsel4/sel4_plat_include/tx1/sel4/plat/api/constants.h
index 855d86a82..d55c59984 100644
--- a/libsel4/sel4_plat_include/tx1/sel4/plat/api/constants.h
+++ b/libsel4/sel4_plat_include/tx1/sel4/plat/api/constants.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_PLAT_API_CONSTANTS_H_
diff --git a/libsel4/sel4_plat_include/tx2/sel4/plat/api/constants.h b/libsel4/sel4_plat_include/tx2/sel4/plat/api/constants.h
index 74b156899..d55c59984 100644
--- a/libsel4/sel4_plat_include/tx2/sel4/plat/api/constants.h
+++ b/libsel4/sel4_plat_include/tx2/sel4/plat/api/constants.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_PLAT_API_CONSTANTS_H_
diff --git a/libsel4/sel4_plat_include/zynq7000/sel4/plat/api/constants.h b/libsel4/sel4_plat_include/zynq7000/sel4/plat/api/constants.h
index 85aca10a3..f1a1ce214 100644
--- a/libsel4/sel4_plat_include/zynq7000/sel4/plat/api/constants.h
+++ b/libsel4/sel4_plat_include/zynq7000/sel4/plat/api/constants.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_PLAT_API_CONSTANTS_H_
diff --git a/libsel4/sel4_plat_include/zynqmp/sel4/plat/api/constants.h b/libsel4/sel4_plat_include/zynqmp/sel4/plat/api/constants.h
index 8956da138..d7f710109 100644
--- a/libsel4/sel4_plat_include/zynqmp/sel4/plat/api/constants.h
+++ b/libsel4/sel4_plat_include/zynqmp/sel4/plat/api/constants.h
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __LIBSEL4_SEL4_PLAT_API_CONSTANTS_H_
diff --git a/libsel4/src/sel4_bootinfo.c b/libsel4/src/sel4_bootinfo.c
index 8dc680cde..03e3e94e2 100644
--- a/libsel4/src/sel4_bootinfo.c
+++ b/libsel4/src/sel4_bootinfo.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <sel4/sel4.h>
diff --git a/libsel4/tools/__init__.py b/libsel4/tools/__init__.py
index b402cb3a4..ec5f2ab36 100644
--- a/libsel4/tools/__init__.py
+++ b/libsel4/tools/__init__.py
@@ -1,14 +1,8 @@
 #!/usr/bin/env python3
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the BSD 2-Clause license. Note that NO WARRANTY is provided.
-# See "LICENSE_BSD2.txt" for details.
-#
-# @TAG(DATA61_BSD)
+# SPDX-License-Identifier: BSD-2-Clause
 #
 
 # This file allows the the libsel4 tools directory to be imported as
diff --git a/libsel4/tools/sel4_idl.dtd b/libsel4/tools/sel4_idl.dtd
index 978e7ca8d..96b52ae34 100644
--- a/libsel4/tools/sel4_idl.dtd
+++ b/libsel4/tools/sel4_idl.dtd
@@ -1,14 +1,8 @@
 <!--
-  Copyright 2017, Data61
-  Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-  ABN 41 687 119 230.
+     Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 
-  This software may be distributed and modified according to the terms of
-  the BSD 2-Clause license. Note that NO WARRANTY is provided.
-  See "LICENSE_BSD2.txt" for details.
-
-     @TAG(DATA61_BSD)
-  -->
+     SPDX-License-Identifier: BSD-2-Clause
+-->
 
 <!ELEMENT api (struct*,interface*)>
 <!ATTLIST api name CDATA #IMPLIED>
diff --git a/libsel4/tools/syscall_stub_gen.py b/libsel4/tools/syscall_stub_gen.py
index 69d15a2f6..5d1cff3ea 100644
--- a/libsel4/tools/syscall_stub_gen.py
+++ b/libsel4/tools/syscall_stub_gen.py
@@ -1,14 +1,8 @@
 #!/usr/bin/env python3
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the BSD 2-Clause license. Note that NO WARRANTY is provided.
-# See "LICENSE_BSD2.txt" for details.
-#
-# @TAG(DATA61_BSD)
+# SPDX-License-Identifier: BSD-2-Clause
 #
 
 #
diff --git a/llvm.cmake b/llvm.cmake
index 015584c8b..7ba0ad170 100644
--- a/llvm.cmake
+++ b/llvm.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2019, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/manual/Doxyfile b/manual/Doxyfile
index 12bc015c6..a3389c91a 100644
--- a/manual/Doxyfile
+++ b/manual/Doxyfile
@@ -1,4 +1,8 @@
-# @TAG(DATA61_BSD)
+#
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
+#
+# SPDX-License-Identifier: BSD-2-Clause
+#
 
 # Doxyfile 1.8.11
 
diff --git a/manual/Makefile b/manual/Makefile
index 1b63df52e..1b86009d1 100644
--- a/manual/Makefile
+++ b/manual/Makefile
@@ -1,11 +1,7 @@
 #
 # Copyright 2014, General Dynamics C4 Systems
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(GD_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 # $Id: Makefile,v 1.26 2009-04-21 05:40:29 gernot Exp $
diff --git a/manual/README b/manual/README
index 6841b3a74..2ebca3f35 100644
--- a/manual/README
+++ b/manual/README
@@ -1,4 +1,8 @@
-<-- @TAG(GD_GPL) -->
+<!--
+     Copyright 2014, General Dynamics C4 Systems
+
+     SPDX-License-Identifier: GPL-2.0-only
+-->
 
 seL4 manual (including API). Default make target builds a PDF.
 
diff --git a/manual/disy.sty b/manual/disy.sty
index 61b5e0587..45112f682 100644
--- a/manual/disy.sty
+++ b/manual/disy.sty
@@ -1,13 +1,7 @@
 %
-% Copyright 2017, Data61
-% Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-% ABN 41 687 119 230.
+% Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 %
-% This software may be distributed and modified according to the terms of
-% the BSD 2-Clause license. Note that NO WARRANTY is provided.
-% See "LICENSE_BSD2.txt" for details.
-%
-% @TAG(DATA61_BSD)
+% SPDX-License-Identifier: BSD-2-Clause
 %
 
 % disy.sty
diff --git a/manual/export.bst b/manual/export.bst
index d35952ed6..0ac5c3138 100644
--- a/manual/export.bst
+++ b/manual/export.bst
@@ -1,4 +1,4 @@
-% @TAG(OTHER_LPPL)
+% SPDX-License-Identifier: LPPL-1.3c
 
 %%
 %% This is file `export.bst',
diff --git a/manual/manual.tex b/manual/manual.tex
index d3eec16d1..3bf61fc77 100644
--- a/manual/manual.tex
+++ b/manual/manual.tex
@@ -1,11 +1,7 @@
 %
 % Copyright 2014, General Dynamics C4 Systems
 %
-% This software may be distributed and modified according to the terms of
-% the GNU General Public License version 2. Note that NO WARRANTY is provided.
-% See "LICENSE_GPLv2.txt" for details.
-%
-% @TAG(GD_GPL)
+% SPDX-License-Identifier: GPL-2.0-only
 %
 
 \documentclass[a4paper,11pt,twoside]{report}
diff --git a/manual/parts/api.tex b/manual/parts/api.tex
index 57df9e9fb..d815b5bd9 100644
--- a/manual/parts/api.tex
+++ b/manual/parts/api.tex
@@ -1,11 +1,7 @@
 %
 % Copyright 2014, General Dynamics C4 Systems
 %
-% This software may be distributed and modified according to the terms of
-% the GNU General Public License version 2. Note that NO WARRANTY is provided.
-% See "LICENSE_GPLv2.txt" for details.
-%
-% @TAG(GD_GPL)
+% SPDX-License-Identifier: GPL-2.0-only
 %
 
 %macros for API documentation
diff --git a/manual/parts/api/debug_halt.tex b/manual/parts/api/debug_halt.tex
index 1d80d2c22..511de1fa3 100644
--- a/manual/parts/api/debug_halt.tex
+++ b/manual/parts/api/debug_halt.tex
@@ -1,11 +1,7 @@
 %
 % Copyright 2014, General Dynamics C4 Systems
 %
-% This software may be distributed and modified according to the terms of
-% the GNU General Public License version 2. Note that NO WARRANTY is provided.
-% See "LICENSE_GPLv2.txt" for details.
-%
-% @TAG(GD_GPL)
+% SPDX-License-Identifier: GPL-2.0-only
 %
 
 \apidoc
diff --git a/manual/parts/api/debug_putchar.tex b/manual/parts/api/debug_putchar.tex
index ca1b7b368..aec2eb2fb 100644
--- a/manual/parts/api/debug_putchar.tex
+++ b/manual/parts/api/debug_putchar.tex
@@ -1,11 +1,7 @@
 %
 % Copyright 2014, General Dynamics C4 Systems
 %
-% This software may be distributed and modified according to the terms of
-% the GNU General Public License version 2. Note that NO WARRANTY is provided.
-% See "LICENSE_GPLv2.txt" for details.
-%
-% @TAG(GD_GPL)
+% SPDX-License-Identifier: GPL-2.0-only
 %
 
 \apidoc
diff --git a/manual/parts/bootup.tex b/manual/parts/bootup.tex
index ee4c1a217..7b47ca181 100644
--- a/manual/parts/bootup.tex
+++ b/manual/parts/bootup.tex
@@ -1,11 +1,7 @@
 %
 % Copyright 2014, General Dynamics C4 Systems
 %
-% This software may be distributed and modified according to the terms of
-% the GNU General Public License version 2. Note that NO WARRANTY is provided.
-% See "LICENSE_GPLv2.txt" for details.
-%
-% @TAG(GD_GPL)
+% SPDX-License-Identifier: GPL-2.0-only
 %
 
 \chapter{\label{ch:bootup}System Bootstrapping}
diff --git a/manual/parts/cspace.tex b/manual/parts/cspace.tex
index 67ca85e53..cfacfee1e 100644
--- a/manual/parts/cspace.tex
+++ b/manual/parts/cspace.tex
@@ -1,11 +1,7 @@
 %
 % Copyright 2014, General Dynamics C4 Systems
 %
-% This software may be distributed and modified according to the terms of
-% the GNU General Public License version 2. Note that NO WARRANTY is provided.
-% See "LICENSE_GPLv2.txt" for details.
-%
-% @TAG(GD_GPL)
+% SPDX-License-Identifier: GPL-2.0-only
 %
 
 \chapter{\label{ch:cspace}Capability Spaces}
diff --git a/manual/parts/intro.tex b/manual/parts/intro.tex
index 0e3e3e075..331c8ad09 100644
--- a/manual/parts/intro.tex
+++ b/manual/parts/intro.tex
@@ -1,11 +1,7 @@
 %
 % Copyright 2014, General Dynamics C4 Systems
 %
-% This software may be distributed and modified according to the terms of
-% the GNU General Public License version 2. Note that NO WARRANTY is provided.
-% See "LICENSE_GPLv2.txt" for details.
-%
-% @TAG(GD_GPL)
+% SPDX-License-Identifier: GPL-2.0-only
 %
 
 \chapter{\label{ch:intro}Introduction}
diff --git a/manual/parts/io.tex b/manual/parts/io.tex
index 011da1244..b6d45ba04 100644
--- a/manual/parts/io.tex
+++ b/manual/parts/io.tex
@@ -1,11 +1,7 @@
 %
 % Copyright 2014, General Dynamics C4 Systems
 %
-% This software may be distributed and modified according to the terms of
-% the GNU General Public License version 2. Note that NO WARRANTY is provided.
-% See "LICENSE_GPLv2.txt" for details.
-%
-% @TAG(GD_GPL)
+% SPDX-License-Identifier: GPL-2.0-only
 %
 
 \chapter{\label{ch:io}Hardware I/O}
diff --git a/manual/parts/ipc.tex b/manual/parts/ipc.tex
index 766dd3b4b..0ae0297b2 100644
--- a/manual/parts/ipc.tex
+++ b/manual/parts/ipc.tex
@@ -1,11 +1,7 @@
 %
 % Copyright 2014, General Dynamics C4 Systems
 %
-% This software may be distributed and modified according to the terms of
-% the GNU General Public License version 2. Note that NO WARRANTY is provided.
-% See "LICENSE_GPLv2.txt" for details.
-%
-% @TAG(GD_GPL)
+% SPDX-License-Identifier: GPL-2.0-only
 %
 
 \chapter{\label{ch:ipc}Message Passing (IPC)}
diff --git a/manual/parts/notifications.tex b/manual/parts/notifications.tex
index af1a48147..a705aa782 100644
--- a/manual/parts/notifications.tex
+++ b/manual/parts/notifications.tex
@@ -1,11 +1,7 @@
 %
 % Copyright 2014, General Dynamics C4 Systems
 %
-% This software may be distributed and modified according to the terms of
-% the GNU General Public License version 2. Note that NO WARRANTY is provided.
-% See "LICENSE_GPLv2.txt" for details.
-%
-% @TAG(GD_GPL)
+% SPDX-License-Identifier: GPL-2.0-only
 %
 
 \chapter{\label{ch:notifications}Notifications}
diff --git a/manual/parts/objects.tex b/manual/parts/objects.tex
index 17ac6e8f5..cd69dff05 100644
--- a/manual/parts/objects.tex
+++ b/manual/parts/objects.tex
@@ -1,11 +1,7 @@
 %
 % Copyright 2014, General Dynamics C4 Systems
 %
-% This software may be distributed and modified according to the terms of
-% the GNU General Public License version 2. Note that NO WARRANTY is provided.
-% See "LICENSE_GPLv2.txt" for details.
-%
-% @TAG(GD_GPL)
+% SPDX-License-Identifier: GPL-2.0-only
 %
 
 \chapter{\label{ch:objects}Kernel Services and Objects}
diff --git a/manual/parts/threads.tex b/manual/parts/threads.tex
index 5c52ea876..5823db9ef 100644
--- a/manual/parts/threads.tex
+++ b/manual/parts/threads.tex
@@ -1,11 +1,7 @@
 %
 % Copyright 2014, General Dynamics C4 Systems
 %
-% This software may be distributed and modified according to the terms of
-% the GNU General Public License version 2. Note that NO WARRANTY is provided.
-% See "LICENSE_GPLv2.txt" for details.
-%
-% @TAG(GD_GPL)
+% SPDX-License-Identifier: GPL-2.0-only
 %
 
 \chapter{\label{ch:threads}Threads and Execution}
diff --git a/manual/parts/vspace.tex b/manual/parts/vspace.tex
index 9e7887295..6712aeb51 100644
--- a/manual/parts/vspace.tex
+++ b/manual/parts/vspace.tex
@@ -1,11 +1,7 @@
 %
 % Copyright 2014, General Dynamics C4 Systems
 %
-% This software may be distributed and modified according to the terms of
-% the GNU General Public License version 2. Note that NO WARRANTY is provided.
-% See "LICENSE_GPLv2.txt" for details.
-%
-% @TAG(GD_GPL)
+% SPDX-License-Identifier: GPL-2.0-only
 %
 
 \chapter{\label{ch:vspace}Address Spaces and Virtual Memory}
diff --git a/manual/tools/gen_env.py b/manual/tools/gen_env.py
index e76f2c2e5..ed68bf960 100755
--- a/manual/tools/gen_env.py
+++ b/manual/tools/gen_env.py
@@ -1,14 +1,8 @@
 #!/usr/bin/env python3
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the BSD 2-Clause license. Note that NO WARRANTY is provided.
-# See "LICENSE_BSD2.txt" for details.
-#
-# @TAG(DATA61_BSD)
+# SPDX-License-Identifier: BSD-2-Clause
 #
 
 import subprocess
diff --git a/manual/tools/gen_invocations.py b/manual/tools/gen_invocations.py
index 9a7ee648d..d629130c8 100755
--- a/manual/tools/gen_invocations.py
+++ b/manual/tools/gen_invocations.py
@@ -1,14 +1,8 @@
 #!/usr/bin/env python3
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the BSD 2-Clause license. Note that NO WARRANTY is provided.
-# See "LICENSE_BSD2.txt" for details.
-#
-# @TAG(DATA61_BSD)
+# SPDX-License-Identifier: BSD-2-Clause
 #
 
 """
diff --git a/manual/tools/parse_doxygen_xml.py b/manual/tools/parse_doxygen_xml.py
index 8c50e1249..c28cc27c4 100755
--- a/manual/tools/parse_doxygen_xml.py
+++ b/manual/tools/parse_doxygen_xml.py
@@ -1,14 +1,8 @@
 #!/usr/bin/env python3
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the BSD 2-Clause license. Note that NO WARRANTY is provided.
-# See "LICENSE_BSD2.txt" for details.
-#
-# @TAG(DATA61_BSD)
+# SPDX-License-Identifier: BSD-2-Clause
 #
 
 """
diff --git a/src/api/faults.c b/src/api/faults.c
index edcb61018..6efe1869c 100644
--- a/src/api/faults.c
+++ b/src/api/faults.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/api/syscall.c b/src/api/syscall.c
index e95e95c2d..ad5287d3d 100644
--- a/src/api/syscall.c
+++ b/src/api/syscall.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <types.h>
diff --git a/src/arch/arm/32/c_traps.c b/src/arch/arm/32/c_traps.c
index 5a012174e..8ec5b7c8a 100644
--- a/src/arch/arm/32/c_traps.c
+++ b/src/arch/arm/32/c_traps.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/arm/32/config.cmake b/src/arch/arm/32/config.cmake
index 48f130aac..8204724cd 100644
--- a/src/arch/arm/32/config.cmake
+++ b/src/arch/arm/32/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/arch/arm/32/head.S b/src/arch/arm/32/head.S
index e738430e7..7a6e33049 100644
--- a/src/arch/arm/32/head.S
+++ b/src/arch/arm/32/head.S
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/arm/32/hyp_traps.S b/src/arch/arm/32/hyp_traps.S
index 88c7d4049..7bed6ec25 100644
--- a/src/arch/arm/32/hyp_traps.S
+++ b/src/arch/arm/32/hyp_traps.S
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/arm/32/idle.c b/src/arch/arm/32/idle.c
index f24f265b0..3336f087a 100644
--- a/src/arch/arm/32/idle.c
+++ b/src/arch/arm/32/idle.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/arm/32/kernel/thread.c b/src/arch/arm/32/kernel/thread.c
index 24d2b2434..0aa40407a 100644
--- a/src/arch/arm/32/kernel/thread.c
+++ b/src/arch/arm/32/kernel/thread.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/arm/32/kernel/vspace.c b/src/arch/arm/32/kernel/vspace.c
index ab491f2f1..3e952abb1 100644
--- a/src/arch/arm/32/kernel/vspace.c
+++ b/src/arch/arm/32/kernel/vspace.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/arm/32/machine/capdl.c b/src/arch/arm/32/machine/capdl.c
index 3bcbe1d48..620e9938b 100644
--- a/src/arch/arm/32/machine/capdl.c
+++ b/src/arch/arm/32/machine/capdl.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 
diff --git a/src/arch/arm/32/machine/fpu.c b/src/arch/arm/32/machine/fpu.c
index 0d4850431..2056f2114 100644
--- a/src/arch/arm/32/machine/fpu.c
+++ b/src/arch/arm/32/machine/fpu.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <mode/machine.h>
diff --git a/src/arch/arm/32/machine/registerset.c b/src/arch/arm/32/machine/registerset.c
index 813a327e9..eb9b1cbac 100644
--- a/src/arch/arm/32/machine/registerset.c
+++ b/src/arch/arm/32/machine/registerset.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <assert.h>
diff --git a/src/arch/arm/32/model/statedata.c b/src/arch/arm/32/model/statedata.c
index b395aba5b..77badd02d 100644
--- a/src/arch/arm/32/model/statedata.c
+++ b/src/arch/arm/32/model/statedata.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/arm/32/object/objecttype.c b/src/arch/arm/32/object/objecttype.c
index bbd1bd57f..b5ae000f2 100644
--- a/src/arch/arm/32/object/objecttype.c
+++ b/src/arch/arm/32/object/objecttype.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/arm/32/traps.S b/src/arch/arm/32/traps.S
index 553f6d01b..4a5a70045 100644
--- a/src/arch/arm/32/traps.S
+++ b/src/arch/arm/32/traps.S
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/arm/64/c_traps.c b/src/arch/arm/64/c_traps.c
index dfa980168..b8f1a2786 100644
--- a/src/arch/arm/64/c_traps.c
+++ b/src/arch/arm/64/c_traps.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/arm/64/config.cmake b/src/arch/arm/64/config.cmake
index f40e26a5a..0784d593f 100644
--- a/src/arch/arm/64/config.cmake
+++ b/src/arch/arm/64/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/arch/arm/64/head.S b/src/arch/arm/64/head.S
index f75991c31..fe0e9d52d 100644
--- a/src/arch/arm/64/head.S
+++ b/src/arch/arm/64/head.S
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/arm/64/idle.c b/src/arch/arm/64/idle.c
index bc71599a5..dff33caad 100644
--- a/src/arch/arm/64/idle.c
+++ b/src/arch/arm/64/idle.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/arm/64/kernel/thread.c b/src/arch/arm/64/kernel/thread.c
index 952703e0c..e2ae2b481 100644
--- a/src/arch/arm/64/kernel/thread.c
+++ b/src/arch/arm/64/kernel/thread.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <object.h>
diff --git a/src/arch/arm/64/kernel/vspace.c b/src/arch/arm/64/kernel/vspace.c
index e2a0d5ec1..a4053892e 100644
--- a/src/arch/arm/64/kernel/vspace.c
+++ b/src/arch/arm/64/kernel/vspace.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/arm/64/machine/capdl.c b/src/arch/arm/64/machine/capdl.c
index 58a3b0727..3e8944b13 100644
--- a/src/arch/arm/64/machine/capdl.c
+++ b/src/arch/arm/64/machine/capdl.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/arm/64/machine/fpu.c b/src/arch/arm/64/machine/fpu.c
index 8d1cbb646..60a2808f8 100644
--- a/src/arch/arm/64/machine/fpu.c
+++ b/src/arch/arm/64/machine/fpu.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <mode/machine.h>
diff --git a/src/arch/arm/64/machine/registerset.c b/src/arch/arm/64/machine/registerset.c
index 01c25d47a..f7052d19a 100644
--- a/src/arch/arm/64/machine/registerset.c
+++ b/src/arch/arm/64/machine/registerset.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <assert.h>
diff --git a/src/arch/arm/64/model/statedata.c b/src/arch/arm/64/model/statedata.c
index 1ee146a9f..30cee37a4 100644
--- a/src/arch/arm/64/model/statedata.c
+++ b/src/arch/arm/64/model/statedata.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/arm/64/object/objecttype.c b/src/arch/arm/64/object/objecttype.c
index 6e94e87f3..bbe758e68 100644
--- a/src/arch/arm/64/object/objecttype.c
+++ b/src/arch/arm/64/object/objecttype.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/arm/64/traps.S b/src/arch/arm/64/traps.S
index f54f33909..ed9aad3dd 100644
--- a/src/arch/arm/64/traps.S
+++ b/src/arch/arm/64/traps.S
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/arm/api/faults.c b/src/arch/arm/api/faults.c
index 568c6a5a1..5c3ff6237 100644
--- a/src/arch/arm/api/faults.c
+++ b/src/arch/arm/api/faults.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/arm/armv/armv6/cache.c b/src/arch/arm/armv/armv6/cache.c
index 037ea817c..9c4c67948 100644
--- a/src/arch/arm/armv/armv6/cache.c
+++ b/src/arch/arm/armv/armv6/cache.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <arch/machine/hardware.h>
diff --git a/src/arch/arm/armv/armv6/config.cmake b/src/arch/arm/armv/armv6/config.cmake
index 001f731fd..a5a413999 100644
--- a/src/arch/arm/armv/armv6/config.cmake
+++ b/src/arch/arm/armv/armv6/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/arch/arm/armv/armv6/machine_asm.S b/src/arch/arm/armv/armv6/machine_asm.S
index f2d400678..dea67d376 100644
--- a/src/arch/arm/armv/armv6/machine_asm.S
+++ b/src/arch/arm/armv/armv6/machine_asm.S
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <machine/assembler.h>
diff --git a/src/arch/arm/armv/armv6/user_access.c b/src/arch/arm/armv/armv6/user_access.c
index 3f4418b50..e844b9f30 100644
--- a/src/arch/arm/armv/armv6/user_access.c
+++ b/src/arch/arm/armv/armv6/user_access.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <arch/user_access.h>
diff --git a/src/arch/arm/armv/armv7-a/cache.c b/src/arch/arm/armv/armv7-a/cache.c
index 08cb840c3..5badaef90 100644
--- a/src/arch/arm/armv/armv7-a/cache.c
+++ b/src/arch/arm/armv/armv7-a/cache.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <arch/machine/hardware.h>
diff --git a/src/arch/arm/armv/armv7-a/config.cmake b/src/arch/arm/armv/armv7-a/config.cmake
index c9bf3cdaa..8b24738b8 100644
--- a/src/arch/arm/armv/armv7-a/config.cmake
+++ b/src/arch/arm/armv/armv7-a/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/arch/arm/armv/armv7-a/machine_asm.S b/src/arch/arm/armv/armv7-a/machine_asm.S
index cf68184d0..07a9ccea7 100644
--- a/src/arch/arm/armv/armv7-a/machine_asm.S
+++ b/src/arch/arm/armv/armv7-a/machine_asm.S
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/arm/armv/armv7-a/tlb.c b/src/arch/arm/armv/armv7-a/tlb.c
index 6557a56ec..e9d0ad6b9 100644
--- a/src/arch/arm/armv/armv7-a/tlb.c
+++ b/src/arch/arm/armv/armv7-a/tlb.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <arch/machine/hardware.h>
diff --git a/src/arch/arm/armv/armv7-a/user_access.c b/src/arch/arm/armv/armv7-a/user_access.c
index 3fca1f9ba..c9d795c26 100644
--- a/src/arch/arm/armv/armv7-a/user_access.c
+++ b/src/arch/arm/armv/armv7-a/user_access.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <plat/machine/hardware.h>
diff --git a/src/arch/arm/armv/armv8-a/32/machine_asm.S b/src/arch/arm/armv/armv8-a/32/machine_asm.S
index 18777114f..671d0de81 100644
--- a/src/arch/arm/armv/armv8-a/32/machine_asm.S
+++ b/src/arch/arm/armv/armv8-a/32/machine_asm.S
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/arm/armv/armv8-a/64/cache.c b/src/arch/arm/armv/armv8-a/64/cache.c
index 6484a238d..e6b2afb04 100644
--- a/src/arch/arm/armv/armv8-a/64/cache.c
+++ b/src/arch/arm/armv/armv8-a/64/cache.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <arch/machine/hardware.h>
diff --git a/src/arch/arm/armv/armv8-a/64/machine_asm.S b/src/arch/arm/armv/armv8-a/64/machine_asm.S
index 66ef3b9b9..dcbfc5f68 100644
--- a/src/arch/arm/armv/armv8-a/64/machine_asm.S
+++ b/src/arch/arm/armv/armv8-a/64/machine_asm.S
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <machine/assembler.h>
diff --git a/src/arch/arm/armv/armv8-a/64/user_access.c b/src/arch/arm/armv/armv8-a/64/user_access.c
index f47b51531..215c9a5bf 100644
--- a/src/arch/arm/armv/armv8-a/64/user_access.c
+++ b/src/arch/arm/armv/armv8-a/64/user_access.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <plat/machine/hardware.h>
diff --git a/src/arch/arm/armv/armv8-a/config.cmake b/src/arch/arm/armv/armv8-a/config.cmake
index a9d6c1599..b4de9c37e 100644
--- a/src/arch/arm/armv/armv8-a/config.cmake
+++ b/src/arch/arm/armv/armv8-a/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/arch/arm/benchmark/benchmark.c b/src/arch/arm/benchmark/benchmark.c
index de6caa813..a7ad51be3 100644
--- a/src/arch/arm/benchmark/benchmark.c
+++ b/src/arch/arm/benchmark/benchmark.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <benchmark/benchmark.h>
diff --git a/src/arch/arm/c_traps.c b/src/arch/arm/c_traps.c
index a473fa928..286e27779 100644
--- a/src/arch/arm/c_traps.c
+++ b/src/arch/arm/c_traps.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/arm/common_arm.lds b/src/arch/arm/common_arm.lds
index 9191a4b89..f684f37fc 100644
--- a/src/arch/arm/common_arm.lds
+++ b/src/arch/arm/common_arm.lds
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/arm/config.cmake b/src/arch/arm/config.cmake
index 33b7cdfbe..018e3a603 100644
--- a/src/arch/arm/config.cmake
+++ b/src/arch/arm/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/arch/arm/kernel/boot.c b/src/arch/arm/kernel/boot.c
index 8d792c514..bae364f87 100644
--- a/src/arch/arm/kernel/boot.c
+++ b/src/arch/arm/kernel/boot.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/arm/kernel/thread.c b/src/arch/arm/kernel/thread.c
index 3297d8be6..f84d59792 100644
--- a/src/arch/arm/kernel/thread.c
+++ b/src/arch/arm/kernel/thread.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <kernel/thread.h>
diff --git a/src/arch/arm/machine/cache.c b/src/arch/arm/machine/cache.c
index 1af931024..a46b022eb 100644
--- a/src/arch/arm/machine/cache.c
+++ b/src/arch/arm/machine/cache.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <api/types.h>
diff --git a/src/arch/arm/machine/debug.c b/src/arch/arm/machine/debug.c
index eb4a312ab..aa183bdaf 100644
--- a/src/arch/arm/machine/debug.c
+++ b/src/arch/arm/machine/debug.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/arm/machine/errata.c b/src/arch/arm/machine/errata.c
index 8cb03e122..a90a6475a 100644
--- a/src/arch/arm/machine/errata.c
+++ b/src/arch/arm/machine/errata.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/arm/machine/gic_v2.c b/src/arch/arm/machine/gic_v2.c
index 47ebffd21..bfe82286e 100644
--- a/src/arch/arm/machine/gic_v2.c
+++ b/src/arch/arm/machine/gic_v2.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/arm/machine/gic_v3.c b/src/arch/arm/machine/gic_v3.c
index e32dd0e17..25e011b3a 100644
--- a/src/arch/arm/machine/gic_v3.c
+++ b/src/arch/arm/machine/gic_v3.c
@@ -1,15 +1,10 @@
 /*
  * Copyright 2019, DornerWorks
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_DORNERWORKS_BSD)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
+
 #include <config.h>
 #include <types.h>
 #include <arch/machine/gic_v3.h>
diff --git a/src/arch/arm/machine/hardware.c b/src/arch/arm/machine/hardware.c
index a2605f83c..3b7590e88 100644
--- a/src/arch/arm/machine/hardware.c
+++ b/src/arch/arm/machine/hardware.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <types.h>
diff --git a/src/arch/arm/machine/l2c_310.c b/src/arch/arm/machine/l2c_310.c
index 0828aabed..02d3a466e 100644
--- a/src/arch/arm/machine/l2c_310.c
+++ b/src/arch/arm/machine/l2c_310.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/arm/machine/l2c_nop.c b/src/arch/arm/machine/l2c_nop.c
index c5f46f99f..28eefdbd5 100644
--- a/src/arch/arm/machine/l2c_nop.c
+++ b/src/arch/arm/machine/l2c_nop.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/arm/object/interrupt.c b/src/arch/arm/object/interrupt.c
index 6b51d28d6..b9863009b 100644
--- a/src/arch/arm/object/interrupt.c
+++ b/src/arch/arm/object/interrupt.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <types.h>
diff --git a/src/arch/arm/object/iospace.c b/src/arch/arm/object/iospace.c
index fe20be0a0..70a78920a 100644
--- a/src/arch/arm/object/iospace.c
+++ b/src/arch/arm/object/iospace.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2016, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/arm/object/tcb.c b/src/arch/arm/object/tcb.c
index 790ed7678..0a5e07210 100644
--- a/src/arch/arm/object/tcb.c
+++ b/src/arch/arm/object/tcb.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/arm/object/vcpu.c b/src/arch/arm/object/vcpu.c
index 6c1b0589f..1c03bae9c 100644
--- a/src/arch/arm/object/vcpu.c
+++ b/src/arch/arm/object/vcpu.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/arm/platform_gen.h.in b/src/arch/arm/platform_gen.h.in
index 4a1442e12..68d75d8e9 100644
--- a/src/arch/arm/platform_gen.h.in
+++ b/src/arch/arm/platform_gen.h.in
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __ARM_PLAT_H
diff --git a/src/arch/arm/smp/ipi.c b/src/arch/arm/smp/ipi.c
index 9fa4330ba..dcbe6c737 100644
--- a/src/arch/arm/smp/ipi.c
+++ b/src/arch/arm/smp/ipi.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/riscv/api/benchmark.c b/src/arch/riscv/api/benchmark.c
index 3798a05e1..91c97da19 100644
--- a/src/arch/riscv/api/benchmark.c
+++ b/src/arch/riscv/api/benchmark.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifdef CONFIG_ENABLE_BENCHMARK
diff --git a/src/arch/riscv/api/faults.c b/src/arch/riscv/api/faults.c
index c46989b03..5f95a8b18 100644
--- a/src/arch/riscv/api/faults.c
+++ b/src/arch/riscv/api/faults.c
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <types.h>
diff --git a/src/arch/riscv/c_traps.c b/src/arch/riscv/c_traps.c
index b0227136a..5d6a7c3fd 100644
--- a/src/arch/riscv/c_traps.c
+++ b/src/arch/riscv/c_traps.c
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/riscv/common_riscv.lds b/src/arch/riscv/common_riscv.lds
index 3158a148e..b1abb379d 100644
--- a/src/arch/riscv/common_riscv.lds
+++ b/src/arch/riscv/common_riscv.lds
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 OUTPUT_ARCH(riscv)
diff --git a/src/arch/riscv/config.cmake b/src/arch/riscv/config.cmake
index 195c0734f..2e2ad09ae 100644
--- a/src/arch/riscv/config.cmake
+++ b/src/arch/riscv/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2018, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/arch/riscv/halt.S b/src/arch/riscv/halt.S
index 2410bdf06..f066d65d1 100644
--- a/src/arch/riscv/halt.S
+++ b/src/arch/riscv/halt.S
@@ -1,12 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
+
 #include <machine/assembler.h>
diff --git a/src/arch/riscv/head.S b/src/arch/riscv/head.S
index c61aa4c30..4f105c5cb 100644
--- a/src/arch/riscv/head.S
+++ b/src/arch/riscv/head.S
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/riscv/idle.c b/src/arch/riscv/idle.c
index 128347588..dca67d707 100644
--- a/src/arch/riscv/idle.c
+++ b/src/arch/riscv/idle.c
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/riscv/kernel/boot.c b/src/arch/riscv/kernel/boot.c
index d5eb080cc..e903d8568 100644
--- a/src/arch/riscv/kernel/boot.c
+++ b/src/arch/riscv/kernel/boot.c
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <assert.h>
diff --git a/src/arch/riscv/kernel/thread.c b/src/arch/riscv/kernel/thread.c
index 01fb85897..9a60bc01c 100644
--- a/src/arch/riscv/kernel/thread.c
+++ b/src/arch/riscv/kernel/thread.c
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/riscv/kernel/vspace.c b/src/arch/riscv/kernel/vspace.c
index a85f12ed3..714b2095b 100644
--- a/src/arch/riscv/kernel/vspace.c
+++ b/src/arch/riscv/kernel/vspace.c
@@ -1,21 +1,9 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * Copyright 2018, DornerWorks
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_DORNERWORKS_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, DornerWorks
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <types.h>
diff --git a/src/arch/riscv/machine/capdl.c b/src/arch/riscv/machine/capdl.c
index e0a9fdecc..d2833623d 100644
--- a/src/arch/riscv/machine/capdl.c
+++ b/src/arch/riscv/machine/capdl.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/riscv/machine/hardware.c b/src/arch/riscv/machine/hardware.c
index 1aafddd53..c912913f4 100644
--- a/src/arch/riscv/machine/hardware.c
+++ b/src/arch/riscv/machine/hardware.c
@@ -1,20 +1,10 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
+ * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
- * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
- */
 #include <config.h>
 #include <types.h>
 #include <machine/registerset.h>
diff --git a/src/arch/riscv/machine/io.c b/src/arch/riscv/machine/io.c
index 2f67953dd..da1edd7d7 100644
--- a/src/arch/riscv/machine/io.c
+++ b/src/arch/riscv/machine/io.c
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <machine/io.h>
diff --git a/src/arch/riscv/machine/registerset.c b/src/arch/riscv/machine/registerset.c
index 8ca1518bc..f78509716 100644
--- a/src/arch/riscv/machine/registerset.c
+++ b/src/arch/riscv/machine/registerset.c
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <assert.h>
diff --git a/src/arch/riscv/model/statedata.c b/src/arch/riscv/model/statedata.c
index fedbf0ef6..2352797a6 100644
--- a/src/arch/riscv/model/statedata.c
+++ b/src/arch/riscv/model/statedata.c
@@ -1,21 +1,9 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * Copyright 2018, DornerWorks
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_DORNERWORKS_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, DornerWorks
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <util.h>
diff --git a/src/arch/riscv/object/interrupt.c b/src/arch/riscv/object/interrupt.c
index abd4fae34..8004a54bc 100644
--- a/src/arch/riscv/object/interrupt.c
+++ b/src/arch/riscv/object/interrupt.c
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <types.h>
diff --git a/src/arch/riscv/object/objecttype.c b/src/arch/riscv/object/objecttype.c
index d571e96f5..de9df7398 100644
--- a/src/arch/riscv/object/objecttype.c
+++ b/src/arch/riscv/object/objecttype.c
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <types.h>
diff --git a/src/arch/riscv/object/tcb.c b/src/arch/riscv/object/tcb.c
index b3f44d3c0..131974903 100644
--- a/src/arch/riscv/object/tcb.c
+++ b/src/arch/riscv/object/tcb.c
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <types.h>
diff --git a/src/arch/riscv/platform_gen.h.in b/src/arch/riscv/platform_gen.h.in
index 9b1991a92..8e96b08da 100644
--- a/src/arch/riscv/platform_gen.h.in
+++ b/src/arch/riscv/platform_gen.h.in
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #ifndef __RISCV_PLAT_H
diff --git a/src/arch/riscv/smp/ipi.c b/src/arch/riscv/smp/ipi.c
index f8379a0fb..da10d7ab3 100644
--- a/src/arch/riscv/smp/ipi.c
+++ b/src/arch/riscv/smp/ipi.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/riscv/traps.S b/src/arch/riscv/traps.S
index e043c1513..4b12ae281 100644
--- a/src/arch/riscv/traps.S
+++ b/src/arch/riscv/traps.S
@@ -1,19 +1,8 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-/*
- *
- * Copyright 2016, 2017 Hesham Almatary, Data61/CSIRO <hesham.almatary@data61.csiro.au>
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  * Copyright 2015, 2016 Hesham Almatary <heshamelmatary@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/x86/32/c_traps.c b/src/arch/x86/32/c_traps.c
index 2447b55b3..e956880e6 100644
--- a/src/arch/x86/32/c_traps.c
+++ b/src/arch/x86/32/c_traps.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/x86/32/config.cmake b/src/arch/x86/32/config.cmake
index 8791effe5..672246f30 100644
--- a/src/arch/x86/32/config.cmake
+++ b/src/arch/x86/32/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/arch/x86/32/head.S b/src/arch/x86/32/head.S
index b6e84501e..984865303 100644
--- a/src/arch/x86/32/head.S
+++ b/src/arch/x86/32/head.S
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 /* Configuration for MultiBoot, see MultiBoot Specification:
diff --git a/src/arch/x86/32/kernel/elf.c b/src/arch/x86/32/kernel/elf.c
index 2aebb6912..2b553d25c 100644
--- a/src/arch/x86/32/kernel/elf.c
+++ b/src/arch/x86/32/kernel/elf.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <arch/kernel/elf.h>
diff --git a/src/arch/x86/32/kernel/thread.c b/src/arch/x86/32/kernel/thread.c
index a479b5334..64595db10 100644
--- a/src/arch/x86/32/kernel/thread.c
+++ b/src/arch/x86/32/kernel/thread.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <object.h>
diff --git a/src/arch/x86/32/kernel/vspace.c b/src/arch/x86/32/kernel/vspace.c
index 226ed7b16..a882e209c 100644
--- a/src/arch/x86/32/kernel/vspace.c
+++ b/src/arch/x86/32/kernel/vspace.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/x86/32/kernel/vspace_32paging.c b/src/arch/x86/32/kernel/vspace_32paging.c
index 90ca6b8e5..19a2d1353 100644
--- a/src/arch/x86/32/kernel/vspace_32paging.c
+++ b/src/arch/x86/32/kernel/vspace_32paging.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <api/syscall.h>
diff --git a/src/arch/x86/32/machine/registerset.c b/src/arch/x86/32/machine/registerset.c
index 08332f9b1..af234a19a 100644
--- a/src/arch/x86/32/machine/registerset.c
+++ b/src/arch/x86/32/machine/registerset.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <assert.h>
diff --git a/src/arch/x86/32/machine_asm.S b/src/arch/x86/32/machine_asm.S
index 70bb10762..dadd3cea7 100644
--- a/src/arch/x86/32/machine_asm.S
+++ b/src/arch/x86/32/machine_asm.S
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <machine/assembler.h>
diff --git a/src/arch/x86/32/model/statedata.c b/src/arch/x86/32/model/statedata.c
index 0818b841f..3c729723a 100644
--- a/src/arch/x86/32/model/statedata.c
+++ b/src/arch/x86/32/model/statedata.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/x86/32/object/objecttype.c b/src/arch/x86/32/object/objecttype.c
index 160959e40..fbc72b5f5 100644
--- a/src/arch/x86/32/object/objecttype.c
+++ b/src/arch/x86/32/object/objecttype.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/x86/32/smp/ipi.c b/src/arch/x86/32/smp/ipi.c
index d9a3ded77..794e3b85e 100644
--- a/src/arch/x86/32/smp/ipi.c
+++ b/src/arch/x86/32/smp/ipi.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/x86/32/traps.S b/src/arch/x86/32/traps.S
index f4ad0d3f6..f46621b38 100644
--- a/src/arch/x86/32/traps.S
+++ b/src/arch/x86/32/traps.S
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/x86/64/c_traps.c b/src/arch/x86/64/c_traps.c
index a3cc1f45a..4e07fa2ff 100644
--- a/src/arch/x86/64/c_traps.c
+++ b/src/arch/x86/64/c_traps.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/x86/64/config.cmake b/src/arch/x86/64/config.cmake
index 03c07a4bb..1b38af4ef 100644
--- a/src/arch/x86/64/config.cmake
+++ b/src/arch/x86/64/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/arch/x86/64/head.S b/src/arch/x86/64/head.S
index eb6cf4a43..076de9f9c 100644
--- a/src/arch/x86/64/head.S
+++ b/src/arch/x86/64/head.S
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 /* The kernel expects to be booted by a Multiboot compliant bootloader.
diff --git a/src/arch/x86/64/kernel/elf.c b/src/arch/x86/64/kernel/elf.c
index da010585b..54c5c532a 100644
--- a/src/arch/x86/64/kernel/elf.c
+++ b/src/arch/x86/64/kernel/elf.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <arch/kernel/elf.h>
diff --git a/src/arch/x86/64/kernel/thread.c b/src/arch/x86/64/kernel/thread.c
index e0197feab..889b86f88 100644
--- a/src/arch/x86/64/kernel/thread.c
+++ b/src/arch/x86/64/kernel/thread.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <object.h>
diff --git a/src/arch/x86/64/kernel/vspace.c b/src/arch/x86/64/kernel/vspace.c
index 342ad5776..0262f9f14 100644
--- a/src/arch/x86/64/kernel/vspace.c
+++ b/src/arch/x86/64/kernel/vspace.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/x86/64/machine/registerset.c b/src/arch/x86/64/machine/registerset.c
index 12ca6529c..c30d0710c 100644
--- a/src/arch/x86/64/machine/registerset.c
+++ b/src/arch/x86/64/machine/registerset.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <assert.h>
diff --git a/src/arch/x86/64/machine_asm.S b/src/arch/x86/64/machine_asm.S
index 922a9a97c..1155681e4 100644
--- a/src/arch/x86/64/machine_asm.S
+++ b/src/arch/x86/64/machine_asm.S
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <machine/assembler.h>
diff --git a/src/arch/x86/64/model/smp.c b/src/arch/x86/64/model/smp.c
index 013f691b3..f6255de11 100644
--- a/src/arch/x86/64/model/smp.c
+++ b/src/arch/x86/64/model/smp.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/x86/64/model/statedata.c b/src/arch/x86/64/model/statedata.c
index 4add00422..7460595e3 100644
--- a/src/arch/x86/64/model/statedata.c
+++ b/src/arch/x86/64/model/statedata.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <arch/model/statedata.h>
diff --git a/src/arch/x86/64/object/objecttype.c b/src/arch/x86/64/object/objecttype.c
index bd9be4ceb..793121860 100644
--- a/src/arch/x86/64/object/objecttype.c
+++ b/src/arch/x86/64/object/objecttype.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/x86/64/smp/ipi.c b/src/arch/x86/64/smp/ipi.c
index 4de7b782a..b5101455f 100644
--- a/src/arch/x86/64/smp/ipi.c
+++ b/src/arch/x86/64/smp/ipi.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/x86/64/traps.S b/src/arch/x86/64/traps.S
index ecfdc8a17..5662f6230 100644
--- a/src/arch/x86/64/traps.S
+++ b/src/arch/x86/64/traps.S
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <machine/assembler.h>
diff --git a/src/arch/x86/api/faults.c b/src/arch/x86/api/faults.c
index 7c9964dab..8b9bd9bd8 100644
--- a/src/arch/x86/api/faults.c
+++ b/src/arch/x86/api/faults.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <types.h>
diff --git a/src/arch/x86/benchmark/benchmark.c b/src/arch/x86/benchmark/benchmark.c
index 8108cd096..d88ae14e5 100644
--- a/src/arch/x86/benchmark/benchmark.c
+++ b/src/arch/x86/benchmark/benchmark.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #if CONFIG_MAX_NUM_TRACE_POINTS > 0
diff --git a/src/arch/x86/c_traps.c b/src/arch/x86/c_traps.c
index 73cc6ff39..bfd259b3a 100644
--- a/src/arch/x86/c_traps.c
+++ b/src/arch/x86/c_traps.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/x86/config.cmake b/src/arch/x86/config.cmake
index dd5f21312..f6cbfc947 100644
--- a/src/arch/x86/config.cmake
+++ b/src/arch/x86/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/arch/x86/idle.c b/src/arch/x86/idle.c
index edcaf1921..cea054293 100644
--- a/src/arch/x86/idle.c
+++ b/src/arch/x86/idle.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/x86/kernel/apic.c b/src/arch/x86/kernel/apic.c
index eb8462855..54f30e0e5 100644
--- a/src/arch/x86/kernel/apic.c
+++ b/src/arch/x86/kernel/apic.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/x86/kernel/boot.c b/src/arch/x86/kernel/boot.c
index 50190acf0..6ad51ba3c 100644
--- a/src/arch/x86/kernel/boot.c
+++ b/src/arch/x86/kernel/boot.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/x86/kernel/boot_sys.c b/src/arch/x86/kernel/boot_sys.c
index c01a0f446..48affd20d 100644
--- a/src/arch/x86/kernel/boot_sys.c
+++ b/src/arch/x86/kernel/boot_sys.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/x86/kernel/cmdline.c b/src/arch/x86/kernel/cmdline.c
index 932aa6e9e..1e86d00d6 100644
--- a/src/arch/x86/kernel/cmdline.c
+++ b/src/arch/x86/kernel/cmdline.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/x86/kernel/ept.c b/src/arch/x86/kernel/ept.c
index 7aac4bdaf..0f60fa1ea 100644
--- a/src/arch/x86/kernel/ept.c
+++ b/src/arch/x86/kernel/ept.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/x86/kernel/smp_sys.c b/src/arch/x86/kernel/smp_sys.c
index d1f31a87b..f7d237d7d 100644
--- a/src/arch/x86/kernel/smp_sys.c
+++ b/src/arch/x86/kernel/smp_sys.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/x86/kernel/thread.c b/src/arch/x86/kernel/thread.c
index 27cea3f37..4029c431c 100644
--- a/src/arch/x86/kernel/thread.c
+++ b/src/arch/x86/kernel/thread.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <kernel/thread.h>
diff --git a/src/arch/x86/kernel/vspace.c b/src/arch/x86/kernel/vspace.c
index 7e691d956..50660ab77 100644
--- a/src/arch/x86/kernel/vspace.c
+++ b/src/arch/x86/kernel/vspace.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/x86/kernel/x2apic.c b/src/arch/x86/kernel/x2apic.c
index b2ac906f7..3026cd0fa 100644
--- a/src/arch/x86/kernel/x2apic.c
+++ b/src/arch/x86/kernel/x2apic.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/x86/kernel/xapic.c b/src/arch/x86/kernel/xapic.c
index b273ef84d..dda8d763e 100644
--- a/src/arch/x86/kernel/xapic.c
+++ b/src/arch/x86/kernel/xapic.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/x86/machine/breakpoint.c b/src/arch/x86/machine/breakpoint.c
index ef8f0bbea..0284fd849 100644
--- a/src/arch/x86/machine/breakpoint.c
+++ b/src/arch/x86/machine/breakpoint.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/x86/machine/capdl.c b/src/arch/x86/machine/capdl.c
index 11188d179..7f13ac85a 100644
--- a/src/arch/x86/machine/capdl.c
+++ b/src/arch/x86/machine/capdl.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/x86/machine/cpu_identification.c b/src/arch/x86/machine/cpu_identification.c
index e5044e3e5..fc7e88b06 100644
--- a/src/arch/x86/machine/cpu_identification.c
+++ b/src/arch/x86/machine/cpu_identification.c
@@ -1,12 +1,9 @@
 /*
  * Copyright 2016, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
+
 #include <string.h>
 #include <util.h>
 #include <arch/machine.h>
diff --git a/src/arch/x86/machine/fpu.c b/src/arch/x86/machine/fpu.c
index cacadeea0..fe691a8a7 100644
--- a/src/arch/x86/machine/fpu.c
+++ b/src/arch/x86/machine/fpu.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <model/statedata.h>
diff --git a/src/arch/x86/machine/hardware.c b/src/arch/x86/machine/hardware.c
index 40b7991b7..fa352bdcc 100644
--- a/src/arch/x86/machine/hardware.c
+++ b/src/arch/x86/machine/hardware.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <types.h>
diff --git a/src/arch/x86/machine/registerset.c b/src/arch/x86/machine/registerset.c
index 2c8ade6ce..9be74f66f 100644
--- a/src/arch/x86/machine/registerset.c
+++ b/src/arch/x86/machine/registerset.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/x86/model/statedata.c b/src/arch/x86/model/statedata.c
index abcdbf32d..545558b87 100644
--- a/src/arch/x86/model/statedata.c
+++ b/src/arch/x86/model/statedata.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/x86/multiboot.S b/src/arch/x86/multiboot.S
index cc0f074a0..b204b563d 100644
--- a/src/arch/x86/multiboot.S
+++ b/src/arch/x86/multiboot.S
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 /* Configuration for MultiBoot, see MultiBoot Specification:
diff --git a/src/arch/x86/object/interrupt.c b/src/arch/x86/object/interrupt.c
index 763b856d4..92e7fd785 100644
--- a/src/arch/x86/object/interrupt.c
+++ b/src/arch/x86/object/interrupt.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <kernel/boot.h>
diff --git a/src/arch/x86/object/ioport.c b/src/arch/x86/object/ioport.c
index 7dc753823..2f12d7ebd 100644
--- a/src/arch/x86/object/ioport.c
+++ b/src/arch/x86/object/ioport.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <kernel/thread.h>
diff --git a/src/arch/x86/object/iospace.c b/src/arch/x86/object/iospace.c
index 889e94781..d4f7dc1b7 100644
--- a/src/arch/x86/object/iospace.c
+++ b/src/arch/x86/object/iospace.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/x86/object/objecttype.c b/src/arch/x86/object/objecttype.c
index f3e94219f..1b46f1bda 100644
--- a/src/arch/x86/object/objecttype.c
+++ b/src/arch/x86/object/objecttype.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/x86/object/tcb.c b/src/arch/x86/object/tcb.c
index cfc531fa6..5e8cc751a 100644
--- a/src/arch/x86/object/tcb.c
+++ b/src/arch/x86/object/tcb.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <types.h>
diff --git a/src/arch/x86/object/vcpu.c b/src/arch/x86/object/vcpu.c
index 23cadfdec..9b30d010a 100644
--- a/src/arch/x86/object/vcpu.c
+++ b/src/arch/x86/object/vcpu.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/arch/x86/smp/ipi.c b/src/arch/x86/smp/ipi.c
index fb23c131f..198148594 100644
--- a/src/arch/x86/smp/ipi.c
+++ b/src/arch/x86/smp/ipi.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/assert.c b/src/assert.c
index 90495f20d..5fa3f35b7 100644
--- a/src/assert.c
+++ b/src/assert.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <assert.h>
diff --git a/src/benchmark/benchmark_track.c b/src/benchmark/benchmark_track.c
index 37bb726b0..815037d72 100644
--- a/src/benchmark/benchmark_track.c
+++ b/src/benchmark/benchmark_track.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2016, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/benchmark/benchmark_utilisation.c b/src/benchmark/benchmark_utilisation.c
index f528384c3..afabfca57 100644
--- a/src/benchmark/benchmark_utilisation.c
+++ b/src/benchmark/benchmark_utilisation.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2016, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/config.cmake b/src/config.cmake
index ff7bf3b67..440fbff84 100644
--- a/src/config.cmake
+++ b/src/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/config/default_domain.c b/src/config/default_domain.c
index 5db911584..cbdcf321c 100644
--- a/src/config/default_domain.c
+++ b/src/config/default_domain.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <object/structures.h>
diff --git a/src/drivers/config.cmake b/src/drivers/config.cmake
index 456bbf982..4cda25fb4 100644
--- a/src/drivers/config.cmake
+++ b/src/drivers/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2019, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/drivers/serial/bcm2835-aux-uart.c b/src/drivers/serial/bcm2835-aux-uart.c
index e15cbccba..7c3a15ee7 100644
--- a/src/drivers/serial/bcm2835-aux-uart.c
+++ b/src/drivers/serial/bcm2835-aux-uart.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/drivers/serial/config.cmake b/src/drivers/serial/config.cmake
index b57910a5f..951d1d45b 100644
--- a/src/drivers/serial/config.cmake
+++ b/src/drivers/serial/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2019, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/drivers/serial/exynos4210-uart.c b/src/drivers/serial/exynos4210-uart.c
index 9e6e28b26..1d487e3ea 100644
--- a/src/drivers/serial/exynos4210-uart.c
+++ b/src/drivers/serial/exynos4210-uart.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/drivers/serial/imx.c b/src/drivers/serial/imx.c
index 53ba6e149..c2f0e5de6 100644
--- a/src/drivers/serial/imx.c
+++ b/src/drivers/serial/imx.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/drivers/serial/meson-gx-uart.c b/src/drivers/serial/meson-gx-uart.c
index 2b52aab67..d51a7aac7 100644
--- a/src/drivers/serial/meson-gx-uart.c
+++ b/src/drivers/serial/meson-gx-uart.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/drivers/serial/msm-uartdm.c b/src/drivers/serial/msm-uartdm.c
index f0e1e8bb2..eb11a8a58 100644
--- a/src/drivers/serial/msm-uartdm.c
+++ b/src/drivers/serial/msm-uartdm.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/drivers/serial/pl011.c b/src/drivers/serial/pl011.c
index 351481c81..16205ae84 100644
--- a/src/drivers/serial/pl011.c
+++ b/src/drivers/serial/pl011.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2016, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/drivers/serial/tegra_omap3_dwapb.c b/src/drivers/serial/tegra_omap3_dwapb.c
index b45b4f56a..d7e763398 100644
--- a/src/drivers/serial/tegra_omap3_dwapb.c
+++ b/src/drivers/serial/tegra_omap3_dwapb.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2016, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/drivers/serial/xuartps.c b/src/drivers/serial/xuartps.c
index 3c3fc802e..3c78ff33c 100644
--- a/src/drivers/serial/xuartps.c
+++ b/src/drivers/serial/xuartps.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/drivers/timer/allwinner-timer.c b/src/drivers/timer/allwinner-timer.c
index 0fea551ec..5a29eeb54 100644
--- a/src/drivers/timer/allwinner-timer.c
+++ b/src/drivers/timer/allwinner-timer.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2015, DornerWorks, Ltd.
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/drivers/timer/am335x-timer.c b/src/drivers/timer/am335x-timer.c
index 3ffafb232..f7125ae5a 100644
--- a/src/drivers/timer/am335x-timer.c
+++ b/src/drivers/timer/am335x-timer.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/drivers/timer/config.cmake b/src/drivers/timer/config.cmake
index a17a9ebe3..daf231043 100644
--- a/src/drivers/timer/config.cmake
+++ b/src/drivers/timer/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2019, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/drivers/timer/exynos4210-mct.c b/src/drivers/timer/exynos4210-mct.c
index 70a585797..21d0a55bf 100644
--- a/src/drivers/timer/exynos4210-mct.c
+++ b/src/drivers/timer/exynos4210-mct.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/drivers/timer/exynos4412-mct.c b/src/drivers/timer/exynos4412-mct.c
index 6c5987bcd..7e8dc4a43 100644
--- a/src/drivers/timer/exynos4412-mct.c
+++ b/src/drivers/timer/exynos4412-mct.c
@@ -1,14 +1,9 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
+
 #include <config.h>
 #include <types.h>
 #include <plat/machine.h>
diff --git a/src/drivers/timer/generic_timer.c b/src/drivers/timer/generic_timer.c
index d260e2cc6..f574de621 100644
--- a/src/drivers/timer/generic_timer.c
+++ b/src/drivers/timer/generic_timer.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <drivers/timer/arm_generic.h>
diff --git a/src/drivers/timer/global_timer.c b/src/drivers/timer/global_timer.c
index 229403f0d..2f13992e7 100644
--- a/src/drivers/timer/global_timer.c
+++ b/src/drivers/timer/global_timer.c
@@ -1,14 +1,9 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
+
 #include <drivers/timer/arm_global.h>
 
 timer_t *const globalTimer = (timer_t *) TIMER_PPTR;
diff --git a/src/drivers/timer/imx31-epit.c b/src/drivers/timer/imx31-epit.c
index 818f46fa2..c076852b3 100644
--- a/src/drivers/timer/imx31-epit.c
+++ b/src/drivers/timer/imx31-epit.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/drivers/timer/imx31-gpt.c b/src/drivers/timer/imx31-gpt.c
index 6db0e9e40..6586feb14 100644
--- a/src/drivers/timer/imx31-gpt.c
+++ b/src/drivers/timer/imx31-gpt.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/drivers/timer/kpss-timer.c b/src/drivers/timer/kpss-timer.c
index 3aeaa5b53..1c486f587 100644
--- a/src/drivers/timer/kpss-timer.c
+++ b/src/drivers/timer/kpss-timer.c
@@ -1,12 +1,9 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
+
 /* @AUTHOR(akroh@ertos.nicta.com.au) */
 
 #include <plat/machine/hardware.h>
diff --git a/src/drivers/timer/omap3430-timer.c b/src/drivers/timer/omap3430-timer.c
index 98b904dcf..a64c3f3bd 100644
--- a/src/drivers/timer/omap3430-timer.c
+++ b/src/drivers/timer/omap3430-timer.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/drivers/timer/priv_timer.c b/src/drivers/timer/priv_timer.c
index 650cf147c..b8fbea709 100644
--- a/src/drivers/timer/priv_timer.c
+++ b/src/drivers/timer/priv_timer.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 /* A9 MPCORE private timer */
diff --git a/src/fastpath/fastpath.c b/src/fastpath/fastpath.c
index 02452c06b..9d83ea0b1 100644
--- a/src/fastpath/fastpath.c
+++ b/src/fastpath/fastpath.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/inlines.c b/src/inlines.c
index 2e77ed2b3..054a7e032 100644
--- a/src/inlines.c
+++ b/src/inlines.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <types.h>
diff --git a/src/kernel/boot.c b/src/kernel/boot.c
index c5a209e79..d5d5b93af 100644
--- a/src/kernel/boot.c
+++ b/src/kernel/boot.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <assert.h>
diff --git a/src/kernel/cspace.c b/src/kernel/cspace.c
index 6fc726a8e..7a7562f9d 100644
--- a/src/kernel/cspace.c
+++ b/src/kernel/cspace.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <types.h>
diff --git a/src/kernel/faulthandler.c b/src/kernel/faulthandler.c
index 2d6008039..89f85be12 100644
--- a/src/kernel/faulthandler.c
+++ b/src/kernel/faulthandler.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <api/failures.h>
diff --git a/src/kernel/sporadic.c b/src/kernel/sporadic.c
index 9e0ab2154..6c66e6bba 100644
--- a/src/kernel/sporadic.c
+++ b/src/kernel/sporadic.c
@@ -1,14 +1,9 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
+
 #include <types.h>
 #include <api/failures.h>
 #include <object/structures.h>
diff --git a/src/kernel/stack.c b/src/kernel/stack.c
index ffe10728a..97701b3d2 100644
--- a/src/kernel/stack.c
+++ b/src/kernel/stack.c
@@ -1,14 +1,9 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
+
 #include <kernel/stack.h>
 
 VISIBLE ALIGN(KERNEL_STACK_ALIGNMENT)
diff --git a/src/kernel/thread.c b/src/kernel/thread.c
index 890b99b87..67f2fd4a5 100644
--- a/src/kernel/thread.c
+++ b/src/kernel/thread.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/machine/fpu.c b/src/machine/fpu.c
index 0f3a25218..79c400bb1 100644
--- a/src/machine/fpu.c
+++ b/src/machine/fpu.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/machine/io.c b/src/machine/io.c
index 1cc86a05a..d998d2ff7 100644
--- a/src/machine/io.c
+++ b/src/machine/io.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/machine/profiler.c b/src/machine/profiler.c
index 76dfaf603..623819b18 100644
--- a/src/machine/profiler.c
+++ b/src/machine/profiler.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 /*
diff --git a/src/machine/registerset.c b/src/machine/registerset.c
index 0c1eb29f7..bf9ce4a64 100644
--- a/src/machine/registerset.c
+++ b/src/machine/registerset.c
@@ -1,14 +1,9 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
+
 #include <machine/registerset.h>
 
 const register_t fault_messages[][MAX_MSG_SIZE] = {
diff --git a/src/model/preemption.c b/src/model/preemption.c
index ef7326f10..4e0d4ba5c 100644
--- a/src/model/preemption.c
+++ b/src/model/preemption.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <api/failures.h>
diff --git a/src/model/smp.c b/src/model/smp.c
index 4a8071692..0cd95216a 100644
--- a/src/model/smp.c
+++ b/src/model/smp.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/model/statedata.c b/src/model/statedata.c
index 855367bd7..78815d2f8 100644
--- a/src/model/statedata.c
+++ b/src/model/statedata.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/object/cnode.c b/src/object/cnode.c
index 1fa6cb0d2..97ef49030 100644
--- a/src/object/cnode.c
+++ b/src/object/cnode.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <assert.h>
diff --git a/src/object/endpoint.c b/src/object/endpoint.c
index 20df4b313..dd516c07b 100644
--- a/src/object/endpoint.c
+++ b/src/object/endpoint.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <types.h>
diff --git a/src/object/interrupt.c b/src/object/interrupt.c
index 90eb6b99f..19a3f1abf 100644
--- a/src/object/interrupt.c
+++ b/src/object/interrupt.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <assert.h>
diff --git a/src/object/notification.c b/src/object/notification.c
index b25f60434..54a709ea5 100644
--- a/src/object/notification.c
+++ b/src/object/notification.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <assert.h>
diff --git a/src/object/objecttype.c b/src/object/objecttype.c
index dcb7e254c..13a048394 100644
--- a/src/object/objecttype.c
+++ b/src/object/objecttype.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <assert.h>
diff --git a/src/object/reply.c b/src/object/reply.c
index 6077bda98..6f702bb5f 100644
--- a/src/object/reply.c
+++ b/src/object/reply.c
@@ -1,14 +1,9 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
+
 #include <object/reply.h>
 
 void reply_push(tcb_t *tcb_caller, tcb_t *tcb_callee, reply_t *reply, bool_t canDonate)
diff --git a/src/object/schedcontext.c b/src/object/schedcontext.c
index b19698887..05e9ddebd 100644
--- a/src/object/schedcontext.c
+++ b/src/object/schedcontext.c
@@ -1,14 +1,9 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
+
 #include <machine/timer.h>
 #include <object/schedcontext.h>
 
diff --git a/src/object/schedcontrol.c b/src/object/schedcontrol.c
index fea7f7694..11ba6ada0 100644
--- a/src/object/schedcontrol.c
+++ b/src/object/schedcontrol.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <machine/timer.h>
diff --git a/src/object/tcb.c b/src/object/tcb.c
index 3cfea3e25..436d4b301 100644
--- a/src/object/tcb.c
+++ b/src/object/tcb.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/object/untyped.c b/src/object/untyped.c
index e2d3de9f1..47805b7e6 100644
--- a/src/object/untyped.c
+++ b/src/object/untyped.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/plat/allwinnerA20/config.cmake b/src/plat/allwinnerA20/config.cmake
index dc3d4556c..eced85312 100644
--- a/src/plat/allwinnerA20/config.cmake
+++ b/src/plat/allwinnerA20/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2018, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/plat/allwinnerA20/machine/l2cache.c b/src/plat/allwinnerA20/machine/l2cache.c
index 8b99d2bfd..473222bc1 100644
--- a/src/plat/allwinnerA20/machine/l2cache.c
+++ b/src/plat/allwinnerA20/machine/l2cache.c
@@ -1,11 +1,7 @@
 /*
- * Copyright 2015, DornerWorks, Ltd.
+ * Copyright 2015, DornerWorks
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <arch/machine.h>
diff --git a/src/plat/allwinnerA20/overlay-allwinnerA20.dts b/src/plat/allwinnerA20/overlay-allwinnerA20.dts
index 0c08583fe..9a89d4fba 100644
--- a/src/plat/allwinnerA20/overlay-allwinnerA20.dts
+++ b/src/plat/allwinnerA20/overlay-allwinnerA20.dts
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 / {
diff --git a/src/plat/am335x/config.cmake b/src/plat/am335x/config.cmake
index d1ce97fb0..67f3200af 100644
--- a/src/plat/am335x/config.cmake
+++ b/src/plat/am335x/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2019, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/plat/am335x/machine/hardware.c b/src/plat/am335x/machine/hardware.c
index 64a588164..329df7ec6 100644
--- a/src/plat/am335x/machine/hardware.c
+++ b/src/plat/am335x/machine/hardware.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/plat/am335x/machine/l2cache.c b/src/plat/am335x/machine/l2cache.c
index d8c1531dd..d9adb88dd 100644
--- a/src/plat/am335x/machine/l2cache.c
+++ b/src/plat/am335x/machine/l2cache.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <arch/machine.h>
diff --git a/src/plat/am335x/overlay-am335x-boneblack.dts b/src/plat/am335x/overlay-am335x-boneblack.dts
index 54f1a36d5..34edd3958 100644
--- a/src/plat/am335x/overlay-am335x-boneblack.dts
+++ b/src/plat/am335x/overlay-am335x-boneblack.dts
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 / {
diff --git a/src/plat/am335x/overlay-am335x.dts b/src/plat/am335x/overlay-am335x.dts
index 5427e988d..6bc8ac0d8 100644
--- a/src/plat/am335x/overlay-am335x.dts
+++ b/src/plat/am335x/overlay-am335x.dts
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 / {
diff --git a/src/plat/apq8064/config.cmake b/src/plat/apq8064/config.cmake
index b8abe87a8..1d91baff8 100644
--- a/src/plat/apq8064/config.cmake
+++ b/src/plat/apq8064/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/plat/apq8064/overlay-apq8064.dts b/src/plat/apq8064/overlay-apq8064.dts
index 60f56fb9b..82dcec4a8 100644
--- a/src/plat/apq8064/overlay-apq8064.dts
+++ b/src/plat/apq8064/overlay-apq8064.dts
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 / {
diff --git a/src/plat/ariane/config.cmake b/src/plat/ariane/config.cmake
index 77f44238d..160203b8d 100644
--- a/src/plat/ariane/config.cmake
+++ b/src/plat/ariane/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2019, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/plat/bcm2837/config.cmake b/src/plat/bcm2837/config.cmake
index 4216534a5..b63982e42 100644
--- a/src/plat/bcm2837/config.cmake
+++ b/src/plat/bcm2837/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/plat/bcm2837/machine/intc.c b/src/plat/bcm2837/machine/intc.c
index f41106b7c..26848e09a 100644
--- a/src/plat/bcm2837/machine/intc.c
+++ b/src/plat/bcm2837/machine/intc.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <util.h>
diff --git a/src/plat/bcm2837/overlay-rpi3.dts b/src/plat/bcm2837/overlay-rpi3.dts
index 5f783209a..684151f2a 100644
--- a/src/plat/bcm2837/overlay-rpi3.dts
+++ b/src/plat/bcm2837/overlay-rpi3.dts
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 / {
diff --git a/src/plat/exynos4/config.cmake b/src/plat/exynos4/config.cmake
index c3d96b11f..1d22645df 100644
--- a/src/plat/exynos4/config.cmake
+++ b/src/plat/exynos4/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/plat/exynos4/overlay-exynos4.dts b/src/plat/exynos4/overlay-exynos4.dts
index 02873cd90..b9c7063db 100644
--- a/src/plat/exynos4/overlay-exynos4.dts
+++ b/src/plat/exynos4/overlay-exynos4.dts
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 / {
diff --git a/src/plat/exynos5/config.cmake b/src/plat/exynos5/config.cmake
index 3d4318698..ce499bb8e 100644
--- a/src/plat/exynos5/config.cmake
+++ b/src/plat/exynos5/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/plat/exynos5/overlay-exynos5250.dts b/src/plat/exynos5/overlay-exynos5250.dts
index 009f629ef..7c07d0ec6 100644
--- a/src/plat/exynos5/overlay-exynos5250.dts
+++ b/src/plat/exynos5/overlay-exynos5250.dts
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 / {
diff --git a/src/plat/exynos5/overlay-exynos5410.dts b/src/plat/exynos5/overlay-exynos5410.dts
index 6c75a42ec..608719d8d 100644
--- a/src/plat/exynos5/overlay-exynos5410.dts
+++ b/src/plat/exynos5/overlay-exynos5410.dts
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 / {
diff --git a/src/plat/exynos5/overlay-exynos5422.dts b/src/plat/exynos5/overlay-exynos5422.dts
index 04643b6c2..f4ff2b7db 100644
--- a/src/plat/exynos5/overlay-exynos5422.dts
+++ b/src/plat/exynos5/overlay-exynos5422.dts
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 / {
diff --git a/src/plat/fvp/config.cmake b/src/plat/fvp/config.cmake
index 1560daeb4..b8bc76d9f 100644
--- a/src/plat/fvp/config.cmake
+++ b/src/plat/fvp/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2019, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/plat/fvp/overlay-fvp.dts b/src/plat/fvp/overlay-fvp.dts
index e213b163e..de6242b50 100644
--- a/src/plat/fvp/overlay-fvp.dts
+++ b/src/plat/fvp/overlay-fvp.dts
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 / {
diff --git a/src/plat/hifive/config.cmake b/src/plat/hifive/config.cmake
index e7580b581..b4feb2ca4 100644
--- a/src/plat/hifive/config.cmake
+++ b/src/plat/hifive/config.cmake
@@ -1,15 +1,8 @@
 #
-# Copyright 2019, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, DornerWorks
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# Copyright 2019, DornerWorks
-#
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_DORNERWORKS_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/plat/hifive/overlay-hifive.dts b/src/plat/hifive/overlay-hifive.dts
index 13d425a5a..e3ea0fc2e 100644
--- a/src/plat/hifive/overlay-hifive.dts
+++ b/src/plat/hifive/overlay-hifive.dts
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 / {
diff --git a/src/plat/hikey/config.cmake b/src/plat/hikey/config.cmake
index 4677fb7a3..8511f9dce 100644
--- a/src/plat/hikey/config.cmake
+++ b/src/plat/hikey/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/plat/hikey/overlay-hikey.dts b/src/plat/hikey/overlay-hikey.dts
index f764f10ac..f8fd187dc 100644
--- a/src/plat/hikey/overlay-hikey.dts
+++ b/src/plat/hikey/overlay-hikey.dts
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 / {
diff --git a/src/plat/imx31/config.cmake b/src/plat/imx31/config.cmake
index fcd828400..5a3464521 100644
--- a/src/plat/imx31/config.cmake
+++ b/src/plat/imx31/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/plat/imx31/machine/hardware.c b/src/plat/imx31/machine/hardware.c
index 91354230d..4c3329f40 100644
--- a/src/plat/imx31/machine/hardware.c
+++ b/src/plat/imx31/machine/hardware.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/plat/imx31/mcs-overlay-kzm.dts b/src/plat/imx31/mcs-overlay-kzm.dts
index da8092952..d91412ed2 100644
--- a/src/plat/imx31/mcs-overlay-kzm.dts
+++ b/src/plat/imx31/mcs-overlay-kzm.dts
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 / {
diff --git a/src/plat/imx31/overlay-kzm.dts b/src/plat/imx31/overlay-kzm.dts
index 9b54e1447..bf00f3eed 100644
--- a/src/plat/imx31/overlay-kzm.dts
+++ b/src/plat/imx31/overlay-kzm.dts
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 / {
diff --git a/src/plat/imx6/config.cmake b/src/plat/imx6/config.cmake
index ee8034218..14e60198b 100644
--- a/src/plat/imx6/config.cmake
+++ b/src/plat/imx6/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/plat/imx6/mcs-overlay-imx6.dts b/src/plat/imx6/mcs-overlay-imx6.dts
index b7028e892..9a6dd1558 100644
--- a/src/plat/imx6/mcs-overlay-imx6.dts
+++ b/src/plat/imx6/mcs-overlay-imx6.dts
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 / {
diff --git a/src/plat/imx6/overlay-sabre.dts b/src/plat/imx6/overlay-sabre.dts
index f6e799b9c..f227a796e 100644
--- a/src/plat/imx6/overlay-sabre.dts
+++ b/src/plat/imx6/overlay-sabre.dts
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 / {
diff --git a/src/plat/imx6/overlay-wandq.dts b/src/plat/imx6/overlay-wandq.dts
index ad74db66d..ecb440f7c 100644
--- a/src/plat/imx6/overlay-wandq.dts
+++ b/src/plat/imx6/overlay-wandq.dts
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 / {
diff --git a/src/plat/imx7/config.cmake b/src/plat/imx7/config.cmake
index d735a9cb8..e00a91b33 100644
--- a/src/plat/imx7/config.cmake
+++ b/src/plat/imx7/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2018, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/plat/imx7/overlay-imx7sabre.dts b/src/plat/imx7/overlay-imx7sabre.dts
index 19e33a2c5..272be816a 100644
--- a/src/plat/imx7/overlay-imx7sabre.dts
+++ b/src/plat/imx7/overlay-imx7sabre.dts
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 / {
diff --git a/src/plat/imx8m-evk/config.cmake b/src/plat/imx8m-evk/config.cmake
index de2a33d0e..cc99b983f 100644
--- a/src/plat/imx8m-evk/config.cmake
+++ b/src/plat/imx8m-evk/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2019, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/plat/imx8m-evk/overlay-imx8m-32bit.dts b/src/plat/imx8m-evk/overlay-imx8m-32bit.dts
index 13bfeccbd..6a61f0f45 100644
--- a/src/plat/imx8m-evk/overlay-imx8m-32bit.dts
+++ b/src/plat/imx8m-evk/overlay-imx8m-32bit.dts
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 / {
diff --git a/src/plat/imx8m-evk/overlay-imx8mm-evk.dts b/src/plat/imx8m-evk/overlay-imx8mm-evk.dts
index fe553eaf3..e1a9a46f8 100644
--- a/src/plat/imx8m-evk/overlay-imx8mm-evk.dts
+++ b/src/plat/imx8m-evk/overlay-imx8mm-evk.dts
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 / {
diff --git a/src/plat/imx8m-evk/overlay-imx8mq-evk.dts b/src/plat/imx8m-evk/overlay-imx8mq-evk.dts
index 5bd284d4d..8e511311b 100644
--- a/src/plat/imx8m-evk/overlay-imx8mq-evk.dts
+++ b/src/plat/imx8m-evk/overlay-imx8mq-evk.dts
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 / {
diff --git a/src/plat/odroidc2/config.cmake b/src/plat/odroidc2/config.cmake
index 4924bfc5b..849776e06 100644
--- a/src/plat/odroidc2/config.cmake
+++ b/src/plat/odroidc2/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2019, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/plat/odroidc2/overlay-odroidc2.dts b/src/plat/odroidc2/overlay-odroidc2.dts
index 72efd7375..809460cc8 100644
--- a/src/plat/odroidc2/overlay-odroidc2.dts
+++ b/src/plat/odroidc2/overlay-odroidc2.dts
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 / {
diff --git a/src/plat/omap3/config.cmake b/src/plat/omap3/config.cmake
index 44a8fadd3..f0392e44c 100644
--- a/src/plat/omap3/config.cmake
+++ b/src/plat/omap3/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/plat/omap3/machine/hardware.c b/src/plat/omap3/machine/hardware.c
index 3dd35394f..befb47d34 100644
--- a/src/plat/omap3/machine/hardware.c
+++ b/src/plat/omap3/machine/hardware.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/plat/omap3/machine/l2cache.c b/src/plat/omap3/machine/l2cache.c
index d8c1531dd..d9adb88dd 100644
--- a/src/plat/omap3/machine/l2cache.c
+++ b/src/plat/omap3/machine/l2cache.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <arch/machine.h>
diff --git a/src/plat/omap3/overlay-omap3.dts b/src/plat/omap3/overlay-omap3.dts
index 725a2fa30..946578b3a 100644
--- a/src/plat/omap3/overlay-omap3.dts
+++ b/src/plat/omap3/overlay-omap3.dts
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 / {
diff --git a/src/plat/pc99/config.cmake b/src/plat/pc99/config.cmake
index fe9b5a082..bf8734f5f 100644
--- a/src/plat/pc99/config.cmake
+++ b/src/plat/pc99/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/plat/pc99/linker.lds b/src/plat/pc99/linker.lds
index ddb4a04fb..5acc17b57 100644
--- a/src/plat/pc99/linker.lds
+++ b/src/plat/pc99/linker.lds
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #define __ASSEMBLER__
diff --git a/src/plat/pc99/machine/acpi.c b/src/plat/pc99/machine/acpi.c
index 4270cd35b..bb1291a0f 100644
--- a/src/plat/pc99/machine/acpi.c
+++ b/src/plat/pc99/machine/acpi.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/plat/pc99/machine/hardware.c b/src/plat/pc99/machine/hardware.c
index 10528c9cd..89fb96168 100644
--- a/src/plat/pc99/machine/hardware.c
+++ b/src/plat/pc99/machine/hardware.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/plat/pc99/machine/intel-vtd.c b/src/plat/pc99/machine/intel-vtd.c
index a62100d6f..63a4e1033 100644
--- a/src/plat/pc99/machine/intel-vtd.c
+++ b/src/plat/pc99/machine/intel-vtd.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/plat/pc99/machine/io.c b/src/plat/pc99/machine/io.c
index 1ccc4c44a..1be6a3ead 100644
--- a/src/plat/pc99/machine/io.c
+++ b/src/plat/pc99/machine/io.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/plat/pc99/machine/ioapic.c b/src/plat/pc99/machine/ioapic.c
index 0b6e1bf83..ced366013 100644
--- a/src/plat/pc99/machine/ioapic.c
+++ b/src/plat/pc99/machine/ioapic.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/plat/pc99/machine/pic.c b/src/plat/pc99/machine/pic.c
index 73b17582f..0238f099c 100644
--- a/src/plat/pc99/machine/pic.c
+++ b/src/plat/pc99/machine/pic.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <linker.h>
diff --git a/src/plat/pc99/machine/pit.c b/src/plat/pc99/machine/pit.c
index b0e7b11ce..7abec9b14 100644
--- a/src/plat/pc99/machine/pit.c
+++ b/src/plat/pc99/machine/pit.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <linker.h>
diff --git a/src/plat/qemu-arm-virt/config.cmake b/src/plat/qemu-arm-virt/config.cmake
index 25bbf6539..525494db0 100644
--- a/src/plat/qemu-arm-virt/config.cmake
+++ b/src/plat/qemu-arm-virt/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2019, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/plat/qemu-arm-virt/overlay-qemu-arm-virt.dts b/src/plat/qemu-arm-virt/overlay-qemu-arm-virt.dts
index 176487bcd..9c5e62afb 100644
--- a/src/plat/qemu-arm-virt/overlay-qemu-arm-virt.dts
+++ b/src/plat/qemu-arm-virt/overlay-qemu-arm-virt.dts
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 / {
diff --git a/src/plat/rocketchip/config.cmake b/src/plat/rocketchip/config.cmake
index b2ac10a4c..24d548e54 100644
--- a/src/plat/rocketchip/config.cmake
+++ b/src/plat/rocketchip/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2019, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/plat/rockpro64/config.cmake b/src/plat/rockpro64/config.cmake
index fa2276ea0..155156b2a 100644
--- a/src/plat/rockpro64/config.cmake
+++ b/src/plat/rockpro64/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2019, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/plat/rockpro64/overlay-rockpro64.dts b/src/plat/rockpro64/overlay-rockpro64.dts
index 046ed72de..87d9382e8 100644
--- a/src/plat/rockpro64/overlay-rockpro64.dts
+++ b/src/plat/rockpro64/overlay-rockpro64.dts
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 / {
diff --git a/src/plat/spike/config.cmake b/src/plat/spike/config.cmake
index e762ecfb9..48f5c64b7 100644
--- a/src/plat/spike/config.cmake
+++ b/src/plat/spike/config.cmake
@@ -1,15 +1,8 @@
 #
-# Copyright 2018, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, DornerWorks
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# Copyright 2018, DornerWorks
-#
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_DORNERWORKS_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/plat/tk1/config.cmake b/src/plat/tk1/config.cmake
index 728c16cf4..91adc11a9 100644
--- a/src/plat/tk1/config.cmake
+++ b/src/plat/tk1/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/plat/tk1/machine/smmu.c b/src/plat/tk1/machine/smmu.c
index ae9e4a6af..4ebf56b8d 100644
--- a/src/plat/tk1/machine/smmu.c
+++ b/src/plat/tk1/machine/smmu.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2016, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <types.h>
diff --git a/src/plat/tk1/overlay-tk1.dts b/src/plat/tk1/overlay-tk1.dts
index e2d71aa37..ff64efd9c 100644
--- a/src/plat/tk1/overlay-tk1.dts
+++ b/src/plat/tk1/overlay-tk1.dts
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 / {
diff --git a/src/plat/tx1/config.cmake b/src/plat/tx1/config.cmake
index 618a963c4..c731a4f0d 100644
--- a/src/plat/tx1/config.cmake
+++ b/src/plat/tx1/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/plat/tx1/overlay-tx1.dts b/src/plat/tx1/overlay-tx1.dts
index f4d47b59e..944f13cbc 100644
--- a/src/plat/tx1/overlay-tx1.dts
+++ b/src/plat/tx1/overlay-tx1.dts
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 / {
diff --git a/src/plat/tx2/config.cmake b/src/plat/tx2/config.cmake
index 7b535e6de..476a56344 100644
--- a/src/plat/tx2/config.cmake
+++ b/src/plat/tx2/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2018, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/plat/tx2/overlay-tx2.dts b/src/plat/tx2/overlay-tx2.dts
index d375d7074..ccb872645 100644
--- a/src/plat/tx2/overlay-tx2.dts
+++ b/src/plat/tx2/overlay-tx2.dts
@@ -1,13 +1,7 @@
 /*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 / {
diff --git a/src/plat/zynq7000/config.cmake b/src/plat/zynq7000/config.cmake
index f25f643f7..01735fc4f 100644
--- a/src/plat/zynq7000/config.cmake
+++ b/src/plat/zynq7000/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/plat/zynq7000/mcs-overlay-zynq7000.dts b/src/plat/zynq7000/mcs-overlay-zynq7000.dts
index 9dee9253c..b139c3683 100644
--- a/src/plat/zynq7000/mcs-overlay-zynq7000.dts
+++ b/src/plat/zynq7000/mcs-overlay-zynq7000.dts
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 / {
diff --git a/src/plat/zynq7000/overlay-zynq7000.dts b/src/plat/zynq7000/overlay-zynq7000.dts
index 7896543a9..65a36bcda 100644
--- a/src/plat/zynq7000/overlay-zynq7000.dts
+++ b/src/plat/zynq7000/overlay-zynq7000.dts
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 / {
diff --git a/src/plat/zynqmp/config.cmake b/src/plat/zynqmp/config.cmake
index acd96e800..7626c931b 100644
--- a/src/plat/zynqmp/config.cmake
+++ b/src/plat/zynqmp/config.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2018, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/src/plat/zynqmp/overlay-zynqmp.dts b/src/plat/zynqmp/overlay-zynqmp.dts
index 48842af23..13d06f89f 100644
--- a/src/plat/zynqmp/overlay-zynqmp.dts
+++ b/src/plat/zynqmp/overlay-zynqmp.dts
@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 / {
diff --git a/src/smp/ipi.c b/src/smp/ipi.c
index 78de6d806..dac74168d 100644
--- a/src/smp/ipi.c
+++ b/src/smp/ipi.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/smp/lock.c b/src/smp/lock.c
index f5b910735..a4b9bd522 100644
--- a/src/smp/lock.c
+++ b/src/smp/lock.c
@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/string.c b/src/string.c
index 8acb939e0..2f3176c04 100644
--- a/src/string.c
+++ b/src/string.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <config.h>
diff --git a/src/util.c b/src/util.c
index 4f71d2a4e..af42d8ab2 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1,11 +1,7 @@
 /*
  * Copyright 2014, General Dynamics C4 Systems
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <assert.h>
diff --git a/tools/bf.vim b/tools/bf.vim
index 3feff812b..7bf8aa2f9 100644
--- a/tools/bf.vim
+++ b/tools/bf.vim
@@ -1,13 +1,7 @@
 "
-" Copyright 2017, Data61
-" Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-" ABN 41 687 119 230.
+" Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 "
-" This software may be distributed and modified according to the terms of
-" the BSD 2-Clause license. Note that NO WARRANTY is provided.
-" See "LICENSE_BSD2.txt" for details.
-"
-" @TAG(DATA61_BSD)
+" SPDX-License-Identifier: BSD-2-Clause
 "
 
 " Vim syntax for .bf/.pbf files. Where relevant, comments below refer to the
diff --git a/tools/bitfield_gen.py b/tools/bitfield_gen.py
index 9331e733d..8b7d2d445 100755
--- a/tools/bitfield_gen.py
+++ b/tools/bitfield_gen.py
@@ -1,15 +1,8 @@
 #!/usr/bin/env python3
-
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the BSD 2-Clause license. Note that NO WARRANTY is provided.
-# See "LICENSE_BSD2.txt" for details.
-#
-# @TAG(DATA61_BSD)
+# SPDX-License-Identifier: BSD-2-Clause
 #
 
 ##
diff --git a/tools/changed.sh b/tools/changed.sh
index 979835fba..14ab3c255 100755
--- a/tools/changed.sh
+++ b/tools/changed.sh
@@ -1,14 +1,8 @@
 #!/bin/bash
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the BSD 2-Clause license. Note that NO WARRANTY is provided.
-# See "LICENSE_BSD2.txt" for details.
-#
-# @TAG(DATA61_BSD)
+# SPDX-License-Identifier: BSD-2-Clause
 #
 
 #
diff --git a/tools/circular_includes.py b/tools/circular_includes.py
index 8f19f1404..1f7059cef 100755
--- a/tools/circular_includes.py
+++ b/tools/circular_includes.py
@@ -1,15 +1,10 @@
 #!/usr/bin/env python3
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the BSD 2-Clause license. Note that NO WARRANTY is provided.
-# See "LICENSE_BSD2.txt" for details.
-#
-# @TAG(DATA61_BSD)
+# SPDX-License-Identifier: BSD-2-Clause
 #
+
 """
 Script for reporting circular #includes in pre-processed sel4 source.
 Exits with a status of 0 if no circular dependencies are found, otherwise
diff --git a/tools/cpp_gen.sh b/tools/cpp_gen.sh
index d8de09cb0..0960f2bb0 100755
--- a/tools/cpp_gen.sh
+++ b/tools/cpp_gen.sh
@@ -1,14 +1,8 @@
 #!/bin/bash
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the BSD 2-Clause license. Note that NO WARRANTY is provided.
-# See "LICENSE_BSD2.txt" for details.
-#
-# @TAG(DATA61_BSD)
+# SPDX-License-Identifier: BSD-2-Clause
 #
 
 #
diff --git a/tools/dts/allwinnerA20.dts b/tools/dts/allwinnerA20.dts
index e181d59e1..0decbc16a 100644
--- a/tools/dts/allwinnerA20.dts
+++ b/tools/dts/allwinnerA20.dts
@@ -1,13 +1,4 @@
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @TAG(OTHER_GPL2P)
- */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 /dts-v1/;
 
diff --git a/tools/dts/am335x-boneblack.dts b/tools/dts/am335x-boneblack.dts
index d302bd222..5dca3762b 100644
--- a/tools/dts/am335x-boneblack.dts
+++ b/tools/dts/am335x-boneblack.dts
@@ -1,13 +1,4 @@
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @TAG(OTHER_GPL2P)
- */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 /dts-v1/;
 
diff --git a/tools/dts/am335x-boneblue.dts b/tools/dts/am335x-boneblue.dts
index 3bd466347..726158b67 100644
--- a/tools/dts/am335x-boneblue.dts
+++ b/tools/dts/am335x-boneblue.dts
@@ -1,13 +1,4 @@
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @TAG(OTHER_GPL2P)
- */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 /dts-v1/;
 
diff --git a/tools/dts/apq8064.dts b/tools/dts/apq8064.dts
index 709f7033e..d0201a40d 100644
--- a/tools/dts/apq8064.dts
+++ b/tools/dts/apq8064.dts
@@ -1,13 +1,4 @@
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @TAG(OTHER_GPL2P)
- */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 /dts-v1/;
 
diff --git a/tools/dts/ariane.dts b/tools/dts/ariane.dts
index a44a13190..a0cda58f5 100644
--- a/tools/dts/ariane.dts
+++ b/tools/dts/ariane.dts
@@ -1,4 +1,4 @@
-/* @TAG(OTHER_SHL51) */
+/* SPDX-License-Identifier: SHL-0.51 */
 
 /* Copyright 2018 ETH Zurich and University of Bologna.
  * Copyright and related rights are licensed under the Solderpad Hardware
diff --git a/tools/dts/exynos4.dts b/tools/dts/exynos4.dts
index 460a249fb..76af8243b 100644
--- a/tools/dts/exynos4.dts
+++ b/tools/dts/exynos4.dts
@@ -1,13 +1,4 @@
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @TAG(OTHER_GPL2P)
- */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 /dts-v1/;
 
diff --git a/tools/dts/exynos5250.dts b/tools/dts/exynos5250.dts
index 8e7b1d5d1..65728ca7d 100644
--- a/tools/dts/exynos5250.dts
+++ b/tools/dts/exynos5250.dts
@@ -1,13 +1,4 @@
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @TAG(OTHER_GPL2P)
- */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 /dts-v1/;
 
diff --git a/tools/dts/exynos5410.dts b/tools/dts/exynos5410.dts
index 7e83d5ffb..1049e6fbb 100644
--- a/tools/dts/exynos5410.dts
+++ b/tools/dts/exynos5410.dts
@@ -1,13 +1,4 @@
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @TAG(OTHER_GPL2P)
- */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 /dts-v1/;
 
diff --git a/tools/dts/exynos5422.dts b/tools/dts/exynos5422.dts
index ccfbc58ee..452dc1d05 100644
--- a/tools/dts/exynos5422.dts
+++ b/tools/dts/exynos5422.dts
@@ -1,13 +1,4 @@
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @TAG(OTHER_GPL2P)
- */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 /dts-v1/;
 
diff --git a/tools/dts/fvp.dts b/tools/dts/fvp.dts
index da69cdd97..1bab60e44 100644
--- a/tools/dts/fvp.dts
+++ b/tools/dts/fvp.dts
@@ -1,13 +1,4 @@
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @TAG(OTHER_GPL2P)
- */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 /dts-v1/;
 
diff --git a/tools/dts/hifive.dts b/tools/dts/hifive.dts
index f41f354f3..fdffdf8ff 100644
--- a/tools/dts/hifive.dts
+++ b/tools/dts/hifive.dts
@@ -1,5 +1,3 @@
-/* @TAG(OTHER_GPL2P) */
-
 /* Copyright (c) 2018 SiFive, Inc */
 /* SPDX-License-Identifier: Apache-2.0 */
 /* SPDX-License-Identifier: GPL-2.0-or-later */
diff --git a/tools/dts/hikey.dts b/tools/dts/hikey.dts
index 8e499bde1..b4997f2fe 100644
--- a/tools/dts/hikey.dts
+++ b/tools/dts/hikey.dts
@@ -1,13 +1,4 @@
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @TAG(OTHER_GPL2P)
- */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 /dts-v1/;
 
diff --git a/tools/dts/imx7sabre.dts b/tools/dts/imx7sabre.dts
index 99e60e622..6025532db 100644
--- a/tools/dts/imx7sabre.dts
+++ b/tools/dts/imx7sabre.dts
@@ -1,13 +1,4 @@
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @TAG(OTHER_GPL2P)
- */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 /dts-v1/;
 
diff --git a/tools/dts/imx8mm-evk.dts b/tools/dts/imx8mm-evk.dts
index fd5ef83ba..3694f09cf 100644
--- a/tools/dts/imx8mm-evk.dts
+++ b/tools/dts/imx8mm-evk.dts
@@ -1,13 +1,4 @@
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @TAG(OTHER_GPL2P)
- */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 /dts-v1/;
 
diff --git a/tools/dts/imx8mq-evk.dts b/tools/dts/imx8mq-evk.dts
index 35a3185e1..1f8025348 100644
--- a/tools/dts/imx8mq-evk.dts
+++ b/tools/dts/imx8mq-evk.dts
@@ -1,13 +1,4 @@
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @TAG(OTHER_GPL2P)
- */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 /dts-v1/;
 
diff --git a/tools/dts/kzm.dts b/tools/dts/kzm.dts
index 373f38183..ed3825071 100644
--- a/tools/dts/kzm.dts
+++ b/tools/dts/kzm.dts
@@ -1,13 +1,4 @@
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @TAG(OTHER_GPL2P)
- */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 /dts-v1/;
 
diff --git a/tools/dts/odroidc2.dts b/tools/dts/odroidc2.dts
index 3dab34362..acec21fb3 100644
--- a/tools/dts/odroidc2.dts
+++ b/tools/dts/odroidc2.dts
@@ -1,13 +1,4 @@
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @TAG(OTHER_GPL2P)
- */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 /dts-v1/;
 
diff --git a/tools/dts/omap3.dts b/tools/dts/omap3.dts
index cf8471bab..28294616c 100644
--- a/tools/dts/omap3.dts
+++ b/tools/dts/omap3.dts
@@ -1,13 +1,4 @@
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @TAG(OTHER_GPL2P)
- */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 /dts-v1/;
 
diff --git a/tools/dts/rocketchip.dts b/tools/dts/rocketchip.dts
index 25a55f406..5a35ccf1b 100644
--- a/tools/dts/rocketchip.dts
+++ b/tools/dts/rocketchip.dts
@@ -1,4 +1,4 @@
-/* @TAG(OTHER_BSD3) */
+/* SPDX-License-Identifier: BSD-3-Clause */
 
 /*
  * Copyright (c) 2012-2014, The Regents of the University of California
diff --git a/tools/dts/rockpro64.dts b/tools/dts/rockpro64.dts
index c5fbba700..61ac25001 100644
--- a/tools/dts/rockpro64.dts
+++ b/tools/dts/rockpro64.dts
@@ -1,13 +1,4 @@
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @TAG(OTHER_GPL2P)
- */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 /dts-v1/;
 
diff --git a/tools/dts/rpi3.dts b/tools/dts/rpi3.dts
index 8f31f6076..3fde00482 100644
--- a/tools/dts/rpi3.dts
+++ b/tools/dts/rpi3.dts
@@ -1,13 +1,4 @@
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @TAG(OTHER_GPL2P)
- */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 /dts-v1/;
 
diff --git a/tools/dts/sabre.dts b/tools/dts/sabre.dts
index 52ad08047..34ecec0f9 100644
--- a/tools/dts/sabre.dts
+++ b/tools/dts/sabre.dts
@@ -1,13 +1,4 @@
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @TAG(OTHER_GPL2P)
- */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 /dts-v1/;
 
diff --git a/tools/dts/spike.dts b/tools/dts/spike.dts
index 24e1b6711..7a8130838 100644
--- a/tools/dts/spike.dts
+++ b/tools/dts/spike.dts
@@ -1,13 +1,4 @@
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @TAG(OTHER_GPL2P)
- */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 /dts-v1/;
 
diff --git a/tools/dts/spike32.dts b/tools/dts/spike32.dts
index fffb2c6f8..9b5306d11 100644
--- a/tools/dts/spike32.dts
+++ b/tools/dts/spike32.dts
@@ -1,13 +1,4 @@
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @TAG(OTHER_GPL2P)
- */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 /dts-v1/;
 
diff --git a/tools/dts/tk1.dts b/tools/dts/tk1.dts
index 6fc4927dc..db52645b4 100644
--- a/tools/dts/tk1.dts
+++ b/tools/dts/tk1.dts
@@ -1,13 +1,4 @@
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @TAG(OTHER_GPL2P)
- */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 /dts-v1/;
 
diff --git a/tools/dts/tx1.dts b/tools/dts/tx1.dts
index 80f62a1fa..007568fa6 100644
--- a/tools/dts/tx1.dts
+++ b/tools/dts/tx1.dts
@@ -1,13 +1,4 @@
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @TAG(OTHER_GPL2P)
- */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 /dts-v1/;
 
diff --git a/tools/dts/tx2.dts b/tools/dts/tx2.dts
index bad1d3451..3e60c8bd5 100644
--- a/tools/dts/tx2.dts
+++ b/tools/dts/tx2.dts
@@ -1,13 +1,4 @@
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @TAG(OTHER_GPL2P)
- */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 /dts-v1/;
 
diff --git a/tools/dts/ultra96.dts b/tools/dts/ultra96.dts
index c052ad5e5..a0b6fe609 100644
--- a/tools/dts/ultra96.dts
+++ b/tools/dts/ultra96.dts
@@ -1,13 +1,4 @@
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @TAG(OTHER_GPL2P)
- */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 /dts-v1/;
 
diff --git a/tools/dts/update-dts.sh b/tools/dts/update-dts.sh
index f38ae83d9..173bf08aa 100755
--- a/tools/dts/update-dts.sh
+++ b/tools/dts/update-dts.sh
@@ -1,14 +1,8 @@
 #!/bin/sh
 #
-# Copyright 2019, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 if [ -z "$1" ]; then
@@ -30,16 +24,7 @@ make ARCH=arm -j4 dtbs
 make ARCH=arm64 defconfig
 make ARCH=arm64 -j4 dtbs
 
-LICENSE="/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @TAG(OTHER_GPL2P)
- */
+LICENSE="/* SPDX-License-Identifier: GPL-2.0-or-later */
 "
 
 ARM_DTBS="
diff --git a/tools/dts/wandq.dts b/tools/dts/wandq.dts
index 26f5c49be..dfb9a3146 100644
--- a/tools/dts/wandq.dts
+++ b/tools/dts/wandq.dts
@@ -1,13 +1,4 @@
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @TAG(OTHER_GPL2P)
- */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 /dts-v1/;
 
diff --git a/tools/dts/zynq7000.dts b/tools/dts/zynq7000.dts
index 4d87e1cf6..601822cbe 100644
--- a/tools/dts/zynq7000.dts
+++ b/tools/dts/zynq7000.dts
@@ -1,13 +1,4 @@
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @TAG(OTHER_GPL2P)
- */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 /dts-v1/;
 
diff --git a/tools/dts/zynqmp.dts b/tools/dts/zynqmp.dts
index e8aa093f9..fc4d051b8 100644
--- a/tools/dts/zynqmp.dts
+++ b/tools/dts/zynqmp.dts
@@ -1,13 +1,4 @@
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @TAG(OTHER_GPL2P)
- */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 /dts-v1/;
 
diff --git a/tools/flags.cmake b/tools/flags.cmake
index 1481c9ad8..d72c645a5 100644
--- a/tools/flags.cmake
+++ b/tools/flags.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/tools/hardware.yml b/tools/hardware.yml
index 94a4bd49f..c93bf1f26 100644
--- a/tools/hardware.yml
+++ b/tools/hardware.yml
@@ -1,16 +1,13 @@
 #
-# Copyright 2018, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
+
+
 # Documentation for bindings is relative to Documentation/devicetree/bindings in Linux,
 # unless otherwise noted.
+
 devices:
   # ARM GIC (interrupt-controller/arm,gic.txt)
   - compatible:
diff --git a/tools/hardware/__init__.py b/tools/hardware/__init__.py
index cbe1039f1..b21bae313 100644
--- a/tools/hardware/__init__.py
+++ b/tools/hardware/__init__.py
@@ -1,11 +1,5 @@
 #
-# Copyright 2019, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
diff --git a/tools/hardware/config.py b/tools/hardware/config.py
index ed1028988..bec1802f5 100644
--- a/tools/hardware/config.py
+++ b/tools/hardware/config.py
@@ -1,13 +1,7 @@
 #
-# Copyright 2019, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 
diff --git a/tools/hardware/device.py b/tools/hardware/device.py
index f6ce9ec07..542df1fdd 100644
--- a/tools/hardware/device.py
+++ b/tools/hardware/device.py
@@ -1,14 +1,9 @@
 #
-# Copyright 2019, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
+
 from collections import OrderedDict
 from typing import Any, Dict, Generator, List, Tuple, cast
 
diff --git a/tools/hardware/fdt.py b/tools/hardware/fdt.py
index aa6b50dac..d24e70ec4 100644
--- a/tools/hardware/fdt.py
+++ b/tools/hardware/fdt.py
@@ -1,14 +1,9 @@
 #
-# Copyright 2019, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
+
 from typing import Any, Dict, IO, List
 import pyfdt.pyfdt
 
diff --git a/tools/hardware/irq.py b/tools/hardware/irq.py
index 20f51b1dc..dbe38746f 100644
--- a/tools/hardware/irq.py
+++ b/tools/hardware/irq.py
@@ -1,14 +1,9 @@
 #
-# Copyright 2019, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
+
 import logging
 
 from hardware.device import Utils, WrappedNode
diff --git a/tools/hardware/memory.py b/tools/hardware/memory.py
index 5fbd218b3..0282053a5 100644
--- a/tools/hardware/memory.py
+++ b/tools/hardware/memory.py
@@ -1,14 +1,9 @@
 #
-# Copyright 2019, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
+
 import functools
 
 import hardware.utils as utils
diff --git a/tools/hardware/outputs/__init__.py b/tools/hardware/outputs/__init__.py
index cbe1039f1..b21bae313 100644
--- a/tools/hardware/outputs/__init__.py
+++ b/tools/hardware/outputs/__init__.py
@@ -1,11 +1,5 @@
 #
-# Copyright 2019, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
diff --git a/tools/hardware/outputs/c_header.py b/tools/hardware/outputs/c_header.py
index 11e564677..046f02f35 100644
--- a/tools/hardware/outputs/c_header.py
+++ b/tools/hardware/outputs/c_header.py
@@ -1,13 +1,7 @@
 #
-# Copyright 2019, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 ''' generate a c header file from the device tree '''
@@ -20,16 +14,11 @@ from hardware import config, fdt
 from hardware.utils import memory, rule
 
 HEADER_TEMPLATE = '''/*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
+
 /*
  * This file is autogenerated by kernel/tools/hardware_gen.py.
  */
diff --git a/tools/hardware/outputs/compat_strings.py b/tools/hardware/outputs/compat_strings.py
index c84e32be3..4b4746a4e 100644
--- a/tools/hardware/outputs/compat_strings.py
+++ b/tools/hardware/outputs/compat_strings.py
@@ -1,13 +1,7 @@
 #
-# Copyright 2019, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 ''' generate a text file with matched compatible strings from the device tree '''
diff --git a/tools/hardware/outputs/elfloader.py b/tools/hardware/outputs/elfloader.py
index 10a994b25..2d00712be 100644
--- a/tools/hardware/outputs/elfloader.py
+++ b/tools/hardware/outputs/elfloader.py
@@ -1,13 +1,7 @@
 #
-# Copyright 2019, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 ''' generate a header file for the elfloader from a device tree '''
@@ -25,16 +19,11 @@ from hardware.utils import cpu, memory, rule
 
 
 HEADER_TEMPLATE = '''/*
- * Copyright 2019, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
+
 /*
  * This file is autogenerated by kernel/tools/hardware_gen.py
  */
diff --git a/tools/hardware/outputs/yaml.py b/tools/hardware/outputs/yaml.py
index 5c7c8cbb1..57340d225 100644
--- a/tools/hardware/outputs/yaml.py
+++ b/tools/hardware/outputs/yaml.py
@@ -1,13 +1,7 @@
 #
-# Copyright 2019, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 ''' generate a yaml file with memory region info from the device tree '''
diff --git a/tools/hardware/utils/__init__.py b/tools/hardware/utils/__init__.py
index b8b3aafff..ba344ebf7 100644
--- a/tools/hardware/utils/__init__.py
+++ b/tools/hardware/utils/__init__.py
@@ -1,13 +1,7 @@
 #
-# Copyright 2019, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 
diff --git a/tools/hardware/utils/cpu.py b/tools/hardware/utils/cpu.py
index 5795e8e0c..febacf9f7 100644
--- a/tools/hardware/utils/cpu.py
+++ b/tools/hardware/utils/cpu.py
@@ -1,14 +1,9 @@
 #
-# Copyright 2019, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
+
 from typing import List
 
 from hardware.device import WrappedNode
diff --git a/tools/hardware/utils/memory.py b/tools/hardware/utils/memory.py
index e29c79343..afbab9a01 100644
--- a/tools/hardware/utils/memory.py
+++ b/tools/hardware/utils/memory.py
@@ -1,14 +1,9 @@
 #
-# Copyright 2019, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
+
 from typing import List, Set
 
 import hardware.utils as utils
diff --git a/tools/hardware/utils/rule.py b/tools/hardware/utils/rule.py
index 456b2d93a..bef4c0493 100644
--- a/tools/hardware/utils/rule.py
+++ b/tools/hardware/utils/rule.py
@@ -1,13 +1,7 @@
 #
-# Copyright 2019, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 from collections import defaultdict
diff --git a/tools/hardware_gen.py b/tools/hardware_gen.py
index f4451571c..5218fe126 100644
--- a/tools/hardware_gen.py
+++ b/tools/hardware_gen.py
@@ -1,14 +1,8 @@
 #!/usr/bin/env python3
 #
-# Copyright 2018-2019, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 from __future__ import print_function, division
diff --git a/tools/hardware_schema.yml b/tools/hardware_schema.yml
index b17fcca91..23e4bba5d 100644
--- a/tools/hardware_schema.yml
+++ b/tools/hardware_schema.yml
@@ -1,14 +1,9 @@
 #
-# Copyright 2018, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
+
 ---
 $schema: http://json-schema.org/draft-07/schema#
 description: Schema for seL4 hardware.yml
diff --git a/tools/helpers.cmake b/tools/helpers.cmake
index aa71344c6..7aac616d7 100644
--- a/tools/helpers.cmake
+++ b/tools/helpers.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.8.2)
diff --git a/tools/internal.cmake b/tools/internal.cmake
index 9797dc4e4..1f678bc8d 100644
--- a/tools/internal.cmake
+++ b/tools/internal.cmake
@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 cmake_minimum_required(VERSION 3.7.2)
diff --git a/tools/invocation_header_gen.py b/tools/invocation_header_gen.py
index d8d120c79..7aa80c19c 100755
--- a/tools/invocation_header_gen.py
+++ b/tools/invocation_header_gen.py
@@ -1,14 +1,8 @@
 #!/usr/bin/env python3
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the BSD 2-Clause license. Note that NO WARRANTY is provided.
-# See "LICENSE_BSD2.txt" for details.
-#
-# @TAG(DATA61_BSD)
+# SPDX-License-Identifier: BSD-2-Clause
 #
 
 # seL4 Invocation ID Generator
@@ -28,25 +22,15 @@ pkg_resources.require("jinja2>=2.10")
 COMMON_HEADER = """
 {%- if libsel4 -%}
 /*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 {%- else -%}
 /*
- * Copyright 2014, General Dynamics C4 Systems
+ * Copyright 2020 Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 {%- endif %}
 
diff --git a/tools/kernel_pylint.sh b/tools/kernel_pylint.sh
index 0f03067b7..bb856bbe3 100755
--- a/tools/kernel_pylint.sh
+++ b/tools/kernel_pylint.sh
@@ -1,15 +1,8 @@
 #!/bin/bash
-
 #
-# Copyright 2018, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the BSD 2-Clause license. Note that NO WARRANTY is provided.
-# See "LICENSE_BSD2.txt" for details.
-#
-# @TAG(DATA61_BSD)
+# SPDX-License-Identifier: BSD-2-Clause
 #
 
 python_sources=$(find ../tools ../manual/tools ../libsel4/tools -name '*.py')
diff --git a/tools/kernel_xmllint.sh b/tools/kernel_xmllint.sh
index c95ce85b8..373d62a64 100755
--- a/tools/kernel_xmllint.sh
+++ b/tools/kernel_xmllint.sh
@@ -1,15 +1,8 @@
 #!/bin/bash
-
 #
-# Copyright 2018, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the BSD 2-Clause license. Note that NO WARRANTY is provided.
-# See "LICENSE_BSD2.txt" for details.
-#
-# @TAG(DATA61_BSD)
+# SPDX-License-Identifier: BSD-2-Clause
 #
 
 xml_sources=$(find ../libsel4/arch_include/*/interfaces ../libsel4/sel4_arch_include/*/interfaces -name 'sel4arch.xml')
diff --git a/tools/lex.py b/tools/lex.py
index 2f68ba905..4c9b15402 100644
--- a/tools/lex.py
+++ b/tools/lex.py
@@ -1,4 +1,4 @@
-# @TAG(OTHER_BSD3)
+# SPDX-License-Identifier: BSD-3-Clause
 
 # -----------------------------------------------------------------------------
 # ply: lex.py
diff --git a/tools/pylintrc b/tools/pylintrc
index de4f6a636..03d9280d7 100644
--- a/tools/pylintrc
+++ b/tools/pylintrc
@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the BSD 2-Clause license. Note that NO WARRANTY is provided.
-# See "LICENSE_BSD2.txt" for details.
-#
-# @TAG(DATA61_BSD)
+# SPDX-License-Identifier: BSD-2-Clause
 #
 
 [MASTER]
diff --git a/tools/python-deps/README.rst b/tools/python-deps/README.rst
index 646ef2fb4..5a2f38123 100644
--- a/tools/python-deps/README.rst
+++ b/tools/python-deps/README.rst
@@ -1,14 +1,9 @@
 ..
-.. Copyright 2017, Data61
-.. Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-.. ABN 41 687 119 230.
+.. Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 ..
-.. This software may be distributed and modified according to the terms of
-.. the GNU General Public License version 2. Note that NO WARRANTY is provided.
-.. See "LICENSE_GPLv2.txt" for details.
-..
-.. @TAG(DATA61_GPL)
+.. SPDX-License-Identifier: GPL-2.0-only
 ..
+
 seL4 Python Dependency Metapackage
 ##################################
 
diff --git a/tools/python-deps/setup.py b/tools/python-deps/setup.py
index 7394cc9b6..1368e4311 100644
--- a/tools/python-deps/setup.py
+++ b/tools/python-deps/setup.py
@@ -1,14 +1,8 @@
 #!/usr/bin/env python3
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the BSD 2-Clause license. Note that NO WARRANTY is provided.
-# See "LICENSE_BSD2.txt" for details.
-#
-# @TAG(DATA61_BSD)
+# SPDX-License-Identifier: BSD-2-Clause
 #
 
 """
diff --git a/tools/reciprocal.py b/tools/reciprocal.py
index bc30db33a..0c0061c59 100755
--- a/tools/reciprocal.py
+++ b/tools/reciprocal.py
@@ -1,14 +1,8 @@
 #!/usr/bin/env python3
 #
-# Copyright 2019, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
+# SPDX-License-Identifier: GPL-2.0-only
 #
 
 # this script can be used to calculate the reciprocal for
diff --git a/tools/syscall_header_gen.py b/tools/syscall_header_gen.py
index 6848549ce..1dab0b36a 100755
--- a/tools/syscall_header_gen.py
+++ b/tools/syscall_header_gen.py
@@ -1,14 +1,8 @@
 #!/usr/bin/env python3
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the BSD 2-Clause license. Note that NO WARRANTY is provided.
-# See "LICENSE_BSD2.txt" for details.
-#
-# @TAG(DATA61_BSD)
+# SPDX-License-Identifier: BSD-2-Clause
 #
 
 # seL4 System Call ID Generator
@@ -34,14 +28,11 @@ COMMON_HEADER = """
  */"""
 
 KERNEL_HEADER_TEMPLATE = """/*
- * Copyright 2014, General Dynamics C4 Systems
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
+ * SPDX-License-Identifier: GPL-2.0-only
  */
+
 """ + COMMON_HEADER + """
 #ifndef __ARCH_API_SYSCALL_H
 #define __ARCH_API_SYSCALL_H
@@ -100,16 +91,9 @@ static char *syscall_names[] UNUSED = {
 """
 
 LIBSEL4_HEADER_TEMPLATE = """/*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
  *
- * This software may be distributed and modified according to the terms of
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- *
- * @TAG(DATA61_BSD)
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 """ + COMMON_HEADER + """
diff --git a/tools/umm.py b/tools/umm.py
index e8ae8a1e3..2f1fcf4f6 100755
--- a/tools/umm.py
+++ b/tools/umm.py
@@ -1,15 +1,8 @@
 #!/usr/bin/env python3
-
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the BSD 2-Clause license. Note that NO WARRANTY is provided.
-# See "LICENSE_BSD2.txt" for details.
-#
-# @TAG(DATA61_BSD)
+# SPDX-License-Identifier: BSD-2-Clause
 #
 
 from __future__ import print_function
diff --git a/tools/xmllint.sh b/tools/xmllint.sh
index 320c1d358..ddd487e0d 100755
--- a/tools/xmllint.sh
+++ b/tools/xmllint.sh
@@ -1,14 +1,8 @@
 #!/bin/bash
 #
-# Copyright 2017, Data61
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
 #
-# This software may be distributed and modified according to the terms of
-# the BSD 2-Clause license. Note that NO WARRANTY is provided.
-# See "LICENSE_BSD2.txt" for details.
-#
-# @TAG(DATA61_BSD)
+# SPDX-License-Identifier: BSD-2-Clause
 #
 
 if [ 0$V -ge 3 ]; then