Merge branch 'for-next/spdx'

140 files changed, 141 insertions, 383 deletions

diff --git a/include/abort.h b/include/abort.h
index 89ee549e34..039500b04d 100644
--- a/include/abort.h
+++ b/include/abort.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __ABORT_H
 #define __ABORT_H
 
diff --git a/include/aimage.h b/include/aimage.h
index 9702b7d35c..4f34c24771 100644
--- a/include/aimage.h
+++ b/include/aimage.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * (C) Copyright 2011 Jean-Christhophe PLAGNIOL-VILLARD <plagniol@jcrosoft.com>
  *
  * Android boot image
- *
- * Under GPLv2 only
  */
 
 #ifndef __AIMAGE_H__
diff --git a/include/aiodev.h b/include/aiodev.h
index 5e38b4fab5..ff877c0d78 100644
--- a/include/aiodev.h
+++ b/include/aiodev.h
@@ -6,15 +6,6 @@
  *
  * See file CREDITS for list of people who contributed to this
  * project.
- *
- * 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.
  */
 
 #ifndef __AIODEVICE_H
diff --git a/include/ata_drive.h b/include/ata_drive.h
index d61c6f11d4..d98e410b30 100644
--- a/include/ata_drive.h
+++ b/include/ata_drive.h
@@ -1,16 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * See file CREDITS for list of people who contributed to this
  * 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.
  */
 
 #ifndef ATA_DISK_H
diff --git a/include/bbu.h b/include/bbu.h
index 9da6785d2e..3b9d2f4bf1 100644
--- a/include/bbu.h
+++ b/include/bbu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __INCLUDE_BBU_H
 #define __INCLUDE_BBU_H
 
diff --git a/include/binfmt.h b/include/binfmt.h
index 46b627e36d..7eb46e5225 100644
--- a/include/binfmt.h
+++ b/include/binfmt.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
- *
- * GPL v2
  */
 
 #ifndef __BFMT_H__
diff --git a/include/block.h b/include/block.h
index 91377679b0..bd87efdc62 100644
--- a/include/block.h
+++ b/include/block.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __BLOCK_H
 #define __BLOCK_H
 
diff --git a/include/blspec.h b/include/blspec.h
index 7d911f030b..37076cd47c 100644
--- a/include/blspec.h
+++ b/include/blspec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __LOADER_H__
 #define __LOADER_H__
 
diff --git a/include/boot.h b/include/boot.h
index 4f7612ab80..4054c27d93 100644
--- a/include/boot.h
+++ b/include/boot.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __BOOT_H
 #define __BOOT_H
 
diff --git a/include/bootchooser.h b/include/bootchooser.h
index 7822c01459..2cfd5b126a 100644
--- a/include/bootchooser.h
+++ b/include/bootchooser.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __BOOTCHOOSER_H
 #define __BOOTCHOOSER_H
 
diff --git a/include/bootm.h b/include/bootm.h
index a041aa35b9..7782de7a47 100644
--- a/include/bootm.h
+++ b/include/bootm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __BOOTM_H
 #define __BOOTM_H
 
diff --git a/include/bootsource.h b/include/bootsource.h
index 92f7f27cd4..32295ddd96 100644
--- a/include/bootsource.h
+++ b/include/bootsource.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __BOOTSOURCE_H__
 #define __BOOTSOURCE_H__
 
diff --git a/include/bootstrap.h b/include/bootstrap.h
index d3ee6be47c..05734a920c 100644
--- a/include/bootstrap.h
+++ b/include/bootstrap.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnio@jcrosoft.com>
- *
- * Under GPLv2
  */
 
 #ifndef __BOOSTRAP_H__
diff --git a/include/bpkfs.h b/include/bpkfs.h
index ccb56c1419..c80dc211c6 100644
--- a/include/bpkfs.h
+++ b/include/bpkfs.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
- *
- * under GPLv2 only
  */
 
 #ifndef __BPKFS_H__
diff --git a/include/bunzip2.h b/include/bunzip2.h
index 115272137a..55404ff846 100644
--- a/include/bunzip2.h
+++ b/include/bunzip2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef DECOMPRESS_BUNZIP2_H
 #define DECOMPRESS_BUNZIP2_H
 
diff --git a/include/byteorder.h b/include/byteorder.h
index 4b255a5fab..c3cac85013 100644
--- a/include/byteorder.h
+++ b/include/byteorder.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __BYTEORDER_H__
 #define __BYTEORDER_H__
 
diff --git a/include/cache.h b/include/cache.h
index 23841dcd06..37e008794b 100644
--- a/include/cache.h
+++ b/include/cache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __CACHE_H
 #define __CACHE_H
 
diff --git a/include/clock.h b/include/clock.h
index 211748f3a0..d681bf630e 100644
--- a/include/clock.h
+++ b/include/clock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef CLOCK_H
 #define CLOCK_H
 
