aboutsummaryrefslogtreecommitdiffstats
path: root/mpm/python
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2018-02-19 16:53:15 -0800
committerMartin Braun <martin.braun@ettus.com>2018-02-19 16:55:08 -0800
commite9288a439cb4c8d1a7a413d6e4c654fc5edfdad5 (patch)
treec68046dc96a0237f42d83b72050730d4aa552712 /mpm/python
parentae5211d71dcd0715ed83e1d4949d8425d64cb3d1 (diff)
downloaduhd-e9288a439cb4c8d1a7a413d6e4c654fc5edfdad5.tar.gz
uhd-e9288a439cb4c8d1a7a413d6e4c654fc5edfdad5.tar.bz2
uhd-e9288a439cb4c8d1a7a413d6e4c654fc5edfdad5.zip
mpm: Update all license headers
- Fix typo in company name (missing 'a') - Updated SPDX license identifier to version 3.0
Diffstat (limited to 'mpm/python')
-rw-r--r--mpm/python/aurora_bist_test.py4
-rw-r--r--mpm/python/converters.hpp4
-rw-r--r--mpm/python/lib_helper.cpp4
-rw-r--r--mpm/python/pyusrp_periphs.cpp2
-rwxr-xr-xmpm/python/setup.py.in4
-rwxr-xr-xmpm/python/socket_test.py4
-rwxr-xr-xmpm/python/test_lmk.py4
-rw-r--r--mpm/python/tests_periphs.cpp4
-rw-r--r--mpm/python/tests_periphs.hpp4
-rwxr-xr-xmpm/python/usrp_hwd.py4
-rw-r--r--mpm/python/usrp_mpm/__init__.py4
-rw-r--r--mpm/python/usrp_mpm/aurora_control.py4
-rw-r--r--mpm/python/usrp_mpm/bfrfs.py4
-rw-r--r--mpm/python/usrp_mpm/chips/__init__.py4
-rw-r--r--mpm/python/usrp_mpm/chips/lmk04828.py4
-rw-r--r--mpm/python/usrp_mpm/cores/__init__.py4
-rw-r--r--mpm/python/usrp_mpm/cores/nijesdcore.py4
-rw-r--r--mpm/python/usrp_mpm/cores/tdc_sync.py4
-rw-r--r--mpm/python/usrp_mpm/dboard_manager/__init__.py4
-rw-r--r--mpm/python/usrp_mpm/dboard_manager/base.py4
-rw-r--r--mpm/python/usrp_mpm/dboard_manager/eiscat.py4
-rw-r--r--mpm/python/usrp_mpm/dboard_manager/lmk_eiscat.py4
-rw-r--r--mpm/python/usrp_mpm/dboard_manager/lmk_mg.py4
-rw-r--r--mpm/python/usrp_mpm/dboard_manager/magnesium.py4
-rwxr-xr-xmpm/python/usrp_mpm/dboard_manager/magnesium_update_cpld.py2
-rw-r--r--mpm/python/usrp_mpm/dboard_manager/mg_periphs.py2
-rw-r--r--mpm/python/usrp_mpm/dboard_manager/test.py4
-rw-r--r--mpm/python/usrp_mpm/dboard_manager/unknown.py4
-rw-r--r--mpm/python/usrp_mpm/discovery.py4
-rw-r--r--mpm/python/usrp_mpm/eeprom.py4
-rw-r--r--mpm/python/usrp_mpm/ethtable.py4
-rwxr-xr-xmpm/python/usrp_mpm/fpga_bit_to_bin.py4
-rw-r--r--mpm/python/usrp_mpm/gpsd_iface.py4
-rw-r--r--mpm/python/usrp_mpm/liberiotable.py4
-rw-r--r--mpm/python/usrp_mpm/mpmlog.py4
-rw-r--r--mpm/python/usrp_mpm/mpmtypes.py4
-rw-r--r--mpm/python/usrp_mpm/mpmutils.py4
-rw-r--r--mpm/python/usrp_mpm/periph_manager/__init__.py.in4
-rw-r--r--mpm/python/usrp_mpm/periph_manager/base.py4
-rw-r--r--mpm/python/usrp_mpm/periph_manager/n310.py4
-rw-r--r--mpm/python/usrp_mpm/periph_manager/test.py4
-rw-r--r--mpm/python/usrp_mpm/prefs.py2
-rw-r--r--mpm/python/usrp_mpm/rpc_server.py2
-rw-r--r--mpm/python/usrp_mpm/sys_utils/__init__.py4
-rw-r--r--mpm/python/usrp_mpm/sys_utils/dtoverlay.py4
-rw-r--r--mpm/python/usrp_mpm/sys_utils/net.py4
-rw-r--r--mpm/python/usrp_mpm/sys_utils/sysfs_gpio.py4
-rw-r--r--mpm/python/usrp_mpm/sys_utils/sysfs_thermal.py2
-rw-r--r--mpm/python/usrp_mpm/sys_utils/udev.py4
-rw-r--r--mpm/python/usrp_mpm/sys_utils/uio.py4
-rw-r--r--mpm/python/usrp_mpm/sys_utils/watchdog.py4
-rw-r--r--mpm/python/usrp_mpm/test_bfrfs.py4
-rw-r--r--mpm/python/usrp_mpm/xports/__init__.py4
-rw-r--r--mpm/python/usrp_mpm/xports/xportmgr_liberio.py4
-rw-r--r--mpm/python/usrp_mpm/xports/xportmgr_udp.py4
55 files changed, 104 insertions, 104 deletions
diff --git a/mpm/python/aurora_bist_test.py b/mpm/python/aurora_bist_test.py
index a55bee490..9fe6f10b4 100644
--- a/mpm/python/aurora_bist_test.py
+++ b/mpm/python/aurora_bist_test.py
@@ -1,8 +1,8 @@
#!/usr/bin/env python3
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
Aurora BIST command line utility
diff --git a/mpm/python/converters.hpp b/mpm/python/converters.hpp
index 5f5ff1785..ede9507a9 100644
--- a/mpm/python/converters.hpp
+++ b/mpm/python/converters.hpp
@@ -1,7 +1,7 @@
//
-// Copyright 2017 Ettus Research, National Instruments Company
+// Copyright 2017 Ettus Research, a National Instruments Company
//
-// SPDX-License-Identifier: GPL-3.0
+// SPDX-License-Identifier: GPL-3.0-or-later
//
#pragma once
diff --git a/mpm/python/lib_helper.cpp b/mpm/python/lib_helper.cpp
index a723fb899..2d533f073 100644
--- a/mpm/python/lib_helper.cpp
+++ b/mpm/python/lib_helper.cpp
@@ -1,7 +1,7 @@
//
-// Copyright 2017 Ettus Research, National Instruments Company
+// Copyright 2017 Ettus Research, a National Instruments Company
//
-// SPDX-License-Identifier: GPL-3.0
+// SPDX-License-Identifier: GPL-3.0-or-later
//
#include "lib_helper.hpp"
diff --git a/mpm/python/pyusrp_periphs.cpp b/mpm/python/pyusrp_periphs.cpp
index 520590773..716209205 100644
--- a/mpm/python/pyusrp_periphs.cpp
+++ b/mpm/python/pyusrp_periphs.cpp
@@ -1,7 +1,7 @@
//
// Copyright 2017 Ettus Research, a National Instruments Company
//
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
//
// include hackery to only include boost python and define the macro here
diff --git a/mpm/python/setup.py.in b/mpm/python/setup.py.in
index 3e25f8085..e131f02f1 100755
--- a/mpm/python/setup.py.in
+++ b/mpm/python/setup.py.in
@@ -1,8 +1,8 @@
#!/usr/bin/env python
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
USRP/MPM
diff --git a/mpm/python/socket_test.py b/mpm/python/socket_test.py
index dcca72637..1f87664bf 100755
--- a/mpm/python/socket_test.py
+++ b/mpm/python/socket_test.py
@@ -1,8 +1,8 @@
#!/usr/bin/env python
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
import socket
diff --git a/mpm/python/test_lmk.py b/mpm/python/test_lmk.py
index 697b55935..db957abb6 100755
--- a/mpm/python/test_lmk.py
+++ b/mpm/python/test_lmk.py
@@ -1,8 +1,8 @@
#!/usr/bin/env python3
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
import libpyusrp_periphs as p
diff --git a/mpm/python/tests_periphs.cpp b/mpm/python/tests_periphs.cpp
index feab6aa63..c0446d87a 100644
--- a/mpm/python/tests_periphs.cpp
+++ b/mpm/python/tests_periphs.cpp
@@ -1,7 +1,7 @@
//
-// Copyright 2017 Ettus Research, National Instruments Company
+// Copyright 2017 Ettus Research, a National Instruments Company
//
-// SPDX-License-Identifier: GPL-3.0
+// SPDX-License-Identifier: GPL-3.0-or-later
//
#include "tests_periphs.hpp"
diff --git a/mpm/python/tests_periphs.hpp b/mpm/python/tests_periphs.hpp
index 2972d570a..b10996572 100644
--- a/mpm/python/tests_periphs.hpp
+++ b/mpm/python/tests_periphs.hpp
@@ -1,7 +1,7 @@
//
-// Copyright 2017 Ettus Research, National Instruments Company
+// Copyright 2017 Ettus Research, a National Instruments Company
//
-// SPDX-License-Identifier: GPL-3.0
+// SPDX-License-Identifier: GPL-3.0-or-later
//
#pragma once
diff --git a/mpm/python/usrp_hwd.py b/mpm/python/usrp_hwd.py
index 2a597c789..267415601 100755
--- a/mpm/python/usrp_hwd.py
+++ b/mpm/python/usrp_hwd.py
@@ -1,8 +1,8 @@
#!/usr/bin/env python3
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
Main executable for the USRP Hardware Daemon
diff --git a/mpm/python/usrp_mpm/__init__.py b/mpm/python/usrp_mpm/__init__.py
index b0f201089..00cbcc987 100644
--- a/mpm/python/usrp_mpm/__init__.py
+++ b/mpm/python/usrp_mpm/__init__.py
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
MPM Module
diff --git a/mpm/python/usrp_mpm/aurora_control.py b/mpm/python/usrp_mpm/aurora_control.py
index 8cea73464..c46ae634c 100644
--- a/mpm/python/usrp_mpm/aurora_control.py
+++ b/mpm/python/usrp_mpm/aurora_control.py
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
Aurora SFP control
diff --git a/mpm/python/usrp_mpm/bfrfs.py b/mpm/python/usrp_mpm/bfrfs.py
index 52126f4ed..84cbad26c 100644
--- a/mpm/python/usrp_mpm/bfrfs.py
+++ b/mpm/python/usrp_mpm/bfrfs.py
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
BufferFS. Serialization mini-library meant for use with EEPROMs.
diff --git a/mpm/python/usrp_mpm/chips/__init__.py b/mpm/python/usrp_mpm/chips/__init__.py
index 31ba707bb..c8d50d714 100644
--- a/mpm/python/usrp_mpm/chips/__init__.py
+++ b/mpm/python/usrp_mpm/chips/__init__.py
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
Chips submodule
diff --git a/mpm/python/usrp_mpm/chips/lmk04828.py b/mpm/python/usrp_mpm/chips/lmk04828.py
index c7b3fb497..c0496a6af 100644
--- a/mpm/python/usrp_mpm/chips/lmk04828.py
+++ b/mpm/python/usrp_mpm/chips/lmk04828.py
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
LMK04828 parent driver class
diff --git a/mpm/python/usrp_mpm/cores/__init__.py b/mpm/python/usrp_mpm/cores/__init__.py
index 15f016feb..0cd2bc0c7 100644
--- a/mpm/python/usrp_mpm/cores/__init__.py
+++ b/mpm/python/usrp_mpm/cores/__init__.py
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
Cores submodule
diff --git a/mpm/python/usrp_mpm/cores/nijesdcore.py b/mpm/python/usrp_mpm/cores/nijesdcore.py
index 5d1f4e264..bf2bde6e9 100644
--- a/mpm/python/usrp_mpm/cores/nijesdcore.py
+++ b/mpm/python/usrp_mpm/cores/nijesdcore.py
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
JESD FPGA Core Interface
diff --git a/mpm/python/usrp_mpm/cores/tdc_sync.py b/mpm/python/usrp_mpm/cores/tdc_sync.py
index f58234e2d..1ded38fef 100644
--- a/mpm/python/usrp_mpm/cores/tdc_sync.py
+++ b/mpm/python/usrp_mpm/cores/tdc_sync.py
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
TDC clock synchronization
diff --git a/mpm/python/usrp_mpm/dboard_manager/__init__.py b/mpm/python/usrp_mpm/dboard_manager/__init__.py
index 4da567000..3f7b6e9f0 100644
--- a/mpm/python/usrp_mpm/dboard_manager/__init__.py
+++ b/mpm/python/usrp_mpm/dboard_manager/__init__.py
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
dboards module __init__.py
diff --git a/mpm/python/usrp_mpm/dboard_manager/base.py b/mpm/python/usrp_mpm/dboard_manager/base.py
index 3bc0bdcff..68a3f3d5b 100644
--- a/mpm/python/usrp_mpm/dboard_manager/base.py
+++ b/mpm/python/usrp_mpm/dboard_manager/base.py
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
dboard base implementation module
diff --git a/mpm/python/usrp_mpm/dboard_manager/eiscat.py b/mpm/python/usrp_mpm/dboard_manager/eiscat.py
index 18de2446d..2b1c247ba 100644
--- a/mpm/python/usrp_mpm/dboard_manager/eiscat.py
+++ b/mpm/python/usrp_mpm/dboard_manager/eiscat.py
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
EISCAT rx board implementation module
diff --git a/mpm/python/usrp_mpm/dboard_manager/lmk_eiscat.py b/mpm/python/usrp_mpm/dboard_manager/lmk_eiscat.py
index 91d12651f..1fb756955 100644
--- a/mpm/python/usrp_mpm/dboard_manager/lmk_eiscat.py
+++ b/mpm/python/usrp_mpm/dboard_manager/lmk_eiscat.py
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
LMK04828 driver for use with Magnesium
diff --git a/mpm/python/usrp_mpm/dboard_manager/lmk_mg.py b/mpm/python/usrp_mpm/dboard_manager/lmk_mg.py
index d9579417c..22d3de983 100644
--- a/mpm/python/usrp_mpm/dboard_manager/lmk_mg.py
+++ b/mpm/python/usrp_mpm/dboard_manager/lmk_mg.py
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
LMK04828 driver for use with Magnesium
diff --git a/mpm/python/usrp_mpm/dboard_manager/magnesium.py b/mpm/python/usrp_mpm/dboard_manager/magnesium.py
index f933d1f14..470723e02 100644
--- a/mpm/python/usrp_mpm/dboard_manager/magnesium.py
+++ b/mpm/python/usrp_mpm/dboard_manager/magnesium.py
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
Magnesium dboard implementation module
diff --git a/mpm/python/usrp_mpm/dboard_manager/magnesium_update_cpld.py b/mpm/python/usrp_mpm/dboard_manager/magnesium_update_cpld.py
index be5cae797..a5ccde40b 100755
--- a/mpm/python/usrp_mpm/dboard_manager/magnesium_update_cpld.py
+++ b/mpm/python/usrp_mpm/dboard_manager/magnesium_update_cpld.py
@@ -2,7 +2,7 @@
#
# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
Update the CPLD image for the N310
diff --git a/mpm/python/usrp_mpm/dboard_manager/mg_periphs.py b/mpm/python/usrp_mpm/dboard_manager/mg_periphs.py
index 77ce4ce89..2f74ce11c 100644
--- a/mpm/python/usrp_mpm/dboard_manager/mg_periphs.py
+++ b/mpm/python/usrp_mpm/dboard_manager/mg_periphs.py
@@ -1,7 +1,7 @@
#
# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
Magnesium dboard peripherals (CPLD, port expander, dboard regs)
diff --git a/mpm/python/usrp_mpm/dboard_manager/test.py b/mpm/python/usrp_mpm/dboard_manager/test.py
index e07648c86..207439c50 100644
--- a/mpm/python/usrp_mpm/dboard_manager/test.py
+++ b/mpm/python/usrp_mpm/dboard_manager/test.py
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
magnesium dboard implementation module
diff --git a/mpm/python/usrp_mpm/dboard_manager/unknown.py b/mpm/python/usrp_mpm/dboard_manager/unknown.py
index 6b1bbbb61..7afc66f74 100644
--- a/mpm/python/usrp_mpm/dboard_manager/unknown.py
+++ b/mpm/python/usrp_mpm/dboard_manager/unknown.py
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
EISCAT rx board implementation module
diff --git a/mpm/python/usrp_mpm/discovery.py b/mpm/python/usrp_mpm/discovery.py
index 8c58fa682..c1a894276 100644
--- a/mpm/python/usrp_mpm/discovery.py
+++ b/mpm/python/usrp_mpm/discovery.py
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
Code to run the discovery port
diff --git a/mpm/python/usrp_mpm/eeprom.py b/mpm/python/usrp_mpm/eeprom.py
index 54dd9bb12..543823cbb 100644
--- a/mpm/python/usrp_mpm/eeprom.py
+++ b/mpm/python/usrp_mpm/eeprom.py
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
EEPROM management code
diff --git a/mpm/python/usrp_mpm/ethtable.py b/mpm/python/usrp_mpm/ethtable.py
index d2cc14e80..e3a3035ec 100644
--- a/mpm/python/usrp_mpm/ethtable.py
+++ b/mpm/python/usrp_mpm/ethtable.py
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
Ethernet dispatcher table control
diff --git a/mpm/python/usrp_mpm/fpga_bit_to_bin.py b/mpm/python/usrp_mpm/fpga_bit_to_bin.py
index ca85898c3..983bb97d6 100755
--- a/mpm/python/usrp_mpm/fpga_bit_to_bin.py
+++ b/mpm/python/usrp_mpm/fpga_bit_to_bin.py
@@ -1,8 +1,8 @@
#!/usr/bin/env python3
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
Convert FPGA Bit files to bin files suitable for flashing
diff --git a/mpm/python/usrp_mpm/gpsd_iface.py b/mpm/python/usrp_mpm/gpsd_iface.py
index 63f079e63..66abfd4bd 100644
--- a/mpm/python/usrp_mpm/gpsd_iface.py
+++ b/mpm/python/usrp_mpm/gpsd_iface.py
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
GPS service daemon (GPSd) interface class
diff --git a/mpm/python/usrp_mpm/liberiotable.py b/mpm/python/usrp_mpm/liberiotable.py
index cc848d570..19226345b 100644
--- a/mpm/python/usrp_mpm/liberiotable.py
+++ b/mpm/python/usrp_mpm/liberiotable.py
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
Liberio DMA dispatcher table control
diff --git a/mpm/python/usrp_mpm/mpmlog.py b/mpm/python/usrp_mpm/mpmlog.py
index 494ee8f2f..02ea305ca 100644
--- a/mpm/python/usrp_mpm/mpmlog.py
+++ b/mpm/python/usrp_mpm/mpmlog.py
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
MPM Logging
diff --git a/mpm/python/usrp_mpm/mpmtypes.py b/mpm/python/usrp_mpm/mpmtypes.py
index cf81f4f16..32ee10fbb 100644
--- a/mpm/python/usrp_mpm/mpmtypes.py
+++ b/mpm/python/usrp_mpm/mpmtypes.py
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
MPM types
diff --git a/mpm/python/usrp_mpm/mpmutils.py b/mpm/python/usrp_mpm/mpmutils.py
index 1e4f49b54..539cd8de4 100644
--- a/mpm/python/usrp_mpm/mpmutils.py
+++ b/mpm/python/usrp_mpm/mpmutils.py
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
Miscellaneous utilities for MPM
diff --git a/mpm/python/usrp_mpm/periph_manager/__init__.py.in b/mpm/python/usrp_mpm/periph_manager/__init__.py.in
index f642b0a42..f507a6808 100644
--- a/mpm/python/usrp_mpm/periph_manager/__init__.py.in
+++ b/mpm/python/usrp_mpm/periph_manager/__init__.py.in
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
periph_manager __init__.py
diff --git a/mpm/python/usrp_mpm/periph_manager/base.py b/mpm/python/usrp_mpm/periph_manager/base.py
index 384be99f3..6608a5d2b 100644
--- a/mpm/python/usrp_mpm/periph_manager/base.py
+++ b/mpm/python/usrp_mpm/periph_manager/base.py
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
Mboard implementation base class
diff --git a/mpm/python/usrp_mpm/periph_manager/n310.py b/mpm/python/usrp_mpm/periph_manager/n310.py
index ca92301fe..d0fb7feee 100644
--- a/mpm/python/usrp_mpm/periph_manager/n310.py
+++ b/mpm/python/usrp_mpm/periph_manager/n310.py
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
N310 implementation module
diff --git a/mpm/python/usrp_mpm/periph_manager/test.py b/mpm/python/usrp_mpm/periph_manager/test.py
index 7df40722e..e0fced56b 100644
--- a/mpm/python/usrp_mpm/periph_manager/test.py
+++ b/mpm/python/usrp_mpm/periph_manager/test.py
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
test periph_manager implementation module
diff --git a/mpm/python/usrp_mpm/prefs.py b/mpm/python/usrp_mpm/prefs.py
index 8ed6f13ff..0e9d636b2 100644
--- a/mpm/python/usrp_mpm/prefs.py
+++ b/mpm/python/usrp_mpm/prefs.py
@@ -1,7 +1,7 @@
#
# Copyright 2018 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
MPM preferences management
diff --git a/mpm/python/usrp_mpm/rpc_server.py b/mpm/python/usrp_mpm/rpc_server.py
index abb3b4327..00175d312 100644
--- a/mpm/python/usrp_mpm/rpc_server.py
+++ b/mpm/python/usrp_mpm/rpc_server.py
@@ -1,7 +1,7 @@
#
# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
Implemented RPC Servers
diff --git a/mpm/python/usrp_mpm/sys_utils/__init__.py b/mpm/python/usrp_mpm/sys_utils/__init__.py
index 61be8ac53..c282aff97 100644
--- a/mpm/python/usrp_mpm/sys_utils/__init__.py
+++ b/mpm/python/usrp_mpm/sys_utils/__init__.py
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
System/OS Utilities
diff --git a/mpm/python/usrp_mpm/sys_utils/dtoverlay.py b/mpm/python/usrp_mpm/sys_utils/dtoverlay.py
index 30f7ae4a0..0c1593fb6 100644
--- a/mpm/python/usrp_mpm/sys_utils/dtoverlay.py
+++ b/mpm/python/usrp_mpm/sys_utils/dtoverlay.py
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
Manipulation of device tree overlays (Linux kernel)
diff --git a/mpm/python/usrp_mpm/sys_utils/net.py b/mpm/python/usrp_mpm/sys_utils/net.py
index f40e147dc..1b6ddd2c1 100644
--- a/mpm/python/usrp_mpm/sys_utils/net.py
+++ b/mpm/python/usrp_mpm/sys_utils/net.py
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
N310 implementation module
diff --git a/mpm/python/usrp_mpm/sys_utils/sysfs_gpio.py b/mpm/python/usrp_mpm/sys_utils/sysfs_gpio.py
index 286b8e54a..ccc597785 100644
--- a/mpm/python/usrp_mpm/sys_utils/sysfs_gpio.py
+++ b/mpm/python/usrp_mpm/sys_utils/sysfs_gpio.py
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
Access to GPIOs mapped into the PS via sysfs
diff --git a/mpm/python/usrp_mpm/sys_utils/sysfs_thermal.py b/mpm/python/usrp_mpm/sys_utils/sysfs_thermal.py
index 8b1098469..a5df76858 100644
--- a/mpm/python/usrp_mpm/sys_utils/sysfs_thermal.py
+++ b/mpm/python/usrp_mpm/sys_utils/sysfs_thermal.py
@@ -1,7 +1,7 @@
#
# Copyright 2017 Ettus Research, A National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
"""
sysfs thermal sensors API
"""
diff --git a/mpm/python/usrp_mpm/sys_utils/udev.py b/mpm/python/usrp_mpm/sys_utils/udev.py
index efd36c245..70b3bcb65 100644
--- a/mpm/python/usrp_mpm/sys_utils/udev.py
+++ b/mpm/python/usrp_mpm/sys_utils/udev.py
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
Utilities for udev lookups
diff --git a/mpm/python/usrp_mpm/sys_utils/uio.py b/mpm/python/usrp_mpm/sys_utils/uio.py
index 6e3a8c182..0a611cc08 100644
--- a/mpm/python/usrp_mpm/sys_utils/uio.py
+++ b/mpm/python/usrp_mpm/sys_utils/uio.py
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
Access to UIO mapped memory.
diff --git a/mpm/python/usrp_mpm/sys_utils/watchdog.py b/mpm/python/usrp_mpm/sys_utils/watchdog.py
index 3c0a48f4a..1acf95bde 100644
--- a/mpm/python/usrp_mpm/sys_utils/watchdog.py
+++ b/mpm/python/usrp_mpm/sys_utils/watchdog.py
@@ -1,7 +1,7 @@
#
-# Copyright 2018 Ettus Research, National Instruments Company
+# Copyright 2018 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
systemd watchdog control module
diff --git a/mpm/python/usrp_mpm/test_bfrfs.py b/mpm/python/usrp_mpm/test_bfrfs.py
index ae12fa8ed..d4a0b9ae1 100644
--- a/mpm/python/usrp_mpm/test_bfrfs.py
+++ b/mpm/python/usrp_mpm/test_bfrfs.py
@@ -1,8 +1,8 @@
#!/usr/bin/env python3
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
import mpmlog
import bfrfs
diff --git a/mpm/python/usrp_mpm/xports/__init__.py b/mpm/python/usrp_mpm/xports/__init__.py
index 36d429ad9..e3e2bc89b 100644
--- a/mpm/python/usrp_mpm/xports/__init__.py
+++ b/mpm/python/usrp_mpm/xports/__init__.py
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
Transport managers
diff --git a/mpm/python/usrp_mpm/xports/xportmgr_liberio.py b/mpm/python/usrp_mpm/xports/xportmgr_liberio.py
index f1e9fe2de..d5c0d2e97 100644
--- a/mpm/python/usrp_mpm/xports/xportmgr_liberio.py
+++ b/mpm/python/usrp_mpm/xports/xportmgr_liberio.py
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
Liberio Transport manager
diff --git a/mpm/python/usrp_mpm/xports/xportmgr_udp.py b/mpm/python/usrp_mpm/xports/xportmgr_udp.py
index 5e565ba86..fe7a9a9d4 100644
--- a/mpm/python/usrp_mpm/xports/xportmgr_udp.py
+++ b/mpm/python/usrp_mpm/xports/xportmgr_udp.py
@@ -1,7 +1,7 @@
#
-# Copyright 2017 Ettus Research, National Instruments Company
+# Copyright 2017 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
UDP Transport manager