helper: update copyright format

Update all helper files to use the new shorter copyright format:

/* SPDX-License-Identifier: BSD-3-Clause
 * Copyright (c) <YEAR> <COPYRIGHT HOLDER>
 */

Signed-off-by: Matias Elo <matias.elo@nokia.com>
Reviewed-by: Petri Savolainen <petri.savolainen@nokia.com>

51 files changed, 107 insertions, 205 deletions

diff --git a/helper/chksum.c b/helper/chksum.c
index 0ac07393b..69781291c 100644
--- a/helper/chksum.c
+++ b/helper/chksum.c
@@ -1,7 +1,5 @@
-/* Copyright (c) 2016-2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2016-2018 Linaro Limited
  */
 
 #include <odp_api.h>
diff --git a/helper/cli.c b/helper/cli.c
index fef42ec61..4ce4bf62e 100644
--- a/helper/cli.c
+++ b/helper/cli.c
@@ -1,7 +1,5 @@
-/* Copyright (c) 2021-2022, Nokia
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021-2022 Nokia
  */
 
 #include <odp/helper/cli.h>
diff --git a/helper/cuckootable.c b/helper/cuckootable.c
index 0a71ca388..85f715b3c 100644
--- a/helper/cuckootable.c
+++ b/helper/cuckootable.c
@@ -1,7 +1,5 @@
-/* Copyright (c) 2016-2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2016-2018 Linaro Limited
  */
 
 /*-
diff --git a/helper/eth.c b/helper/eth.c
index 12218442d..171563ca8 100644
--- a/helper/eth.c
+++ b/helper/eth.c
@@ -1,7 +1,5 @@
-/* Copyright (c) 2016-2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2016-2018 Linaro Limited
  */
 
 #include <odp/helper/eth.h>
diff --git a/helper/hashtable.c b/helper/hashtable.c
index fc1774bb0..28c23a58c 100644
--- a/helper/hashtable.c
+++ b/helper/hashtable.c
@@ -1,7 +1,5 @@
-/* Copyright (c) 2015-2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:   BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2015-2018 Linaro Limited
  */
 
 #include <stdio.h>
diff --git a/helper/include/odp/helper/chksum.h b/helper/include/odp/helper/chksum.h
index b9d808bb2..f9b3f2dc2 100644
--- a/helper/include/odp/helper/chksum.h
+++ b/helper/include/odp/helper/chksum.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2014-2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2014-2018 Linaro Limited
  */
 
 /**
diff --git a/helper/include/odp/helper/cli.h b/helper/include/odp/helper/cli.h
index 57e958568..8a77ab763 100644
--- a/helper/include/odp/helper/cli.h
+++ b/helper/include/odp/helper/cli.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2021, Nokia
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021 Nokia
  */
 
 /**
diff --git a/helper/include/odp/helper/deprecated.h b/helper/include/odp/helper/deprecated.h
index 3415b2127..9251f2ca8 100644
--- a/helper/include/odp/helper/deprecated.h
+++ b/helper/include/odp/helper/deprecated.h
@@ -1,8 +1,6 @@
-/* Copyright (c) 2017-2018, Linaro Limited
- * Copyright (c) 2021, Nokia
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ * Copyright (c) 2021 Nokia
  */
 
 /**
diff --git a/helper/include/odp/helper/eth.h b/helper/include/odp/helper/eth.h
index 329a39af4..2a1f3f159 100644
--- a/helper/include/odp/helper/eth.h
+++ b/helper/include/odp/helper/eth.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2014-2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2014-2018 Linaro Limited
  */
 
 /**
diff --git a/helper/include/odp/helper/gtp.h b/helper/include/odp/helper/gtp.h
index eddfac754..e9f5a8c61 100644
--- a/helper/include/odp/helper/gtp.h
+++ b/helper/include/odp/helper/gtp.h
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2020 Marvell.
+ * Copyright(c) 2020 Marvell
  */