diff --git a/include/cmdlinepart.h b/include/cmdlinepart.h
index bf8cdfa62a..9f5bdf610a 100644
--- a/include/cmdlinepart.h
+++ b/include/cmdlinepart.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __CMD_LINE_PART_H
 #define __CMD_LINE_PART_H
 
diff --git a/include/command.h b/include/command.h
index 7555d0053c..f016e35b2d 100644
--- a/include/command.h
+++ b/include/command.h
@@ -1,20 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * See file CREDITS for list of people who contributed to this
  * 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.
- *
  */
 
 /*
diff --git a/include/common.h b/include/common.h
index c6eb50420f..ef2e4e5c31 100644
--- a/include/common.h
+++ b/include/common.h
@@ -1,20 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) Copyright 2000-2004
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * See file CREDITS for list of people who contributed to this
  * 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.
- *
  */
 
 #ifndef __COMMON_H_
diff --git a/include/complete.h b/include/complete.h
index 491ba66cb4..763d256bf4 100644
--- a/include/complete.h
+++ b/include/complete.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __COMPLETE_
 #define __COMPLETE_
 
diff --git a/include/console.h b/include/console.h
index 537ac97ab3..634b95ca4e 100644
--- a/include/console.h
+++ b/include/console.h
@@ -1,20 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) Copyright 2000
  * Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), arsenio@tin.it
  *
  * See file CREDITS for list of people who contributed to this
  * 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.
- *
  */
 
 #ifndef _CONSOLE_H_
diff --git a/include/console_countdown.h b/include/console_countdown.h
index 88cadf11ec..df8da71e8b 100644
--- a/include/console_countdown.h
+++ b/include/console_countdown.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __CONSOLE_COUNTDOWN_H
 #define __CONSOLE_COUNTDOWN_H
 
diff --git a/include/crc.h b/include/crc.h
index a67388f732..eb972705c2 100644
--- a/include/crc.h
+++ b/include/crc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __INCLUDE_CRC_H
 #define __INCLUDE_CRC_H
 
diff --git a/include/crc7.h b/include/crc7.h
index 0c41cc341f..27d2dae422 100644
--- a/include/crc7.h
+++ b/include/crc7.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef _LINUX_CRC7_H
 #define _LINUX_CRC7_H
 #include <common.h>
diff --git a/include/debug_ll.h b/include/debug_ll.h
index 5047516399..5bd1afe6ac 100644
--- a/include/debug_ll.h
+++ b/include/debug_ll.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * debug_ll.h
  *
@@ -5,16 +6,6 @@
  *  12 Feb 2005
  *
  *  Copyright (C) 2005 Marc Singer
- *
- * 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.
  */
 
 #ifndef __INCLUDE_DEBUG_LL_H__
diff --git a/include/dhcp.h b/include/dhcp.h
index 0dced8e9fa..e19dac0d66 100644
--- a/include/dhcp.h
+++ b/include/dhcp.h
@@ -1,10 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (C) 2015 PHYTEC Messtechnik GmbH,
  * Author: Wadim Egorov <w.egorov@phytec.de>
- *
- * 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.
  */
 
 #ifndef __DHCP_H__
diff --git a/include/digest.h b/include/digest.h
index 176084146b..6148c03da4 100644
--- a/include/digest.h
+++ b/include/digest.h
@@ -1,19 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * (C) Copyright 2008-2010 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  *
  * See file CREDITS for list of people who contributed to this
  * 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; version 2 of
- * the License.
- *
- * 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.
- *
  */
 
 #ifndef __DIGEST_H__
diff --git a/include/dirent.h b/include/dirent.h
index 1df5d90452..d7b5e78b27 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __DIRENT_H
 #define __DIRENT_H
 
diff --git a/include/disks.h b/include/disks.h
index 9932750a24..e9b72c2507 100644
--- a/include/disks.h
+++ b/include/disks.h
@@ -1,16 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * See file CREDITS for list of people who contributed to this
  * 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.
  */
 
 #ifndef DISKS_H
diff --git a/include/dma-dir.h b/include/dma-dir.h
index 970764c5b3..d3b1a27b4f 100644
--- a/include/dma-dir.h
+++ b/include/dma-dir.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __DMA_DIR_H
 #define __DMA_DIR_H
 
diff --git a/include/dma.h b/include/dma.h
index 7f95782635..07b79cd918 100644
--- a/include/dma.h
+++ b/include/dma.h
@@ -1,8 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (C) 2012 by Marc Kleine-Budde <mkl@pengutronix.de>
- *
- * This file is released under the GPLv2
- *
  */
 
 #ifndef __DMA_H
diff --git a/include/driver.h b/include/driver.h
index 74be1b3e8e..6176e6a05f 100644
--- a/include/driver.h
+++ b/include/driver.h
@@ -1,19 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) 2007 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de>
  *
  * See file CREDITS for list of people who contributed to this
  * 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.
- *
  */
 
 #ifndef DRIVER_H
diff --git a/include/efi.h b/include/efi.h
index 43c0593951..5698a84145 100644
--- a/include/efi.h
+++ b/include/efi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef _LINUX_EFI_H
 #define _LINUX_EFI_H
 
diff --git a/include/elf.h b/include/elf.h
index 44be07f73a..113728f08a 100644
--- a/include/elf.h
+++ b/include/elf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef _LINUX_ELF_H
 #define _LINUX_ELF_H
 
diff --git a/include/envfs.h b/include/envfs.h
index c8fc3759c6..d4e2c6110e 100644
--- a/include/envfs.h
+++ b/include/envfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef _ENVFS_H
 #define _ENVFS_H
 
diff --git a/include/environment.h b/include/environment.h
index 52eafe9882..39606b8ad9 100644
--- a/include/environment.h
+++ b/include/environment.h
@@ -1,20 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) Copyright 2002
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * See file CREDITS for list of people who contributed to this
  * 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.
- *
  */
 
 #ifndef _ENVIRONMENT_H_
diff --git a/include/errno.h b/include/errno.h
index 496ccab0ee..50f00de5d6 100644
--- a/include/errno.h
+++ b/include/errno.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __ERRNO_H
 #define __ERRNO_H
 
diff --git a/include/fb.h b/include/fb.h
index 271b939968..e17d07ae0c 100644
--- a/include/fb.h
+++ b/include/fb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __FB_H
 #define __FB_H
 
diff --git a/include/fcntl.h b/include/fcntl.h
index 98020bdfb1..2e7c0eed34 100644
--- a/include/fcntl.h
+++ b/include/fcntl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __FCNTL_H
 #define __FCNTL_H
 
diff --git a/include/fdt.h b/include/fdt.h
index 38a2d27b02..232514c894 100644
--- a/include/fdt.h
+++ b/include/fdt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef _FDT_H
 #define _FDT_H
 
diff --git a/include/file-list.h b/include/file-list.h
index 404d8d64bb..9a9edfa378 100644
--- a/include/file-list.h
+++ b/include/file-list.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __FILE_LIST
 #define __FILE_LIST
 
diff --git a/include/filetype.h b/include/filetype.h
index db95fdaa0a..c3a5bdfbbe 100644
--- a/include/filetype.h
+++ b/include/filetype.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __FILE_TYPE_H
 #define __FILE_TYPE_H
 
diff --git a/include/firmware.h b/include/firmware.h
index 7c01a77118..19777d9bf7 100644
--- a/include/firmware.h
+++ b/include/firmware.h
@@ -1,14 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2013 Juergen Beisert <kernel@pengutronix.de>, Pengutronix
- *
- * 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.
  */
 
 #ifndef FIRMWARE_H
diff --git a/include/fnmatch.h b/include/fnmatch.h
index c0fd6a9207..c13beb9011 100644
--- a/include/fnmatch.h
+++ b/include/fnmatch.h
@@ -1,20 +1,7 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /* Copyright (C) 1991,92,93,96,97,98,99,2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+*/
 
 #ifndef	_FNMATCH_H
 #define	_FNMATCH_H	1
diff --git a/include/fs.h b/include/fs.h
index 38debfc41b..04ec1329e1 100644
--- a/include/fs.h
+++ b/include/fs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __FS_H
 #define __FS_H
 
diff --git a/include/getopt.h b/include/getopt.h
index 4f48ba8fd9..d4c01e793a 100644
--- a/include/getopt.h
+++ b/include/getopt.h
@@ -1,17 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * getopt.h - a simple getopt(3) implementation.
  *
  * Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * 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.
- *
  */
 
 #ifndef __GETOPT_H
diff --git a/include/glob.h b/include/glob.h
index 7778152513..5f532e6652 100644
--- a/include/glob.h
+++ b/include/glob.h
@@ -1,20 +1,7 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /* Copyright (C) 1991,92,95,96,97,98,2000,2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+*/
 
 #ifndef	_GLOB_H
 #define	_GLOB_H	1
diff --git a/include/globalvar.h b/include/globalvar.h
index 67391e2042..fc85e93e14 100644
--- a/include/globalvar.h
+++ b/include/globalvar.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __GLOBALVAR_H
 #define __GLOBALVAR_H
 
diff --git a/include/gpio.h b/include/gpio.h
index 0c0c0337e0..98c5b93ba2 100644
--- a/include/gpio.h
+++ b/include/gpio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __GPIO_H
 #define __GPIO_H
 
diff --git a/include/gpio_keys.h b/include/gpio_keys.h
index f4a22e16db..f12bed2a0b 100644
--- a/include/gpio_keys.h
+++ b/include/gpio_keys.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef _GPIO_KEYS_H
 #define _GPIO_KEYS_H
 
