Convert license tags to SPDX identifiers

This commit also converts our own copyright headers to directly use
SPDX, but leaves all other copyright header intact, only adding the
SPDX ident. As far as possible this commit also merges multiple
Data61 copyright statements/headers into one for consistency.

.cmake-format.yaml

@@ -1,14 +1,9 @@
 #
-# Copyright 2019, Data61
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
 #
-# This software may be distributed and modified according to the terms of
+# SPDX-License-Identifier: GPL-2.0-only
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
 #
+
 additional_commands:
   add_sources:
     kwargs:

.gitignore

@@ -1,11 +1,7 @@
 #
 # Copyright 2014, General Dynamics C4 Systems
 #
-# This software may be distributed and modified according to the terms of
+# SPDX-License-Identifier: GPL-2.0-only
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(GD_GPL)
 #
 
 # generated python bytecode

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
+# SPDX-License-Identifier: GPL-2.0-only
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(GD_GPL)
 #
 
 This file lists known caveats in the seL4 API and implementation.

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
+# SPDX-License-Identifier: GPL-2.0-only
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(GD_GPL)
 #
 
 * Intel VT-d (I/O MMU) support

CMakeLists.txt

@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
 #
-# This software may be distributed and modified according to the terms of
+# SPDX-License-Identifier: GPL-2.0-only
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
 #
 
 cmake_minimum_required(VERSION 3.8.2)

CONTRIBUTING.md

@@ -1,13 +1,7 @@
 <!--
-  Copyright 2017, Data61
+     Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
-  Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-  ABN 41 687 119 230.
 
-  This software may be distributed and modified according to the terms of
+     SPDX-License-Identifier: GPL-2.0-only
-  the GNU General Public License version 2. Note that NO WARRANTY is provided.
-  See "LICENSE_GPLv2.txt" for details.
-
-  @TAG(DATA61_GPL)
 -->
 
 Contributions to the seL4 kernel repository are welcome!

FindseL4.cmake

@@ -1,13 +1,7 @@
 #
-# Copyright 2019, Data61
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
 #
-# This software may be distributed and modified according to the terms of
+# SPDX-License-Identifier: GPL-2.0-only
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
 #
 
 set(KERNEL_PATH "${CMAKE_CURRENT_LIST_DIR}" CACHE STRING "")

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
+     SPDX-License-Identifier: GPL-2.0-only
-  the GNU General Public License version 2. Note that NO WARRANTY is provided.
-  See "LICENSE_GPLv2.txt" for details.
-
-  @TAG(GD_GPL)
 -->
 
 The seL4 Repository

config.cmake

@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
 #
-# This software may be distributed and modified according to the terms of
+# SPDX-License-Identifier: GPL-2.0-only
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
 #
 
 cmake_minimum_required(VERSION 3.7.2)

configs/ARM_HYP_verified.cmake

@@ -1,15 +1,10 @@
 #!/usr/bin/env -S cmake -P
 #
-# Copyright 2017, Data61
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
 #
-# This software may be distributed and modified according to the terms of
+# SPDX-License-Identifier: GPL-2.0-only
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
 #
+
 # 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()

configs/ARM_MCS_verified.cmake

@@ -1,15 +1,10 @@
 #!/usr/bin/env -S cmake -P
 #
-# Copyright 2019, Data61
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
 #
-# This software may be distributed and modified according to the terms of
+# SPDX-License-Identifier: GPL-2.0-only
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
 #
+
 # 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()

configs/ARM_verified.cmake

@@ -1,14 +1,8 @@
 #!/usr/bin/env -S cmake -P
 #
-# Copyright 2017, Data61
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
 #
-# This software may be distributed and modified according to the terms of
+# SPDX-License-Identifier: GPL-2.0-only
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
 #
 
 # If this file is executed then build the kernel.elf and kernel_all_pp.c file

configs/RISCV64_verified.cmake

@@ -1,15 +1,10 @@
 #!/usr/bin/env -S cmake -P
 #
-# Copyright 2017, Data61
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
 #
-# This software may be distributed and modified according to the terms of
+# SPDX-License-Identifier: GPL-2.0-only
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
 #