+
 /**
  * @file
  *
diff --git a/helper/include/odp/helper/icmp.h b/helper/include/odp/helper/icmp.h
index c2b463a24..8f3215428 100644
--- a/helper/include/odp/helper/icmp.h
+++ b/helper/include/odp/helper/icmp.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2014-2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:		 BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2014-2018 Linaro Limited
  */
 
 
diff --git a/helper/include/odp/helper/igmp.h b/helper/include/odp/helper/igmp.h
index 082da5272..7ab0d20ad 100644
--- a/helper/include/odp/helper/igmp.h
+++ b/helper/include/odp/helper/igmp.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2020 Marvell.
+ * Copyright(c) 2020 Marvell
  */
 
 /**
diff --git a/helper/include/odp/helper/ip.h b/helper/include/odp/helper/ip.h
index 5deb45150..733c145d8 100644
--- a/helper/include/odp/helper/ip.h
+++ b/helper/include/odp/helper/ip.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2014-2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2014-2018 Linaro Limited
  */
 
 /**
diff --git a/helper/include/odp/helper/ipsec.h b/helper/include/odp/helper/ipsec.h
index 734c13b18..11b7a3829 100644
--- a/helper/include/odp/helper/ipsec.h
+++ b/helper/include/odp/helper/ipsec.h
@@ -1,8 +1,6 @@
-/* Copyright (c) 2014-2018, Linaro Limited
- * Copyright (c) 2021, Nokia
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2014-2018 Linaro Limited
+ * Copyright (c) 2021 Nokia
  */
 
 
diff --git a/helper/include/odp/helper/linux.h b/helper/include/odp/helper/linux.h
index f63385ec1..df852569f 100644
--- a/helper/include/odp/helper/linux.h
+++ b/helper/include/odp/helper/linux.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017-2018, Linaro Limited
- * All rights reserved
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
  */
 
 /**
diff --git a/helper/include/odp/helper/linux/process.h b/helper/include/odp/helper/linux/process.h
index fd7faff6c..0f34d604b 100644
--- a/helper/include/odp/helper/linux/process.h
+++ b/helper/include/odp/helper/linux/process.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017-2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
  */
 
 /**
diff --git a/helper/include/odp/helper/linux/pthread.h b/helper/include/odp/helper/linux/pthread.h
index ee7700ebd..5a2f6fd53 100644
--- a/helper/include/odp/helper/linux/pthread.h
+++ b/helper/include/odp/helper/linux/pthread.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017-2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
  */
 
 /**
diff --git a/helper/include/odp/helper/odph_api.h b/helper/include/odp/helper/odph_api.h
index 3c321b9d4..b4e3985c8 100644
--- a/helper/include/odp/helper/odph_api.h
+++ b/helper/include/odp/helper/odph_api.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017-2018, Linaro Limited
- * All rights reserved
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
  */
 
 /**
diff --git a/helper/include/odp/helper/odph_cuckootable.h b/helper/include/odp/helper/odph_cuckootable.h
index 7056c5141..1c87a3d42 100644
--- a/helper/include/odp/helper/odph_cuckootable.h
+++ b/helper/include/odp/helper/odph_cuckootable.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2016-2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2016-2018 Linaro Limited
  */
 
 /*-
diff --git a/helper/include/odp/helper/odph_debug.h b/helper/include/odp/helper/odph_debug.h
index c78df2238..41b425ab2 100644
--- a/helper/include/odp/helper/odph_debug.h
+++ b/helper/include/odp/helper/odph_debug.h
@@ -1,9 +1,6 @@
-/* Copyright (c) 2015-2018, Linaro Limited
- * Copyright (c) 2019, Nokia
- *
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2015-2018 Linaro Limited
+ * Copyright (c) 2019 Nokia
  */
 
 /**
diff --git a/helper/include/odp/helper/odph_hashtable.h b/helper/include/odp/helper/odph_hashtable.h
index 3921e0a2b..b2dd21920 100644
--- a/helper/include/odp/helper/odph_hashtable.h
+++ b/helper/include/odp/helper/odph_hashtable.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2015-2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2015-2018 Linaro Limited
  */
 
 /**
diff --git a/helper/include/odp/helper/odph_iplookuptable.h b/helper/include/odp/helper/odph_iplookuptable.h
index 017746d0d..41235ecc6 100644
--- a/helper/include/odp/helper/odph_iplookuptable.h
+++ b/helper/include/odp/helper/odph_iplookuptable.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2016-2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:    BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2016-2018 Linaro Limited
  */
 
 /**
diff --git a/helper/include/odp/helper/odph_lineartable.h b/helper/include/odp/helper/odph_lineartable.h
index 72b9472d0..dc61113a5 100644
--- a/helper/include/odp/helper/odph_lineartable.h
+++ b/helper/include/odp/helper/odph_lineartable.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2015-2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2015-2018 Linaro Limited
  */
 
 /**
diff --git a/helper/include/odp/helper/sctp.h b/helper/include/odp/helper/sctp.h
index da9773de7..f6661e390 100644
--- a/helper/include/odp/helper/sctp.h
+++ b/helper/include/odp/helper/sctp.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2014-2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2014-2018 Linaro Limited
  */
 
 /**
diff --git a/helper/include/odp/helper/strong_types.h b/helper/include/odp/helper/strong_types.h
index 72e3c3176..b0f504c16 100644
--- a/helper/include/odp/helper/strong_types.h
+++ b/helper/include/odp/helper/strong_types.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2015-2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2015-2018 Linaro Limited
  */
 
 /**
diff --git a/helper/include/odp/helper/table.h b/helper/include/odp/helper/table.h
index 711f8a202..6a24e742b 100644
--- a/helper/include/odp/helper/table.h
+++ b/helper/include/odp/helper/table.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2015-2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2015-2018 Linaro Limited
  */
 
 /**
diff --git a/helper/include/odp/helper/tcp.h b/helper/include/odp/helper/tcp.h
index 00dfe4e60..8a14efa15 100644
--- a/helper/include/odp/helper/tcp.h
+++ b/helper/include/odp/helper/tcp.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2014-2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2014-2018 Linaro Limited
  */
 
 
diff --git a/helper/include/odp/helper/threads.h b/helper/include/odp/helper/threads.h
index 785437ed1..358543c85 100644
--- a/helper/include/odp/helper/threads.h
+++ b/helper/include/odp/helper/threads.h
@@ -1,8 +1,6 @@
-/* Copyright (c) 2013-2018, Linaro Limited
- * Copyright (c) 2019-2021, Nokia
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2013-2018 Linaro Limited
+ * Copyright (c) 2019-2021 Nokia
  */
 
 
diff --git a/helper/include/odp/helper/udp.h b/helper/include/odp/helper/udp.h
index 0fe14ac48..53ac7281a 100644
--- a/helper/include/odp/helper/udp.h
+++ b/helper/include/odp/helper/udp.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2014-2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2014-2018 Linaro Limited
  */
 
 /**
diff --git a/helper/include/odp/helper/version.h.in b/helper/include/odp/helper/version.h.in
index d08b413c9..e576de561 100644
--- a/helper/include/odp/helper/version.h.in
+++ b/helper/include/odp/helper/version.h.in
@@ -1,7 +1,5 @@
-/* Copyright (c) 2019, Nokia
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2019 Nokia
  */
 
 
diff --git a/helper/include/odph_list_internal.h b/helper/include/odph_list_internal.h
index fd889d971..d90b07ebc 100644
--- a/helper/include/odph_list_internal.h
+++ b/helper/include/odph_list_internal.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2015-2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2015-2018 Linaro Limited
  */
 
 /**
diff --git a/helper/ip.c b/helper/ip.c
index 9e02892aa..964544ddb 100644
--- a/helper/ip.c
+++ b/helper/ip.c
@@ -1,7 +1,5 @@
-/* Copyright (c) 2016-2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2016-2018 Linaro Limited
  */
 
 #include <odp/helper/ip.h>