diff --git a/include/gunzip.h b/include/gunzip.h
index b9018941d1..0a959d5eb7 100644
--- a/include/gunzip.h
+++ b/include/gunzip.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef GUNZIP_H
 #define GUNZIP_H
 
diff --git a/include/hab.h b/include/hab.h
index 78c2b865ba..1aa5384053 100644
--- a/include/hab.h
+++ b/include/hab.h
@@ -1,18 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * Copyright (C) 2014, 2015 Marc Kleine-Budde <mkl@pengutronix.de>
  *
  * See file CREDITS for list of people who contributed to this
  * 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.
  */
 
 #ifndef __HABV4_H
diff --git a/include/image-fit.h b/include/image-fit.h
index fc0883b5dc..27c9e83519 100644
--- a/include/image-fit.h
+++ b/include/image-fit.h
@@ -1,17 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- *
  * Copyright (C) Jan Lübbe, 2014
  */
 
diff --git a/include/image-metadata.h b/include/image-metadata.h
index 4ed5448a8c..42ddf2fab0 100644
--- a/include/image-metadata.h
+++ b/include/image-metadata.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __INCLUDE_IMAGE_METADTA_H
 #define __INCLUDE_IMAGE_METADTA_H
 
diff --git a/include/image.h b/include/image.h
index add9c85874..18344dfef9 100644
--- a/include/image.h
+++ b/include/image.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) Copyright 2000-2005
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
@@ -5,17 +6,6 @@
  * See file CREDITS for list of people who contributed to this
  * 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.
- *
- *
  ********************************************************************
  * NOTE: This header file defines an interface to barebox. Including
  * this (unmodified) header file in another file is considered normal
diff --git a/include/init.h b/include/init.h
index 527d49afec..d1cef14b07 100644
--- a/include/init.h
+++ b/include/init.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef _INIT_H
 #define _INIT_H
 
diff --git a/include/int_sqrt.h b/include/int_sqrt.h
index 55fb4fbe66..b06e6a8ab1 100644
--- a/include/int_sqrt.h
+++ b/include/int_sqrt.h
@@ -1,17 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * See file CREDITS for list of people who contributed to this
  * 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.
- *
  */
 
 #ifndef __INT_SQRT__
diff --git a/include/io.h b/include/io.h
index 8eb56b061f..9130020722 100644
--- a/include/io.h
+++ b/include/io.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __IO_H
 #define __IO_H
 
diff --git a/include/ioctl.h b/include/ioctl.h
index 1ade20f905..3290a52519 100644
--- a/include/ioctl.h
+++ b/include/ioctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __IOCTL_H
 #define __IOCTL_H
 
diff --git a/include/jtag.h b/include/jtag.h
index 4cc4eaca91..b2a533fcb8 100644
--- a/include/jtag.h
+++ b/include/jtag.h
@@ -1,21 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * include/linux/jtag.h
  *
  * Written Aug 2009 by Davide Rizzo <elpa.rizzo@gmail.com>
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 /*
diff --git a/include/kallsyms.h b/include/kallsyms.h
index 69b84d2c6c..e0b3ff7cd5 100644
--- a/include/kallsyms.h
+++ b/include/kallsyms.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __KALLSYMS_H
 #define __KALLSYMS_H
 
diff --git a/include/kfifo.h b/include/kfifo.h
index 25880f4626..9c19d08b69 100644
--- a/include/kfifo.h
+++ b/include/kfifo.h
@@ -1,17 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * A simple kernel FIFO implementation.
  *
  * Copyright (C) 2004 Stelian Pop <stelian@popies.net>
- *
- * 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.
  */
 #ifndef _LINUX_KFIFO_H
 #define _LINUX_KFIFO_H
diff --git a/include/kgdb.h b/include/kgdb.h
index f543cd6e18..1f23833f92 100644
--- a/include/kgdb.h
+++ b/include/kgdb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __KGDB_H__
 #define __KGDB_H__
 
diff --git a/include/led.h b/include/led.h
index 0ce857129d..6b6aff922a 100644
--- a/include/led.h
+++ b/include/led.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __LED_H
 #define __LED_H
 
diff --git a/include/libbb.h b/include/libbb.h
index d05c190637..a3a13b41ce 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1,4 +1,4 @@
-
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __LIBBB_H
 #define __LIBBB_H
 
diff --git a/include/libfile.h b/include/libfile.h
index f1d6951877..350ddddf70 100644
--- a/include/libfile.h
+++ b/include/libfile.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __LIBFILE_H
 #define __LIBFILE_H
 
diff --git a/include/libgen.h b/include/libgen.h
index 71f06eb6f6..6c0f039efa 100644
--- a/include/libgen.h
+++ b/include/libgen.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __LIBGEN_H
 #define __LIBGEN_H
 
diff --git a/include/local_mac_address.h b/include/local_mac_address.h
index 3d1ec66b1f..5d2fb9d4c2 100644
--- a/include/local_mac_address.h
+++ b/include/local_mac_address.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnio@jcrosoft.com>
- *
- * Under GPLv2 only
  */
 
 #ifndef __LOCAL_MAC_ADDRESS_H__
diff --git a/include/lzo.h b/include/lzo.h
index 6c34be13ef..f46f38b0ed 100644
--- a/include/lzo.h
+++ b/include/lzo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __LZO_H__
 #define __LZO_H__
 /*
diff --git a/include/magicvar.h b/include/magicvar.h
index bb5bd2591f..9fb89a84cc 100644
--- a/include/magicvar.h
+++ b/include/magicvar.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __MAGIC_VARS_H
 #define __MAGIC_VARS_H
 
diff --git a/include/malloc.h b/include/malloc.h
index 0d3c9e97a0..971fc4058b 100644
--- a/include/malloc.h
+++ b/include/malloc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __MALLOC_H
 #define __MALLOC_H
 
diff --git a/include/math.h b/include/math.h
index 5648e3f9c1..1e59a8479e 100644
--- a/include/math.h
+++ b/include/math.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /* math.h - interface to shell math "library" -- this allows shells to share
  *          the implementation of arithmetic $((...)) expansions.
  *
diff --git a/include/mci.h b/include/mci.h
index d967027598..cf9d188c5c 100644
--- a/include/mci.h
+++ b/include/mci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) Copyright 2010 Juergen Beisert, Pengutronix
  *
@@ -10,17 +11,6 @@
  *
  * See file CREDITS for list of people who contributed to this
  * 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.
- *
  */
 
 #ifndef _MCI_H_
diff --git a/include/memory.h b/include/memory.h
index 73ee7661ef..906d9f7b26 100644
--- a/include/memory.h
+++ b/include/memory.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __MEM_MALLOC_H
 #define __MEM_MALLOC_H
 
diff --git a/include/memtest.h b/include/memtest.h
index 0100a6c58c..df0a391cc3 100644
--- a/include/memtest.h
+++ b/include/memtest.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __MEMTEST_H
 #define __MEMTEST_H
 
diff --git a/include/menu.h b/include/menu.h
index 2fef064499..77c496c65c 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -1,19 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * (C) Copyright 2009-2010 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  *
  * See file CREDITS for list of people who contributed to this
  * 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; version 2 of
- * the License.
- *
- * 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.
- *
  */
 
 #ifndef __MENU_H__
diff --git a/include/mmu.h b/include/mmu.h
index 66b246f6d2..2e23853df3 100644
--- a/include/mmu.h
+++ b/include/mmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __MMU_H
 #define __MMU_H
 
diff --git a/include/module.h b/include/module.h
index 460a34fe2b..abf740a789 100644
--- a/include/module.h
+++ b/include/module.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __MODULE_H
 #define __MODULE_H
 
diff --git a/include/nand.h b/include/nand.h
index fb3b5a1088..f0114a227d 100644
--- a/include/nand.h
+++ b/include/nand.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __NAND_H__
 #define __NAND_H__
 
diff --git a/include/notifier.h b/include/notifier.h
index e0df3e666b..432b66c4ca 100644
--- a/include/notifier.h
+++ b/include/notifier.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __NOTIFIER_H
 #define __NOTIFIER_H
 
diff --git a/include/of.h b/include/of.h
index 67601ce80c..8d6c018b73 100644
--- a/include/of.h
+++ b/include/of.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __OF_H
 #define __OF_H
 
diff --git a/include/of_address.h b/include/of_address.h
index 350ecaec82..66117b1fa7 100644
--- a/include/of_address.h
+++ b/include/of_address.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __OF_ADDRESS_H
 #define __OF_ADDRESS_H
 
diff --git a/include/of_device.h b/include/of_device.h
index 54410ad12f..244f5fcbbb 100644
--- a/include/of_device.h
+++ b/include/of_device.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __OF_DEVICE_H
 #define __OF_DEVICE_H
 
diff --git a/include/of_gpio.h b/include/of_gpio.h
index 95a454c683..9076c81e54 100644
--- a/include/of_gpio.h
+++ b/include/of_gpio.h
@@ -1,12 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * OF helpers for the GPIO API
  *
  * based on Linux OF_GPIO API
- *
- * 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.
  */
 
 #ifndef __OF_GPIO_H
diff --git a/include/of_graph.h b/include/of_graph.h
index 254dd2ca28..ef3fb8b94a 100644
--- a/include/of_graph.h
+++ b/include/of_graph.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * OF graph binding parsing helpers
  *
