diff --git a/boards/z16/z16f/z16f2800100zcog/include/board.h b/boards/z16/z16f/z16f2800100zcog/include/board.h
index 4fb58894dc2..0d6d7403abd 100644
--- a/boards/z16/z16f/z16f2800100zcog/include/board.h
+++ b/boards/z16/z16f/z16f2800100zcog/include/board.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * boards/z16/z16f/z16f2800100zcog/include/board.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/boards/z16/z16f/z16f2800100zcog/scripts/Make.defs b/boards/z16/z16f/z16f2800100zcog/scripts/Make.defs
index e6588c69ca7..9912a1caa5f 100644
--- a/boards/z16/z16f/z16f2800100zcog/scripts/Make.defs
+++ b/boards/z16/z16f/z16f2800100zcog/scripts/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # boards/z16/z16f/z16f2800100zcog/scripts/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/boards/z16/z16f/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd b/boards/z16/z16f/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd
index 36a03fc467e..751fd6301e0 100644
--- a/boards/z16/z16f/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd
+++ b/boards/z16/z16f/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd
@@ -1,22 +1,24 @@
-/****************************************************************************/
-/* boards/z16/z16f/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd          */
-/*                                                                          */
-/* Licensed to the Apache Software Foundation (ASF) under one or more       */
-/* contributor license agreements.  See the NOTICE file distributed with    */
-/* this work for additional information regarding copyright ownership.  The */
-/* ASF licenses this file to you under the Apache License, Version 2.0 (the */
-/* "License"); you may not use this file except in compliance with the      */
-/* License.  You may obtain a copy of the License at                        */
-/*                                                                          */
-/*   http://www.apache.org/licenses/LICENSE-2.0                             */
-/*                                                                          */
-/* Unless required by applicable law or agreed to in writing, software      */
-/* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT*/
-/* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the*/
-/* License for the specific language governing permissions and limitations  */
-/* under the License.                                                       */
-/*                                                                          */
-/****************************************************************************/
+/****************************************************************************
+ * boards/z16/z16f/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
 
 -FORMAT=OMF695,INTEL32
 -map -maxhexlen=64 -quiet -sort NAME=ascending -unresolved=fatal
diff --git a/boards/z16/z16f/z16f2800100zcog/src/Makefile b/boards/z16/z16f/z16f2800100zcog/src/Makefile
index e7d511e76f8..9f244f1b0c7 100644
--- a/boards/z16/z16f/z16f2800100zcog/src/Makefile
+++ b/boards/z16/z16f/z16f2800100zcog/src/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # boards/z16/z16f/z16f2800100zcog/src/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/boards/z16/z16f/z16f2800100zcog/src/z16f_appinit.c b/boards/z16/z16f/z16f2800100zcog/src/z16f_appinit.c
index 456a9843e3b..b641e0a455e 100644
--- a/boards/z16/z16f/z16f2800100zcog/src/z16f_appinit.c
+++ b/boards/z16/z16f/z16f2800100zcog/src/z16f_appinit.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * boards/z16/z16f/z16f2800100zcog/src/z16f_appinit.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/boards/z16/z16f/z16f2800100zcog/src/z16f_boot.c b/boards/z16/z16f/z16f2800100zcog/src/z16f_boot.c
index e9bd9f68a17..45836bbd403 100644
--- a/boards/z16/z16f/z16f2800100zcog/src/z16f_boot.c
+++ b/boards/z16/z16f/z16f2800100zcog/src/z16f_boot.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * boards/z16/z16f/z16f2800100zcog/src/z16f_boot.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/boards/z16/z16f/z16f2800100zcog/src/z16f_leds.c b/boards/z16/z16f/z16f2800100zcog/src/z16f_leds.c
index b6730a96d73..d34caa0f16d 100644
--- a/boards/z16/z16f/z16f2800100zcog/src/z16f_leds.c
+++ b/boards/z16/z16f/z16f2800100zcog/src/z16f_leds.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * boards/z16/z16f/z16f2800100zcog/src/z16f_leds.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/boards/z16/z16f/z16f2800100zcog/tools/dopatch.sh b/boards/z16/z16f/z16f2800100zcog/tools/dopatch.sh
index 0a5264a96b4..fab1511a6b9 100755
--- a/boards/z16/z16f/z16f2800100zcog/tools/dopatch.sh
+++ b/boards/z16/z16f/z16f2800100zcog/tools/dopatch.sh
@@ -2,6 +2,8 @@
 ############################################################################
 # boards/z16/z16f/z16f2800100zcog/tools/dopatch.sh
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The