+
 # 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()

configs/X64_verified.cmake

@@ -1,15 +1,10 @@
 #!/usr/bin/env -S cmake -P
 #
-# Copyright 2017, Data61
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
 #
-# This software may be distributed and modified according to the terms of
+# SPDX-License-Identifier: GPL-2.0-only
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
 #
+
 # 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()

configs/seL4Config.cmake

@@ -1,13 +1,7 @@
 #
-# Copyright 2019, Data61
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
 #
-# This software may be distributed and modified according to the terms of
+# SPDX-License-Identifier: GPL-2.0-only
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
 #
 
 #

gcc.cmake

@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
 #
-# This software may be distributed and modified according to the terms of
+# SPDX-License-Identifier: GPL-2.0-only
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
 #
 
 cmake_minimum_required(VERSION 3.7.2)

gdb-macros

@@ -1,11 +1,7 @@
 #
 # Copyright 2014, General Dynamics C4 Systems
 #
-# This software may be distributed and modified according to the terms of
+# SPDX-License-Identifier: GPL-2.0-only
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(GD_GPL)
 #
 
 #GDB macros for displaying seL4 data structures. Currently a work in progress.

include/32/mode/api/ipc_buffer.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
 
 #ifndef __IPC_BUFFER_H

include/32/mode/config.cmake

@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
 #
-# This software may be distributed and modified according to the terms of
+# SPDX-License-Identifier: GPL-2.0-only
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
 #
 
 cmake_minimum_required(VERSION 3.7.2)

include/32/mode/stdint.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
 
 #ifndef __MODE_STDINT_H

include/32/mode/util.h

@@ -1,14 +1,9 @@
 /*
- * Copyright 2019, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
+
 #ifndef __MODE_UTIL_H
 #define __MODE_UTIL_H
 

include/64/mode/api/ipc_buffer.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
 
 #ifndef __IPC_BUFFER_H

include/64/mode/config.cmake

@@ -1,13 +1,7 @@
 #
-# Copyright 2017, Data61
+# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
-# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-# ABN 41 687 119 230.
 #
-# This software may be distributed and modified according to the terms of
+# SPDX-License-Identifier: GPL-2.0-only
-# the GNU General Public License version 2. Note that NO WARRANTY is provided.
-# See "LICENSE_GPLv2.txt" for details.
-#
-# @TAG(DATA61_GPL)
 #
 
 cmake_minimum_required(VERSION 3.7.2)

include/64/mode/stdint.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
 
 #ifndef __MODE_STDINT_H

include/64/mode/util.h

@@ -1,14 +1,9 @@
 /*
- * Copyright 2019, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
+
 #ifndef __MODE_UTIL_H
 #define __MODE_UTIL_H
 

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
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
  */
 
 #ifndef __API_H

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
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
  */
 
 #include <config.h>

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
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
  */
 
 #ifndef __FAILURES_H

include/api/faults.h

@@ -1,14 +1,9 @@
 /*
- * Copyright 2017, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
+
 #ifndef __API_FAULTS_H
 #define __API_FAULTS_H
 

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
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
  */
 
 #ifndef __API_SYSCALL_H

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
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
  */
 
 #ifndef __API_TYPES_H

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
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
  */
 
 #ifndef __ARCH_FASTPATH_32_H

include/arch/arm/arch/32/mode/hardware.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
 
 #ifndef __ARCH_HARDWARE_32_H

include/arch/arm/arch/32/mode/kernel/stack.h

@@ -1,14 +1,9 @@
 /*
- * Copyright 2017, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
+
 #ifndef __KERNEL_MODE_STACK_H
 #define __KERNEL_MODE_STACK_H
 

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
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
  */
 
 #ifndef __MODE_KERNEL_THREAD_H

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
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
  */
 
 #ifndef __ARCH_MODE_KERNEL_VSPACE_H

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
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
  */
 
 #ifndef __ARCH_MACHINE_32_H

include/arch/arm/arch/32/mode/machine/debug.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
 
 #ifndef __ARCH_MODE_MACHINE_DEBUG_H_