@@ -6,10 +7,6 @@
  *
  * Copyright (C) 2012 Renesas Electronics Corp.
  * Author: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
  */
 #ifndef __LINUX_OF_GRAPH_H
 #define __LINUX_OF_GRAPH_H
diff --git a/include/of_mtd.h b/include/of_mtd.h
index 9f5b8a2796..6dbc3d8673 100644
--- a/include/of_mtd.h
+++ b/include/of_mtd.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  *
  * OF helpers for mtd.
- *
- * This file is released under the GPLv2
  */
 
 #ifndef __LINUX_OF_MTD_H
diff --git a/include/of_net.h b/include/of_net.h
index 0f6ef200d5..f37af58303 100644
--- a/include/of_net.h
+++ b/include/of_net.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * OF helpers for network devices.
- *
- * This file is released under the GPLv2
  */
 
 #ifndef __LINUX_OF_NET_H
diff --git a/include/of_pci.h b/include/of_pci.h
index c95cb0135a..c787150936 100644
--- a/include/of_pci.h
+++ b/include/of_pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __OF_PCI_H
 #define __OF_PCI_H
 
diff --git a/include/param.h b/include/param.h
index c79b908b18..6aca1b481d 100644
--- a/include/param.h
+++ b/include/param.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef PARAM_H
 #define PARAM_H
 
diff --git a/include/parseopt.h b/include/parseopt.h
index 273a371ac3..5a40bdc219 100644
--- a/include/parseopt.h
+++ b/include/parseopt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __PARSEOPT_H__
 #define __PARSEOPT_H__
 void parseopt_llu_suffix(const char *options, const char *opt,
diff --git a/include/part.h b/include/part.h
index d4d40f6ec9..66cc93ae96 100644
--- a/include/part.h
+++ b/include/part.h
@@ -1,20 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) Copyright 2000-2004
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * See file CREDITS for list of people who contributed to this
  * 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.
- *
  */
 #ifndef _PART_H
 #define _PART_H
diff --git a/include/partition.h b/include/partition.h
index 32570530eb..373134afad 100644
--- a/include/partition.h
+++ b/include/partition.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __PARTITION_H
 #define __PARTITION_H
 
diff --git a/include/password.h b/include/password.h
index 8b9961815f..e259a87da1 100644
--- a/include/password.h
+++ b/include/password.h
@@ -1,18 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2008-2010 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  *
  * See file CREDITS for list of people who contributed to this
  * project.
- *
- * 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.
- *
  */
 
 #ifndef __PASSWORD_H__
diff --git a/include/pbl.h b/include/pbl.h
index 787bd8293f..f84ed3b7bf 100644
--- a/include/pbl.h
+++ b/include/pbl.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
- *
- * Under GPLv2
  */
 
 #ifndef __PBL_H__
diff --git a/include/phy-id-list.h b/include/phy-id-list.h
index a6070a0248..f770c775b8 100644
--- a/include/phy-id-list.h
+++ b/include/phy-id-list.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * List of all Etherenet PHY IDs that is not found in any .h files in
  * include/linux
diff --git a/include/pinctrl.h b/include/pinctrl.h
index 7d8716996d..0fd7f49118 100644
--- a/include/pinctrl.h
+++ b/include/pinctrl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef PINCTRL_H
 #define PINCTRL_H
 
diff --git a/include/poller.h b/include/poller.h
index 35a2271d69..b22b8a1b89 100644
--- a/include/poller.h
+++ b/include/poller.h
@@ -1,8 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (C) 2010 Marc Kleine-Budde <mkl@pengutronix.de>
- *
- * This file is released under the GPLv2
- *
  */
 
 #ifndef POLLER_H
diff --git a/include/poweroff.h b/include/poweroff.h
index ae9557db5d..217b68cdf9 100644
--- a/include/poweroff.h
+++ b/include/poweroff.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __INCLUDE_POWEROFF_H
 #define __INCLUDE_POWEROFF_H
 
diff --git a/include/printk.h b/include/printk.h
index b0d5d09f83..6a027175ab 100644
--- a/include/printk.h
+++ b/include/printk.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __PRINTK_H
 #define __PRINTK_H
 
diff --git a/include/progress.h b/include/progress.h
index 5c4dd1e775..75aa9c4f86 100644
--- a/include/progress.h
+++ b/include/progress.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __PROGRSS_H
 #define __PROGRSS_H
 
diff --git a/include/pwm.h b/include/pwm.h
index 3dce285913..ca01f5b53d 100644
--- a/include/pwm.h
+++ b/include/pwm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __PWM_H
 #define __PWM_H
 
diff --git a/include/qsort.h b/include/qsort.h
index d279dc2810..f8d889ea1e 100644
--- a/include/qsort.h
+++ b/include/qsort.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __QSORT_H
 #define __QSORT_H
 
