4 files changed, 27 insertions, 20 deletions
diff --git a/src/rtl/fmc_arbiter.v b/src/rtl/fmc_arbiter.v
index 376e85b..2bdb717 100644
--- a/src/rtl/fmc_arbiter.v
+++ b/src/rtl/fmc_arbiter.v
@@ -6,8 +6,10 @@
 // Novena FPGA + STM32 Bridge Board framework.
 //
 //
-// Author: Pavel Shatov
-// Copyright (c) 2015, 2018-2019 NORDUnet A/S All rights reserved.
+// Author: Paul Selkirk, Pavel Shatov
+// Copyright 2015, 2018 NORDUnet
+// Copyright 2020 The Commons Conservancy Cryptech Project
+// SPDX-License-Identifier: BSD-3-Clause
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions
@@ -19,9 +21,9 @@
 //   notice, this list of conditions and the following disclaimer in the
 //   documentation and/or other materials provided with the distribution.
 //
-// - Neither the name of the NORDUnet nor the names of its contributors may
-//   be used to endorse or promote products derived from this software
-//   without specific prior written permission.
+// - Neither the name of the copyright holder nor the names of its
+//   contributors may be used to endorse or promote products derived from
+//   this software without specific prior written permission.
 //
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
 // IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff --git a/src/rtl/fmc_regs.v b/src/rtl/fmc_regs.v
index 64afbe9..c084c99 100644
--- a/src/rtl/fmc_regs.v
+++ b/src/rtl/fmc_regs.v
@@ -1,12 +1,14 @@
 //======================================================================
 //
-// fmc.v
-// ------
+// fmc_regs.v
+// ----------
 // Configuration registers for the fmc core.
 //
 //
-// Author: Joachim Strombergson
-// Copyright (c) 2015, NORDUnet A/S All rights reserved.
+// Authors: Joachim Strombergson, Paul Selkirk, Pavel Shatov
+// Copyright 2015, 2018 NORDUnet A/S
+// Copyright 2020 The Commons Conservancy Cryptech Project
+// SPDX-License-Identifier: BSD-3-Clause
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions
@@ -18,9 +20,9 @@
 //   notice, this list of conditions and the following disclaimer in the
 //   documentation and/or other materials provided with the distribution.
 //
-// - Neither the name of the NORDUnet nor the names of its contributors may
-//   be used to endorse or promote products derived from this software
-//   without specific prior written permission.
+// - Neither the name of the copyright holder nor the names of its
+//   contributors may be used to endorse or promote products derived from
+//   this software without specific prior written permission.
 //
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
 // IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff --git a/src/tb/tb_fmc.v b/src/tb/tb_fmc.v
index 5294be9..b99771d 100644
--- a/src/tb/tb_fmc.v
+++ b/src/tb/tb_fmc.v
@@ -6,7 +6,9 @@
 //
 // Authors: Pavel Shatov
 //
-// Copyright (c) 2018-2019, NORDUnet A/S
+// Copyright 2018 NORDUnet A/S
+// Copyright 2020-2021 The Commons Conservancy Cryptech Project
+// SPDX-License-Identifier: BSD-3-Clause
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are met:
@@ -18,9 +20,9 @@
 //   this list of conditions and the following disclaimer in the documentation
 //   and/or other materials provided with the distribution.
 //
-// - Neither the name of the NORDUnet nor the names of its contributors may be
-//   used to endorse or promote products derived from this software without
-//   specific prior written permission.
+// - Neither the name of the copyright holder nor the names of its
+//   contributors may be used to endorse or promote products derived from
+//   this software without specific prior written permission.
 //
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 // AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
diff --git a/src/tb/tb_fmc_core_selector.v b/src/tb/tb_fmc_core_selector.v
index 9c0c6ca..c09fc89 100644
--- a/src/tb/tb_fmc_core_selector.v
+++ b/src/tb/tb_fmc_core_selector.v
@@ -6,7 +6,8 @@
 //
 // Authors: Pavel Shatov
 //
-// Copyright (c) 2018-2019, NORDUnet A/S
+// Copyright 2018 NORDUnet A/S
+// Copyright 2020 The Commons Conservancy Cryptech Project
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are met:
@@ -18,9 +19,9 @@
 //   this list of conditions and the following disclaimer in the documentation
 //   and/or other materials provided with the distribution.
 //
-// - Neither the name of the NORDUnet nor the names of its contributors may be
-//   used to endorse or promote products derived from this software without
-//   specific prior written permission.
+// - Neither the name of the copyright holder nor the names of its
+//   contributors may be used to endorse or promote products derived from
+//   this software without specific prior written permission.
 //
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 // AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE