We were using LICENSE.bnx2x_pmd to reference inclusion of SPDX licensing tag from all the source file. Remove the LICENSE.bnx2x_pmd file and directly include SPDX tags in source files.
Signed-off-by: Rasesh Mody <rasesh.m...@cavium.com> Acked-by: Hemant Agrawal <hemant.agra...@nxp.com> --- drivers/net/bnx2x/LICENSE.bnx2x_pmd | 3 --- drivers/net/bnx2x/Makefile | 9 ++++----- drivers/net/bnx2x/bnx2x.c | 4 +--- drivers/net/bnx2x/bnx2x.h | 4 +--- drivers/net/bnx2x/bnx2x_ethdev.c | 5 +---- drivers/net/bnx2x/bnx2x_ethdev.h | 5 +---- drivers/net/bnx2x/bnx2x_logs.h | 5 +---- drivers/net/bnx2x/bnx2x_rxtx.c | 5 +---- drivers/net/bnx2x/bnx2x_rxtx.h | 5 +---- drivers/net/bnx2x/bnx2x_stats.c | 4 +--- drivers/net/bnx2x/bnx2x_stats.h | 4 +--- drivers/net/bnx2x/bnx2x_vfpf.c | 5 +---- drivers/net/bnx2x/bnx2x_vfpf.h | 5 +---- drivers/net/bnx2x/ecore_fw_defs.h | 4 +--- drivers/net/bnx2x/ecore_hsi.h | 4 +--- drivers/net/bnx2x/ecore_init.h | 4 +--- drivers/net/bnx2x/ecore_init_ops.h | 4 +--- drivers/net/bnx2x/ecore_mfw_req.h | 4 +--- drivers/net/bnx2x/ecore_reg.h | 4 +--- drivers/net/bnx2x/ecore_sp.c | 4 +--- drivers/net/bnx2x/ecore_sp.h | 4 +--- drivers/net/bnx2x/elink.c | 4 +--- drivers/net/bnx2x/elink.h | 4 +--- 23 files changed, 25 insertions(+), 78 deletions(-) delete mode 100644 drivers/net/bnx2x/LICENSE.bnx2x_pmd diff --git a/drivers/net/bnx2x/LICENSE.bnx2x_pmd b/drivers/net/bnx2x/LICENSE.bnx2x_pmd deleted file mode 100644 index 64c6ef2..0000000 --- a/drivers/net/bnx2x/LICENSE.bnx2x_pmd +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: BSD-3-Clause - * Copyright (c) 2014-2018 Cavium Inc. - */ diff --git a/drivers/net/bnx2x/Makefile b/drivers/net/bnx2x/Makefile index 150b4cf..55d1ad6 100644 --- a/drivers/net/bnx2x/Makefile +++ b/drivers/net/bnx2x/Makefile @@ -1,8 +1,7 @@ -# Copyright (c) 2014 - 2018 Cavium Inc. -# All rights reserved. -# www.cavium.com -# -# See LICENSE.bnx2x_pmd for copyright and licensing details. +# SPDX-License-Identifier: BSD-3-Clause +# Copyright (c) 2014 - 2018 Cavium Inc. +# All rights reserved. +# www.cavium.com include $(RTE_SDK)/mk/rte.vars.mk # diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c index 84ade5f..317578c 100644 --- a/drivers/net/bnx2x/bnx2x.c +++ b/drivers/net/bnx2x/bnx2x.c @@ -1,4 +1,4 @@ -/*- +/* SPDX-License-Identifier: BSD-3-Clause * Copyright (c) 2007-2013 Broadcom Corporation. * * Eric Davis <eda...@broadcom.com> @@ -9,8 +9,6 @@ * Copyright (c) 2015-2018 Cavium Inc. * All rights reserved. * www.cavium.com - * - * See LICENSE.bnx2x_pmd for copyright and licensing details. */ #define BNX2X_DRIVER_VERSION "1.78.18" diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h index 4150fd8..34a5d65 100644 --- a/drivers/net/bnx2x/bnx2x.h +++ b/drivers/net/bnx2x/bnx2x.h @@ -1,4 +1,4 @@ -/*- +/* SPDX-License-Identifier: BSD-3-Clause * Copyright (c) 2007-2013 Broadcom Corporation. * * Eric Davis <eda...@broadcom.com> @@ -9,8 +9,6 @@ * Copyright (c) 2015-2018 Cavium Inc. * All rights reserved. * www.cavium.com - * - * See LICENSE.bnx2x_pmd for copyright and licensing details. */ #ifndef __BNX2X_H__ diff --git a/drivers/net/bnx2x/bnx2x_ethdev.c b/drivers/net/bnx2x/bnx2x_ethdev.c index 3a554b8..0949330 100644 --- a/drivers/net/bnx2x/bnx2x_ethdev.c +++ b/drivers/net/bnx2x/bnx2x_ethdev.c @@ -1,11 +1,8 @@ -/* +/* SPDX-License-Identifier: BSD-3-Clause * Copyright (c) 2013-2015 Brocade Communications Systems, Inc. - * * Copyright (c) 2015-2018 Cavium Inc. * All rights reserved. * www.cavium.com - * - * See LICENSE.bnx2x_pmd for copyright and licensing details. */ #include "bnx2x.h" diff --git a/drivers/net/bnx2x/bnx2x_ethdev.h b/drivers/net/bnx2x/bnx2x_ethdev.h index f05be7e..3178245 100644 --- a/drivers/net/bnx2x/bnx2x_ethdev.h +++ b/drivers/net/bnx2x/bnx2x_ethdev.h @@ -1,11 +1,8 @@ -/* +/* SPDX-License-Identifier: BSD-3-Clause * Copyright (c) 2013-2015 Brocade Communications Systems, Inc. - * * Copyright (c) 2015-2018 Cavium Inc. * All rights reserved. * www.cavium.com - * - * See LICENSE.bnx2x_pmd for copyright and licensing details. */ #ifndef PMD_BNX2X_ETHDEV_H diff --git a/drivers/net/bnx2x/bnx2x_logs.h b/drivers/net/bnx2x/bnx2x_logs.h index 69a2fe1..9e232a9 100644 --- a/drivers/net/bnx2x/bnx2x_logs.h +++ b/drivers/net/bnx2x/bnx2x_logs.h @@ -1,11 +1,8 @@ -/* +/* SPDX-License-Identifier: BSD-3-Clause * Copyright (c) 2013-2015 Brocade Communications Systems, Inc. - * * Copyright (c) 2015-2018 Cavium Inc. * All rights reserved. * www.cavium.com - * - * See LICENSE.bnx2x_pmd for copyright and licensing details. */ #ifndef _PMD_LOGS_H_ diff --git a/drivers/net/bnx2x/bnx2x_rxtx.c b/drivers/net/bnx2x/bnx2x_rxtx.c index 331884c..d9a4127 100644 --- a/drivers/net/bnx2x/bnx2x_rxtx.c +++ b/drivers/net/bnx2x/bnx2x_rxtx.c @@ -1,11 +1,8 @@ -/* +/* SPDX-License-Identifier: BSD-3-Clause * Copyright (c) 2013-2015 Brocade Communications Systems, Inc. - * * Copyright (c) 2015-2018 Cavium Inc. * All rights reserved. * www.cavium.com - * - * See LICENSE.bnx2x_pmd for copyright and licensing details. */ #include "bnx2x.h" diff --git a/drivers/net/bnx2x/bnx2x_rxtx.h b/drivers/net/bnx2x/bnx2x_rxtx.h index 94b9e1b..6ad4928 100644 --- a/drivers/net/bnx2x/bnx2x_rxtx.h +++ b/drivers/net/bnx2x/bnx2x_rxtx.h @@ -1,11 +1,8 @@ -/* +/* SPDX-License-Identifier: BSD-3-Clause * Copyright (c) 2013-2015 Brocade Communications Systems, Inc. - * * Copyright (c) 2015-2018 Cavium Inc. * All rights reserved. * www.cavium.com - * - * See LICENSE.bnx2x_pmd for copyright and licensing details. */ #ifndef _BNX2X_RXTX_H_ diff --git a/drivers/net/bnx2x/bnx2x_stats.c b/drivers/net/bnx2x/bnx2x_stats.c index b67a711..edc86cc 100644 --- a/drivers/net/bnx2x/bnx2x_stats.c +++ b/drivers/net/bnx2x/bnx2x_stats.c @@ -1,4 +1,4 @@ -/*- +/* SPDX-License-Identifier: BSD-3-Clause * Copyright (c) 2007-2013 Broadcom Corporation. * * Eric Davis <eda...@broadcom.com> @@ -9,8 +9,6 @@ * Copyright (c) 2015-2018 Cavium Inc. * All rights reserved. * www.cavium.com - * - * See LICENSE.bnx2x_pmd for copyright and licensing details. */ #include "bnx2x.h" diff --git a/drivers/net/bnx2x/bnx2x_stats.h b/drivers/net/bnx2x/bnx2x_stats.h index 0ffd308..635412b 100644 --- a/drivers/net/bnx2x/bnx2x_stats.h +++ b/drivers/net/bnx2x/bnx2x_stats.h @@ -1,4 +1,4 @@ -/*- +/* SPDX-License-Identifier: BSD-3-Clause * Copyright (c) 2007-2013 Broadcom Corporation. * * Eric Davis <eda...@broadcom.com> @@ -9,8 +9,6 @@ * Copyright (c) 2015-2018 Cavium Inc. * All rights reserved. * www.cavium.com - * - * See LICENSE.bnx2x_pmd for copyright and licensing details. */ #ifndef BNX2X_STATS_H diff --git a/drivers/net/bnx2x/bnx2x_vfpf.c b/drivers/net/bnx2x/bnx2x_vfpf.c index dacad77..50099d4 100644 --- a/drivers/net/bnx2x/bnx2x_vfpf.c +++ b/drivers/net/bnx2x/bnx2x_vfpf.c @@ -1,11 +1,8 @@ -/* +/* SPDX-License-Identifier: BSD-3-Clause * Copyright (c) 2013-2015 Brocade Communications Systems, Inc. - * * Copyright (c) 2015-2018 Cavium Inc. * All rights reserved. * www.cavium.com - * - * See LICENSE.bnx2x_pmd for copyright and licensing details. */ #include "bnx2x.h" diff --git a/drivers/net/bnx2x/bnx2x_vfpf.h b/drivers/net/bnx2x/bnx2x_vfpf.h index c4675d4..cc6fef9 100644 --- a/drivers/net/bnx2x/bnx2x_vfpf.h +++ b/drivers/net/bnx2x/bnx2x_vfpf.h @@ -1,11 +1,8 @@ -/* +/* SPDX-License-Identifier: BSD-3-Clause * Copyright (c) 2013-2015 Brocade Communications Systems, Inc. - * * Copyright (c) 2015-2018 Cavium Inc. * All rights reserved. * www.cavium.com - * - * See LICENSE.bnx2x_pmd for copyright and licensing details. */ #ifndef BNX2X_VFPF_H diff --git a/drivers/net/bnx2x/ecore_fw_defs.h b/drivers/net/bnx2x/ecore_fw_defs.h index 544ec23..5984acd 100644 --- a/drivers/net/bnx2x/ecore_fw_defs.h +++ b/drivers/net/bnx2x/ecore_fw_defs.h @@ -1,4 +1,4 @@ -/*- +/* SPDX-License-Identifier: BSD-3-Clause * Copyright (c) 2007-2013 Broadcom Corporation. * * Eric Davis <eda...@broadcom.com> @@ -8,8 +8,6 @@ * Copyright (c) 2014-2018 Cavium Inc. * All rights reserved. * www.cavium.com - * - * See LICENSE.bnx2x_pmd for copyright and licensing details. */ #ifndef ECORE_FW_DEFS_H diff --git a/drivers/net/bnx2x/ecore_hsi.h b/drivers/net/bnx2x/ecore_hsi.h index c9c5ba7..57085eb 100644 --- a/drivers/net/bnx2x/ecore_hsi.h +++ b/drivers/net/bnx2x/ecore_hsi.h @@ -1,4 +1,4 @@ -/*- +/* SPDX-License-Identifier: BSD-3-Clause * Copyright (c) 2007-2013 Broadcom Corporation. * * Eric Davis <eda...@broadcom.com> @@ -8,8 +8,6 @@ * Copyright (c) 2014-2018 Cavium Inc. * All rights reserved. * www.cavium.com - * - * See LICENSE.bnx2x_pmd for copyright and licensing details. */ #ifndef ECORE_HSI_H diff --git a/drivers/net/bnx2x/ecore_init.h b/drivers/net/bnx2x/ecore_init.h index dcf409d..f2de07e 100644 --- a/drivers/net/bnx2x/ecore_init.h +++ b/drivers/net/bnx2x/ecore_init.h @@ -1,4 +1,4 @@ -/*- +/* SPDX-License-Identifier: BSD-3-Clause * Copyright (c) 2007-2013 Broadcom Corporation. * * Eric Davis <eda...@broadcom.com> @@ -9,8 +9,6 @@ * Copyright (c) 2015-2018 Cavium Inc. * All rights reserved. * www.cavium.com - * - * See LICENSE.bnx2x_pmd for copyright and licensing details. */ #ifndef ECORE_INIT_H diff --git a/drivers/net/bnx2x/ecore_init_ops.h b/drivers/net/bnx2x/ecore_init_ops.h index 5cc6730..2b003af 100644 --- a/drivers/net/bnx2x/ecore_init_ops.h +++ b/drivers/net/bnx2x/ecore_init_ops.h @@ -1,4 +1,4 @@ -/*- +/* SPDX-License-Identifier: BSD-3-Clause * Copyright (c) 2007-2013 Broadcom Corporation. * * Eric Davis <eda...@broadcom.com> @@ -9,8 +9,6 @@ * Copyright (c) 2015-2018 Cavium Inc. * All rights reserved. * www.cavium.com - * - * See LICENSE.bnx2x_pmd for copyright and licensing details. */ #ifndef ECORE_INIT_OPS_H diff --git a/drivers/net/bnx2x/ecore_mfw_req.h b/drivers/net/bnx2x/ecore_mfw_req.h index fe7fe0e..fe94504 100644 --- a/drivers/net/bnx2x/ecore_mfw_req.h +++ b/drivers/net/bnx2x/ecore_mfw_req.h @@ -1,4 +1,4 @@ -/*- +/* SPDX-License-Identifier: BSD-3-Clause * Copyright (c) 2007-2013 Broadcom Corporation. * * Eric Davis <eda...@broadcom.com> @@ -8,8 +8,6 @@ * Copyright (c) 2014-2018 Cavium Inc. * All rights reserved. * www.cavium.com - * - * See LICENSE.bnx2x_pmd for copyright and licensing details. */ #ifndef ECORE_MFW_REQ_H diff --git a/drivers/net/bnx2x/ecore_reg.h b/drivers/net/bnx2x/ecore_reg.h index 87a98b5..ae8a93b 100644 --- a/drivers/net/bnx2x/ecore_reg.h +++ b/drivers/net/bnx2x/ecore_reg.h @@ -1,4 +1,4 @@ -/*- +/* SPDX-License-Identifier: BSD-3-Clause * Copyright (c) 2007-2013 Broadcom Corporation. * * Eric Davis <eda...@broadcom.com> @@ -8,8 +8,6 @@ * Copyright (c) 2014-2018 Cavium Inc. * All rights reserved. * www.cavium.com - * - * See LICENSE.bnx2x_pmd for copyright and licensing details. */ #ifndef ECORE_REG_H diff --git a/drivers/net/bnx2x/ecore_sp.c b/drivers/net/bnx2x/ecore_sp.c index b790400..0c8685c 100644 --- a/drivers/net/bnx2x/ecore_sp.c +++ b/drivers/net/bnx2x/ecore_sp.c @@ -1,4 +1,4 @@ -/*- +/* SPDX-License-Identifier: BSD-3-Clause * Copyright (c) 2007-2013 Broadcom Corporation. * * Eric Davis <eda...@broadcom.com> @@ -9,8 +9,6 @@ * Copyright (c) 2015-2018 Cavium Inc. * All rights reserved. * www.cavium.com - * - * See LICENSE.bnx2x_pmd for copyright and licensing details. */ #include "bnx2x.h" diff --git a/drivers/net/bnx2x/ecore_sp.h b/drivers/net/bnx2x/ecore_sp.h index d0d4082..6b65a49 100644 --- a/drivers/net/bnx2x/ecore_sp.h +++ b/drivers/net/bnx2x/ecore_sp.h @@ -1,4 +1,4 @@ -/*- +/* SPDX-License-Identifier: BSD-3-Clause * Copyright (c) 2007-2013 Broadcom Corporation. * * Eric Davis <eda...@broadcom.com> @@ -9,8 +9,6 @@ * Copyright (c) 2015-2018 Cavium Inc. * All rights reserved. * www.cavium.com - * - * See LICENSE.bnx2x_pmd for copyright and licensing details. */ #ifndef ECORE_SP_H diff --git a/drivers/net/bnx2x/elink.c b/drivers/net/bnx2x/elink.c index f7e097a..b63fd23 100644 --- a/drivers/net/bnx2x/elink.c +++ b/drivers/net/bnx2x/elink.c @@ -1,4 +1,4 @@ -/* +/* SPDX-License-Identifier: BSD-3-Clause * Copyright (c) 2007-2013 Broadcom Corporation. * * Eric Davis <eda...@broadcom.com> @@ -9,8 +9,6 @@ * Copyright (c) 2015-2018 Cavium Inc. * All rights reserved. * www.cavium.com - * - * See LICENSE.bnx2x_pmd for copyright and licensing details. */ #include "bnx2x.h" diff --git a/drivers/net/bnx2x/elink.h b/drivers/net/bnx2x/elink.h index 7556797..40000c2 100644 --- a/drivers/net/bnx2x/elink.h +++ b/drivers/net/bnx2x/elink.h @@ -1,4 +1,4 @@ -/* +/* SPDX-License-Identifier: BSD-3-Clause * Copyright (c) 2007-2013 Broadcom Corporation. * * Eric Davis <eda...@broadcom.com> @@ -9,8 +9,6 @@ * Copyright (c) 2015-2018 Cavium Inc. * All rights reserved. * www.cavium.com - * - * See LICENSE.bnx2x_pmd for copyright and licensing details. */ #ifndef ELINK_H -- 1.7.10.3
