diff --git a/pyocd/board/__init__.py b/pyocd/board/__init__.py
index a1eb82b8e..030dfc1c2 100644
--- a/pyocd/board/__init__.py
+++ b/pyocd/board/__init__.py
@@ -1,17 +1,16 @@
-"""
- mbed CMSIS-DAP debugger
- Copyright (c) 2006-2013,2018 ARM Limited
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2006-2013,2018 Arm Limited
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 
diff --git a/pyocd/board/board.py b/pyocd/board/board.py
index b2dc8769c..70ad9f119 100644
--- a/pyocd/board/board.py
+++ b/pyocd/board/board.py
@@ -1,19 +1,18 @@
-"""
- mbed CMSIS-DAP debugger
- Copyright (c) 2006-2013,2018 ARM Limited
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2006-2013,2018 Arm Limited
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 
 from ..target import TARGET
 from ..target.pack import pack_target
diff --git a/pyocd/gdbserver/context_facade.py b/pyocd/gdbserver/context_facade.py
index b19a3f6e9..980647b4d 100644
--- a/pyocd/gdbserver/context_facade.py
+++ b/pyocd/gdbserver/context_facade.py
@@ -1,19 +1,18 @@
-"""
- mbed CMSIS-DAP debugger
- Copyright (c) 2016,2018 ARM Limited
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2016,2018 Arm Limited
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 
 from ..utility import conversion
 from ..core.memory_map import MemoryType
diff --git a/pyocd/probe/pydapaccess/cmsis_dap_core.py b/pyocd/probe/pydapaccess/cmsis_dap_core.py
index 2790be6f3..564da0ccb 100644
--- a/pyocd/probe/pydapaccess/cmsis_dap_core.py
+++ b/pyocd/probe/pydapaccess/cmsis_dap_core.py
@@ -1,19 +1,18 @@
-"""
- mbed CMSIS-DAP debugger
- Copyright (c) 2006-2013,2018 ARM Limited
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2006-2013,2018 Arm Limited
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 
 import array
 from .dap_access_api import DAPAccessIntf
diff --git a/pyocd/probe/pydapaccess/dap_access_api.py b/pyocd/probe/pydapaccess/dap_access_api.py
index d271d7d03..ce42dc194 100644
--- a/pyocd/probe/pydapaccess/dap_access_api.py
+++ b/pyocd/probe/pydapaccess/dap_access_api.py
@@ -1,19 +1,18 @@
-"""
- mbed CMSIS-DAP debugger
- Copyright (c) 2006-2013,2018 ARM Limited
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2006-2013,2018 Arm Limited
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 
 
 from enum import Enum
diff --git a/pyocd/probe/pydapaccess/dap_access_cmsis_dap.py b/pyocd/probe/pydapaccess/dap_access_cmsis_dap.py
index 444ab5c51..164c4e622 100644
--- a/pyocd/probe/pydapaccess/dap_access_cmsis_dap.py
+++ b/pyocd/probe/pydapaccess/dap_access_cmsis_dap.py
@@ -1,19 +1,18 @@
-"""
- mbed CMSIS-DAP debugger
- Copyright (c) 2006-2013,2018 ARM Limited
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2006-2013,2018 Arm Limited
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 
 
 import re
diff --git a/pyocd/probe/pydapaccess/interface/interface.py b/pyocd/probe/pydapaccess/interface/interface.py
index aebd232f9..159e3c10a 100644
--- a/pyocd/probe/pydapaccess/interface/interface.py
+++ b/pyocd/probe/pydapaccess/interface/interface.py
@@ -1,19 +1,18 @@
-"""
- mbed CMSIS-DAP debugger
- Copyright (c) 2006-2013,2018 ARM Limited
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2006-2013,2018 Arm Limited
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 
 
 class Interface(object):
diff --git a/pyocd/target/builtin/target_K32W042S1M2xxx.py b/pyocd/target/builtin/target_K32W042S1M2xxx.py
index 1a7993569..ce2e090cb 100644
--- a/pyocd/target/builtin/target_K32W042S1M2xxx.py
+++ b/pyocd/target/builtin/target_K32W042S1M2xxx.py
@@ -154,7 +154,7 @@
     'analyzer_address' : 0x8000000,  # Analyzer 0x8000000..0x80000600
     'page_buffers' : [0x20003000, 0x20004000],   # Enable double buffering
     'min_program_length' : 8,
-};
+}
 
 class K32W042S(Kinetis):
 
diff --git a/pyocd/target/builtin/target_LPC1114FN28_102.py b/pyocd/target/builtin/target_LPC1114FN28_102.py
index 5137a72f0..c45d3b247 100644
--- a/pyocd/target/builtin/target_LPC1114FN28_102.py
+++ b/pyocd/target/builtin/target_LPC1114FN28_102.py
@@ -50,7 +50,7 @@
     'page_size' : 0x00001000,
     'min_program_length' : 1024,
     'analyzer_supported' : False,
-};
+}
 
 class Flash_lpc11xx_32(Flash):
     def __init__(self, target):
diff --git a/pyocd/target/builtin/target_LPC11U24FBD64_401.py b/pyocd/target/builtin/target_LPC11U24FBD64_401.py
index 2f73ce79d..468e1e065 100644
--- a/pyocd/target/builtin/target_LPC11U24FBD64_401.py
+++ b/pyocd/target/builtin/target_LPC11U24FBD64_401.py
@@ -45,7 +45,7 @@
                'static_base' : 0x1000019c,
                'min_program_length' : 256,
                'analyzer_supported' : False
-              };
+              }
 
 class Flash_lpc11u24(Flash):
 
diff --git a/pyocd/target/builtin/target_LPC1768.py b/pyocd/target/builtin/target_LPC1768.py
index 0345e5fea..eaa10ab2b 100644
--- a/pyocd/target/builtin/target_LPC1768.py
+++ b/pyocd/target/builtin/target_LPC1768.py
@@ -55,7 +55,7 @@
                'min_program_length' : 256,
                'analyzer_supported' : True,
                'analyzer_address' : 0x10002000  # Analyzer 0x10002000..0x10002600
-              };
+              }
 
 class Flash_lpc1768(Flash):
 
diff --git a/pyocd/target/builtin/target_LPC4330.py b/pyocd/target/builtin/target_LPC4330.py
index 33b180bf2..db25f50e2 100644
--- a/pyocd/target/builtin/target_LPC4330.py
+++ b/pyocd/target/builtin/target_LPC4330.py
@@ -1,19 +1,18 @@
-"""
- mbed CMSIS-DAP debugger
- Copyright (c) 2006-2015,2018 ARM Limited
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2006-2015,2018 Arm Limited
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 
 from ...core.coresight_target import (SVDFile, CoreSightTarget)
 from ...core.memory_map import (FlashRegion, RamRegion, MemoryMap)
