From 83d290c56fab2d38cd1ab4c4cc7099559c1d5046 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sun, 6 May 2018 17:58:06 -0400 Subject: SPDX: Convert all of our single license tags to Linux Kernel style When U-Boot started using SPDX tags we were among the early adopters and there weren't a lot of other examples to borrow from. So we picked the area of the file that usually had a full license text and replaced it with an appropriate SPDX-License-Identifier: entry. Since then, the Linux Kernel has adopted SPDX tags and they place it as the very first line in a file (except where shebangs are used, then it's second line) and with slightly different comment styles than us. In part due to community overlap, in part due to better tag visibility and in part for other minor reasons, switch over to that style. This commit changes all instances where we have a single declared license in the tag as both the before and after are identical in tag contents. There's also a few places where I found we did not have a tag and have introduced one. Signed-off-by: Tom Rini --- include/usb/ci_udc.h | 3 +-- include/usb/designware_udc.h | 3 +-- include/usb/dwc2_udc.h | 3 +-- include/usb/ehci-ci.h | 3 +-- include/usb/fotg210.h | 3 +-- include/usb/fusbh200.h | 3 +-- include/usb/lin_gadget_compat.h | 3 +-- include/usb/pxa27x_udc.h | 3 +-- include/usb/udc.h | 4 +--- include/usb/ulpi.h | 3 +-- 10 files changed, 10 insertions(+), 21 deletions(-) (limited to 'include/usb') diff --git a/include/usb/ci_udc.h b/include/usb/ci_udc.h index 0dee50461e8..06adb2bb4d3 100644 --- a/include/usb/ci_udc.h +++ b/include/usb/ci_udc.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2011, Marvell Semiconductor Inc. * Lei Wen - * - * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/include/usb/designware_udc.h b/include/usb/designware_udc.h index 2e1cdf138f1..f874e5c35cc 100644 --- a/include/usb/designware_udc.h +++ b/include/usb/designware_udc.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2009 * Vipin Kumar, ST Micoelectronics, vipin.kumar@st.com. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __DW_UDC_H diff --git a/include/usb/dwc2_udc.h b/include/usb/dwc2_udc.h index 1a370e0e86b..62e32365e21 100644 --- a/include/usb/dwc2_udc.h +++ b/include/usb/dwc2_udc.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * drivers/usb/gadget/dwc2_udc.h * Designware DWC2 on-chip full/high speed USB device controllers * Copyright (C) 2005 for Samsung Electronics - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __DWC2_USB_GADGET diff --git a/include/usb/ehci-ci.h b/include/usb/ehci-ci.h index 4853cb2c71a..e4579a5bec8 100644 --- a/include/usb/ehci-ci.h +++ b/include/usb/ehci-ci.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2005, 2009 Freescale Semiconductor, Inc * Copyright (c) 2005 MontaVista Software * Copyright (c) 2008 Excito Elektronik i Sk=E5ne AB - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _EHCI_CI_H diff --git a/include/usb/fotg210.h b/include/usb/fotg210.h index b83e8f5931f..292ce54e0c4 100644 --- a/include/usb/fotg210.h +++ b/include/usb/fotg210.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Faraday USB 2.0 OTG Controller * * (C) Copyright 2010 Faraday Technology * Dante Su - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _FOTG210_H diff --git a/include/usb/fusbh200.h b/include/usb/fusbh200.h index e2d8553653b..6ae1d848801 100644 --- a/include/usb/fusbh200.h +++ b/include/usb/fusbh200.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Faraday USB 2.0 EHCI Controller * * (C) Copyright 2010 Faraday Technology * Dante Su - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _FUSBH200_H diff --git a/include/usb/lin_gadget_compat.h b/include/usb/lin_gadget_compat.h index d0d71f7c321..e5dba473b7a 100644 --- a/include/usb/lin_gadget_compat.h +++ b/include/usb/lin_gadget_compat.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2011 Samsung Electronics * Lukasz Majewski * * This is a Linux kernel compatibility layer for USB Gadget - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __LIN_COMPAT_H__ diff --git a/include/usb/pxa27x_udc.h b/include/usb/pxa27x_udc.h index 7eaa000303d..07d14821c31 100644 --- a/include/usb/pxa27x_udc.h +++ b/include/usb/pxa27x_udc.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * PXA27x register declarations and HCD data structures * * Copyright (C) 2007 Rodolfo Giometti * Copyright (C) 2007 Eurotech S.p.A. - * - * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/include/usb/udc.h b/include/usb/udc.h index b2e0c6b6f51..749b3a3f015 100644 --- a/include/usb/udc.h +++ b/include/usb/udc.h @@ -1,6 +1,4 @@ -/* - * SPDX-License-Identifier: GPL-2.0+ - */ +/* SPDX-License-Identifier: GPL-2.0+ */ #ifndef USB_UDC_H #define USB_UDC_H diff --git a/include/usb/ulpi.h b/include/usb/ulpi.h index 747fb0a9fd7..71642d257b6 100644 --- a/include/usb/ulpi.h +++ b/include/usb/ulpi.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Generic ULPI interface. * @@ -12,8 +13,6 @@ * * Original Copyrights follow: * Copyright (C) 2010 Nokia Corporation - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef __USB_ULPI_H__ -- cgit v1.3.1