diff --git a/helper/iplookuptable.c b/helper/iplookuptable.c
index 22fd6e56c..31273a0a5 100644
--- a/helper/iplookuptable.c
+++ b/helper/iplookuptable.c
@@ -1,7 +1,5 @@
-/* Copyright (c) 2016-2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2016-2018 Linaro Limited
  */
 
 #include <string.h>
diff --git a/helper/ipsec.c b/helper/ipsec.c
index 05f8b841a..bb7d5d0eb 100644
--- a/helper/ipsec.c
+++ b/helper/ipsec.c
@@ -1,9 +1,7 @@
-/* Copyright (c) 2017-2018, Linaro Limited
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
  * Copyright (c) 2020 Marvell
  * Copyright (c) 2021 Nokia
- * All rights reserved.
- *
- * SPDX-License-Identifier:	 BSD-3-Clause
  */
 
 #include <odp/helper/ipsec.h>
diff --git a/helper/lineartable.c b/helper/lineartable.c
index a81e4301c..290a90c02 100644
--- a/helper/lineartable.c
+++ b/helper/lineartable.c
@@ -1,7 +1,5 @@
-/* Copyright (c) 2015-2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:	BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2015-2018 Linaro Limited
  */
 
 #include <stdio.h>
diff --git a/helper/linux/thread.c b/helper/linux/thread.c
index 3d90d794c..d5b016833 100644
--- a/helper/linux/thread.c
+++ b/helper/linux/thread.c
@@ -1,7 +1,5 @@
-/* Copyright (c) 2016-2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2016-2018 Linaro Limited
  */
 
 #ifndef _GNU_SOURCE
diff --git a/helper/test/chksum.c b/helper/test/chksum.c
index 3b1f8ed9f..d7273284a 100644
--- a/helper/test/chksum.c
+++ b/helper/test/chksum.c
@@ -1,7 +1,5 @@
-/* Copyright (c) 2015-2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2015-2018 Linaro Limited
  */
 
 #include <odp_api.h>
diff --git a/helper/test/cli.c b/helper/test/cli.c
index 4fa403f5a..08e750153 100644
--- a/helper/test/cli.c
+++ b/helper/test/cli.c
@@ -1,7 +1,5 @@
-/* Copyright (c) 2021, Nokia
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021 Nokia
  */
 
 #include <odp_api.h>
diff --git a/helper/test/cuckootable.c b/helper/test/cuckootable.c
index 06d207f07..d17f79562 100644
--- a/helper/test/cuckootable.c
+++ b/helper/test/cuckootable.c
@@ -1,7 +1,5 @@
-/* Copyright (c) 2016-2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2016-2018 Linaro Limited
  */
 
 /*-
diff --git a/helper/test/debug.c b/helper/test/debug.c
index 3b8a69d8b..78ffb6347 100644
--- a/helper/test/debug.c
+++ b/helper/test/debug.c
@@ -1,7 +1,5 @@
-/* Copyright (c) 2019, Nokia
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2019 Nokia
  */
 
 #include <odp/helper/autoheader_external.h>
diff --git a/helper/test/iplookuptable.c b/helper/test/iplookuptable.c
index bd724b1b7..669d334dd 100644
--- a/helper/test/iplookuptable.c
+++ b/helper/test/iplookuptable.c
@@ -1,7 +1,5 @@
-/* Copyright (c) 2016-2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2016-2018 Linaro Limited
  */
 
 #include <stdio.h>
diff --git a/helper/test/linux/process.c b/helper/test/linux/process.c
index 8d3f31af0..54614a695 100644
--- a/helper/test/linux/process.c
+++ b/helper/test/linux/process.c
@@ -1,7 +1,5 @@
-/* Copyright (c) 2015-2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2015-2018 Linaro Limited
  */
 
 #include <odp_api.h>
diff --git a/helper/test/linux/pthread.c b/helper/test/linux/pthread.c
index 770308faa..f6c624df7 100644
--- a/helper/test/linux/pthread.c
+++ b/helper/test/linux/pthread.c
@@ -1,7 +1,5 @@
-/* Copyright (c) 2015-2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2015-2018 Linaro Limited
  */
 
 #include <odp_api.h>
diff --git a/helper/test/odpthreads.c b/helper/test/odpthreads.c
index b7b4c2104..bf623569b 100644
--- a/helper/test/odpthreads.c
+++ b/helper/test/odpthreads.c
@@ -1,8 +1,6 @@
-/* Copyright (c) 2016-2018, Linaro Limited
- * Copyright (c) 2021, Nokia
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2016-2018 Linaro Limited
+ * Copyright (c) 2021 Nokia
  */
 
 /*
diff --git a/helper/test/odpthreads_as_processes b/helper/test/odpthreads_as_processes
index 88f759272..f71717b6b 100755
--- a/helper/test/odpthreads_as_processes
+++ b/helper/test/odpthreads_as_processes
@@ -1,9 +1,7 @@
 #!/bin/sh
 #
-# Copyright (c) 2016-2018, Linaro Limited
-# All rights reserved.
-#
-# SPDX-License-Identifier:	BSD-3-Clause
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (c) 2016-2018 Linaro Limited
 #
 
 PATH=$(dirname $0):$PATH
diff --git a/helper/test/odpthreads_as_pthreads b/helper/test/odpthreads_as_pthreads
index 92f43ef90..b666e1a4d 100755
--- a/helper/test/odpthreads_as_pthreads
+++ b/helper/test/odpthreads_as_pthreads
@@ -1,9 +1,7 @@
 #!/bin/sh
 #
-# Copyright (c) 2016-2018, Linaro Limited
-# All rights reserved.
-#
-# SPDX-License-Identifier:	BSD-3-Clause
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (c) 2016-2018 Linaro Limited
 #
 
 PATH=$(dirname $0):$PATH
diff --git a/helper/test/parse.c b/helper/test/parse.c
index 3097ae476..6f4dcc16c 100644
--- a/helper/test/parse.c
+++ b/helper/test/parse.c
@@ -1,7 +1,5 @@
-/* Copyright (c) 2016-2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2016-2018 Linaro Limited
  */
 
 #include <odp_api.h>
diff --git a/helper/test/table.c b/helper/test/table.c
index df7a23d6e..fb17e8a37 100644
--- a/helper/test/table.c
+++ b/helper/test/table.c
@@ -1,7 +1,5 @@
-/* Copyright (c) 2015-2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2015-2018 Linaro Limited
  */
 
 #include <odp_api.h>
diff --git a/helper/test/version.c b/helper/test/version.c
index 925d305da..17c971886 100644
--- a/helper/test/version.c
+++ b/helper/test/version.c
@@ -1,7 +1,5 @@
-/* Copyright (c) 2019, Nokia
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2019 Nokia
  */
 
 #include <odp_api.h>
diff --git a/helper/threads.c b/helper/threads.c
index 74f64b138..63b4cc019 100644
--- a/helper/threads.c
+++ b/helper/threads.c
@@ -1,8 +1,6 @@
-/* Copyright (c) 2013-2018, Linaro Limited
- * Copyright (c) 2019-2022, Nokia
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2013-2018 Linaro Limited
+ * Copyright (c) 2019-2022 Nokia
  */
 
 #ifndef _GNU_SOURCE
diff --git a/helper/version.c b/helper/version.c
index 586abbe41..f2635a6c2 100644
--- a/helper/version.c
+++ b/helper/version.c
@@ -1,7 +1,5 @@
-/* Copyright (c) 2019, Nokia
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2019 Nokia
  */
 
 #include <odp/helper/version.h>