@@ -311,7 +310,7 @@
                'min_program_length' : 512,
                'analyzer_supported' : False,    # Analyzer works, but would fail if a full ROM analysis was performed since there is not enough ram
                'analyzer_address' : 0x10005000  # Analyzer 0x10005000..0x10005600
-              };
+              }
 
 class LPC4330(CoreSightTarget):
 
diff --git a/pyocd/target/builtin/target_LPC54114J256BD64.py b/pyocd/target/builtin/target_LPC54114J256BD64.py
index cb189da12..4c99ce36b 100644
--- a/pyocd/target/builtin/target_LPC54114J256BD64.py
+++ b/pyocd/target/builtin/target_LPC54114J256BD64.py
@@ -55,7 +55,7 @@
     'page_size' : 0x00000100,
     'min_program_length' : 256,
     'analyzer_supported' : False
-};
+}
 
 class Flash_lpc54114(Flash):
     def __init__(self, target):
diff --git a/pyocd/target/builtin/target_LPC54608J512ET180.py b/pyocd/target/builtin/target_LPC54608J512ET180.py
index 0046cd6ea..8aba35cce 100644
--- a/pyocd/target/builtin/target_LPC54608J512ET180.py
+++ b/pyocd/target/builtin/target_LPC54608J512ET180.py
@@ -51,7 +51,7 @@
     'page_size' : 0x00000100,
     'min_program_length' : 256,
     'analyzer_supported' : False
-};
+}
 
 class Flash_lpc54608(Flash):
     def __init__(self, target):
diff --git a/pyocd/target/builtin/target_MAX32600.py b/pyocd/target/builtin/target_MAX32600.py
index e15ded0ee..afcb5f86a 100644
--- a/pyocd/target/builtin/target_MAX32600.py
+++ b/pyocd/target/builtin/target_MAX32600.py
@@ -1,19 +1,18 @@
-"""
- mbed CMSIS-DAP debugger
- Copyright (c) 2006-2013,2018 ARM Limited
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2006-2013,2018 Arm Limited
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 
 from ...flash.flash import Flash
 from ...core.coresight_target import CoreSightTarget
@@ -51,7 +50,7 @@
                'min_program_length' : 4,
                'analyzer_supported' : True,
                'analyzer_address' : 0x20004000  # Analyzer 0x20004000..0x20004600
-              };
+              }
 
 class MAX32600(CoreSightTarget):
 
diff --git a/pyocd/target/builtin/target_MAX32620.py b/pyocd/target/builtin/target_MAX32620.py
index 70f6af253..5485fb7b1 100644
--- a/pyocd/target/builtin/target_MAX32620.py
+++ b/pyocd/target/builtin/target_MAX32620.py
@@ -1,19 +1,18 @@
-"""
- mbed CMSIS-DAP debugger
- Copyright (c) 2006-2013,2018 ARM Limited
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2006-2013,2018 Arm Limited
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 
 from ...flash.flash import Flash
 from ...core.coresight_target import CoreSightTarget
@@ -56,7 +55,7 @@
                'min_program_length' : 4,
                'analyzer_supported' : True,
                'analyzer_address'   : 0x2000A000                  # Analyzer 0x2000A000..0x2000A600
-              };
+              }
 
 class MAX32620(CoreSightTarget):
 
diff --git a/pyocd/target/builtin/target_MAX32625.py b/pyocd/target/builtin/target_MAX32625.py
index 398fc7eeb..99c5e053d 100644
--- a/pyocd/target/builtin/target_MAX32625.py
+++ b/pyocd/target/builtin/target_MAX32625.py
@@ -1,19 +1,18 @@
-"""
- mbed CMSIS-DAP debugger
- Copyright (c) 2006-2013,2018 ARM Limited
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2006-2013,2018 Arm Limited
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 
 from ...flash.flash import Flash
 from ...core.coresight_target import CoreSightTarget
@@ -56,7 +55,7 @@
                'min_program_length' : 4,
                'analyzer_supported' : True,
                'analyzer_address'   : 0x2000A000                  # Analyzer 0x2000A000..0x2000A600
-              };
+              }
 
 class MAX32625(CoreSightTarget):
 
diff --git a/pyocd/target/builtin/target_MAX32630.py b/pyocd/target/builtin/target_MAX32630.py
index 6c8473a03..90181cb96 100644
--- a/pyocd/target/builtin/target_MAX32630.py
+++ b/pyocd/target/builtin/target_MAX32630.py
@@ -1,19 +1,18 @@
-"""
- mbed CMSIS-DAP debugger
- Copyright (c) 2006-2013,2018 ARM Limited
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2006-2013,2018 Arm Limited
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 
 from ...flash.flash import Flash
 from ...core.coresight_target import CoreSightTarget
@@ -56,7 +55,7 @@
                'min_program_length' : 4,
                'analyzer_supported' : True,
                'analyzer_address'   : 0x2000A000                  # Analyzer 0x2000A000..0x2000A600
-              };
+              }
 
 class MAX32630(CoreSightTarget):
 
diff --git a/pyocd/target/builtin/target_MIMXRT1021xxxxx.py b/pyocd/target/builtin/target_MIMXRT1021xxxxx.py
index 46b8c206f..6b109df7a 100644
--- a/pyocd/target/builtin/target_MIMXRT1021xxxxx.py
+++ b/pyocd/target/builtin/target_MIMXRT1021xxxxx.py
@@ -1,20 +1,19 @@
-"""
- mbed CMSIS-DAP debugger
- Copyright (c) 2017 NXP
- Copyright (c) 2018 Arm Ltd
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2017 NXP
+# Copyright (c) 2018 Arm Limited
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 
 from ...flash.flash import Flash
 from ...core.coresight_target import CoreSightTarget
diff --git a/pyocd/target/builtin/target_MIMXRT1052xxxxB.py b/pyocd/target/builtin/target_MIMXRT1052xxxxB.py
index d342a2f25..d45c83013 100644
--- a/pyocd/target/builtin/target_MIMXRT1052xxxxB.py
+++ b/pyocd/target/builtin/target_MIMXRT1052xxxxB.py
@@ -1,20 +1,19 @@
-"""
- mbed CMSIS-DAP debugger
- Copyright (c) 2017 NXP
- Copyright (c) 2018 Arm Ltd
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2017 NXP
+# Copyright (c) 2018 Arm Limited
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 
 from ...flash.flash import Flash
 from ...core.coresight_target import CoreSightTarget
diff --git a/pyocd/target/builtin/target_MK20DX128xxx5.py b/pyocd/target/builtin/target_MK20DX128xxx5.py
index ea2c23146..bd7e75096 100644
--- a/pyocd/target/builtin/target_MK20DX128xxx5.py
+++ b/pyocd/target/builtin/target_MK20DX128xxx5.py
@@ -71,7 +71,7 @@
                'min_program_length' : 8,
                'analyzer_supported' : True,
                'analyzer_address' : 0x1fffe000  # Analyzer 0x1fffe000..0x1fffe600
-              };
+              }
 
 class K20D50M(Kinetis):
 
diff --git a/pyocd/target/builtin/target_MK22FN1M0Axxx12.py b/pyocd/target/builtin/target_MK22FN1M0Axxx12.py
index 590b851c3..791fd8662 100644
--- a/pyocd/target/builtin/target_MK22FN1M0Axxx12.py
+++ b/pyocd/target/builtin/target_MK22FN1M0Axxx12.py
@@ -87,7 +87,7 @@
     'analyzer_address' : 0x1ffff000,  # Analyzer 0x1ffff000..0x1ffff600
     'page_buffers' : [0x20003000, 0x20004000],   # Enable double buffering
     'min_program_length' : 8,
-};
+}
 
 class K22FA12(Kinetis):
 
diff --git a/pyocd/target/builtin/target_MK22FN512xxx12.py b/pyocd/target/builtin/target_MK22FN512xxx12.py
index 1f17f4ab4..057ecfdad 100644
--- a/pyocd/target/builtin/target_MK22FN512xxx12.py
+++ b/pyocd/target/builtin/target_MK22FN512xxx12.py
@@ -1,19 +1,18 @@
-"""
- mbed CMSIS-DAP debugger
- Copyright (c) 2006-2013,2018 ARM Limited
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2006-2013,2018 Arm Limited
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 
 from ..family.target_kinetis import Kinetis
 from ..family.flash_kinetis import Flash_Kinetis
@@ -73,7 +72,7 @@
                'min_program_length' : 8,
                'analyzer_supported' : True,
                'analyzer_address' : 0x1ffff000  # Analyzer 0x1ffff000..0x1ffff600
-              };
+              }
 
 class K22F(Kinetis):
 
diff --git a/pyocd/target/builtin/target_MK28FN2M0xxx15.py b/pyocd/target/builtin/target_MK28FN2M0xxx15.py
index dd0a1c875..7a5e71e8b 100644
--- a/pyocd/target/builtin/target_MK28FN2M0xxx15.py
+++ b/pyocd/target/builtin/target_MK28FN2M0xxx15.py
@@ -1,19 +1,18 @@
-"""
- mbed CMSIS-DAP debugger
- Copyright (c) 2016,2018 ARM Limited
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2016,2018 Arm Limited
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 
 from ..family.target_kinetis import Kinetis
 from ..family.flash_kinetis import Flash_Kinetis
