On Tue, Feb 23, 2021 at 06:28:51PM +0100, Uwe Kleine-König wrote: > Converts the files that licensecheck can determine to be licensed under > GPL-2.0-only or GPL-2.0-or-later and also convert the copyright statements > to SPDX. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> > --- > arch/arm/mach-davinci/include/mach/debug_ll.h | 17 ++--------------- > arch/arm/mach-davinci/include/mach/hardware.h | 8 +++----- > arch/arm/mach-davinci/include/mach/serial.h | 8 +++----- > arch/arm/mach-davinci/include/mach/time.h | 8 +++----- > arch/arm/mach-davinci/time.c | 8 +++----- > 5 files changed, 14 insertions(+), 35 deletions(-) Applied, thanks Sascha > > diff --git a/arch/arm/mach-davinci/include/mach/debug_ll.h b/arch/arm/mach-davinci/include/mach/debug_ll.h > index d509e849f39d..60a8d2a5f184 100644 > --- a/arch/arm/mach-davinci/include/mach/debug_ll.h > +++ b/arch/arm/mach-davinci/include/mach/debug_ll.h > @@ -1,18 +1,5 @@ > -/* > - * Copyright (C) 2014 Antony Pavlov <antonynpavlov@xxxxxxxxx> > - * > - * This file is part of barebox. > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License version 2 > - * as published by the Free Software Foundation. > - * > - * This program is distributed in the hope that it will be useful, > - * but WITHOUT ANY WARRANTY; without even the implied warranty of > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > - * GNU General Public License for more details. > - * > - */ > +/* SPDX-License-Identifier: GPL-2.0-only */ > +/* SPDX-FileCopyrightText: 2014 Antony Pavlov <antonynpavlov@xxxxxxxxx> */ > > /** @file > * This File contains declaration for early output support > diff --git a/arch/arm/mach-davinci/include/mach/hardware.h b/arch/arm/mach-davinci/include/mach/hardware.h > index ea9f48184404..8ab824800e0c 100644 > --- a/arch/arm/mach-davinci/include/mach/hardware.h > +++ b/arch/arm/mach-davinci/include/mach/hardware.h > @@ -1,12 +1,10 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > +/* SPDX-FileCopyrightText: 2007 Deep Root Systems, LLC. */ > + > /* > * Hardware definitions common to all DaVinci family processors > * > * Author: Kevin Hilman, Deep Root Systems, LLC > - * > - * 2007 (c) Deep Root Systems, LLC. This file is licensed under > - * the terms of the GNU General Public License version 2. This program > - * is licensed "as is" without any warranty of any kind, whether express > - * or implied. > */ > #ifndef __ASM_ARCH_HARDWARE_H > #define __ASM_ARCH_HARDWARE_H > diff --git a/arch/arm/mach-davinci/include/mach/serial.h b/arch/arm/mach-davinci/include/mach/serial.h > index bc7449f3d765..03e8ef43dd7c 100644 > --- a/arch/arm/mach-davinci/include/mach/serial.h > +++ b/arch/arm/mach-davinci/include/mach/serial.h > @@ -1,12 +1,10 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > +/* SPDX-FileCopyrightText: 2007 MontaVista Software, Inc. */ > + > /* > * DaVinci serial device definitions > * > * Author: Kevin Hilman, MontaVista Software, Inc. <source@xxxxxxxxxx> > - * > - * 2007 (c) MontaVista Software, Inc. This file is licensed under > - * the terms of the GNU General Public License version 2. This program > - * is licensed "as is" without any warranty of any kind, whether express > - * or implied. > */ > #ifndef __ASM_ARCH_SERIAL_H > #define __ASM_ARCH_SERIAL_H > diff --git a/arch/arm/mach-davinci/include/mach/time.h b/arch/arm/mach-davinci/include/mach/time.h > index 34781b6ec5a7..6456205859c5 100644 > --- a/arch/arm/mach-davinci/include/mach/time.h > +++ b/arch/arm/mach-davinci/include/mach/time.h > @@ -1,12 +1,10 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > +/* SPDX-FileCopyrightText: 2007 MontaVista Software, Inc. */ > + > /* > * Local header file for DaVinci time code. > * > * Author: Kevin Hilman, MontaVista Software, Inc. <source@xxxxxxxxxx> > - * > - * 2007 (c) MontaVista Software, Inc. This file is licensed under > - * the terms of the GNU General Public License version 2. This program > - * is licensed "as is" without any warranty of any kind, whether express > - * or implied. > */ > #ifndef __ARCH_ARM_MACH_DAVINCI_TIME_H > #define __ARCH_ARM_MACH_DAVINCI_TIME_H > diff --git a/arch/arm/mach-davinci/time.c b/arch/arm/mach-davinci/time.c > index 5b57fe61929b..52b3ac3e6823 100644 > --- a/arch/arm/mach-davinci/time.c > +++ b/arch/arm/mach-davinci/time.c > @@ -1,12 +1,10 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* SPDX-FileCopyrightText: 2007 MontaVista Software, Inc. */ > + > /* > * DaVinci timer subsystem > * > * Author: Kevin Hilman, MontaVista Software, Inc. <source@xxxxxxxxxx> > - * > - * 2007 (c) MontaVista Software, Inc. This file is licensed under > - * the terms of the GNU General Public License version 2. This program > - * is licensed "as is" without any warranty of any kind, whether express > - * or implied. > */ > > #include <common.h> > -- > 2.30.0 > > > _______________________________________________ > barebox mailing list > barebox@xxxxxxxxxxxxxxxxxxx > http://lists.infradead.org/mailman/listinfo/barebox -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
