formal: fix licenses

19 files changed, 22 insertions, 18 deletions

diff --git a/formal/promela/models/barriers/barrier-mgr-model.pml b/formal/promela/models/barriers/barrier-mgr-model.pml
index 85c2aef8..6d3b130f 100644
--- a/formal/promela/models/barriers/barrier-mgr-model.pml
+++ b/formal/promela/models/barriers/barrier-mgr-model.pml
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
+/* SPDX-License-Identifier: BSD-3-Clause */
 
 /*
  * barrier-mgr-model.pml
diff --git a/formal/promela/models/chains/chains-api-model-post.h b/formal/promela/models/chains/chains-api-model-post.h
index d826725d..b1d1aef2 100644
--- a/formal/promela/models/chains/chains-api-model-post.h
+++ b/formal/promela/models/chains/chains-api-model-post.h
@@ -1,3 +1,3 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
+/* SPDX-License-Identifier: BSD-3-Clause */
 
 /* post-amble empty for now */
diff --git a/formal/promela/models/chains/chains-api-model-pre.h b/formal/promela/models/chains/chains-api-model-pre.h
index 9816a5ad..7227c32b 100644
--- a/formal/promela/models/chains/chains-api-model-pre.h
+++ b/formal/promela/models/chains/chains-api-model-pre.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
+/* SPDX-License-Identifier: BSD-3-Clause */
 
 /******************************************************************************
  * Chains API Model
diff --git a/formal/promela/models/chains/chains-api-model-rfn.yml b/formal/promela/models/chains/chains-api-model-rfn.yml
index 103e32ce..441b8ceb 100644
--- a/formal/promela/models/chains/chains-api-model-rfn.yml
+++ b/formal/promela/models/chains/chains-api-model-rfn.yml
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: BSD-2-Clause
+# SPDX-License-Identifier: BSD-3-Clause
 # Event Manager: Promela to RTEMS Refinement
 
 # Copyright (C) 2019-2021 Trinity College Dublin (www.tcd.ie)
@@ -11,6 +11,9 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
+# 3. 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/formal/promela/models/chains/chains-api-model-run.h b/formal/promela/models/chains/chains-api-model-run.h
index 292718ee..6320e503 100644
--- a/formal/promela/models/chains/chains-api-model-run.h
+++ b/formal/promela/models/chains/chains-api-model-run.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
+/* SPDX-License-Identifier: BSD-3-Clause */
 
 void RtemsModelChainsAPI_Run{0}(
 )