@@ -73,7 +72,7 @@
     'analyzer_address' : 0x1ffff000,  # Analyzer 0x1ffff000..0x1ffff600
     'page_buffers' : [0x20003000, 0x20004000],   # Enable double buffering
     'min_program_length' : 8,
-  };
+  }
 
 class K28F15(Kinetis):
 
diff --git a/pyocd/target/builtin/target_MK64FN1M0xxx12.py b/pyocd/target/builtin/target_MK64FN1M0xxx12.py
index e16b6ba72..f163b9559 100644
--- a/pyocd/target/builtin/target_MK64FN1M0xxx12.py
+++ b/pyocd/target/builtin/target_MK64FN1M0xxx12.py
@@ -71,7 +71,7 @@
                'min_program_length' : 8,
                'analyzer_supported' : True,
                'analyzer_address' : 0x1ffff000  # Analyzer 0x1ffff000..0x1ffff600
-              };
+              }
 
 class K64F(Kinetis):
 
diff --git a/pyocd/target/builtin/target_MK66FN2M0xxx18.py b/pyocd/target/builtin/target_MK66FN2M0xxx18.py
index e60eb32a1..528c166a4 100644
--- a/pyocd/target/builtin/target_MK66FN2M0xxx18.py
+++ b/pyocd/target/builtin/target_MK66FN2M0xxx18.py
@@ -1,19 +1,18 @@
-"""
- mbed CMSIS-DAP debugger
- Copyright (c) 2016,2018 ARM Limited
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2016,2018 Arm Limited
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 
 from ..family.target_kinetis import Kinetis
 from ..family.flash_kinetis import Flash_Kinetis
@@ -73,7 +72,7 @@
     'analyzer_address' : 0x1ffff000,  # Analyzer 0x1ffff000..0x1ffff600
     'page_buffers' : [0x20003000, 0x20004000],   # Enable double buffering
     'min_program_length' : 8,
-  };
+  }
 
 class K66F18(Kinetis):
 
diff --git a/pyocd/target/builtin/target_MK82FN256xxx15.py b/pyocd/target/builtin/target_MK82FN256xxx15.py
index 6a7df9e26..00b290836 100644
--- a/pyocd/target/builtin/target_MK82FN256xxx15.py
+++ b/pyocd/target/builtin/target_MK82FN256xxx15.py
@@ -1,19 +1,18 @@
-"""
- Flash OS Routines (Automagically Generated)
- Copyright (c) 2009-2015,2018 ARM Limited
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2009-2015,2018 Arm Limited
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 
 from ..family.target_kinetis import Kinetis
 from ..family.flash_kinetis import Flash_Kinetis
@@ -82,7 +81,7 @@
     'analyzer_address' : 0x1ffff000,  # Analyzer 0x1ffff000..0x1ffff600
     'page_buffers' : [0x20003000, 0x20004000],   # Enable double buffering
     'min_program_length' : 8,
-  };
+  }
 
 class K82F25615(Kinetis):
 
diff --git a/pyocd/target/builtin/target_MKE15Z256xxx7.py b/pyocd/target/builtin/target_MKE15Z256xxx7.py
index b4eb58cd1..bd42975d8 100644
--- a/pyocd/target/builtin/target_MKE15Z256xxx7.py
+++ b/pyocd/target/builtin/target_MKE15Z256xxx7.py
@@ -1,19 +1,20 @@
-"""
- mbed CMSIS-DAP debugger
- Copyright (c) 2016,2018 Freescale Semiconductor, Inc.
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2018-2019 Arm Limited
+# Copyright (c) 2017 NXP
+# Copyright (c) 2016 Freescale Semiconductor, Inc.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 
 from ..family.target_kinetis import Kinetis
 from ..family.flash_kinetis import Flash_Kinetis
@@ -82,7 +83,7 @@
     'analyzer_address' : 0x1ffff000,  # Analyzer 0x1ffff000..0x1ffff600
     'page_buffers' : [0x20003000, 0x20004000],   # Enable double buffering
     'min_program_length' : 8,
-};
+}
 
 class KE15Z7(Kinetis):
 
diff --git a/pyocd/target/builtin/target_MKE18F256xxx16.py b/pyocd/target/builtin/target_MKE18F256xxx16.py
index 40fb61487..efab8d699 100644
--- a/pyocd/target/builtin/target_MKE18F256xxx16.py
+++ b/pyocd/target/builtin/target_MKE18F256xxx16.py
@@ -1,19 +1,20 @@
-"""
- mbed CMSIS-DAP debugger
- Copyright (c) 2016,2018 Freescale Semiconductor, Inc.
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2018-2019 Arm Limited
+# Copyright (c) 2017 NXP
+# Copyright (c) 2016 Freescale Semiconductor, Inc.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 
 from ..family.target_kinetis import Kinetis
 from ..family.flash_kinetis import Flash_Kinetis
@@ -83,7 +84,7 @@
     'analyzer_address' : 0x1ffff000,  # Analyzer 0x1ffff000..0x1ffff600
     'page_buffers' : [0x20003000, 0x20004000],   # Enable double buffering
     'min_program_length' : 8,