include/arch/arm/arch/32/mode/machine/fpu.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
 
 #ifndef __MODE_MACHINE_FPU_H

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
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
  */
 
 #ifndef __ARCH_MACHINE_HARDWARE_32_H

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
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
  */
 
 #ifndef __ARCH_MACHINE_REGISTERSET_32_H

include/arch/arm/arch/32/mode/machine/timer.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
 
 #ifndef __ARCH_MODE_MACHINE_TIMER_H_

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
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
  */
 
 #ifndef __ARCH_MACHINE_PL2_32_H

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
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
  */
 
 #ifndef __ARCH_MODEL_STATEDATA_32_H

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
+-- SPDX-License-Identifier: GPL-2.0-only
--- the GNU General Public License version 2. Note that NO WARRANTY is provided.
--- See "LICENSE_GPLv2.txt" for details.
---
--- @TAG(GD_GPL)
 --
 
 #include <config.h>

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
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
  */
 
 #ifndef __ARCH_OBJECT_STRUCTURES_32_H

include/arch/arm/arch/32/mode/smp/ipi.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
 
 #ifndef __MODE_SMP_IPI_H

include/arch/arm/arch/32/mode/smp/smp.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
 
 #ifndef __MODE_SMP_H_

include/arch/arm/arch/32/mode/types.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
 
 #ifndef __ARCH_MODE_TYPES_H_

include/arch/arm/arch/64/mode/fastpath/fastpath.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
 
 #ifndef __ARCH_FASTPATH_64_H

include/arch/arm/arch/64/mode/hardware.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
 
 #ifndef __ARCH_MODE_HARDWARE_H

include/arch/arm/arch/64/mode/kernel/stack.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
 
 #ifndef __KERNEL_MODE_STACK_H

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
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
  */
 
 #ifndef __MODE_KERNEL_THREAD_H

include/arch/arm/arch/64/mode/kernel/vspace.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
 
 #ifndef __ARCH_MODE_KERNEL_VSPACE_H_

include/arch/arm/arch/64/mode/machine.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
 
 #ifndef __ARCH_MODE_MACHINE_H

include/arch/arm/arch/64/mode/machine/debug.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
 
 #ifndef __ARCH_MODE_MACHINE_DEBUG_H_

include/arch/arm/arch/64/mode/machine/fpu.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
 
 #ifndef __MODE_MACHINE_FPU_H

include/arch/arm/arch/64/mode/machine/hardware.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
 
 #ifndef __ARCH_MACHINE_HARDWARE_64_H

include/arch/arm/arch/64/mode/machine/registerset.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
 
 #ifndef __ARCH_MACHINE_REGISTERSET_64_H

include/arch/arm/arch/64/mode/machine/timer.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
 
 #ifndef __ARCH_MODE_MACHINE_TIMER_H_

include/arch/arm/arch/64/mode/machine_pl2.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
 
 #ifndef __ARCH_MODE_MACHINE_PL2_H

include/arch/arm/arch/64/mode/model/statedata.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
 
 #ifndef __ARCH_MODEL_STATEDATA_64_H

include/arch/arm/arch/64/mode/object/structures.bf

@@ -1,13 +1,7 @@
 --
--- Copyright 2017, Data61
+-- Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
--- Commonwealth Scientific and Industrial Research Organisation (CSIRO)
--- ABN 41 687 119 230.
 --
--- This software may be distributed and modified according to the terms of
+-- SPDX-License-Identifier: GPL-2.0-only
--- the GNU General Public License version 2. Note that NO WARRANTY is provided.
--- See "LICENSE_GPLv2.txt" for details.
---
--- @TAG(DATA61_GPL)
 --
 
 #include <config.h>

include/arch/arm/arch/64/mode/object/structures.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
 
 #ifndef __ARCH_OBJECT_STRUCTURES_64_H

include/arch/arm/arch/64/mode/smp/ipi.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
 
 #ifndef __MODE_SMP_IPI_H

include/arch/arm/arch/64/mode/smp/smp.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
 
 #ifndef __MODE_SMP_H_