diff --git a/formal/promela/models/chains/chains-api-model.pml b/formal/promela/models/chains/chains-api-model.pml
index b76a8628..b4ae38e2 100644
--- a/formal/promela/models/chains/chains-api-model.pml
+++ b/formal/promela/models/chains/chains-api-model.pml
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
+/* SPDX-License-Identifier: BSD-3-Clause */
 
 /******************************************************************************
  * chains-api-model.pml
diff --git a/formal/promela/models/chains/tr-chains-api-model.c b/formal/promela/models/chains/tr-chains-api-model.c
index 05938362..be79d61e 100644
--- a/formal/promela/models/chains/tr-chains-api-model.c
+++ b/formal/promela/models/chains/tr-chains-api-model.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
+/* SPDX-License-Identifier: BSD-3-Clause */
 
 /******************************************************************************
  * Chains API Model
diff --git a/formal/promela/models/chains/tr-chains-api-model.h b/formal/promela/models/chains/tr-chains-api-model.h
index 18c2c9b6..72250cd6 100644
--- a/formal/promela/models/chains/tr-chains-api-model.h
+++ b/formal/promela/models/chains/tr-chains-api-model.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
+/* SPDX-License-Identifier: BSD-3-Clause */
 
 /******************************************************************************
  * Chains API model
diff --git a/formal/promela/models/events/event-mgr-model.pml b/formal/promela/models/events/event-mgr-model.pml
index 9bfa255b..01ef9f58 100644
--- a/formal/promela/models/events/event-mgr-model.pml
+++ b/formal/promela/models/events/event-mgr-model.pml
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
+/* SPDX-License-Identifier: BSD-3-Clause */
 
 /*
  * event-mgr-model.pml
diff --git a/formal/promela/src/examples/draft/parse.pml b/formal/promela/src/examples/draft/parse.pml
index ec86d1fd..aa7aca38 100644
--- a/formal/promela/src/examples/draft/parse.pml
+++ b/formal/promela/src/examples/draft/parse.pml
@@ -1,5 +1,5 @@
 /******************************************************************************
- * FV2-201
+ * SPDX-License-Identifier: BSD-3-Clause
  *
  * Copyright (C) 2019-2021 Trinity College Dublin (www.tcd.ie)
  *
diff --git a/formal/promela/src/src/library.coco b/formal/promela/src/src/library.coco
index e212538d..022cc704 100644
--- a/formal/promela/src/src/library.coco
+++ b/formal/promela/src/src/library.coco
@@ -1,4 +1,5 @@
  ##############################################################################
+ # SPDX-License-Identifier: BSD-3-Clause
  # Library
  #
  # Copyright (C) 2019-2021 Trinity College Dublin (www.tcd.ie)
diff --git a/formal/promela/src/src/syntax_ml.coco b/formal/promela/src/src/syntax_ml.coco
index 2199ef97..d0c281c8 100644
--- a/formal/promela/src/src/syntax_ml.coco
+++ b/formal/promela/src/src/syntax_ml.coco
@@ -1,4 +1,5 @@
  ##############################################################################
+ # SPDX-License-Identifier: BSD-3-Clause
  # Syntax ML
  #
  # Copyright (C) 2019-2021 Trinity College Dublin (www.tcd.ie)
diff --git a/formal/promela/src/src/syntax_pml.coco b/formal/promela/src/src/syntax_pml.coco
index 98360fbd..39b4375f 100644
--- a/formal/promela/src/src/syntax_pml.coco
+++ b/formal/promela/src/src/syntax_pml.coco
@@ -1,4 +1,5 @@
  ##############################################################################
+ # SPDX-License-Identifier: BSD-3-Clause
  # Syntax PML
  #
  # Copyright (C) 2019-2021 Trinity College Dublin (www.tcd.ie)
diff --git a/formal/promela/src/src/syntax_yaml.coco b/formal/promela/src/src/syntax_yaml.coco
index 5ebeb7e2..6842f70c 100644
--- a/formal/promela/src/src/syntax_yaml.coco
+++ b/formal/promela/src/src/syntax_yaml.coco
@@ -1,4 +1,5 @@
  ##############################################################################
+ # SPDX-License-Identifier: BSD-3-Clause
  # Syntax YAML
  #
  # Copyright (C) 2019-2021 Trinity College Dublin (www.tcd.ie)
diff --git a/formal/promela/src/src/testgen.coco b/formal/promela/src/src/testgen.coco
index 2a8a3397..6443c019 100644
--- a/formal/promela/src/src/testgen.coco
+++ b/formal/promela/src/src/testgen.coco
@@ -1,4 +1,5 @@
  ##############################################################################
+ # SPDX-License-Identifier: BSD-3-Clause
  # TestGen
  #
  # Copyright (C) 2019-2021 Trinity College Dublin (www.tcd.ie)
diff --git a/formal/promela/src/src/tests/test_coverage_testgen.coco b/formal/promela/src/src/tests/test_coverage_testgen.coco
index 94314c8e..f4dc409f 100644
--- a/formal/promela/src/src/tests/test_coverage_testgen.coco
+++ b/formal/promela/src/src/tests/test_coverage_testgen.coco
@@ -1,6 +1,5 @@
- # SPDX-License-Identifier: BSD-2-Clause 
- 
  ##############################################################################
+ # SPDX-License-Identifier: BSD-3-Clause
  # Test Coverage TestGen
  #
  # Copyright (C) 2019-2021 Trinity College Dublin (www.tcd.ie)
diff --git a/formal/promela/src/src/tests/test_optional.coco b/formal/promela/src/src/tests/test_optional.coco
index 833cc3c3..97ace379 100644
--- a/formal/promela/src/src/tests/test_optional.coco
+++ b/formal/promela/src/src/tests/test_optional.coco
@@ -1,6 +1,5 @@
-# SPDX-License-Identifier: BSD-2-Clause
-
 ##############################################################################
+ # SPDX-License-Identifier: BSD-3-Clause
  # Test Optional
  #
  # Copyright (C) 2019-2021 Trinity College Dublin (www.tcd.ie)
diff --git a/formal/promela/src/testgen_ml.coco b/formal/promela/src/testgen_ml.coco
index d4c84c68..b1368711 100644
--- a/formal/promela/src/testgen_ml.coco
+++ b/formal/promela/src/testgen_ml.coco
@@ -1,6 +1,5 @@
- # SPDX-License-Identifier: BSD-2-Clause
- 
  ##############################################################################
+ # SPDX-License-Identifier: BSD-3-Clause
  # Testgen ML
  #
  # Copyright (C) 2019-2021 Trinity College Dublin (www.tcd.ie)
diff --git a/formal/promela/src/testgen_yaml.coco b/formal/promela/src/testgen_yaml.coco
index 22c3498f..fc3acefb 100644
--- a/formal/promela/src/testgen_yaml.coco
+++ b/formal/promela/src/testgen_yaml.coco
@@ -1,6 +1,5 @@
- # SPDX-License-Identifier: BSD-2-Clause
- 
  ##############################################################################
+ # SPDX-License-Identifier: BSD-3-Clause
  # Testgen YAML
  #
  # Copyright (C) 2019-2021 Trinity College Dublin (www.tcd.ie)