-};
+}
 
 class KE18F16(Kinetis):
 
diff --git a/pyocd/target/builtin/target_MKL02Z32xxx4.py b/pyocd/target/builtin/target_MKL02Z32xxx4.py
index 02e37a252..b57929a9a 100644
--- a/pyocd/target/builtin/target_MKL02Z32xxx4.py
+++ b/pyocd/target/builtin/target_MKL02Z32xxx4.py
@@ -1,19 +1,18 @@
-"""
- mbed CMSIS-DAP debugger
- Copyright (c) 2006-2013,2018 ARM Limited
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2006-2013,2018 Arm Limited
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 
 from ..family.target_kinetis import Kinetis
 from ..family.flash_kinetis import Flash_Kinetis
@@ -83,7 +82,7 @@
                'static_base' : 0x20000000 + 0x20 + 0x5E8,
                'min_program_length' : 4,
                'analyzer_supported' : False     # Not enough space on KL02 and KL05
-              };
+              }
 
 class KL02Z(Kinetis):
 
diff --git a/pyocd/target/builtin/target_MKL05Z32xxx4.py b/pyocd/target/builtin/target_MKL05Z32xxx4.py
index 221c98d69..0b14b2402 100644
--- a/pyocd/target/builtin/target_MKL05Z32xxx4.py
+++ b/pyocd/target/builtin/target_MKL05Z32xxx4.py
@@ -1,19 +1,18 @@
-"""
- mbed CMSIS-DAP debugger
- Copyright (c) 2006-2013,2018 ARM Limited
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2006-2013,2018 Arm Limited
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 
 from ..family.target_kinetis import Kinetis
 from ..family.flash_kinetis import Flash_Kinetis
@@ -83,7 +82,7 @@
                'static_base' : 0x20000000 + 0x20 + 0x5E8,
                'min_program_length' : 4,
                'analyzer_supported' : False     # Not enough space on KL02 and KL05
-              };
+              }
 
 class KL05Z(Kinetis):
 
diff --git a/pyocd/target/builtin/target_MKL25Z128xxx4.py b/pyocd/target/builtin/target_MKL25Z128xxx4.py
index eacabbd17..54a152b36 100644
--- a/pyocd/target/builtin/target_MKL25Z128xxx4.py
+++ b/pyocd/target/builtin/target_MKL25Z128xxx4.py
@@ -1,19 +1,18 @@
-"""
- mbed CMSIS-DAP debugger
- Copyright (c) 2006-2013,2018 ARM Limited
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2006-2013,2018 Arm Limited
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 
 from ..family.target_kinetis import Kinetis
 from ..family.flash_kinetis import Flash_Kinetis
@@ -85,7 +84,7 @@
                'page_buffers' : [0x20000800, 0x20000c00], # Enable double buffering
                'analyzer_supported' : True,
                'analyzer_address' : 0x1ffff000  # Analyzer 0x1ffff000..0x1ffff600
-              };
+              }
 
 class KL25Z(Kinetis):
 
diff --git a/pyocd/target/builtin/target_MKL26Z256xxx4.py b/pyocd/target/builtin/target_MKL26Z256xxx4.py
index 5aea955ca..889989892 100644
--- a/pyocd/target/builtin/target_MKL26Z256xxx4.py
+++ b/pyocd/target/builtin/target_MKL26Z256xxx4.py
@@ -1,19 +1,18 @@
-"""
- mbed CMSIS-DAP debugger
- Copyright (c) 2006-2013,2018 ARM Limited
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2006-2013,2018 Arm Limited
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 
 from ..family.target_kinetis import Kinetis
 from ..family.flash_kinetis import Flash_Kinetis
@@ -85,7 +84,7 @@
                'page_buffers' : [0x20000800, 0x20000c00], # Enable double buffering
                'analyzer_supported' : True,
                'analyzer_address' : 0x1ffff000  # Analyzer 0x1ffff000..0x1ffff600
-              };
+              }
 
 class KL26Z(Kinetis):
 
diff --git a/pyocd/target/builtin/target_MKL27Z256xxx4.py b/pyocd/target/builtin/target_MKL27Z256xxx4.py
index 5e2d86add..706029282 100644
--- a/pyocd/target/builtin/target_MKL27Z256xxx4.py
+++ b/pyocd/target/builtin/target_MKL27Z256xxx4.py
@@ -1,19 +1,18 @@
-"""
- mbed CMSIS-DAP debugger
- Copyright (c) 2006-2013,2018 ARM Limited
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2006-2013,2018 Arm Limited
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 
 from ..family.target_kinetis import Kinetis
 from ..family.flash_kinetis import Flash_Kinetis
@@ -87,7 +86,7 @@
     'min_program_length' : 4,
     'analyzer_supported' : True,
     'analyzer_address' : 0x20002000
-  };
+  }
 
 class KL27Z4(Kinetis):
 
diff --git a/pyocd/target/builtin/target_MKL28Z512xxx7.py b/pyocd/target/builtin/target_MKL28Z512xxx7.py
index eb4d7abb9..6dcd12ebd 100644
--- a/pyocd/target/builtin/target_MKL28Z512xxx7.py
+++ b/pyocd/target/builtin/target_MKL28Z512xxx7.py
@@ -1,19 +1,18 @@
-"""
- mbed CMSIS-DAP debugger
- Copyright (c) 2006-2013,2018 ARM Limited
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2006-2013,2018 Arm Limited
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 
 from ..family.target_kinetis import Kinetis
 from ..family.flash_kinetis import Flash_Kinetis
