diff --git a/configure.ac b/configure.ac index 4e3673b0..588f205a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,12 +1,10 @@ +# SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 # # NFB framework configure script # # Copyright (C) 2018 CESNET # Author(s): # Martin Spinler -# -# SPDX-License-Identifier: GPL-2.0 -# # ----[ SECTION: Autoconf setup ]---- # AC_PREREQ([2.63]) diff --git a/drivers/Makefile.conf b/drivers/Makefile.conf index 243b4c4d..8c291f96 100644 --- a/drivers/Makefile.conf +++ b/drivers/Makefile.conf @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 # # Configuration Makefile for NFB driver # @@ -5,9 +6,6 @@ # # Author(s): # Martin Spinler -# -# SPDX-License-Identifier: GPL-2.0 -# CONFIG_MODULES = y CONFIG_NFB = m diff --git a/drivers/Makefile.in b/drivers/Makefile.in index 03e611b0..8a518770 100644 --- a/drivers/Makefile.in +++ b/drivers/Makefile.in @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 # # NFB driver Makefile # diff --git a/drivers/configure.ac b/drivers/configure.ac index 0e35e475..e6a61b68 100644 --- a/drivers/configure.ac +++ b/drivers/configure.ac @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 # # Configure script for NFB driver # diff --git a/drivers/kernel/drivers/Makefile b/drivers/kernel/drivers/Makefile index e73f8459..8ae716f4 100644 --- a/drivers/kernel/drivers/Makefile +++ b/drivers/kernel/drivers/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 # # Makefile for NFB driver # diff --git a/drivers/kernel/drivers/nfb/Makefile b/drivers/kernel/drivers/nfb/Makefile index a980087e..6f6fc815 100644 --- a/drivers/kernel/drivers/nfb/Makefile +++ b/drivers/kernel/drivers/nfb/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 # # NFB driver Makefile # diff --git a/drivers/kernel/drivers/nfb/boot/boot.c b/drivers/kernel/drivers/nfb/boot/boot.c index b5211bd6..4b4bf7d4 100644 --- a/drivers/kernel/drivers/nfb/boot/boot.c +++ b/drivers/kernel/drivers/nfb/boot/boot.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * Boot driver module header of the NFB platform * diff --git a/drivers/kernel/drivers/nfb/boot/boot.h b/drivers/kernel/drivers/nfb/boot/boot.h index 923dab84..72c2858d 100644 --- a/drivers/kernel/drivers/nfb/boot/boot.h +++ b/drivers/kernel/drivers/nfb/boot/boot.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * Boot driver module header of the NFB platform * diff --git a/drivers/kernel/drivers/nfb/boot/flash.c b/drivers/kernel/drivers/nfb/boot/flash.c index d1f943c9..8c449d91 100644 --- a/drivers/kernel/drivers/nfb/boot/flash.c +++ b/drivers/kernel/drivers/nfb/boot/flash.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * Boot driver of the NFB platform - flash module * diff --git a/drivers/kernel/drivers/nfb/boot/gecko.c b/drivers/kernel/drivers/nfb/boot/gecko.c index a223dd41..f25d80fb 100644 --- a/drivers/kernel/drivers/nfb/boot/gecko.c +++ b/drivers/kernel/drivers/nfb/boot/gecko.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * Boot driver of the NFB platform - gecko module * diff --git a/drivers/kernel/drivers/nfb/boot/gecko.h b/drivers/kernel/drivers/nfb/boot/gecko.h index 84c82f87..a435b9ec 100644 --- a/drivers/kernel/drivers/nfb/boot/gecko.h +++ b/drivers/kernel/drivers/nfb/boot/gecko.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * Boot driver of the NFB platform - gecko module * diff --git a/drivers/kernel/drivers/nfb/boot/nfb-pmci.c b/drivers/kernel/drivers/nfb/boot/nfb-pmci.c index f658897d..552246f4 100644 --- a/drivers/kernel/drivers/nfb/boot/nfb-pmci.c +++ b/drivers/kernel/drivers/nfb/boot/nfb-pmci.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * Boot driver module for Intel M10 BMC * diff --git a/drivers/kernel/drivers/nfb/boot/nfb-pmci.h b/drivers/kernel/drivers/nfb/boot/nfb-pmci.h index 005defc4..7203a871 100644 --- a/drivers/kernel/drivers/nfb/boot/nfb-pmci.h +++ b/drivers/kernel/drivers/nfb/boot/nfb-pmci.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * Boot driver module header for Intel M10 BMC * diff --git a/drivers/kernel/drivers/nfb/boot/reload.c b/drivers/kernel/drivers/nfb/boot/reload.c index 54808f9b..c2ff8c34 100644 --- a/drivers/kernel/drivers/nfb/boot/reload.c +++ b/drivers/kernel/drivers/nfb/boot/reload.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * Boot driver of the NFB platform - reload module * diff --git a/drivers/kernel/drivers/nfb/boot/sdm.c b/drivers/kernel/drivers/nfb/boot/sdm.c index 7de157eb..c371b90c 100644 --- a/drivers/kernel/drivers/nfb/boot/sdm.c +++ b/drivers/kernel/drivers/nfb/boot/sdm.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * sdm.c: SDM Client commands implementation * diff --git a/drivers/kernel/drivers/nfb/boot/sdm.h b/drivers/kernel/drivers/nfb/boot/sdm.h index 185880f6..da436b4a 100644 --- a/drivers/kernel/drivers/nfb/boot/sdm.h +++ b/drivers/kernel/drivers/nfb/boot/sdm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * sdm.h: SDM Client commands header file * diff --git a/drivers/kernel/drivers/nfb/bus.c b/drivers/kernel/drivers/nfb/bus.c index e3281429..eff3b21b 100644 --- a/drivers/kernel/drivers/nfb/bus.c +++ b/drivers/kernel/drivers/nfb/bus.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * Component and bus driver module of the NFB platform * diff --git a/drivers/kernel/drivers/nfb/char.c b/drivers/kernel/drivers/nfb/char.c index 65179380..43c6ac37 100644 --- a/drivers/kernel/drivers/nfb/char.c +++ b/drivers/kernel/drivers/nfb/char.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * Char driver module of the NFB platform * diff --git a/drivers/kernel/drivers/nfb/core.c b/drivers/kernel/drivers/nfb/core.c index 85c3774d..3bcb97ec 100644 --- a/drivers/kernel/drivers/nfb/core.c +++ b/drivers/kernel/drivers/nfb/core.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * Core driver module of the NFB platform * diff --git a/drivers/kernel/drivers/nfb/fdt.h b/drivers/kernel/drivers/nfb/fdt.h index a30c725f..9a561ed8 100644 --- a/drivers/kernel/drivers/nfb/fdt.h +++ b/drivers/kernel/drivers/nfb/fdt.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * libfdt extension of the NFB platform * diff --git a/drivers/kernel/drivers/nfb/hwmon/nfb_hwmon.c b/drivers/kernel/drivers/nfb/hwmon/nfb_hwmon.c index 4c0fb84d..43746653 100644 --- a/drivers/kernel/drivers/nfb/hwmon/nfb_hwmon.c +++ b/drivers/kernel/drivers/nfb/hwmon/nfb_hwmon.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * HWMon driver module of the NFB platform * diff --git a/drivers/kernel/drivers/nfb/hwmon/nfb_hwmon.h b/drivers/kernel/drivers/nfb/hwmon/nfb_hwmon.h index e07e0905..6a09b231 100644 --- a/drivers/kernel/drivers/nfb/hwmon/nfb_hwmon.h +++ b/drivers/kernel/drivers/nfb/hwmon/nfb_hwmon.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * HWMon driver module header of the NFB platform * diff --git a/drivers/kernel/drivers/nfb/hwmon/nfb_hwmon_transceiver.h b/drivers/kernel/drivers/nfb/hwmon/nfb_hwmon_transceiver.h index f44d7050..a2308e6e 100644 --- a/drivers/kernel/drivers/nfb/hwmon/nfb_hwmon_transceiver.h +++ b/drivers/kernel/drivers/nfb/hwmon/nfb_hwmon_transceiver.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * HWMon helper library - transciever sensors functions * diff --git a/drivers/kernel/drivers/nfb/lock.c b/drivers/kernel/drivers/nfb/lock.c index b2b9def5..8720a723 100644 --- a/drivers/kernel/drivers/nfb/lock.c +++ b/drivers/kernel/drivers/nfb/lock.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * MI bus driver module of the NFB platform * diff --git a/drivers/kernel/drivers/nfb/mi/mi.c b/drivers/kernel/drivers/nfb/mi/mi.c index a09828bd..f3654c98 100644 --- a/drivers/kernel/drivers/nfb/mi/mi.c +++ b/drivers/kernel/drivers/nfb/mi/mi.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * MI bus driver of the NFB platform * diff --git a/drivers/kernel/drivers/nfb/mi/mi.h b/drivers/kernel/drivers/nfb/mi/mi.h index 114c826d..a0848337 100644 --- a/drivers/kernel/drivers/nfb/mi/mi.h +++ b/drivers/kernel/drivers/nfb/mi/mi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * MI driver header of the NFB platform * diff --git a/drivers/kernel/drivers/nfb/misc.c b/drivers/kernel/drivers/nfb/misc.c index 5b2153c8..9c6d56ec 100644 --- a/drivers/kernel/drivers/nfb/misc.c +++ b/drivers/kernel/drivers/nfb/misc.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * Misc functions of the NFB platform * diff --git a/drivers/kernel/drivers/nfb/misc.h b/drivers/kernel/drivers/nfb/misc.h index 0c9f2d61..8284c9ae 100644 --- a/drivers/kernel/drivers/nfb/misc.h +++ b/drivers/kernel/drivers/nfb/misc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * Header for misc functionality of the NFB platform * diff --git a/drivers/kernel/drivers/nfb/ndp/channel.c b/drivers/kernel/drivers/nfb/ndp/channel.c index d0c10f36..d2cbe19f 100644 --- a/drivers/kernel/drivers/nfb/ndp/channel.c +++ b/drivers/kernel/drivers/nfb/ndp/channel.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * NDP driver of the NFB platform - transmission channel module * diff --git a/drivers/kernel/drivers/nfb/ndp/char.c b/drivers/kernel/drivers/nfb/ndp/char.c index 729cf053..1262e3ab 100644 --- a/drivers/kernel/drivers/nfb/ndp/char.c +++ b/drivers/kernel/drivers/nfb/ndp/char.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * NDP driver of the NFB platform - char module * diff --git a/drivers/kernel/drivers/nfb/ndp/ctrl.c b/drivers/kernel/drivers/nfb/ndp/ctrl.c index a9c5bb81..a04ac454 100644 --- a/drivers/kernel/drivers/nfb/ndp/ctrl.c +++ b/drivers/kernel/drivers/nfb/ndp/ctrl.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * NDP driver of the NFB platform - DMA controller - SZE/v1 type * diff --git a/drivers/kernel/drivers/nfb/ndp/ctrl_ndp.c b/drivers/kernel/drivers/nfb/ndp/ctrl_ndp.c index 5c00a016..0455baa0 100644 --- a/drivers/kernel/drivers/nfb/ndp/ctrl_ndp.c +++ b/drivers/kernel/drivers/nfb/ndp/ctrl_ndp.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * NDP driver of the NFB platform - DMA controller - Medusa/v2 type, Calypte/v3 type * diff --git a/drivers/kernel/drivers/nfb/ndp/driver.c b/drivers/kernel/drivers/nfb/ndp/driver.c index ff6a049f..b9aebbed 100644 --- a/drivers/kernel/drivers/nfb/ndp/driver.c +++ b/drivers/kernel/drivers/nfb/ndp/driver.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * NDP driver of the NFB platform - main module * diff --git a/drivers/kernel/drivers/nfb/ndp/kndp.c b/drivers/kernel/drivers/nfb/ndp/kndp.c index cccd0481..407830c4 100644 --- a/drivers/kernel/drivers/nfb/ndp/kndp.c +++ b/drivers/kernel/drivers/nfb/ndp/kndp.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * NDP driver of the NFB platform - sync module * diff --git a/drivers/kernel/drivers/nfb/ndp/kndp.h b/drivers/kernel/drivers/nfb/ndp/kndp.h index 7371ef33..a2821d50 100644 --- a/drivers/kernel/drivers/nfb/ndp/kndp.h +++ b/drivers/kernel/drivers/nfb/ndp/kndp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * NDP driver of the NFB platform - public header * diff --git a/drivers/kernel/drivers/nfb/ndp/ndp.h b/drivers/kernel/drivers/nfb/ndp/ndp.h index c94216eb..b3c9b9dc 100644 --- a/drivers/kernel/drivers/nfb/ndp/ndp.h +++ b/drivers/kernel/drivers/nfb/ndp/ndp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * NDP driver of the NFB platform - private header * diff --git a/drivers/kernel/drivers/nfb/ndp/ring.c b/drivers/kernel/drivers/nfb/ndp/ring.c index 0b43fa67..861502d9 100644 --- a/drivers/kernel/drivers/nfb/ndp/ring.c +++ b/drivers/kernel/drivers/nfb/ndp/ring.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * NDP driver of the NFB platform - ring buffer module * diff --git a/drivers/kernel/drivers/nfb/ndp/subscriber.c b/drivers/kernel/drivers/nfb/ndp/subscriber.c index 940ba2d6..2cc9f15a 100644 --- a/drivers/kernel/drivers/nfb/ndp/subscriber.c +++ b/drivers/kernel/drivers/nfb/ndp/subscriber.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * NDP driver of the NFB platform - subscriber module * diff --git a/drivers/kernel/drivers/nfb/ndp/subscription.c b/drivers/kernel/drivers/nfb/ndp/subscription.c index 8ffde825..7cdf9a5d 100644 --- a/drivers/kernel/drivers/nfb/ndp/subscription.c +++ b/drivers/kernel/drivers/nfb/ndp/subscription.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * NDP driver of the NFB platform - subscription module * diff --git a/drivers/kernel/drivers/nfb/ndp_netdev/core.c b/drivers/kernel/drivers/nfb/ndp_netdev/core.c index 6c959ac6..1d1b505e 100644 --- a/drivers/kernel/drivers/nfb/ndp_netdev/core.c +++ b/drivers/kernel/drivers/nfb/ndp_netdev/core.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * NDP backend network interface driver of the NFB platform * diff --git a/drivers/kernel/drivers/nfb/ndp_netdev/core.h b/drivers/kernel/drivers/nfb/ndp_netdev/core.h index 0f8b660a..dd410b1d 100644 --- a/drivers/kernel/drivers/nfb/ndp_netdev/core.h +++ b/drivers/kernel/drivers/nfb/ndp_netdev/core.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * NDP backend network interface driver of the NFB platform - main header * diff --git a/drivers/kernel/drivers/nfb/net/compat.h b/drivers/kernel/drivers/nfb/net/compat.h index 1294241f..7a0b5aaf 100644 --- a/drivers/kernel/drivers/nfb/net/compat.h +++ b/drivers/kernel/drivers/nfb/net/compat.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * NDP backend network interface driver of the NFB platform - compatibility hdr * diff --git a/drivers/kernel/drivers/nfb/net/device.c b/drivers/kernel/drivers/nfb/net/device.c index 462d8a31..4df3eab3 100644 --- a/drivers/kernel/drivers/nfb/net/device.c +++ b/drivers/kernel/drivers/nfb/net/device.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * Network interface driver of the NFB platform * diff --git a/drivers/kernel/drivers/nfb/net/driver.c b/drivers/kernel/drivers/nfb/net/driver.c index d7ad297f..544da90c 100644 --- a/drivers/kernel/drivers/nfb/net/driver.c +++ b/drivers/kernel/drivers/nfb/net/driver.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * Network interface driver of the NFB platform - core * diff --git a/drivers/kernel/drivers/nfb/net/ethtool.c b/drivers/kernel/drivers/nfb/net/ethtool.c index 60d5192e..6594addf 100644 --- a/drivers/kernel/drivers/nfb/net/ethtool.c +++ b/drivers/kernel/drivers/nfb/net/ethtool.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * Network interface driver of the NFB platform - ethtool support * diff --git a/drivers/kernel/drivers/nfb/net/net.h b/drivers/kernel/drivers/nfb/net/net.h index 4501857b..7b364c9a 100644 --- a/drivers/kernel/drivers/nfb/net/net.h +++ b/drivers/kernel/drivers/nfb/net/net.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * Network interface driver of the NFB platform - main header * diff --git a/drivers/kernel/drivers/nfb/net/sysfs.c b/drivers/kernel/drivers/nfb/net/sysfs.c index 37e909ec..75b66761 100644 --- a/drivers/kernel/drivers/nfb/net/sysfs.c +++ b/drivers/kernel/drivers/nfb/net/sysfs.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * Network interface driver of the NFB platform - sysfs support * diff --git a/drivers/kernel/drivers/nfb/nfb.h b/drivers/kernel/drivers/nfb/nfb.h index 76949465..b371ffe0 100644 --- a/drivers/kernel/drivers/nfb/nfb.h +++ b/drivers/kernel/drivers/nfb/nfb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * Main driver private header of the NFB platform * diff --git a/drivers/kernel/drivers/nfb/pci.c b/drivers/kernel/drivers/nfb/pci.c index 37d5ae2e..3df1d11b 100644 --- a/drivers/kernel/drivers/nfb/pci.c +++ b/drivers/kernel/drivers/nfb/pci.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * PCI driver module of the NFB platform * diff --git a/drivers/kernel/drivers/nfb/pci.h b/drivers/kernel/drivers/nfb/pci.h index a372e3b4..ce1f7a55 100644 --- a/drivers/kernel/drivers/nfb/pci.h +++ b/drivers/kernel/drivers/nfb/pci.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * PCI driver module header of the NFB platform * diff --git a/drivers/kernel/drivers/nfb/qdr/qdr.c b/drivers/kernel/drivers/nfb/qdr/qdr.c index d4f914e7..2d7297c8 100644 --- a/drivers/kernel/drivers/nfb/qdr/qdr.c +++ b/drivers/kernel/drivers/nfb/qdr/qdr.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * QDR driver module of the NFB platform * diff --git a/drivers/kernel/drivers/nfb/qdr/qdr.h b/drivers/kernel/drivers/nfb/qdr/qdr.h index adc084a5..1c837758 100644 --- a/drivers/kernel/drivers/nfb/qdr/qdr.h +++ b/drivers/kernel/drivers/nfb/qdr/qdr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * QDR driver module of the NFB platform - header file * diff --git a/drivers/kernel/include/linux/nfb/boot.h b/drivers/kernel/include/linux/nfb/boot.h index 51e96577..52d8cb4f 100644 --- a/drivers/kernel/include/linux/nfb/boot.h +++ b/drivers/kernel/include/linux/nfb/boot.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */ /* * NFB driver Boot component public header * diff --git a/drivers/kernel/include/linux/nfb/ndp.h b/drivers/kernel/include/linux/nfb/ndp.h index b62e3d6e..96585f2a 100644 --- a/drivers/kernel/include/linux/nfb/ndp.h +++ b/drivers/kernel/include/linux/nfb/ndp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */ /* * Interface to the NDP interface * diff --git a/drivers/kernel/include/linux/nfb/nfb.h b/drivers/kernel/include/linux/nfb/nfb.h index 74d7826a..480289f8 100644 --- a/drivers/kernel/include/linux/nfb/nfb.h +++ b/drivers/kernel/include/linux/nfb/nfb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */ /* * NFB driver public header file * diff --git a/ext/libnfb_ext_grpc/CMakeLists.txt b/ext/libnfb_ext_grpc/CMakeLists.txt index 64e5285f..7f34d2f0 100644 --- a/ext/libnfb_ext_grpc/CMakeLists.txt +++ b/ext/libnfb_ext_grpc/CMakeLists.txt @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: BSD-3-Clause # # CMake build file for NFB debug tools # diff --git a/libnfb/include/netcope/dma_ctrl_ndp.h b/libnfb/include/netcope/dma_ctrl_ndp.h index bcef16ab..d7ca227e 100644 --- a/libnfb/include/netcope/dma_ctrl_ndp.h +++ b/libnfb/include/netcope/dma_ctrl_ndp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ /* * Network component library - DMA controller - NDP/v2 type, CALYPTE/v3 type * diff --git a/libnfb/src/ndp/ndp.c b/libnfb/src/ndp/ndp.c index 0facca39..a2095b8a 100644 --- a/libnfb/src/ndp/ndp.c +++ b/libnfb/src/ndp/ndp.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * NDP driver of the NFB platform - sync module * diff --git a/python/nfb-tools/CMakeLists.txt b/python/nfb-tools/CMakeLists.txt index c83ee1b3..839913b1 100644 --- a/python/nfb-tools/CMakeLists.txt +++ b/python/nfb-tools/CMakeLists.txt @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: BSD-3-Clause # # CMake build file for NFB python tools # diff --git a/tools-debug/CMakeLists.txt b/tools-debug/CMakeLists.txt index acbaef73..8552d361 100644 --- a/tools-debug/CMakeLists.txt +++ b/tools-debug/CMakeLists.txt @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: BSD-3-Clause # # CMake build file for NFB debug tools # diff --git a/tools-debug/busdebugctl/busdebugctl.c b/tools-debug/busdebugctl/busdebugctl.c index 00901bcd..f3b76087 100644 --- a/tools-debug/busdebugctl/busdebugctl.c +++ b/tools-debug/busdebugctl/busdebugctl.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /*! * \file busdebugctl.c * \brief Tool for controlling the data streaming bus debuging master and connected probes. (STREAMING_DEBUG) diff --git a/tools-debug/busdump/busdump.c b/tools-debug/busdump/busdump.c index 0671ac88..0081a4fb 100644 --- a/tools-debug/busdump/busdump.c +++ b/tools-debug/busdump/busdump.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /*! * \file busdump.c * \brief Tool to read dumped Frame Link Unaligned data from firmware diff --git a/tools-debug/busreplay/busreplay.c b/tools-debug/busreplay/busreplay.c index 45c808d7..0a2e0c95 100644 --- a/tools-debug/busreplay/busreplay.c +++ b/tools-debug/busreplay/busreplay.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /*! * \file busreplay.c * \brief Tool to write dumped Frame Link Unaligned data into firmware diff --git a/tools-debug/nfb-mi-test/nfb-mi-test.c b/tools-debug/nfb-mi-test/nfb-mi-test.c index 1ddc8c0e..cdc0709a 100644 --- a/tools-debug/nfb-mi-test/nfb-mi-test.c +++ b/tools-debug/nfb-mi-test/nfb-mi-test.c @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * MI test tool * * Copyright (C) CESNET, 2024 * Author(s): * Martin Spinler - * - * SPDX-License-Identifier: GPL-2.0 */ #include diff --git a/tools-misc/CMakeLists.txt b/tools-misc/CMakeLists.txt index 0799b465..b18c167a 100644 --- a/tools-misc/CMakeLists.txt +++ b/tools-misc/CMakeLists.txt @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: BSD-3-Clause # # CMake build file for NFB miscellaneous tools # diff --git a/tools-misc/nfb-flash-ident/flashident.c b/tools-misc/nfb-flash-ident/flashident.c index dbd7373a..f4b6cf37 100644 --- a/tools-misc/nfb-flash-ident/flashident.c +++ b/tools-misc/nfb-flash-ident/flashident.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Board identification tool * diff --git a/tools-misc/nfb-flash-read/flashread.c b/tools-misc/nfb-flash-read/flashread.c index 378670e4..a00fbda8 100644 --- a/tools-misc/nfb-flash-read/flashread.c +++ b/tools-misc/nfb-flash-read/flashread.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Flash/MTD memory read tool * diff --git a/tools-misc/nfb-spi-max/max-spi.c b/tools-misc/nfb-spi-max/max-spi.c index 782ff26e..cb7aef0f 100644 --- a/tools-misc/nfb-spi-max/max-spi.c +++ b/tools-misc/nfb-spi-max/max-spi.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Tool for access MAX chip over SPI on specific boards * diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index cd9a39c5..a6decd58 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: BSD-3-Clause # # CMake build file for NFB tools # diff --git a/tools/boot/boot.c b/tools/boot/boot.c index d305313b..54ed37c1 100644 --- a/tools/boot/boot.c +++ b/tools/boot/boot.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Flash and boot tool * diff --git a/tools/bus/bus.c b/tools/bus/bus.c index e7d18ff8..e60bf74c 100644 --- a/tools/bus/bus.c +++ b/tools/bus/bus.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Firmware bus tool * diff --git a/tools/dma/dma.c b/tools/dma/dma.c index 562795a2..271ac111 100644 --- a/tools/dma/dma.c +++ b/tools/dma/dma.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * DMA controller status tool * diff --git a/tools/eth/cfp2.c b/tools/eth/cfp2.c index 765edadf..38c53237 100644 --- a/tools/eth/cfp2.c +++ b/tools/eth/cfp2.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Ethernet interface configuration tool - CFP2 control * diff --git a/tools/eth/eth.h b/tools/eth/eth.h index 840ef680..b2872403 100644 --- a/tools/eth/eth.h +++ b/tools/eth/eth.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Ethernet interface configuration tool - private header * diff --git a/tools/eth/ieee802_3.c b/tools/eth/ieee802_3.c index e3eaee87..e7d43b35 100644 --- a/tools/eth/ieee802_3.c +++ b/tools/eth/ieee802_3.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Ethernet interface configuration tool - IEEE 802.3 registers * diff --git a/tools/eth/ieee802_3.h b/tools/eth/ieee802_3.h index 1dec01ae..fb7df72c 100644 --- a/tools/eth/ieee802_3.h +++ b/tools/eth/ieee802_3.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Ethernet interface configuration tool - IEEE 802.3 registers header file * diff --git a/tools/eth/main.c b/tools/eth/main.c index c2347029..6218e037 100644 --- a/tools/eth/main.c +++ b/tools/eth/main.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Ethernet interface configuration tool * diff --git a/tools/eth/mdio.h b/tools/eth/mdio.h index 340e8eb1..cd580c18 100644 --- a/tools/eth/mdio.h +++ b/tools/eth/mdio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Ethernet interface configuration tool - private MDIO header * diff --git a/tools/eth/pcspma.c b/tools/eth/pcspma.c index c87a257e..7aa13a10 100644 --- a/tools/eth/pcspma.c +++ b/tools/eth/pcspma.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Ethernet interface configuration tool - PCS/PMA control * diff --git a/tools/eth/qsfpp.c b/tools/eth/qsfpp.c index 1bc4f7ef..c4d296a6 100644 --- a/tools/eth/qsfpp.c +++ b/tools/eth/qsfpp.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Ethernet interface configuration tool - QSFP+ control * diff --git a/tools/eth/query.c b/tools/eth/query.c index b8c281b4..afa51e48 100644 --- a/tools/eth/query.c +++ b/tools/eth/query.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Ethernet interface configuration tool - query interface * diff --git a/tools/eth/rxmac.c b/tools/eth/rxmac.c index f77a2a4e..3d8f2f17 100644 --- a/tools/eth/rxmac.c +++ b/tools/eth/rxmac.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Ethernet interface configuration tool - RX MAC control * diff --git a/tools/eth/transceiver.c b/tools/eth/transceiver.c index 7224df0d..70bc1e28 100644 --- a/tools/eth/transceiver.c +++ b/tools/eth/transceiver.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Ethernet interface configuration tool - transceiver control * diff --git a/tools/eth/txmac.c b/tools/eth/txmac.c index 27b2fe7e..8f79ba47 100644 --- a/tools/eth/txmac.c +++ b/tools/eth/txmac.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Ethernet interface configuration tool - TX MAC control * diff --git a/tools/info/info.c b/tools/info/info.c index dd2fb0d8..d51dbd05 100644 --- a/tools/info/info.c +++ b/tools/info/info.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Basic information tool * diff --git a/tools/mdio/mdio.c b/tools/mdio/mdio.c index a5a38f88..7b7bac88 100644 --- a/tools/mdio/mdio.c +++ b/tools/mdio/mdio.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * MDIO control tool * diff --git a/tools/ndptool/common.c b/tools/ndptool/common.c index d30a7ef5..8a6e67da 100644 --- a/tools/ndptool/common.c +++ b/tools/ndptool/common.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Data transmission tool - common code * diff --git a/tools/ndptool/common.h b/tools/ndptool/common.h index 48c14c7e..d34bc271 100644 --- a/tools/ndptool/common.h +++ b/tools/ndptool/common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Data transmission tool - common code header * diff --git a/tools/ndptool/generate.c b/tools/ndptool/generate.c index 9cc591cc..0f44ddb3 100644 --- a/tools/ndptool/generate.c +++ b/tools/ndptool/generate.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Data transmission tool - generate module * diff --git a/tools/ndptool/loopback.c b/tools/ndptool/loopback.c index 1e815bb1..b6e710eb 100644 --- a/tools/ndptool/loopback.c +++ b/tools/ndptool/loopback.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Data transmission tool - loopback module * diff --git a/tools/ndptool/loopback_hw.c b/tools/ndptool/loopback_hw.c index b39098fd..fdceafe9 100644 --- a/tools/ndptool/loopback_hw.c +++ b/tools/ndptool/loopback_hw.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Data transmission tool - loopback module * diff --git a/tools/ndptool/main.c b/tools/ndptool/main.c index 4d8c2714..aa9ad8da 100644 --- a/tools/ndptool/main.c +++ b/tools/ndptool/main.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Data transmission tool * diff --git a/tools/ndptool/modules.c b/tools/ndptool/modules.c index e8dfd3df..cf41f597 100644 --- a/tools/ndptool/modules.c +++ b/tools/ndptool/modules.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Data transmission tool - modules * diff --git a/tools/ndptool/pcap.c b/tools/ndptool/pcap.c index e3c3cb77..783a2e15 100644 --- a/tools/ndptool/pcap.c +++ b/tools/ndptool/pcap.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Data transmission tool - PCAP file handling * diff --git a/tools/ndptool/pcap.h b/tools/ndptool/pcap.h index d7e00bb2..a04e83da 100644 --- a/tools/ndptool/pcap.h +++ b/tools/ndptool/pcap.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Data transmission tool - PCAP file handling header * diff --git a/tools/ndptool/read.c b/tools/ndptool/read.c index 49beffd5..e5f5fb6c 100644 --- a/tools/ndptool/read.c +++ b/tools/ndptool/read.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Data transmission tool - read module * diff --git a/tools/ndptool/receive.c b/tools/ndptool/receive.c index a38811c0..0fc6ee62 100644 --- a/tools/ndptool/receive.c +++ b/tools/ndptool/receive.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Data transmission tool - receive module * diff --git a/tools/ndptool/stats.c b/tools/ndptool/stats.c index ff39d838..a34bee21 100644 --- a/tools/ndptool/stats.c +++ b/tools/ndptool/stats.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Data transmission tool - statistics * diff --git a/tools/ndptool/structured_packet.h b/tools/ndptool/structured_packet.h index 6fc51a3c..d47dab34 100644 --- a/tools/ndptool/structured_packet.h +++ b/tools/ndptool/structured_packet.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Data transmission tool - structured packet manipulations * diff --git a/tools/ndptool/transmit.c b/tools/ndptool/transmit.c index a141dbf7..2425ce44 100644 --- a/tools/ndptool/transmit.c +++ b/tools/ndptool/transmit.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Data transmission tool - transmit module * diff --git a/tools/tsu/tsu.c b/tools/tsu/tsu.c index 08a5cbbe..e35ec1c4 100644 --- a/tools/tsu/tsu.c +++ b/tools/tsu/tsu.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * TSU time synchronisation tool *