17 files changed, 19 insertions, 37 deletions
diff --git a/tools/patman/README b/tools/patman/README
index 8582ed6ba1..606780e2ed 100644
--- a/tools/patman/README
+++ b/tools/patman/README
@@ -1,7 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0+
 # Copyright (c) 2011 The Chromium OS Authors.
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 What is this?
 =============
diff --git a/tools/patman/checkpatch.py b/tools/patman/checkpatch.py
index 2915d97950..d47ea438b7 100644
--- a/tools/patman/checkpatch.py
+++ b/tools/patman/checkpatch.py
@@ -1,7 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
 # Copyright (c) 2011 The Chromium OS Authors.
 #
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 import collections
 import command
diff --git a/tools/patman/command.py b/tools/patman/command.py
index bebc495b59..598bfdcd90 100644
--- a/tools/patman/command.py
+++ b/tools/patman/command.py
@@ -1,7 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
 # Copyright (c) 2011 The Chromium OS Authors.
 #
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 import os
 import cros_subprocess
diff --git a/tools/patman/commit.py b/tools/patman/commit.py
index 3e0adb8f7e..2bf3a0ba5b 100644
--- a/tools/patman/commit.py
+++ b/tools/patman/commit.py
@@ -1,7 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
 # Copyright (c) 2011 The Chromium OS Authors.
 #
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 import re
 
diff --git a/tools/patman/func_test.py b/tools/patman/func_test.py
index 2c0da84b30..85372f3c0a 100644
--- a/tools/patman/func_test.py
+++ b/tools/patman/func_test.py
@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
+# SPDX-License-Identifier:	GPL-2.0+
 #
 # Copyright 2017 Google, Inc
 #
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 import contextlib
 import os
diff --git a/tools/patman/get_maintainer.py b/tools/patman/get_maintainer.py
index 22b091808a..0ffb55a821 100644
--- a/tools/patman/get_maintainer.py
+++ b/tools/patman/get_maintainer.py
@@ -1,7 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
 # Copyright (c) 2012 The Chromium OS Authors.
 #
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 import command
 import gitutil
diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py
index 08be9377ce..64ac0c8d3d 100644
--- a/tools/patman/gitutil.py
+++ b/tools/patman/gitutil.py
@@ -1,7 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
 # Copyright (c) 2011 The Chromium OS Authors.
 #
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 import command
 import re
diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py
index 1b9136aa5c..b6455b0fa3 100644
--- a/tools/patman/patchstream.py
+++ b/tools/patman/patchstream.py
@@ -1,7 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
 # Copyright (c) 2011 The Chromium OS Authors.
 #
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 import math
 import os
diff --git a/tools/patman/patman.py b/tools/patman/patman.py
index 7647440be5..8d2c78235a 100755
--- a/tools/patman/patman.py
+++ b/tools/patman/patman.py
@@ -1,9 +1,8 @@
 #!/usr/bin/env python2
+# SPDX-License-Identifier: GPL-2.0+
 #
 # Copyright (c) 2011 The Chromium OS Authors.
 #
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 """See README for more information"""
 
diff --git a/tools/patman/project.py b/tools/patman/project.py
index e05ff1163f..1d9cfc0625 100644
--- a/tools/patman/project.py
+++ b/tools/patman/project.py
@@ -1,7 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
 # Copyright (c) 2012 The Chromium OS Authors.
 #
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 import os.path
 
diff --git a/tools/patman/series.py b/tools/patman/series.py
index 73ee394486..d526d4ee91 100644
--- a/tools/patman/series.py
+++ b/tools/patman/series.py
@@ -1,7 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
 # Copyright (c) 2011 The Chromium OS Authors.
 #
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 from __future__ import print_function
 
diff --git a/tools/patman/settings.py b/tools/patman/settings.py
index 92379b72e7..94ea5b5a1b 100644
--- a/tools/patman/settings.py
+++ b/tools/patman/settings.py
@@ -1,7 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
 # Copyright (c) 2011 The Chromium OS Authors.
 #
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 from __future__ import print_function
 
diff --git a/tools/patman/setup.py b/tools/patman/setup.py
index e61804f178..43fdc00ce6 100644
--- a/tools/patman/setup.py
+++ b/tools/patman/setup.py
@@ -1,6 +1,5 @@
-#
-# SPDX-License-Identifier:      GPL-2.0+
-#
+# SPDX-License-Identifier: GPL-2.0+
+
 from distutils.core import setup
 setup(name='patman',
       version='1.0',
diff --git a/tools/patman/terminal.py b/tools/patman/terminal.py
index 137265fc81..4ceab189bf 100644
--- a/tools/patman/terminal.py
+++ b/tools/patman/terminal.py
@@ -1,7 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
 # Copyright (c) 2011 The Chromium OS Authors.
 #
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 """Terminal utilities
 
diff --git a/tools/patman/test.py b/tools/patman/test.py
index 51145e8390..343efc99bd 100644
--- a/tools/patman/test.py
+++ b/tools/patman/test.py
@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
+# SPDX-License-Identifier: GPL-2.0+
 #
 # Copyright (c) 2011 The Chromium OS Authors.
 #
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 import os
 import tempfile
@@ -149,10 +148,10 @@ index 0000000..2234c87
 --- /dev/null
 +++ b/common/bootstage.c
 @@ -0,0 +1,37 @@
++/* SPDX-License-Identifier: GPL-2.0+ */
 +/*
 + * Copyright (c) 2011, Google Inc. All rights reserved.
 + *
-+ * SPDX-License-Identifier:	GPL-2.0+
 + */
 +
 +/*
diff --git a/tools/patman/tools.py b/tools/patman/tools.py
index ba24853030..700cb4505d 100644
--- a/tools/patman/tools.py
+++ b/tools/patman/tools.py
@@ -1,8 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
 #
 # Copyright (c) 2016 Google, Inc
 #
-# SPDX-License-Identifier:      GPL-2.0+
-#
 
 import os
 import shutil
diff --git a/tools/patman/tout.py b/tools/patman/tout.py
index c5fbd80dbc..4cd49e1c68 100644
--- a/tools/patman/tout.py
+++ b/tools/patman/tout.py
@@ -1,7 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
 # Copyright (c) 2016 Google, Inc
 #
-# SPDX-License-Identifier:            GPL-2.0+
-#
 # Terminal output logging.
 #