@@ -123,7 +122,7 @@
     'analyzer_address' : 0x1fffa000,             # [modified] default is zero. Use 8K block before flash algo. Can be any unused SRAM.
     'page_buffers' : [0x20000a00, 0x20001200],   # [added] Use areas above algo. Note 'begin_data' is unused if double buffering. Can be any unused SRAM.
     'min_program_length' : 4                     # [added] See FSL_FEATURE_FLASH_PFLASH_BLOCK_WRITE_UNIT_SIZE in KSDK features header file
-};
+}
 
 class Flash_kl28z(Flash_Kinetis):
     def __init__(self, target):
diff --git a/pyocd/target/builtin/target_MKL43Z256xxx4.py b/pyocd/target/builtin/target_MKL43Z256xxx4.py
index 48215100d..635577cf0 100644
--- a/pyocd/target/builtin/target_MKL43Z256xxx4.py
+++ b/pyocd/target/builtin/target_MKL43Z256xxx4.py
@@ -1,19 +1,18 @@
-"""
- mbed CMSIS-DAP debugger
- Copyright (c) 2006-2013,2018 ARM Limited
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2006-2013,2018 Arm Limited
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 
 from ..family.target_kinetis import Kinetis
 from ..family.flash_kinetis import Flash_Kinetis
@@ -88,7 +87,7 @@
     'min_program_length' : 4,
     'analyzer_supported' : True,
     'analyzer_address' : 0x20002000
-  };
+  }
 
 class KL43Z4(Kinetis):
 
diff --git a/pyocd/target/builtin/target_MKL46Z256xxx4.py b/pyocd/target/builtin/target_MKL46Z256xxx4.py
index fc2a21262..efd442dcd 100644
--- a/pyocd/target/builtin/target_MKL46Z256xxx4.py
+++ b/pyocd/target/builtin/target_MKL46Z256xxx4.py
@@ -1,19 +1,18 @@
-"""
- mbed CMSIS-DAP debugger
- Copyright (c) 2006-2013,2018 ARM Limited
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2006-2013,2018 Arm Limited
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 
 from ..family.target_kinetis import Kinetis
 from ..family.flash_kinetis import Flash_Kinetis
@@ -85,7 +84,7 @@
                'page_buffers' : [0x20000800, 0x20000c00], # Enable double buffering
                'analyzer_supported' : True,
                'analyzer_address' : 0x1ffff000  # Analyzer 0x1ffff000..0x1ffff600
-              };
+              }
 
 class KL46Z(Kinetis):
 
diff --git a/pyocd/target/builtin/target_MKL82Z128xxx7.py b/pyocd/target/builtin/target_MKL82Z128xxx7.py
index 1fb2a51b0..fc1ff113a 100644
--- a/pyocd/target/builtin/target_MKL82Z128xxx7.py
+++ b/pyocd/target/builtin/target_MKL82Z128xxx7.py
@@ -1,19 +1,18 @@
-"""
- mbed CMSIS-DAP debugger
- Copyright (c) 2006-2013,2018 ARM Limited
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2006-2013,2018 Arm Limited
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 
 from ..family.target_kinetis import Kinetis
 from ..family.flash_kinetis import Flash_Kinetis
@@ -83,7 +82,7 @@
     'analyzer_address' : 0x1fffa000,             # [modified] default is zero. Use 8K block before flash algo. Can be any unused SRAM.
     'page_buffers' : [0x20000a00, 0x20001200],   # [added] Use areas above algo. Note 'begin_data' is unused if double buffering. Can be any unused SRAM.
     'min_program_length' : 4                     # [added] See FSL_FEATURE_FLASH_PFLASH_BLOCK_WRITE_UNIT_SIZE in KSDK features header file
-};
+}
 
 class KL82Z7(Kinetis):
 
diff --git a/pyocd/target/builtin/target_MKV10Z128xxx7.py b/pyocd/target/builtin/target_MKV10Z128xxx7.py
index 6269dff2c..03125940d 100644
--- a/pyocd/target/builtin/target_MKV10Z128xxx7.py
+++ b/pyocd/target/builtin/target_MKV10Z128xxx7.py
@@ -1,19 +1,18 @@
-"""
- mbed CMSIS-DAP debugger
- Copyright (c) 2006-2013, ARM Limited
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2006-2013, Arm Limited
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 
 from ..family.target_kinetis import Kinetis
 from ..family.flash_kinetis import Flash_Kinetis
@@ -89,7 +88,7 @@
     'min_program_length' : 4,
     'analyzer_supported' : True,
     'analyzer_address' : 0x1ffff800
-  };
+  }
 
 class KV10Z7(Kinetis):
 