diff --git a/include/ratp.h b/include/ratp.h
index d2a8192357..effa288b42 100644
--- a/include/ratp.h
+++ b/include/ratp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __RATP_H
 #define __RATP_H
 
diff --git a/include/ratp_bb.h b/include/ratp_bb.h
index b6699979b6..a4f28c642c 100644
--- a/include/ratp_bb.h
+++ b/include/ratp_bb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __RATP_BB_H
 #define __RATP_BB_H
 
diff --git a/include/readkey.h b/include/readkey.h
index ed1cd1542d..fdb96426e0 100644
--- a/include/readkey.h
+++ b/include/readkey.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef READKEY_H
 #define READKEY_H
 
diff --git a/include/regmap.h b/include/regmap.h
index 049ac0210e..718bb51979 100644
--- a/include/regmap.h
+++ b/include/regmap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __REGMAP_H
 #define __REGMAP_H
 
diff --git a/include/regulator.h b/include/regulator.h
index a445c5c3d1..d01535df52 100644
--- a/include/regulator.h
+++ b/include/regulator.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __REGULATOR_H
 #define __REGULATOR_H
 
diff --git a/include/reset_source.h b/include/reset_source.h
index 305dde0102..8795029315 100644
--- a/include/reset_source.h
+++ b/include/reset_source.h
@@ -1,13 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * 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.
  */
 
 #ifndef __INCLUDE_RESET_SOURCE_H
diff --git a/include/restart.h b/include/restart.h
index 79b57c8e11..7ec0910e94 100644
--- a/include/restart.h
+++ b/include/restart.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __INCLUDE_RESTART_H
 #define __INCLUDE_RESTART_H
 
diff --git a/include/rtc.h b/include/rtc.h
index 600dc46c41..3190ea20da 100644
--- a/include/rtc.h
+++ b/include/rtc.h
@@ -1,20 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) Copyright 2001
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * See file CREDITS for list of people who contributed to this
  * 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.
- *
  */
 
 /*
diff --git a/include/s_record.h b/include/s_record.h
index 84b4719519..190850beed 100644
--- a/include/s_record.h
+++ b/include/s_record.h
@@ -1,20 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * See file CREDITS for list of people who contributed to this
  * 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.
- *
  */
 
 /*--------------------------------------------------------------------------
diff --git a/include/scsi.h b/include/scsi.h
index 59d47393c8..ede1907962 100644
--- a/include/scsi.h
+++ b/include/scsi.h
@@ -1,21 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) Copyright 2001
  * Denis Peter, MPL AG Switzerland
  *
  * See file CREDITS for list of people who contributed to this
  * 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.
- *
- *
  */
  #ifndef _SCSI_H
  #define _SCSI_H
diff --git a/include/serdev.h b/include/serdev.h
index 29030538e5..0d020b8e82 100644
--- a/include/serdev.h
+++ b/include/serdev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef _SERDEV_H_
 #define _SERDEV_H_
 
diff --git a/include/shell.h b/include/shell.h
index 65dad0e1d1..073f18102b 100644
--- a/include/shell.h
+++ b/include/shell.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * (C) Copyright 2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
- *
- * Under GPLv2 only
  */
 
 #ifndef __SHELL_H__
diff --git a/include/sntp.h b/include/sntp.h
index bfcfcfa8c8..05cad129cd 100644
--- a/include/sntp.h
+++ b/include/sntp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __SNTP_H
 #define __SNTP_H
 
diff --git a/include/spi/eeprom.h b/include/spi/eeprom.h
index 137718f026..1afeeede98 100644
--- a/include/spi/eeprom.h
+++ b/include/spi/eeprom.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef _SPI_EEPROM_H
 #define _SPI_EEPROM_H
 
diff --git a/include/spi/flash.h b/include/spi/flash.h
index c1204e7e61..796d649d9a 100644
--- a/include/spi/flash.h
+++ b/include/spi/flash.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef LINUX_SPI_FLASH_H
 #define LINUX_SPI_FLASH_H
 
diff --git a/include/spi/imx-spi.h b/include/spi/imx-spi.h
index a592573e62..568795188c 100644
--- a/include/spi/imx-spi.h
+++ b/include/spi/imx-spi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __SPI_IMX_SPI_H
 #define __SPI_IMX_SPI_H
 
diff --git a/include/spi/spi.h b/include/spi/spi.h
index bdcda0bb60..48a90bcca7 100644
--- a/include/spi/spi.h
+++ b/include/spi/spi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __INCLUDE_SPI_H
 #define __INCLUDE_SPI_H
 
diff --git a/include/spi/spi_gpio.h b/include/spi/spi_gpio.h
index 841c934f6e..a18b7dbe07 100644
--- a/include/spi/spi_gpio.h
+++ b/include/spi/spi_gpio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * SPI master driver using generic bitbanged GPIO
  *
@@ -5,16 +6,6 @@
  *
  * Based on Linux driver
  *   Copyright (C) 2006,2008 David Brownell
