diff --git a/tools/dts/allwinnerA20.dts b/tools/dts/allwinnerA20.dts
index 412a8561c..e181d59e1 100644
--- a/tools/dts/allwinnerA20.dts
+++ b/tools/dts/allwinnerA20.dts
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/gpl-license.html
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @TAG(OTHER_GPL)
+ * @TAG(OTHER_GPL2P)
  */
 
 /dts-v1/;
diff --git a/tools/dts/am335x-boneblack.dts b/tools/dts/am335x-boneblack.dts
index e0f04c18b..d302bd222 100644
--- a/tools/dts/am335x-boneblack.dts
+++ b/tools/dts/am335x-boneblack.dts
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/gpl-license.html
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @TAG(OTHER_GPL)
+ * @TAG(OTHER_GPL2P)
  */
 
 /dts-v1/;
diff --git a/tools/dts/am335x-boneblue.dts b/tools/dts/am335x-boneblue.dts
index 0e172ff25..3bd466347 100644
--- a/tools/dts/am335x-boneblue.dts
+++ b/tools/dts/am335x-boneblue.dts
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/gpl-license.html
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @TAG(OTHER_GPL)
+ * @TAG(OTHER_GPL2P)
  */
 
 /dts-v1/;
diff --git a/tools/dts/apq8064.dts b/tools/dts/apq8064.dts
index d022fd88d..709f7033e 100644
--- a/tools/dts/apq8064.dts
+++ b/tools/dts/apq8064.dts
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/gpl-license.html
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @TAG(OTHER_GPL)
+ * @TAG(OTHER_GPL2P)
  */
 
 /dts-v1/;
diff --git a/tools/dts/ariane.dts b/tools/dts/ariane.dts
index 56224b8fa..a44a13190 100644
--- a/tools/dts/ariane.dts
+++ b/tools/dts/ariane.dts
@@ -1,3 +1,5 @@
+/* @TAG(OTHER_SHL51) */
+
 /* Copyright 2018 ETH Zurich and University of Bologna.
  * Copyright and related rights are licensed under the Solderpad Hardware
  * License, Version 0.51 (the "License"); you may not use this file except in
@@ -9,8 +11,6 @@
  * specific language governing permissions and limitations under the License.
  */
 