diff --git a/pyocd/target/builtin/target_MKV11Z128xxx7.py b/pyocd/target/builtin/target_MKV11Z128xxx7.py
index ee1125abc..fb372a7fc 100644
--- a/pyocd/target/builtin/target_MKV11Z128xxx7.py
+++ b/pyocd/target/builtin/target_MKV11Z128xxx7.py
@@ -1,19 +1,18 @@
-"""
- mbed CMSIS-DAP debugger
- Copyright (c) 2006-2013,2018 ARM Limited
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2006-2013,2018 Arm Limited
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 
 from ..family.target_kinetis import Kinetis
 from ..family.flash_kinetis import Flash_Kinetis
@@ -90,7 +89,7 @@
     'min_program_length' : 4,
     'analyzer_supported' : True,
     'analyzer_address' : 0x1ffff800
-  };
+  }
 
 class KV11Z7(Kinetis):
 
diff --git a/pyocd/target/builtin/target_MKW01Z128xxx4.py b/pyocd/target/builtin/target_MKW01Z128xxx4.py
index 2987f6c79..820ceb57e 100644
--- a/pyocd/target/builtin/target_MKW01Z128xxx4.py
+++ b/pyocd/target/builtin/target_MKW01Z128xxx4.py
@@ -1,19 +1,18 @@
-"""
- mbed CMSIS-DAP debugger
- Copyright (c) 2006-2013,2018 ARM Limited
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2006-2013,2018 Arm Limited
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 
 from ..family.target_kinetis import Kinetis
 from ..family.flash_kinetis import Flash_Kinetis
@@ -88,7 +87,7 @@
     'min_program_length' : 4,
     'analyzer_supported' : True,
     'analyzer_address' : 0x1ffff800
-  };
+  }
 
 class KW01Z4(Kinetis):
 
diff --git a/pyocd/target/builtin/target_MKW24D512xxx5.py b/pyocd/target/builtin/target_MKW24D512xxx5.py
index aa69b11d0..c9a7ab52a 100644
--- a/pyocd/target/builtin/target_MKW24D512xxx5.py
+++ b/pyocd/target/builtin/target_MKW24D512xxx5.py
@@ -79,7 +79,7 @@
     'min_program_length' : 4,
     'analyzer_supported' : True,
     'analyzer_address' : 0x1ffff800
-  };
+  }
 
 class KW24D5(Kinetis):
 
diff --git a/pyocd/target/builtin/target_MKW36Z512xxx4.py b/pyocd/target/builtin/target_MKW36Z512xxx4.py
index b86e5e770..ed22de00b 100644
--- a/pyocd/target/builtin/target_MKW36Z512xxx4.py
+++ b/pyocd/target/builtin/target_MKW36Z512xxx4.py
@@ -150,7 +150,7 @@
     'min_program_length' : 8,
     'analyzer_supported' : True,
     'analyzer_address' : 0x1fffc000
-};
+}
 
 class KW36Z4(Kinetis):
 
diff --git a/pyocd/target/builtin/target_MKW40Z160xxx4.py b/pyocd/target/builtin/target_MKW40Z160xxx4.py
index fdd82e576..d8a7dfca7 100644
--- a/pyocd/target/builtin/target_MKW40Z160xxx4.py
+++ b/pyocd/target/builtin/target_MKW40Z160xxx4.py
@@ -1,19 +1,18 @@
-"""
- mbed CMSIS-DAP debugger
- Copyright (c) 2006-2013,2018 ARM Limited
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2006-2013,2018 Arm Limited
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 
 from ..family.target_kinetis import Kinetis
 from ..family.flash_kinetis import Flash_Kinetis
@@ -89,7 +88,7 @@
     'min_program_length' : 4,
     'analyzer_supported' : True,
     'analyzer_address' : 0x1ffff800
-  };
+  }
 
 class KW40Z4(Kinetis):
 
diff --git a/pyocd/target/builtin/target_MKW41Z512xxx4.py b/pyocd/target/builtin/target_MKW41Z512xxx4.py
index bc6b7d61b..4d9d124f2 100644
--- a/pyocd/target/builtin/target_MKW41Z512xxx4.py
+++ b/pyocd/target/builtin/target_MKW41Z512xxx4.py
@@ -1,19 +1,18 @@
-"""
- mbed CMSIS-DAP debugger
- Copyright (c) 2006-2013,2018 ARM Limited
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2006-2013,2018 Arm Limited
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 
 from ..family.target_kinetis import Kinetis
 from ..family.flash_kinetis import Flash_Kinetis
@@ -79,7 +78,7 @@
     'page_size' : 0x00000200,
     'analyzer_supported' : False,
     'analyzer_address' : 0x00000000  # ITCM, Analyzer 0x00000000..0x000000600
-};
+}
 
 class KW41Z4(Kinetis):
 
diff --git a/pyocd/target/builtin/target_STM32F051T8.py b/pyocd/target/builtin/target_STM32F051T8.py
index c17d56ba8..965ca1e51 100644
--- a/pyocd/target/builtin/target_STM32F051T8.py
+++ b/pyocd/target/builtin/target_STM32F051T8.py
@@ -63,7 +63,7 @@
                'min_program_length' : 2,
                'analyzer_supported' : True,
                'analyzer_address' : 0x20001400 # Analyzer 0x20001400..0x20001A00
-              };
+              }
 
 
 class STM32F051(CoreSightTarget):
diff --git a/pyocd/target/builtin/target_STM32F103RC.py b/pyocd/target/builtin/target_STM32F103RC.py
index adb3bf499..f256960d7 100644
--- a/pyocd/target/builtin/target_STM32F103RC.py
+++ b/pyocd/target/builtin/target_STM32F103RC.py
@@ -46,7 +46,7 @@
                'min_program_length' : 2,
                'analyzer_supported' : True,
                'analyzer_address' : 0x20003000 # Analyzer 0x20003000..0x20003600
