On Fri, Sep 18, 2020 at 12:35:37PM +0200, Uwe Kleine-König wrote: > Converts the files that licensecheck can determine the license for. > Additionally some minor code reformatting is done. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> For the record, Reviewed-by: Roland Hieber <rhi@xxxxxxxxxxxxxx> Also, thanks for moving barebox towards SPDX compatibility! :-) - Roland > --- > arch/x86/bios/bios_disk.S | 23 ++++--------------- > arch/x86/bios/memory16.S | 21 ++++------------- > arch/x86/bios/traveler.S | 21 ++++------------- > arch/x86/boards/x86_generic/disk_bios_drive.c | 17 ++------------ > arch/x86/boards/x86_generic/envsector.h | 14 +---------- > arch/x86/boards/x86_generic/generic_pc.c | 17 ++------------ > .../boards/x86_generic/intf_platform_ide.c | 19 +++------------ > arch/x86/boards/x86_generic/serial_ns16550.c | 19 +++------------ > arch/x86/boot/a20.c | 16 +++++-------- > arch/x86/boot/bioscall.S | 13 ++++------- > arch/x86/boot/boot.h | 16 +++++-------- > arch/x86/boot/boot_main.S | 21 ++++------------- > arch/x86/boot/main_entry.c | 17 ++------------ > arch/x86/boot/pmjump.S | 12 +++------- > arch/x86/boot/prepare_uboot.c | 12 +++------- > arch/x86/boot/regs.c | 13 ++++------- > arch/x86/boot/tty.c | 16 +++++-------- > arch/x86/include/asm/bitops.h | 14 +---------- > arch/x86/include/asm/byteorder.h | 14 +---------- > arch/x86/include/asm/common.h | 14 +---------- > arch/x86/include/asm/dma.h | 8 ++----- > arch/x86/include/asm/modes.h | 17 ++------------ > arch/x86/include/asm/module.h | 14 +---------- > arch/x86/include/asm/segment.h | 17 ++------------ > arch/x86/include/asm/string.h | 14 +---------- > arch/x86/include/asm/syslib.h | 17 ++------------ > arch/x86/lib/barebox.lds.S | 14 +---------- > arch/x86/lib/gdt.c | 17 ++------------ > arch/x86/lib/linux_start.S | 23 ++++--------------- > arch/x86/lib/memory.c | 21 ++++------------- > arch/x86/mach-i386/include/mach/barebox.lds.h | 17 ++------------ > arch/x86/mach-i386/pit_timer.c | 17 ++------------ > 32 files changed, 91 insertions(+), 434 deletions(-) > > diff --git a/arch/x86/bios/bios_disk.S b/arch/x86/bios/bios_disk.S > index cce33e67afaf..c2a824ed6eb4 100644 > --- a/arch/x86/bios/bios_disk.S > +++ b/arch/x86/bios/bios_disk.S > @@ -1,21 +1,8 @@ > -/* > - * Copyright (C) 2009 Juergen Beisert, Pengutronix > - * > - * Mostly stolen from the GRUB2 project > - * Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008 Free Software Foundation, Inc. > - * > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License as > - * published by the Free Software Foundation; either version 2 of > - * the License, or (at your option) any later version. > - * > - * 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-or-later */ > +/* SPDX-FileCopyrightText: 2009 Juergen Beisert, Pengutronix */ > +/* SPDX-FileCopyrightText: 1999-2008 Free Software Foundation, Inc. */ > + > +/* Mostly stolen from the GRUB2 project */ > > /** > * @file > diff --git a/arch/x86/bios/memory16.S b/arch/x86/bios/memory16.S > index 76ee72b56cda..e4aef2f256ea 100644 > --- a/arch/x86/bios/memory16.S > +++ b/arch/x86/bios/memory16.S > @@ -1,20 +1,7 @@ > -/* > - * Copyright (C) 2009 Juergen Beisert, Pengutronix > - * > - * This code was inspired by the GRUB2 project. > - * > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License as > - * published by the Free Software Foundation; either version 2 of > - * the License, or (at your option) any later version. > - * > - * 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-or-later */ > +/* SPDX-FileCopyrightText: 2009 Juergen Beisert, Pengutronix */ > + > +/* This code was inspired by the GRUB2 project. */ > > /** > * @file > diff --git a/arch/x86/bios/traveler.S b/arch/x86/bios/traveler.S > index 113b19802eb9..1c11c9dc747d 100644 > --- a/arch/x86/bios/traveler.S > +++ b/arch/x86/bios/traveler.S > @@ -1,20 +1,7 @@ > -/* > - * Copyright (C) 2009 Juergen Beisert, Pengutronix > - * > - * Mostly stolen from the GRUB2 project > - * > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License as > - * published by the Free Software Foundation; either version 2 of > - * the License, or (at your option) any later version. > - * > - * 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-or-later */ > +/* SPDX-FileCopyrightText: 2009 Juergen Beisert, Pengutronix */ > + > +/* Mostly stolen from the GRUB2 project */ > > /** > * @file > diff --git a/arch/x86/boards/x86_generic/disk_bios_drive.c b/arch/x86/boards/x86_generic/disk_bios_drive.c > index f33f48c3fba4..c8e9ae85232a 100644 > --- a/arch/x86/boards/x86_generic/disk_bios_drive.c > +++ b/arch/x86/boards/x86_generic/disk_bios_drive.c > @@ -1,18 +1,5 @@ > -/* > - * Copyright (C) 2009 Juergen Beisert, Pengutronix > - * > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License as > - * published by the Free Software Foundation; either version 2 of > - * the License, or (at your option) any later version. > - * > - * 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-or-later > +// SPDX-FileCopyrightText: 2009 Juergen Beisert, Pengutronix > > /** > * @file > diff --git a/arch/x86/boards/x86_generic/envsector.h b/arch/x86/boards/x86_generic/envsector.h > index 86511c8af782..57a6d2a21ff2 100644 > --- a/arch/x86/boards/x86_generic/envsector.h > +++ b/arch/x86/boards/x86_generic/envsector.h > @@ -1,16 +1,4 @@ > -/* > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License as > - * published by the Free Software Foundation; either version 2 of > - * the License, or (at your option) any later version. > - * > - * 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-or-later */ > > /** > * @file > diff --git a/arch/x86/boards/x86_generic/generic_pc.c b/arch/x86/boards/x86_generic/generic_pc.c > index 482889f2d98a..2f1db7aca18d 100644 > --- a/arch/x86/boards/x86_generic/generic_pc.c > +++ b/arch/x86/boards/x86_generic/generic_pc.c > @@ -1,18 +1,5 @@ > -/* > - * Copyright (C) 2009 Juergen Beisert, Pengutronix > - * > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License as > - * published by the Free Software Foundation; either version 2 of > - * the License, or (at your option) any later version. > - * > - * 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-or-later > +// SPDX-FileCopyrightText: 2009 Juergen Beisert, Pengutronix > > #include <common.h> > #include <types.h> > diff --git a/arch/x86/boards/x86_generic/intf_platform_ide.c b/arch/x86/boards/x86_generic/intf_platform_ide.c > index 528e721d560c..0db031484fb1 100644 > --- a/arch/x86/boards/x86_generic/intf_platform_ide.c > +++ b/arch/x86/boards/x86_generic/intf_platform_ide.c > @@ -1,19 +1,6 @@ > -/* > - * Copyright (C) 2014 Juergen Beisert, Pengutronix, Michel Stam, > - * Fugro Intersite > - * > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License as > - * published by the Free Software Foundation; either version 2 of > - * the License, or (at your option) any later version. > - * > - * 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-or-later > +// SPDX-FileCopyrightText: 2014 Juergen Beisert, Pengutronix > +// SPDX-FileCopyrightText: 2014 Michel Stam, Fugro Intersite > > /** > * @file > diff --git a/arch/x86/boards/x86_generic/serial_ns16550.c b/arch/x86/boards/x86_generic/serial_ns16550.c > index abc1047a501c..4159bc39fb76 100644 > --- a/arch/x86/boards/x86_generic/serial_ns16550.c > +++ b/arch/x86/boards/x86_generic/serial_ns16550.c > @@ -1,19 +1,6 @@ > -/* > - * Copyright (C) 2009 Juergen Beisert, Pengutronix, Michel Stam, > - * Fugro Intersite > - * > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License as > - * published by the Free Software Foundation; either version 2 of > - * the License, or (at your option) any later version. > - * > - * 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-or-later > +// SPDX-FileCopyrightText: 2009 Juergen Beisert, Pengutronix > +// SPDX-FileCopyrightText: 2009 Michel Stam, Fugro Intersite > > /** > * @file > diff --git a/arch/x86/boot/a20.c b/arch/x86/boot/a20.c > index ddb40ee5c2e9..f501feeeddc2 100644 > --- a/arch/x86/boot/a20.c > +++ b/arch/x86/boot/a20.c > @@ -1,13 +1,9 @@ > -/* -*- linux-c -*- ------------------------------------------------------- * > - * > - * Copyright (C) 1991, 1992 Linus Torvalds > - * Copyright 2007-2008 rPath, Inc. - All Rights Reserved > - * Copyright 2009 Intel Corporation; author H. Peter Anvin > - * > - * This file is part of the Linux kernel, and is made available under > - * the terms of the GNU General Public License version 2. > - * > - * ----------------------------------------------------------------------- */ > +// SPDX-License-Identifier: GPL-2.0-only > +// SPDX-FileCopyrightText: 1991,1992 Linus Torvalds > +// SPDX-FileCopyrightText: 2007-2008 rPath, Inc. > +// SPDX-FileCopyrightText: 2009 Intel Corporation > + > +/* Author: H. Peter Anvin and others */ > > /* > * Enable A20 gate (return -1 on failure) > diff --git a/arch/x86/boot/bioscall.S b/arch/x86/boot/bioscall.S > index e60072992bb4..6cda1eb40a49 100644 > --- a/arch/x86/boot/bioscall.S > +++ b/arch/x86/boot/bioscall.S > @@ -1,12 +1,7 @@ > -/* ----------------------------------------------------------------------- > - * > - * Copyright 2009 Intel Corporation; author H. Peter Anvin > - * > - * This file is part of the Linux kernel, and is made available under > - * the terms of the GNU General Public License version 2 or (at your > - * option) any later version; incorporated herein by reference. > - * > - * ----------------------------------------------------------------------- */ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > +/* SPDX-FileCopyrightText: 2009 Intel Corporation */ > + > +/* Author: H. Peter Anvin */ > > /* > * "Glove box" for BIOS calls. Avoids the constant problems with BIOSes > diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h > index d98b0661cdf2..54483c46c697 100644 > --- a/arch/x86/boot/boot.h > +++ b/arch/x86/boot/boot.h > @@ -1,13 +1,9 @@ > -/* -*- linux-c -*- ------------------------------------------------------- * > - * > - * Copyright (C) 1991, 1992 Linus Torvalds > - * Copyright 2007 rPath, Inc. - All Rights Reserved > - * Copyright 2009 Intel Corporation; author H. Peter Anvin > - * > - * This file is part of the Linux kernel, and is made available under > - * the terms of the GNU General Public License version 2. > - * > - * ----------------------------------------------------------------------- */ > +/* SPDX-License-Identifier: GPL-2.0-only */ > +/* SPDX-FileCopyrightText: 1991,1992 Linus Torvalds */ > +/* SPDX-FileCopyrightText: 2007 rPath, Inc. */ > +/* SPDX-FileCopyrightText: 2009 Intel Corporation */ > + > +/* Author: H. Peter Anvin and others */ > > /** > * @file > diff --git a/arch/x86/boot/boot_main.S b/arch/x86/boot/boot_main.S > index a952c8d27972..632b3f4ffa6f 100644 > --- a/arch/x86/boot/boot_main.S > +++ b/arch/x86/boot/boot_main.S > @@ -1,20 +1,7 @@ > -/* > - * Copyright (C) 2009 Juergen Beisert, Pengutronix > - * > - * This code was inspired by the GRUB2 project. > - * > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License as > - * published by the Free Software Foundation; either version 2 of > - * the License, or (at your option) any later version. > - * > - * 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-or-later */ > +/* SPDX-FileCopyrightText: Juergen Beisert, Pengutronix */ > + > +/* This code was inspired by the GRUB2 project. */ > > /** > * @file > diff --git a/arch/x86/boot/main_entry.c b/arch/x86/boot/main_entry.c > index afb7e32dfcf3..b37aa38fca20 100644 > --- a/arch/x86/boot/main_entry.c > +++ b/arch/x86/boot/main_entry.c > @@ -1,18 +1,5 @@ > -/* > - * Copyright (C) 2009 Juergen Beisert, Pengutronix > - * > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License as > - * published by the Free Software Foundation; either version 2 of > - * the License, or (at your option) any later version. > - * > - * 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-or-later > +// SPDX-FileCopyrightText: 2009 Juergen Beisert, Pengutronix > > /** > * @file > diff --git a/arch/x86/boot/pmjump.S b/arch/x86/boot/pmjump.S > index 09bfc6ea8646..4dd1881e65bb 100644 > --- a/arch/x86/boot/pmjump.S > +++ b/arch/x86/boot/pmjump.S > @@ -1,12 +1,6 @@ > -/* ----------------------------------------------------------------------- * > - * > - * Copyright (C) 1991, 1992 Linus Torvalds > - * Copyright 2007 rPath, Inc. - All Rights Reserved > - * > - * This file is part of the Linux kernel, and is made available under > - * the terms of the GNU General Public License version 2. > - * > - * ----------------------------------------------------------------------- */ > +/* SPDX-License-Identifier: GPL-2.0-only */ > +/* SPDX-FileCopyrightText: 1991,1992 Linus Torvalds */ > +/* SPDX-FileCopyrightText: 2007 rPath, Inc. */ > > /** > * @file > diff --git a/arch/x86/boot/prepare_uboot.c b/arch/x86/boot/prepare_uboot.c > index 79e6fb0cbee7..9cac594a4633 100644 > --- a/arch/x86/boot/prepare_uboot.c > +++ b/arch/x86/boot/prepare_uboot.c > @@ -1,12 +1,6 @@ > -/* -*- linux-c -*- ------------------------------------------------------- * > - * > - * Copyright (C) 1991, 1992 Linus Torvalds > - * Copyright 2007 rPath, Inc. - All Rights Reserved > - * > - * This file is part of the Linux kernel, and is made available under > - * the terms of the GNU General Public License version 2. > - * > - * ----------------------------------------------------------------------- */ > +// SPDX-License-Identifier: GPL-2.0-only > +// SPDX-FileCopyrightText: 1991,1992 Linus Torvalds > +// SPDX-FileCopyrightText: 2007 rPath, Inc. > > /* > * Prepare the machine for transition to protected mode. > diff --git a/arch/x86/boot/regs.c b/arch/x86/boot/regs.c > index ddc515518c4e..318b662175b3 100644 > --- a/arch/x86/boot/regs.c > +++ b/arch/x86/boot/regs.c > @@ -1,12 +1,7 @@ > -/* ----------------------------------------------------------------------- > - * > - * Copyright 2009 Intel Corporation; author H. Peter Anvin > - * > - * This file is part of the Linux kernel, and is made available under > - * the terms of the GNU General Public License version 2 or (at your > - * option) any later version; incorporated herein by reference. > - * > - * ----------------------------------------------------------------------- */ > +// SPDX-License-Identifier: GPL-2.0-or-later > +// SPDX-FileCopyrightText: 2009 Intel Corporation > + > +/* Author: H. Peter Anvin */ > > /** > * @file > diff --git a/arch/x86/boot/tty.c b/arch/x86/boot/tty.c > index a81671be3b72..620197c67701 100644 > --- a/arch/x86/boot/tty.c > +++ b/arch/x86/boot/tty.c > @@ -1,13 +1,9 @@ > -/* -*- linux-c -*- ------------------------------------------------------- * > - * > - * Copyright (C) 1991, 1992 Linus Torvalds > - * Copyright 2007 rPath, Inc. - All Rights Reserved > - * Copyright 2009 Intel Corporation; author H. Peter Anvin > - * > - * This file is part of the Linux kernel, and is made available under > - * the terms of the GNU General Public License version 2. > - * > - * ----------------------------------------------------------------------- */ > +// SPDX-License-Identifier: GPL-2.0-only > +// SPDX-FileCopyrightText: 1991,1992 Linus Torvalds > +// SPDX-FileCopyrightText: 2007 rPath, Inc. > +// SPDX-FileCopyrightText: 2009 Intel Corporation > + > +/* Author: H. Peter Anvin and others */ > > /** > * @file > diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h > index e77ab8320296..e2bdf98e956a 100644 > --- a/arch/x86/include/asm/bitops.h > +++ b/arch/x86/include/asm/bitops.h > @@ -1,16 +1,4 @@ > -/* > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License as > - * published by the Free Software Foundation; either version 2 of > - * the License, or (at your option) any later version. > - * > - * 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-or-later */ > > #ifndef _ASM_BITOPS_H_ > #define _ASM_BITOPS_H_ > diff --git a/arch/x86/include/asm/byteorder.h b/arch/x86/include/asm/byteorder.h > index 3cfd85056841..878b7eaa3cdd 100644 > --- a/arch/x86/include/asm/byteorder.h > +++ b/arch/x86/include/asm/byteorder.h > @@ -1,16 +1,4 @@ > -/* > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License as > - * published by the Free Software Foundation; either version 2 of > - * the License, or (at your option) any later version. > - * > - * 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-or-later */ > > /** > * @file > diff --git a/arch/x86/include/asm/common.h b/arch/x86/include/asm/common.h > index 174363b58bd1..1376b76ffe5d 100644 > --- a/arch/x86/include/asm/common.h > +++ b/arch/x86/include/asm/common.h > @@ -1,16 +1,4 @@ > -/* > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License as > - * published by the Free Software Foundation; either version 2 of > - * the License, or (at your option) any later version. > - * > - * 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-or-later */ > > /** > * @file > diff --git a/arch/x86/include/asm/dma.h b/arch/x86/include/asm/dma.h > index 27d269f49182..3dab2b688d8e 100644 > --- a/arch/x86/include/asm/dma.h > +++ b/arch/x86/include/asm/dma.h > @@ -1,9 +1,5 @@ > -/* > - * Copyright (C) 2012 by Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx> > - * > - * This file is released under the GPLv2 > - * > - */ > +/* SPDX-License-Identifier: GPL-2.0-only */ > +/* SPDX-FileCopyrightText: 2012 Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx> */ > > #ifndef __ASM_DMA_H > #define __ASM_DMA_H > diff --git a/arch/x86/include/asm/modes.h b/arch/x86/include/asm/modes.h > index bd454c7c9531..b33df858921c 100644 > --- a/arch/x86/include/asm/modes.h > +++ b/arch/x86/include/asm/modes.h > @@ -1,18 +1,5 @@ > -/* > - * Copyright (C) 2009 Juergen Beisert, Pengutronix > - * > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License as > - * published by the Free Software Foundation; either version 2 of > - * the License, or (at your option) any later version. > - * > - * 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-or-later */ > +/* SPDX-FileCopyrightText: 2009 Juergen Beisert, Pengutronix */ > > /** > * @file > diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h > index 05fbb81d2b83..3fd2ce27f4d7 100644 > --- a/arch/x86/include/asm/module.h > +++ b/arch/x86/include/asm/module.h > @@ -1,16 +1,4 @@ > -/* > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License as > - * published by the Free Software Foundation; either version 2 of > - * the License, or (at your option) any later version. > - * > - * 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-or-later */ > > /** > * @file > diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h > index 88d908a2fcc7..9e1d897b0386 100644 > --- a/arch/x86/include/asm/segment.h > +++ b/arch/x86/include/asm/segment.h > @@ -1,18 +1,5 @@ > -/* > - * Copyright (C) 2009 Juergen Beisert, Pengutronix > - * > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License as > - * published by the Free Software Foundation; either version 2 of > - * the License, or (at your option) any later version. > - * > - * 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-or-later */ > +/* SPDX-FileCopyrightText: 2009 Juergen Beisert, Pengutronix */ > > #ifndef _ASM_X86_SEGMENT_H > #define _ASM_X86_SEGMENT_H > diff --git a/arch/x86/include/asm/string.h b/arch/x86/include/asm/string.h > index 5994b51d7002..f72d8a3d1d83 100644 > --- a/arch/x86/include/asm/string.h > +++ b/arch/x86/include/asm/string.h > @@ -1,16 +1,4 @@ > -/* > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License as > - * published by the Free Software Foundation; either version 2 of > - * the License, or (at your option) any later version. > - * > - * 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-or-later */ > > /** > * @file > diff --git a/arch/x86/include/asm/syslib.h b/arch/x86/include/asm/syslib.h > index 14e373a5afb8..7e08cfd44e47 100644 > --- a/arch/x86/include/asm/syslib.h > +++ b/arch/x86/include/asm/syslib.h > @@ -1,18 +1,5 @@ > -/* > - * Copyright (C) 2009 Juergen Beisert, Pengutronix > - * > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License as > - * published by the Free Software Foundation; either version 2 of > - * the License, or (at your option) any later version. > - * > - * 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-or-later */ > +/* SPDX-FileCopyrightText: 2009 Juergen Beisert, Pengutronix */ > > #ifdef CONFIG_X86_BIOS_BRINGUP > > diff --git a/arch/x86/lib/barebox.lds.S b/arch/x86/lib/barebox.lds.S > index bf52ba9a1896..b24c4807b59d 100644 > --- a/arch/x86/lib/barebox.lds.S > +++ b/arch/x86/lib/barebox.lds.S > @@ -1,16 +1,4 @@ > -/* > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License as > - * published by the Free Software Foundation; either version 2 of > - * the License, or (at your option) any later version. > - * > - * 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-or-later */ > > #undef i386 > #include <asm-generic/barebox.lds.h> > diff --git a/arch/x86/lib/gdt.c b/arch/x86/lib/gdt.c > index 447e81942e01..4cd1622b6b63 100644 > --- a/arch/x86/lib/gdt.c > +++ b/arch/x86/lib/gdt.c > @@ -1,18 +1,5 @@ > -/* > - * Copyright (C) 2009 Juergen Beisert, Pengutronix > - * > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License as > - * published by the Free Software Foundation; either version 2 of > - * the License, or (at your option) any later version. > - * > - * 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-or-later > +// SPDX-FileCopyrightText: 2009 Juergen Beisert, Pengutronix > > /** > * @file > diff --git a/arch/x86/lib/linux_start.S b/arch/x86/lib/linux_start.S > index b9489b8e5057..07be37fed4a9 100644 > --- a/arch/x86/lib/linux_start.S > +++ b/arch/x86/lib/linux_start.S > @@ -1,21 +1,8 @@ > -/* > - * Copyright (C) 2009 Juergen Beisert, Pengutronix > - * > - * Mostly stolen from the GRUB2 project > - * Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008 Free Software Foundation, Inc. > - * > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License as > - * published by the Free Software Foundation; either version 2 of > - * the License, or (at your option) any later version. > - * > - * 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-or-later */ > +/* SPDX-FileCopyrightText: 2009 Juergen Beisert, Pengutronix */ > +/* SPDX-FileCopyrightText: 1999-2008 Free Software Foundation, Inc. */ > + > +/* Mostly stolen from the GRUB2 project */ > > /** > * @file > diff --git a/arch/x86/lib/memory.c b/arch/x86/lib/memory.c > index de0e5d907f49..64fbbb9300e5 100644 > --- a/arch/x86/lib/memory.c > +++ b/arch/x86/lib/memory.c > @@ -1,20 +1,7 @@ > -/* > - * Copyright (C) 2009 Juergen Beisert, Pengutronix > - * > - * This code was inspired by the GRUB2 project. > - * > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License as > - * published by the Free Software Foundation; either version 2 of > - * the License, or (at your option) any later version. > - * > - * 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-or-later > +// SPDX-FileCopyrightText: 2009 Juergen Beisert, Pengutronix > + > +/* This code was inspired by the GRUB2 project. */ > > /** > * @file > diff --git a/arch/x86/mach-i386/include/mach/barebox.lds.h b/arch/x86/mach-i386/include/mach/barebox.lds.h > index f6f6346398a3..50f17340e40a 100644 > --- a/arch/x86/mach-i386/include/mach/barebox.lds.h > +++ b/arch/x86/mach-i386/include/mach/barebox.lds.h > @@ -1,18 +1,5 @@ > -/* > - * Copyright (C) 2009 Juergen Beisert, Pengutronix > - * > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License as > - * published by the Free Software Foundation; either version 2 of > - * the License, or (at your option) any later version. > - * > - * 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-or-later */ > +/* SPDX-FileCopyrightText: 2009 Juergen Beisert, Pengutronix */ > > /** > * @file > diff --git a/arch/x86/mach-i386/pit_timer.c b/arch/x86/mach-i386/pit_timer.c > index 857ba3136ccf..d2da3b60d48b 100644 > --- a/arch/x86/mach-i386/pit_timer.c > +++ b/arch/x86/mach-i386/pit_timer.c > @@ -1,18 +1,5 @@ > -/* > - * Copyright (C) 2009 Juergen Beisert, Pengutronix > - * > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License as > - * published by the Free Software Foundation; either version 2 of > - * the License, or (at your option) any later version. > - * > - * 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-or-later > +// SPDX-FileCopyrightText: 2009 Juergen Beisert, Pengutronix */ > > /** > * @file > -- > 2.27.0 > > > _______________________________________________ > barebox mailing list > barebox@xxxxxxxxxxxxxxxxxxx > http://lists.infradead.org/mailman/listinfo/barebox -- Roland Hieber, Pengutronix e.K. | r.hieber@xxxxxxxxxxxxxx | Steuerwalder Str. 21 | https://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