- *
- * 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.
  */
 
 #ifndef __SPI_GPIO_H
diff --git a/include/state.h b/include/state.h
index d98b781c20..be1b592576 100644
--- a/include/state.h
+++ b/include/state.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __STATE_H
 #define __STATE_H
 
diff --git a/include/stdio.h b/include/stdio.h
index 46e277889d..1cb11e88de 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __STDIO_H
 #define __STDIO_H
 
diff --git a/include/stdlib.h b/include/stdlib.h
index ee3f229968..d405608724 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __STDLIB_H
 #define __STDLIB_H
 
diff --git a/include/stmp-device.h b/include/stmp-device.h
index 9b5bee4712..256856c589 100644
--- a/include/stmp-device.h
+++ b/include/stmp-device.h
@@ -1,12 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * basic functions for devices following the "stmp" style register layout
  *
  * Copyright (C) 2011 Wolfram Sang, Pengutronix e.K.
- *
- * 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.
  */
 
 #ifndef __STMP_DEVICE_H__
diff --git a/include/string.h b/include/string.h
index 8c63f22491..120a613d46 100644
--- a/include/string.h
+++ b/include/string.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __STRING_H
 #define __STRING_H
 
diff --git a/include/stringlist.h b/include/stringlist.h
index e85500a994..5cd452ca5f 100644
--- a/include/stringlist.h
+++ b/include/stringlist.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __STRINGLIST_H
 #define __STRINGLIST_H
 
diff --git a/include/twl6030_pwrbtn.h b/include/twl6030_pwrbtn.h
index c4e13d1f1d..4c8e166256 100644
--- a/include/twl6030_pwrbtn.h
+++ b/include/twl6030_pwrbtn.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef _TWL6030_PWRBTN_H
 #define _TWL6030_PWRBTN_H
 
diff --git a/include/types.h b/include/types.h
index 0bfe3b9a0b..a6739394e0 100644
--- a/include/types.h
+++ b/include/types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __TYPES_H
 #define __TYPES_H
 
diff --git a/include/ubiformat.h b/include/ubiformat.h
index 8a7a16ac18..eca62ae6db 100644
--- a/include/ubiformat.h
+++ b/include/ubiformat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __UBIFORMAT_H
 #define __UBIFORMAT_H
 
diff --git a/include/uimagefs.h b/include/uimagefs.h
index 3f58589b73..6b34982e4e 100644
--- a/include/uimagefs.h
+++ b/include/uimagefs.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
- *
- * under GPLv2 only
  */
 
 #ifndef __UIMAGEFS_H__
diff --git a/include/uncompress.h b/include/uncompress.h
index d146c90768..4bdb03d4f5 100644
--- a/include/uncompress.h
+++ b/include/uncompress.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __UNCOMPRESS_H
 #define __UNCOMPRESS_H
 
diff --git a/include/unistd.h b/include/unistd.h
index f392e6dd6c..06ce355809 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __UNISTD_H
 #define __UNISTD_H
 
diff --git a/include/usb_dfu_trailer.h b/include/usb_dfu_trailer.h
index 2cf66a590c..64b8407275 100644
--- a/include/usb_dfu_trailer.h
+++ b/include/usb_dfu_trailer.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef _USB_DFU_TRAILER_H
 #define _USB_DFU_TRAILER_H
 
diff --git a/include/w1_mac_address.h b/include/w1_mac_address.h
index cd4be765f7..1ee0ad27c9 100644
--- a/include/w1_mac_address.h
+++ b/include/w1_mac_address.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnio@jcrosoft.com>
- *
- * Under GPLv2 only
  */
 
 #ifndef __W1_MAC_ADDRESS_H__
diff --git a/include/watchdog.h b/include/watchdog.h
index 9741570ce2..419c1cdf46 100644
--- a/include/watchdog.h
+++ b/include/watchdog.h
@@ -1,14 +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 INCLUDE_WATCHDOG_H
 # define INCLUDE_WATCHDOG_H
diff --git a/include/wchar.h b/include/wchar.h
index adb4f373e9..b601cc6207 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __WCHAR_H
 #define __WCHAR_H
 
diff --git a/include/xfuncs.h b/include/xfuncs.h
index e3f120a040..a9132d3787 100644
--- a/include/xfuncs.h
+++ b/include/xfuncs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __XFUNCS_H
 #define __XFUNCS_H
 
diff --git a/include/xymodem.h b/include/xymodem.h
index 917cecc003..89444f5c5e 100644
--- a/include/xymodem.h
+++ b/include/xymodem.h
@@ -1,17 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * Handles the X-Modem, Y-Modem and Y-Modem/G protocols
  *
  * Copyright (C) 2008 Robert Jarzmik
- *
- * 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.
  */
 
 #ifndef _XYMODEM_