-              };
+              }
 
 
 class STM32F103RC(CoreSightTarget):
diff --git a/pyocd/target/builtin/target_STM32F412xx.py b/pyocd/target/builtin/target_STM32F412xx.py
index f3f84019b..b5702b172 100644
--- a/pyocd/target/builtin/target_STM32F412xx.py
+++ b/pyocd/target/builtin/target_STM32F412xx.py
@@ -59,7 +59,7 @@ class DBGMCU:
     'min_program_length' : 2,
     'analyzer_supported' : True,
     'analyzer_address' : 0x20002000
-  };
+  }
 
 class STM32F412xE(CoreSightTarget):
 
diff --git a/pyocd/target/builtin/target_STM32F429xx.py b/pyocd/target/builtin/target_STM32F429xx.py
index f6fb0812e..aedabee8e 100644
--- a/pyocd/target/builtin/target_STM32F429xx.py
+++ b/pyocd/target/builtin/target_STM32F429xx.py
@@ -59,7 +59,7 @@ class DBGMCU:
     'min_program_length' : 1,
     'analyzer_supported' : True,
     'analyzer_address' : 0x20002000
-  };
+  }
 
 # @brief Flash algorithm for STM32F429xx device.
 class Flash_stm32f429xx(Flash):
diff --git a/pyocd/target/builtin/target_STM32F439xx.py b/pyocd/target/builtin/target_STM32F439xx.py
index 37b5c2466..fa20ddc94 100644
--- a/pyocd/target/builtin/target_STM32F439xx.py
+++ b/pyocd/target/builtin/target_STM32F439xx.py
@@ -59,7 +59,7 @@ class DBGMCU:
     'min_program_length' : 1,
     'analyzer_supported' : True,
     'analyzer_address' : 0x20002000
-  };
+  }
 
 # @brief Flash algorithm for STM32F439xx device.
 class Flash_stm32f439xx(Flash):
diff --git a/pyocd/target/builtin/target_STM32L475xx.py b/pyocd/target/builtin/target_STM32L475xx.py
index b64ef4e30..963621b5d 100644
--- a/pyocd/target/builtin/target_STM32L475xx.py
+++ b/pyocd/target/builtin/target_STM32L475xx.py
@@ -63,7 +63,7 @@ class DBGMCU:
     'min_program_length' : 8,
     'analyzer_supported' : True,
     'analyzer_address' : 0x20002000
-  };
+  }
 
 class STM32L475xx(CoreSightTarget):
         
diff --git a/pyocd/target/builtin/target_lpc800.py b/pyocd/target/builtin/target_lpc800.py
index 7b0ab5eeb..30e45399f 100644
--- a/pyocd/target/builtin/target_lpc800.py
+++ b/pyocd/target/builtin/target_lpc800.py
@@ -45,7 +45,7 @@
                'min_program_length' : 64,
                'analyzer_supported' : True,
                'analyzer_address' : 0x10000800  # Analyzer 0x10000800..0x10000e00
-              };
+              }
 
 class LPC800(CoreSightTarget):
 
diff --git a/pyocd/target/builtin/target_w7500.py b/pyocd/target/builtin/target_w7500.py
index 17d969caa..5ecd02453 100644
--- a/pyocd/target/builtin/target_w7500.py
+++ b/pyocd/target/builtin/target_w7500.py
@@ -35,7 +35,7 @@
                'page_size'        : 256,
                'analyzer_supported' : True,
                'analyzer_address' : 0x20001000 # Analyzer 0x20001000..0x20001600
-              };
+              }
 
 
 class W7500(CoreSightTarget):
diff --git a/pyocd/tools/gdb_server.py b/pyocd/tools/gdb_server.py
index 90065afe6..8e08f9955 100644
--- a/pyocd/tools/gdb_server.py
+++ b/pyocd/tools/gdb_server.py
@@ -1,20 +1,19 @@
 #!/usr/bin/env python
-"""
- mbed CMSIS-DAP debugger
- Copyright (c) 2006-2018 ARM Limited
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2006-2018 Arm Limited
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 
 from __future__ import print_function
 import sys
diff --git a/test/basic_test.py b/test/basic_test.py
index af7bb3b08..4a18cc943 100644
--- a/test/basic_test.py
+++ b/test/basic_test.py
@@ -1,19 +1,18 @@
-"""
- mbed CMSIS-DAP debugger
- Copyright (c) 2006-2015,2018 ARM Limited
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2006-2015,2018 Arm Limited
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 from __future__ import print_function
 
 import argparse, os, sys
diff --git a/test/unit/test_cmdline.py b/test/unit/test_cmdline.py
index f97b894e0..26f161fba 100644
--- a/test/unit/test_cmdline.py
+++ b/test/unit/test_cmdline.py
@@ -1,19 +1,18 @@
-"""
- mbed CMSIS-DAP debugger
- Copyright (c) 2015,2018 ARM Limited
-
- Licensed 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.
-"""
+# pyOCD debugger
+# Copyright (c) 2015,2018 Arm Limited
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed 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.
 
 from pyocd.utility.cmdline import (
     split_command_line,