-/* @TAG(OTHER_GPL) */
-
 /dts-v1/;
 
 / {
diff --git a/tools/dts/exynos4.dts b/tools/dts/exynos4.dts
index 9c231044b..460a249fb 100644
--- a/tools/dts/exynos4.dts
+++ b/tools/dts/exynos4.dts
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/gpl-license.html
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @TAG(OTHER_GPL)
+ * @TAG(OTHER_GPL2P)
  */
 
 /dts-v1/;
diff --git a/tools/dts/exynos5250.dts b/tools/dts/exynos5250.dts
index b1370146c..8e7b1d5d1 100644
--- a/tools/dts/exynos5250.dts
+++ b/tools/dts/exynos5250.dts
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/gpl-license.html
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @TAG(OTHER_GPL)
+ * @TAG(OTHER_GPL2P)
  */
 
 /dts-v1/;
diff --git a/tools/dts/exynos5410.dts b/tools/dts/exynos5410.dts
index 777c3459f..7e83d5ffb 100644
--- a/tools/dts/exynos5410.dts
+++ b/tools/dts/exynos5410.dts
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/gpl-license.html
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @TAG(OTHER_GPL)
+ * @TAG(OTHER_GPL2P)
  */
 
 /dts-v1/;
diff --git a/tools/dts/exynos5422.dts b/tools/dts/exynos5422.dts
index dfa9bfd82..ccfbc58ee 100644
--- a/tools/dts/exynos5422.dts
+++ b/tools/dts/exynos5422.dts
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/gpl-license.html
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @TAG(OTHER_GPL)
+ * @TAG(OTHER_GPL2P)
  */
 
 /dts-v1/;
diff --git a/tools/dts/fvp.dts b/tools/dts/fvp.dts
index c3a040d7a..da69cdd97 100644
--- a/tools/dts/fvp.dts
+++ b/tools/dts/fvp.dts
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/gpl-license.html
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @TAG(OTHER_GPL)
+ * @TAG(OTHER_GPL2P)
  */
 
 /dts-v1/;
diff --git a/tools/dts/hifive.dts b/tools/dts/hifive.dts
index 1fdde2ac7..f41f354f3 100644
--- a/tools/dts/hifive.dts
+++ b/tools/dts/hifive.dts
@@ -1,9 +1,9 @@
+/* @TAG(OTHER_GPL2P) */
+
 /* Copyright (c) 2018 SiFive, Inc */
 /* SPDX-License-Identifier: Apache-2.0 */
 /* SPDX-License-Identifier: GPL-2.0-or-later */
-/* See the file LICENSE for further information */
 
-/* @TAG(OTHER_GPL) */
 /dts-v1/;
 
 / {
diff --git a/tools/dts/hikey.dts b/tools/dts/hikey.dts
index c0904e5de..8e499bde1 100644
--- a/tools/dts/hikey.dts
+++ b/tools/dts/hikey.dts
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/gpl-license.html
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @TAG(OTHER_GPL)
+ * @TAG(OTHER_GPL2P)
  */
 
 /dts-v1/;
diff --git a/tools/dts/imx7sabre.dts b/tools/dts/imx7sabre.dts
index 6ab668246..99e60e622 100644
--- a/tools/dts/imx7sabre.dts
+++ b/tools/dts/imx7sabre.dts
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/gpl-license.html
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @TAG(OTHER_GPL)
+ * @TAG(OTHER_GPL2P)
  */
 
 /dts-v1/;
diff --git a/tools/dts/imx8mm-evk.dts b/tools/dts/imx8mm-evk.dts
index dec1d6072..fd5ef83ba 100644
--- a/tools/dts/imx8mm-evk.dts
+++ b/tools/dts/imx8mm-evk.dts
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/gpl-license.html
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @TAG(OTHER_GPL)
+ * @TAG(OTHER_GPL2P)
  */
 
 /dts-v1/;
diff --git a/tools/dts/imx8mq-evk.dts b/tools/dts/imx8mq-evk.dts
index 01526f5df..35a3185e1 100644
--- a/tools/dts/imx8mq-evk.dts
+++ b/tools/dts/imx8mq-evk.dts
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/gpl-license.html
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @TAG(OTHER_GPL)
+ * @TAG(OTHER_GPL2P)
  */
 
 /dts-v1/;
diff --git a/tools/dts/kzm.dts b/tools/dts/kzm.dts
index 48b8142d7..373f38183 100644
--- a/tools/dts/kzm.dts
+++ b/tools/dts/kzm.dts
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/gpl-license.html
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @TAG(OTHER_GPL)
+ * @TAG(OTHER_GPL2P)
  */
 
 /dts-v1/;
diff --git a/tools/dts/odroidc2.dts b/tools/dts/odroidc2.dts
index 1c5c8c152..3dab34362 100644
--- a/tools/dts/odroidc2.dts
+++ b/tools/dts/odroidc2.dts
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/gpl-license.html
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @TAG(OTHER_GPL)
+ * @TAG(OTHER_GPL2P)
  */
 
 /dts-v1/;
diff --git a/tools/dts/omap3.dts b/tools/dts/omap3.dts
index ed1af390f..cf8471bab 100644
--- a/tools/dts/omap3.dts
+++ b/tools/dts/omap3.dts
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/gpl-license.html
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @TAG(OTHER_GPL)
+ * @TAG(OTHER_GPL2P)
  */
 
 /dts-v1/;
diff --git a/tools/dts/rocketchip.dts b/tools/dts/rocketchip.dts
index d1dfec837..25a55f406 100644
--- a/tools/dts/rocketchip.dts
+++ b/tools/dts/rocketchip.dts
@@ -1,4 +1,4 @@
-/* @TAG(OTHER_GPL) */
+/* @TAG(OTHER_BSD3) */
 
 /*
  * Copyright (c) 2012-2014, The Regents of the University of California
@@ -14,12 +14,12 @@
  *  3. Neither the name of the Regents nor the
  *     names of its contributors may be used to endorse or promote products
  *     derived from this software without specific prior written permission.
- *  
+ *
  *  IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
  *  SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING
  *  OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF REGENTS HAS
  *  BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *  
+ *
  *  REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  *  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  *  PURPOSE. THE SOFTWARE AND ACCOMPANYING DOCUMENTATION, IF ANY, PROVIDED
diff --git a/tools/dts/rockpro64.dts b/tools/dts/rockpro64.dts
index 09f1f565e..c5fbba700 100644
--- a/tools/dts/rockpro64.dts
+++ b/tools/dts/rockpro64.dts
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/gpl-license.html
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @TAG(OTHER_GPL)
+ * @TAG(OTHER_GPL2P)
  */
 
 /dts-v1/;
@@ -1808,7 +1808,7 @@
 		clocks = < 0x08 0x17c >;
 		interrupts = < 0x00 0x78 0x04 0x00 >;
 	};
-/* 
+/*
 For future reference timer blocks are 0x20
 and sit next to one another from a base address.
 */
diff --git a/tools/dts/rpi3.dts b/tools/dts/rpi3.dts
index 53e4d8202..8f31f6076 100644
--- a/tools/dts/rpi3.dts
+++ b/tools/dts/rpi3.dts
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/gpl-license.html
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @TAG(OTHER_GPL)
+ * @TAG(OTHER_GPL2P)
  */
 
 /dts-v1/;
diff --git a/tools/dts/sabre.dts b/tools/dts/sabre.dts
index 8ed305da4..52ad08047 100644
--- a/tools/dts/sabre.dts
+++ b/tools/dts/sabre.dts
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/gpl-license.html
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @TAG(OTHER_GPL)
+ * @TAG(OTHER_GPL2P)
  */
 
 /dts-v1/;
diff --git a/tools/dts/spike.dts b/tools/dts/spike.dts
index e6cc9d547..24e1b6711 100644
--- a/tools/dts/spike.dts
+++ b/tools/dts/spike.dts
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/gpl-license.html
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @TAG(OTHER_GPL)
+ * @TAG(OTHER_GPL2P)
  */
 
 /dts-v1/;
diff --git a/tools/dts/spike32.dts b/tools/dts/spike32.dts
index 6320db8c6..fffb2c6f8 100644
--- a/tools/dts/spike32.dts
+++ b/tools/dts/spike32.dts
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/gpl-license.html
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @TAG(OTHER_GPL)
+ * @TAG(OTHER_GPL2P)
  */
 
 /dts-v1/;
diff --git a/tools/dts/tk1.dts b/tools/dts/tk1.dts
index 05bdd80c0..6fc4927dc 100644
--- a/tools/dts/tk1.dts
+++ b/tools/dts/tk1.dts
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/gpl-license.html
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @TAG(OTHER_GPL)
+ * @TAG(OTHER_GPL2P)
  */
 
 /dts-v1/;
diff --git a/tools/dts/tx1.dts b/tools/dts/tx1.dts
index 3415a4451..80f62a1fa 100644
--- a/tools/dts/tx1.dts
+++ b/tools/dts/tx1.dts
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/gpl-license.html
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @TAG(OTHER_GPL)
+ * @TAG(OTHER_GPL2P)
  */
 
 /dts-v1/;
diff --git a/tools/dts/tx2.dts b/tools/dts/tx2.dts
index 212bc24af..bad1d3451 100644
--- a/tools/dts/tx2.dts
+++ b/tools/dts/tx2.dts
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/gpl-license.html
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @TAG(OTHER_GPL)
+ * @TAG(OTHER_GPL2P)
  */
 
 /dts-v1/;
diff --git a/tools/dts/ultra96.dts b/tools/dts/ultra96.dts
index 288bad739..c052ad5e5 100644
--- a/tools/dts/ultra96.dts
+++ b/tools/dts/ultra96.dts
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/gpl-license.html
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @TAG(OTHER_GPL)
+ * @TAG(OTHER_GPL2P)
  */
 
 /dts-v1/;
diff --git a/tools/dts/update-dts.sh b/tools/dts/update-dts.sh
index 978812e74..f38ae83d9 100755
--- a/tools/dts/update-dts.sh
+++ b/tools/dts/update-dts.sh
@@ -38,7 +38,7 @@ LICENSE="/*
  * http://www.opensource.org/licenses/gpl-license.html
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @TAG(OTHER_GPL)
+ * @TAG(OTHER_GPL2P)
  */
 "
 
diff --git a/tools/dts/wandq.dts b/tools/dts/wandq.dts
index 1865ce38c..26f5c49be 100644
--- a/tools/dts/wandq.dts
+++ b/tools/dts/wandq.dts
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/gpl-license.html
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @TAG(OTHER_GPL)
+ * @TAG(OTHER_GPL2P)
  */
 
 /dts-v1/;
diff --git a/tools/dts/zynq7000.dts b/tools/dts/zynq7000.dts
index f9586f7ac..4d87e1cf6 100644
--- a/tools/dts/zynq7000.dts
+++ b/tools/dts/zynq7000.dts
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/gpl-license.html
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @TAG(OTHER_GPL)
+ * @TAG(OTHER_GPL2P)
  */
 
 /dts-v1/;
diff --git a/tools/dts/zynqmp.dts b/tools/dts/zynqmp.dts
index eddbc7aed..e8aa093f9 100644
--- a/tools/dts/zynqmp.dts
+++ b/tools/dts/zynqmp.dts
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/gpl-license.html
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @TAG(OTHER_GPL)
+ * @TAG(OTHER_GPL2P)
  */
 
 /dts-v1/;
diff --git a/tools/lex.py b/tools/lex.py
index b60666154..2f68ba905 100644
--- a/tools/lex.py
+++ b/tools/lex.py
@@ -1,6 +1,5 @@
-#
-# @TAG(OTHER_BSD)
-#
+# @TAG(OTHER_BSD3)
+
 # -----------------------------------------------------------------------------
 # ply: lex.py
 #