include/arch/arm/arch/64/mode/types.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
 
 #ifndef __ARCH_MODE_TYPES_H_

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
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
  */
 
 #ifndef __ARCH_API_TYPES_H

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
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
  */
 
 #ifndef ARCH_BENCHMARK_H

include/arch/arm/arch/bootinfo.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
 
 #ifndef __ARCH_BOOTINFO_H

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
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
  */
 
 #ifndef __ARCH_FASTPATH_H

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
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
  */
 
 #ifndef __ARCH_KERNEL_BOOT_H

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
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
  */
 
 #ifndef __ARCH_KERNEL_THREAD_H

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
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
  */
 
 #ifndef __KERNEL_ARM_TRAPS_H

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
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
  */
 
 #ifndef __ARCH_KERNEL_VSPACE_H

include/arch/arm/arch/linker.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: BSD-2-Clause
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_BSD)
  */
 
 #ifndef __ARCH_LINKER_H

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
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
  */
 
 #ifndef __ARCH_MACHINE_H

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
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
  */
 
 #ifndef __ARCH_MACHINE_CAPDL_H

include/arch/arm/arch/machine/debug.h

@@ -1,14 +1,9 @@
 /*
- * Copyright 2017, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
+
 #ifndef __ARCH_MACHINE_DEBUG_H
 #define __ARCH_MACHINE_DEBUG_H
 

include/arch/arm/arch/machine/debug_conf.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
 
 #ifndef ARCH_MACHINE_DEBUG_CONF_H

include/arch/arm/arch/machine/fpu.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
 
 #ifndef __ARCH_MACHINE_FPU_H

include/arch/arm/arch/machine/gic_common.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2019, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
 
 #ifndef __ARCH_MACHINE_GIC_COMMON_H

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
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
  */
 
 /*

include/arch/arm/arch/machine/gic_v3.h

@@ -1,14 +1,8 @@
 /*
  * Copyright 2019, DornerWorks
- * Copyright 2019, Data61
+ * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the BSD 2-Clause license. Note that NO WARRANTY is provided.
- * See "LICENSE_BSD2.txt" for details.
- *
- * @TAG(DATA61_DORNERWORKS_BSD)
  */
 
 /*

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
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
  */
 
 #ifndef __ARCH_MACHINE_HARDWARE_H

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
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
  */
 
 /*

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
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
  */
 
 #ifndef __ARCH_MACHINE_REGISTERSET_H

include/arch/arm/arch/machine/timer.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
 
 #ifndef __ARCH_MACHINE_TIMER_H_

include/arch/arm/arch/machine/tlb.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
 
 #ifndef __ARCH_MACHINE_TLB_H

include/arch/arm/arch/model/smp.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
 
 #ifndef __ARCH_MODEL_SMP_H_

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
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
  */
 
 #ifndef __ARCH_MODEL_STATEDATA_H

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
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
  */
 
 #ifndef __ARCH_OBJECT_INTERRUPT_H

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
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
  */
 
 #ifndef __ARCH_OBJECT_IOSPACE_H

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
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
  */
 
 #ifndef __ARCH_OBJECT_OBJECTTYPE_H

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
+-- SPDX-License-Identifier: GPL-2.0-only
--- the GNU General Public License version 2. Note that NO WARRANTY is provided.
--- See "LICENSE_GPLv2.txt" for details.
---
--- @TAG(GD_GPL)
 --
 
 #include <mode/object/structures.bf>

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
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
  */
 
 #ifndef __ARCH_OBJECT_STRUCTURES_H

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
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
  */
 
 #ifndef __ARCH_OBJECT_VCPU_H

include/arch/arm/arch/smp/ipi.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
 
 #ifndef __ARCH_SMP_IPI_H

include/arch/arm/arch/smp/ipi_inline.h

@@ -1,13 +1,7 @@
 /*
- * Copyright 2017, Data61
+ * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
  *
- * This software may be distributed and modified according to the terms of
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
  */
 
 #ifndef __ARCH_SMP_IPI_INLINE_H

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
+ * SPDX-License-Identifier: GPL-2.0-only
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
  */
 
 #ifndef __ARCH_TYPES_H